Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_adminUI

src/views/course/courseTrafficLog/index.vue

@@ -7,7 +7,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="项目" prop="project">
-        <el-select v-model="form.project" placeholder="请选择项目" filterable clearable size="small">
+        <el-select v-model="queryParams.project" placeholder="请选择项目" filterable clearable size="small">
           <el-option
             v-for="dict in projectOptions"
             :key="dict.dictValue"
@@ -28,11 +28,12 @@
       </el-form-item>
       <el-form-item label="年月" prop="time">
         <el-date-picker
-          v-model="queryParams.time"
-          type="month"
+          v-model="time"
+          type="daterange"
           placeholder="选择年月"
           :picker-options="pickerOptions"
-          :value-format="'yyyy-MM'"
+          :value-format="'yyyy-MM-dd'"
+          @change="handleDateData"
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -61,7 +62,7 @@
       <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" prop="month" />
       <el-table-column label="使用流量" align="center">
         <template slot-scope="scope">
           <span>{{ formatTrafficData(scope.row.totalInternetTraffic) }}</span>
@@ -93,10 +94,18 @@ export default {
   name: "CourseTrafficLog",
   data() {
     return {
-      companyList:[],
       pickerOptions: {
-        shortcuts: [{ text: '本月', onClick: () => this.handleShortcut() }],
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
       },
+      companyList:[],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -119,8 +128,11 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      time: null,
       // 查询参数
       queryParams: {
+        startDate: null,
+        endDate: null,
         pageNum: 1,
         pageSize: 10,
         userId: null,
@@ -131,7 +143,6 @@ export default {
         companyUserId: null,
         companyId: null,
         courseId: null,
-        time:new Date().toISOString().slice(0, 7)
       },
       // 表单参数
       form: {},
@@ -152,6 +163,15 @@ export default {
 
   },
   methods: {
+    handleDateData(){
+      if (this.time) {
+        this.queryParams.startDate = this.time[0];
+        this.queryParams.endDate = this.time[1];
+      } else {
+        this.queryParams.startDate = null;
+        this.queryParams.endDate = null;
+      }
+    },
     getAllCompany() {
       allList().then(response => {
         this.companyList = response.rows;

src/views/course/courseUserStatistics/index.vue

@@ -31,7 +31,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="销售" prop="nickName">
+      <el-form-item label="公司名称" prop="companyId">
+        <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small"  @change="handleSeller">
+          <el-option
+            v-for="item in companys"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="销售" prop="nickName" v-if="queryParams.companyId">
         <el-select v-model="queryParams.companyUserId" remote placeholder="请选择" filterable clearable  style="width: 100%;" @keyup.enter.native="handleQuery">
           <el-option
             v-for="dict in companyUserList"
@@ -44,16 +54,7 @@
       <el-form-item label="添加时间" prop="createTime">
         <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
       </el-form-item>
-      <el-form-item label="公司名称" prop="companyId">
-        <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
-          <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </el-select>
-      </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>
@@ -259,13 +260,17 @@ export default {
     this.getDicts("sys_course_project").then(response => {
       this.projectLists = response.data;
     })
-    getUserList().then(res=>{
-      if(res.code === 200) {
-        this.companyUserList = res.data
-      }
-    })
   },
   methods: {
+    handleSeller(){
+      if(this.queryParams.companyId != null) {
+        getUserList(this.queryParams.companyId).then(res=>{
+          if(res.code === 200) {
+            this.companyUserList = res.data
+          }
+        })
+      }
+    },
     courseChange(row){
       this.queryParams.videoId=null;
       if(row === ''){

src/views/course/courseUserStatistics/qw/index.vue

@@ -30,7 +30,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange"  show-summary height="600">
+    <el-table border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange"  show-summary>
       <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="企微员工名称" align="center" prop="qwUserName" />
 

src/views/course/courseUserStatistics/statistics.vue

@@ -11,16 +11,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="公司名称" prop="companyId">
-        <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
-          <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </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
@@ -41,8 +32,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="销售" prop="nickName">
-        <el-select v-model="queryParams.companyUserId" @click="handleSeller" remote placeholder="请选择" filterable clearable @keyup.enter.native="handleQuery">
+      <el-form-item label="公司名称" prop="companyId">
+        <el-select style="width: 220px" @change="handleSeller" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
+          <el-option
+            v-for="item in companys"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="销售" prop="nickName" v-if="queryParams.companyId">
+        <el-select v-model="queryParams.companyUserId" remote placeholder="请选择" filterable clearable @keyup.enter.native="handleQuery">
           <el-option
             v-for="dict in companyUserList"
             :key="`${dict.nickName} - ${dict.userName}`"
@@ -574,13 +575,17 @@ export default {
     this.getDicts("sys_course_project").then(response => {
       this.projectLists = response.data;
     })
-    getUserList().then(res=>{
-      if(res.code === 200) {
-        this.companyUserList = res.data
-      }
-    })
   },
   methods: {
+    handleSeller(){
+      if(this.queryParams.companyId != null) {
+        getUserList(this.queryParams.companyId).then(res=>{
+          if(res.code === 200) {
+            this.companyUserList = res.data
+          }
+        })
+      }
+    },
     courseChange(row){
       this.queryParams.videoId=null;
       if(row === ''){

src/views/course/courseWatchLog/statistics.vue

@@ -186,6 +186,7 @@ export default {
   },
   methods: {
     handleSeller(){
+      console.log(this.queryParams.companyId)
       if(this.queryParams.companyId != null) {
         getUserList(this.queryParams.companyId).then(res=>{
           if(res.code === 200) {

src/views/course/videoResource/index.vue

@@ -1226,7 +1226,7 @@ export default {
       document.body.removeChild(input);
       // 提示用户复制成功
       this.$message({
-        message: '链接已复制到剪贴板',
+        message: '已复制到剪贴板',
         type: 'success',
         duration: 1500
       });