Merge remote-tracking branch 'origin/master'

src/api/course/courseTrafficLog.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询短链课程流量记录列表
+export function listCourseTrafficLog(query) {
+  return request({
+    url: '/course/courseTrafficLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询短链课程流量记录详细
+export function getCourseTrafficLog(logId) {
+  return request({
+    url: '/course/courseTrafficLog/' + logId,
+    method: 'get'
+  })
+}
+
+// 新增短链课程流量记录
+export function addCourseTrafficLog(data) {
+  return request({
+    url: '/course/courseTrafficLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改短链课程流量记录
+export function updateCourseTrafficLog(data) {
+  return request({
+    url: '/course/courseTrafficLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除短链课程流量记录
+export function delCourseTrafficLog(logId) {
+  return request({
+    url: '/course/courseTrafficLog/' + logId,
+    method: 'delete'
+  })
+}
+
+// 导出短链课程流量记录
+export function exportCourseTrafficLog(query) {
+  return request({
+    url: '/course/courseTrafficLog/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/course/courseAnswerlogs/index.vue

@@ -52,7 +52,7 @@
 <!--        </el-select>-->
 <!--      </el-form-item>-->
       <el-form-item label="是否全部正确" prop="isRight">
-        <el-select filterable  v-model="queryParams.isRight" placeholder="请选择公司名"  clearable size="small">
+        <el-select filterable  v-model="queryParams.isRight" placeholder="是否全部正确"  clearable size="small">
           <el-option
             v-for="dict in sysCompanyOr"
             :key="dict.dictValue"

src/views/course/courseTrafficLog/index.vue

@@ -0,0 +1,293 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+<!--      <el-form-item label="公司名称" prop="companyId" >-->
+<!--        <el-select v-model="queryParams.companyId" placeholder="请选择所属公司" filterable clearable size="small">-->
+<!--          <el-option v-for="(option, index) in companyList" :key="index" :value="option.dictValue" :label="option.dictLabel"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="项目" prop="project">
+        <el-select v-model="form.project" placeholder="请选择项目" filterable clearable size="small">
+          <el-option
+            v-for="dict in projectOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="课程" prop="courseId">
+        <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
+          <el-option
+            v-for="dict in courseLists"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="年月" prop="time">
+        <el-date-picker
+          v-model="queryParams.time"
+          type="month"
+          placeholder="选择年月"
+          :picker-options="pickerOptions"
+          :value-format="'yyyy-MM'"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['course:courseTrafficLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="courseTrafficLogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="公司名称" align="center" prop="companyName" />
+      <el-table-column label="项目" align="center" prop="projectName" />
+      <el-table-column label="课程" align="center" prop="courseName" />
+      <el-table-column label="月份" align="center" prop="month" />
+      <el-table-column label="使用流量" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTrafficData(scope.row.totalInternetTraffic) }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="费用" align="center">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ formatTrafficMoney(scope.row.totalInternetTraffic) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { listCourseTrafficLog, getCourseTrafficLog, delCourseTrafficLog, addCourseTrafficLog, updateCourseTrafficLog, exportCourseTrafficLog } from "@/api/course/courseTrafficLog";
+import {courseList} from "@/api/course/courseRedPacketLog";
+import {allList}from "@/api/company/company";
+export default {
+  name: "CourseTrafficLog",
+  data() {
+    return {
+      companyList:[],
+      pickerOptions: {
+        shortcuts: [{ text: '本月', onClick: () => this.handleShortcut() }],
+      },
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 短链课程流量记录表格数据
+      courseTrafficLogList: [],
+      projectOptions:[],
+      courseLists:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        videoId: null,
+        qwExternalContactId: null,
+        internetTraffic: null,
+        qwUserId: null,
+        companyUserId: null,
+        companyId: null,
+        courseId: null,
+        time:new Date().toISOString().slice(0, 7)
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    courseList().then(response => {
+      this.courseLists = response.list;
+    });
+    this.getDicts("sys_course_project").then(response => {
+      this.projectOptions = response.data;
+    });
+    this.getList();
+    this.getAllCompany();
+
+  },
+  methods: {
+    getAllCompany() {
+      allList().then(response => {
+        this.companyList = response.rows;
+      });
+    },
+    formatTrafficData(traffic) {
+
+        if (traffic < 1024) { // Less than 1 KB
+          return traffic + ' B';
+        } else if (traffic < 1024 * 1024) { // Less than 1 MB
+          return (traffic / 1024).toFixed(2) + ' KB';
+        } else if (traffic < 1024 * 1024 * 1024) { // Less than 1 GB
+          return (traffic / (1024 * 1024)).toFixed(2) + ' MB';
+        } else { // More than 1 GB
+          return (traffic / (1024 * 1024 * 1024)).toFixed(2) + ' GB';
+        }
+
+    },
+    formatTrafficMoney(traffic){
+      return (traffic / (1024 * 1024 * 1024) * 0.095).toFixed(2) + ' 元'
+    },
+
+    handleShortcut() {
+      this.queryParams.time = new Date().toISOString().slice(0, 7);
+    },
+    /** 查询短链课程流量记录列表 */
+    getList() {
+      this.loading = true;
+      listCourseTrafficLog(this.queryParams).then(response => {
+        this.courseTrafficLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        logId: null,
+        userId: null,
+        videoId: null,
+        createTime: null,
+        qwExternalContactId: null,
+        internetTraffic: null,
+        qwUserId: null,
+        companyUserId: null,
+        companyId: null,
+        courseId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.logId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加短链课程流量记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const logId = row.logId || this.ids
+      getCourseTrafficLog(logId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改短链课程流量记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.logId != null) {
+            updateCourseTrafficLog(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCourseTrafficLog(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const logIds = row.logId || this.ids;
+      this.$confirm('是否确认删除短链课程流量记录编号为"' + logIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCourseTrafficLog(logIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有短链课程流量记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportCourseTrafficLog(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/qw/friendWelcome/index.vue

@@ -377,7 +377,7 @@
     </el-dialog>
 
     <!-- 选择成员账号弹窗   -->
-    <el-dialog :title="listUser.title" :visible.sync="listUser.open" style="width: 1600px;height: 100%" append-to-body>
+    <el-dialog :title="listUser.title" :visible.sync="listUser.open" width="1000" append-to-body>
       <qwUserList ref="QwUserList" @selectUserList="selectUserList"></qwUserList>
     </el-dialog>
 

src/views/qw/friendWelcome/indexNew.vue

@@ -125,8 +125,8 @@
     />
 
     <!-- 添加或修改好友欢迎语对话框 -->
-    <el-dialog :title="title" :visible.sync="open" v-loading="loading" width="1700px" append-to-body>
-      <div style="width: 1130px" class="app-container">
+    <el-dialog :title="title" :visible.sync="open" v-loading="loading" width="1000px" append-to-body>
+      <div style="width: 800px" class="app-container">
         <div>
           <span style="font-size: 15px">基础信息</span>
           <el-divider></el-divider>
@@ -370,18 +370,18 @@
         </el-form>
       </div>
 
-      <div slot="footer" class="dialog-footer" style="text-align: center">
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary"  @click="submitForm">确定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 选择成员账号弹窗   -->
-    <el-dialog :title="listUser.title" :visible.sync="listUser.open" style="width: 1600px;height: 100%" append-to-body>
+    <el-dialog :title="listUser.title" :visible.sync="listUser.open" width="700" append-to-body>
       <qwUserList ref="QwUserList" @selectUserList="selectUserList"></qwUserList>
     </el-dialog>
 
-    <el-dialog :title="welcomeItem.title" :visible.sync="welcomeItem.open" style="width: 1300px;height: 100%" append-to-body>
+    <el-dialog :title="welcomeItem.title" :visible.sync="welcomeItem.open" width="1000" append-to-body>
       <el-form ref="fileFrom" :model="fileFrom" :rules="fuleRules" label-width="110px">
         <div v-if="welcomeItem.type==='image'">
           <el-form-item label="图片：" prop="imagePicUrl">
@@ -390,7 +390,18 @@
         </div>
         <div v-if="welcomeItem.type==='link'">
 
-          <el-form-item label="选择课程">
+          <el-form-item label="是否注册链接" prop="isFixed">
+            <el-radio-group v-model="fileFrom.isFixed">
+              <el-radio
+                :label="1"
+              >是</el-radio>
+              <el-radio
+                :label="0"
+              >否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="选择课程" v-if="fileFrom.isFixed==0">
             <el-select  v-model="fileFrom.courseId" placeholder="请选择课程" style=" margin-right: 10px;" size="mini"  @change="courseChange(fileFrom,welcomeItem.index,welcomeItem.itemIndex)">
               <el-option
                 v-for="dict in courseList"
@@ -418,27 +429,18 @@
           <el-form-item label="图文的描述：" prop="linkDesc">
             <el-input v-model="fileFrom.linkDesc" :rows="4" maxlength="170" show-word-limit type="textarea" placeholder="请输入内容,，最长为170字" />
           </el-form-item>
-          <div v-if="fileFrom.videoId==null" style="margin-top: 1%">
+          <div v-if="fileFrom.videoId==null && fileFrom.isFixed==0" style="margin-top: 1%">
             <el-form-item label="图文链接:"  label-width="100px" >
               <el-input v-model="fileFrom.linkUrl" placeholder="请输入链接地址" style="width: 90%;"/>
             </el-form-item>
           </div>
-          <el-form-item label="图文链接替换为注册链接" prop="isFixed">
-            <el-radio-group v-model="fileFrom.isFixed">
-              <el-radio
-                :label="1"
-              >是</el-radio>
-              <el-radio
-                :label="0"
-              >否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <div v-if="fileFrom.videoId!=null">
+
+          <div v-if="fileFrom.videoId!=null && fileFrom.isFixed==0">
             <el-form-item label="图文链接:"  label-width="100px" >
               <el-tag type="warning" v-model="fileFrom.linkUrl='待生成'">选择的课程小节 即为卡片链接地址/注册链接</el-tag>
             </el-form-item>
           </div>
-          <div v-if="fileFrom.videoId!=null">
+          <div v-if="fileFrom.videoId!=null && fileFrom.isFixed==0">
             <el-form-item label="课节过期时间" style="margin-top: 1%" required label-width="110px">
               <el-row>
                 <el-input-number  v-model="fileFrom.expiresDays"  :min="1" :max="9999" ></el-input-number>
@@ -502,7 +504,7 @@
           <!--          </el-form-item>-->
         </div>
       </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
+      <div slot="footer" class="dialog-footer" >
         <el-button type="primary" @click="confirmUpload">确定</el-button>
         <el-button type="primary" @click="cancelUpload">取消</el-button>
       </div>
@@ -910,11 +912,11 @@ export default {
         this.fileFrom.expiresDays = item.link.expiresDays;
         this.fileFrom.isFixed = item.link.isFixed;
 
-        videoList(item.link.courseId).then(response => {
-          this.videoList = response.list;
-        });
-
-
+        if (this.fileFrom.isFixed==0){
+          videoList(item.link.courseId).then(response => {
+            this.videoList = response.list;
+          });
+        }
       }else if (item.msgtype === 'miniprogram') {
         this.fileFrom.miniprogramAppid = 'wx73f85f8d62769119';
         this.fileFrom.miniprogramTitle = item.miniprogram.title;

src/views/qw/sop/addSop.vue

@@ -340,11 +340,11 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-      <el-dialog :title="listUser.title" :visible.sync="listUser.open" style="width: 1300px;height: 100%" append-to-body>
+      <el-dialog :title="listUser.title" :visible.sync="listUser.open" width="700px" append-to-body>
         <qwUserList ref="QwUserList" @selectUserList="selectUserList"></qwUserList>
       </el-dialog>
 
-      <el-dialog :title="companyUser.title" :visible.sync="companyUser.open" style="width: 110%;height: 100%" append-to-body>
+      <el-dialog :title="companyUser.title" :visible.sync="companyUser.open" width="700px" append-to-body>
         <company-user-list ref="companyUserList" @selectCompanyUserList="selectCompanyUserList"></company-user-list>
       </el-dialog>
 
@@ -353,7 +353,7 @@
       </el-dialog>
 
       <!--  选择/排除标签   -->
-      <el-dialog :title="changeTagDialog.title" :visible.sync="changeTagDialog.open" style="width:100%;height: 100%" append-to-body>
+      <el-dialog :title="changeTagDialog.title" :visible.sync="changeTagDialog.open" width="800px" append-to-body>
 
         <div>搜索标签：
           <el-input v-model="queryTagParams.tagName" placeholder="请输入标签名称" clearable size="small" style="width: 200px;margin-right: 10px" />

src/views/qw/sopLogs/sopLogsList.vue

@@ -152,6 +152,7 @@
               <span v-if="item.contentType == 5">文件</span>
               <span v-if="item.contentType == 6">视频</span>
               <span v-if="item.contentType == 7">语音</span>
+              <span v-if="item.contentType == 10">注册链接</span>
             </div>
             <div v-if="item.contentType == 1" v-html="item.value"></div>
             <div v-if="item.contentType == 2">
@@ -161,7 +162,7 @@
                 fit="contain"
                 @click.prevent="openImageViewer(item.imgUrl)" />
             </div>
-            <div v-if="item.contentType == 3" class="message-style">
+            <div v-if="item.contentType == 3 || item.contentType == 10" class="message-style">
               <div
                 style="background-color: white; padding: 10px; width: 100%"
                 @click="openLink(item.linkUrl)">