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

src/api/system/employeeStats.js

@@ -9,6 +9,22 @@ export function listEmployeeStats(query) {
   })
 }
 
+export function listPeriodList(query) {
+  return request({
+    url: '/stats/period/pageList',
+    method: 'post',
+    data: query
+  })
+}
+
+export function listTodayList(query) {
+  return request({
+    url: '/stats/everyDay/pageList',
+    method: 'post',
+    data: query
+  })
+}
+
 // 查询员工完成统计详细
 export function getEmployeeStats(id) {
   return request({
@@ -49,3 +65,11 @@ export function getSOPTaskData(param){
     method: 'get'
   })
 }
+
+// 获取部门数据
+export function getDeptData(param){
+  return request({
+    url: '/stats/getDeptData',
+    method: 'get'
+  })
+}

src/components/TreeSelect/index.vue

@@ -37,8 +37,8 @@
           >
             <span class="custom-tree-node" slot-scope="{ node, data }">
               <span>{{ node.label }}</span>
-              <span v-if="!data.isParent && showNodeDetail" class="node-detail-text">
-                (ID: {{ data.originalData.qwUserId}} {{ data.originalData.taskExecDate }})
+              <span v-if="isLeafNode(data) && showNodeDetail" class="node-detail-text">
+                (ID: {{ data.originalData.qwUserId || data.originalData.id }} {{ data.originalData.taskExecDate || '' }})
               </span>
             </span>
           </el-tree>
@@ -80,17 +80,17 @@
           </template>
           <span v-else-if="!multiple && currentSelectedNodes.length > 0" class="single-value-display">
             {{ currentSelectedNodes[0][treeProps.label] }}
-            </span>
+          </span>
           <span v-else class="placeholder-text">{{ placeholder }}</span>
         </div>
 
         <span class="icons-container">
-            <i
-              v-if="showClearIcon"
-              class="el-icon-circle-close clear-icon"
-              @click.stop="handleClearOnTrigger"
-            ></i>
-            <i :class="['el-icon-arrow-up', 'arrow-icon', { 'is-reverse': !popoverVisible }]"></i>
+          <i
+            v-if="showClearIcon"
+            class="el-icon-circle-close clear-icon"
+            @click.stop="handleClearOnTrigger"
+          ></i>
+          <i :class="['el-icon-arrow-up', 'arrow-icon', { 'is-reverse': !popoverVisible }]"></i>
         </span>
       </div>
     </el-popover>
@@ -166,6 +166,11 @@ export default {
       default: 280
     },
     returnLeafOnly: {
+      type: Boolean,
+      default: true
+    },
+    // 新增属性：父节点是否可选
+    parentSelectable: {
       type: Boolean,
       default: false
     }
@@ -207,23 +212,15 @@ export default {
       immediate: true,
       handler(newData) {
         this.processRawData(newData);
-        // 过滤掉父节点，只保留子节点
-        const leafOnlyKeys = this.value.filter(key => {
-          const node = this.nodeMap[key];
-          return node && !node.isParent;
-        });
+        const leafOnlyKeys = this.getLeafOnlyKeys(this.value);
         this.updateCurrentSelectedNodesFromKeys(leafOnlyKeys, true);
       }
     },
     value: {
       handler(newVal) {
-        // 过滤掉父节点，只保留子节点
-        const leafOnlyKeys = newVal.filter(key => {
-          const node = this.nodeMap[key];
-          return node && !node.isParent;
-        });
-
+        const leafOnlyKeys = this.getLeafOnlyKeys(newVal);
         const validKeysFromNewVal = leafOnlyKeys.filter(key => this.nodeMap[key] !== undefined);
+
         const sortedNewValStr = JSON.stringify([...leafOnlyKeys].sort());
         const sortedValidKeysFromNewValStr = JSON.stringify([...validKeysFromNewVal].sort());
         const currentInternalNodeKeys = this.currentSelectedNodes.map(n => n[this.nodeKey]);
@@ -263,52 +260,90 @@ export default {
     }
   },
   mounted() {
-    // 过滤掉父节点，只保留子节点
-    const leafOnlyKeys = this.value.filter(key => {
-      const node = this.nodeMap[key];
-      return node && !node.isParent;
-    });
+    const leafOnlyKeys = this.getLeafOnlyKeys(this.value);
     this.updateCurrentSelectedNodesFromKeys(leafOnlyKeys, true);
   },
   methods: {
+    /**
+     * 处理原始数据，转换成树形结构
+     */
     processRawData(data) {
       if (!data || !Array.isArray(data)) {
         this.processedTreeData = [];
         this.nodeMap = {};
         return;
       }
-      const newMap = {};
-      const mapNode = (node) => {
-        newMap[node[this.nodeKey]] = node;
-        if (node[this.treeProps.children] && node[this.treeProps.children].length) {
-          node[this.treeProps.children].forEach(mapNode);
-        }
-      };
 
-      this.processedTreeData = data.map(mainTask => {
-        const children = (mainTask.taskDetailList || []).map(detail => ({
-          [this.nodeKey]: detail.taskId,
-          [this.treeProps.label]: `${detail.qwUserId || '未命名子任务'}`,
-          isParent: false,
-          [this.treeProps.isLeaf]: true,
-          disabled: false, // 子节点可以选择
-          originalData: { ...detail, parentTaskId: mainTask.taskId }
-        }));
-
-        const parentNode = {
-          [this.nodeKey]: mainTask.taskId,
-          [this.treeProps.label]: mainTask.taskName,
-          isParent: true,
-          [this.treeProps.isLeaf]: children.length === 0,
-          disabled: true, // 父节点不可选择
-          [this.treeProps.children]: children,
-          originalData: { taskId: mainTask.taskId, taskName: mainTask.taskName }
+      this.nodeMap = {};
+
+      // 递归处理树节点
+      const processNode = (node, level = 0) => {
+        const children = node[this.treeProps.children] || [];
+        const hasChildren = children && children.length > 0;
+
+        const processedNode = {
+          [this.nodeKey]: node[this.nodeKey],
+          [this.treeProps.label]: node[this.treeProps.label] || `节点-${node[this.nodeKey]}`,
+          [this.treeProps.isLeaf]: !hasChildren,
+          level: level,
+          // 根据 parentSelectable 属性决定父节点是否可选
+          disabled: hasChildren && !this.parentSelectable,
+          originalData: { ...node },
+          [this.treeProps.children]: hasChildren ? children.map(child => processNode(child, level + 1)) : undefined
         };
-        mapNode(parentNode); // Add parent and its children to map
-        return parentNode;
+
+        // 添加到节点映射
+        this.nodeMap[node[this.nodeKey]] = processedNode;
+
+        return processedNode;
+      };
+
+      this.processedTreeData = data.map(node => processNode(node, 0));
+    },
+
+    /**
+     * 判断是否为叶子节点
+     */
+    isLeafNode(node) {
+      return !node[this.treeProps.children] || node[this.treeProps.children].length === 0;
+    },
+
+    /**
+     * 获取节点下所有叶子节点的ID
+     */
+    getAllLeafKeysUnderNode(nodeKey) {
+      const node = this.nodeMap[nodeKey];
+      if (!node) return [];
+
+      if (this.isLeafNode(node)) {
+        return [nodeKey];
+      }
+
+      const leafKeys = [];
+      const children = node[this.treeProps.children] || [];
+
+      children.forEach(child => {
+        leafKeys.push(...this.getAllLeafKeysUnderNode(child[this.nodeKey]));
+      });
+
+      return leafKeys;
+    },
+
+    /**
+     * 过滤出叶子节点的keys
+     */
+    getLeafOnlyKeys(keys) {
+      if (!keys || !Array.isArray(keys)) return [];
+
+      return keys.filter(key => {
+        const node = this.nodeMap[key];
+        return node && this.isLeafNode(node);
       });
-      this.nodeMap = newMap;
     },
+
+    /**
+     * 根据keys更新当前选中的节点
+     */
     updateCurrentSelectedNodesFromKeys(keys, updateTreeVisualState = false) {
       const newSelectedNodes = [];
       const actualFoundKeys = [];
@@ -316,8 +351,8 @@ export default {
       if (keys && Array.isArray(keys)) {
         keys.forEach(key => {
           const node = this.nodeMap[key];
-          // 只添加子节点到选中列表
-          if (node && !node.isParent) {
+          // 只添加叶子节点到选中列表
+          if (node && this.isLeafNode(node)) {
             newSelectedNodes.push(node);
             actualFoundKeys.push(key);
           }
@@ -330,37 +365,91 @@ export default {
         this.$refs.taskTree.setCheckedKeys([...actualFoundKeys]);
       }
     },
+
+    /**
+     * 过滤节点方法
+     */
     filterNode(value, data) {
       if (!value) return true;
       return data[this.treeProps.label].toLowerCase().indexOf(value.toLowerCase()) !== -1;
     },
+
+    /**
+     * 处理树节点选择
+     */
     handleTreeCheck(nodeData, checkStatus) {
-      // 如果是父节点，不允许选择
-      if (nodeData.isParent) {
+      const isNodeChecked = checkStatus.checkedKeys.includes(nodeData[this.nodeKey]);
+
+      // 如果选中的是父节点且父节点可选
+      if (!this.isLeafNode(nodeData) && this.parentSelectable && isNodeChecked) {
+        // 获取该父节点下所有叶子节点的ID
+        const leafKeysUnderParent = this.getAllLeafKeysUnderNode(nodeData[this.nodeKey]);
+
+        if (!this.multiple) {
+          // 单选模式：选择父节点下的第一个叶子节点
+          this.tempCheckedKeys = leafKeysUnderParent.slice(0, 1);
+        } else {
+          // 多选模式：添加所有叶子节点
+          const existingLeafKeys = this.tempCheckedKeys.filter(key => {
+            const node = this.nodeMap[key];
+            return node && this.isLeafNode(node);
+          });
+
+          // 合并现有的叶子节点和新选择的叶子节点，去重
+          const allLeafKeys = [...new Set([...existingLeafKeys, ...leafKeysUnderParent])];
+          this.tempCheckedKeys = allLeafKeys;
+        }
+
+        // 更新树的选中状态
+        this.$refs.taskTree.setCheckedKeys(this.tempCheckedKeys);
+        return;
+      }
+
+      // 如果取消选中父节点
+      if (!this.isLeafNode(nodeData) && this.parentSelectable && !isNodeChecked) {
+        // 获取该父节点下所有叶子节点的ID
+        const leafKeysUnderParent = this.getAllLeafKeysUnderNode(nodeData[this.nodeKey]);
+
+        // 从当前选中的keys中移除这些叶子节点
+        this.tempCheckedKeys = this.tempCheckedKeys.filter(key => !leafKeysUnderParent.includes(key));
+
+        // 更新树的选中状态
+        this.$refs.taskTree.setCheckedKeys(this.tempCheckedKeys);
+        return;
+      }
+
+      // 如果是非叶子节点且父节点不可选，不允许选择
+      if (!this.isLeafNode(nodeData) && !this.parentSelectable) {
         // 恢复之前的选中状态
         this.$refs.taskTree.setCheckedKeys(this.tempCheckedKeys);
         return;
       }
 
-      if (!this.multiple) {
-        const isNodeChecked = checkStatus.checkedKeys.includes(nodeData[this.nodeKey]);
-        if (isNodeChecked) {
-          this.tempCheckedKeys = [nodeData[this.nodeKey]];
-          this.$refs.taskTree.setCheckedKeys([nodeData[this.nodeKey]]); // Visually enforce single check
+      // 处理叶子节点的选择
+      if (this.isLeafNode(nodeData)) {
+        if (!this.multiple) {
+          if (isNodeChecked) {
+            this.tempCheckedKeys = [nodeData[this.nodeKey]];
+            this.$refs.taskTree.setCheckedKeys([nodeData[this.nodeKey]]);
+          } else {
+            this.tempCheckedKeys = [];
+          }
         } else {
-          this.tempCheckedKeys = [];
+          // 只保留叶子节点的选中状态
+          const leafKeys = checkStatus.checkedKeys.filter(key => {
+            const node = this.nodeMap[key];
+            return node && this.isLeafNode(node);
+          });
+          this.tempCheckedKeys = leafKeys;
+          // 更新树的选中状态，确保只显示叶子节点被选中
+          this.$refs.taskTree.setCheckedKeys(leafKeys);
         }
-      } else {
-        // 只保留子节点的选中状态
-        const leafKeys = checkStatus.checkedKeys.filter(key => {
-          const node = this.nodeMap[key];
-          return node && !node.isParent;
-        });
-        this.tempCheckedKeys = leafKeys;
-        // 更新树的选中状态，确保只显示子节点被选中
-        this.$refs.taskTree.setCheckedKeys(leafKeys);
       }
     },
+
+    /**
+     * 确认选择
+     */
     handleConfirm() {
       let finalSelectedKeys = [];
       let finalSelectedNodes = [];
@@ -368,16 +457,13 @@ export default {
       if (this.$refs.taskTree) {
         // 获取所有选中的节点
         const allCheckedNodes = this.$refs.taskTree.getCheckedNodes();
-        // 只保留子节点（叶子节点）
-        finalSelectedNodes = allCheckedNodes.filter(node => !node.isParent);
+        // 只保留叶子节点
+        finalSelectedNodes = allCheckedNodes.filter(node => this.isLeafNode(node));
         finalSelectedKeys = finalSelectedNodes.map(node => node[this.nodeKey]);
 
-        if(!this.multiple) {
-          // 单选模式下，确保只选择子节点
-          const leafKeys = this.tempCheckedKeys.filter(key => {
-            const node = this.nodeMap[key];
-            return node && !node.isParent;
-          });
+        if (!this.multiple) {
+          // 单选模式下，确保只选择叶子节点
+          const leafKeys = this.getLeafOnlyKeys(this.tempCheckedKeys);
           finalSelectedKeys = leafKeys;
           finalSelectedNodes = finalSelectedKeys.map(key => this.nodeMap[key]).filter(Boolean);
         }
@@ -388,12 +474,20 @@ export default {
       this.updateCurrentSelectedNodesFromKeys(finalSelectedKeys, true);
       this.popoverVisible = false;
     },
+
+    /**
+     * 弹窗内清空选择
+     */
     handleClearInPopover() {
       this.tempCheckedKeys = [];
       if (this.$refs.taskTree) {
         this.$refs.taskTree.setCheckedKeys([]);
       }
     },
+
+    /**
+     * 触发器清空选择
+     */
     handleClearOnTrigger() {
       if (this.disabled) return;
       this.tempCheckedKeys = [];
@@ -405,6 +499,10 @@ export default {
       }
       this.popoverVisible = false;
     },
+
+    /**
+     * 移除标签
+     */
     removeTag(nodeToRemove) {
       if (this.disabled) return;
       const newKeys = this.value.filter(key => key !== nodeToRemove[this.nodeKey]);
@@ -418,6 +516,10 @@ export default {
         this.$refs.taskTree.setCheckedKeys(newKeys);
       }
     },
+
+    /**
+     * 弹窗显示时的处理
+     */
     onPopoverShow() {
       if (this.$refs.popover && this.$refs.popover.$refs.reference) {
         this.triggerElRect = this.$refs.popover.$refs.reference.getBoundingClientRect();
@@ -450,16 +552,15 @@ export default {
   border: 1px solid #dcdfe6;
   box-sizing: border-box;
   color: #606266;
-  display: flex; /* Use flex for alignment */
-  align-items: center; /* Vertically align items */
-  min-height: 32px; /* Element UI default input height (small) or 40px (default) */
-  /* Adjust line-height or padding if min-height is larger */
-  padding: 0 30px 0 10px; /* Space for text/tags and icons */
+  display: flex;
+  align-items: center;
+  min-height: 32px;
+  padding: 0 30px 0 10px;
   position: relative;
   transition: border-color .2s cubic-bezier(.645,.045,.355,1);
   width: 100%;
   cursor: pointer;
-  overflow: hidden; /* Hide overflow from tags */
+  overflow: hidden;
 }
 .select-trigger-wrapper.is-disabled {
   background-color: #f5f7fa;
@@ -483,19 +584,13 @@ export default {
 }
 
 .tags-or-value-container {
-  flex-grow: 1; /* Allow this container to take available space */
+  flex-grow: 1;
   display: flex;
-  flex-wrap: wrap; /* For multiple tags */
-  gap: 5px; /* Space between tags */
+  flex-wrap: wrap;
+  gap: 5px;
   align-items: center;
-  overflow: hidden; /* Prevent content from pushing icons */
-  padding: 2px 0; /* Small padding for tags not to touch border */
-}
-
-.trigger-tag {
-  /* margin-right: 5px; /* Use gap if supported, otherwise this */
-  /* margin-bottom: 2px;
-  margin-top: 2px; */
+  overflow: hidden;
+  padding: 2px 0;
 }
 
 .single-value-display {
@@ -503,7 +598,7 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
   color: #606266;
-  line-height: 30px; /* Adjust if trigger height changes */
+  line-height: 30px;
 }
 
 .placeholder-text {
@@ -511,7 +606,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  line-height: 30px; /* Adjust if trigger height changes */
+  line-height: 30px;
 }
 
 .icons-container {
@@ -530,7 +625,6 @@ export default {
   font-size: 14px;
 }
 .select-trigger-wrapper:hover .clear-icon {
-  /* Only show if showClearIcon is true (handled by v-if) */
   display: inline-block;
 }
 .icons-container .arrow-icon {
@@ -550,15 +644,14 @@ export default {
   margin-bottom: 8px;
 }
 .tree-scrollbar {
-  /* height is set by prop */
   border: 1px solid #ebeef5;
   border-radius: 2px;
 }
-.el-scrollbar__wrap { /* Make sure scrollbar wrap doesn't add extra space */
+.el-scrollbar__wrap {
   overflow-x: hidden;
 }
 .task-tree-in-popover {
-  min-height: 50px; /* Prevent collapse if empty */
+  min-height: 50px;
 }
 .custom-tree-node {
   flex: 1;
@@ -585,6 +678,6 @@ export default {
 <style>
 /* Global style for popper to customize padding */
 .task-select-tree-popper.el-popover {
-  padding: 12px; /* Adjust padding of the popper itself */
+  padding: 12px;
 }
 </style>

src/views/course/courseQuestionBank/index.vue

@@ -300,7 +300,7 @@
         <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button type="primary" :loading="upload.isUploading" :disabled="upload.isUploading" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -546,6 +546,12 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.question = [
+        { name: "", isAnswer: 0, indexId:0},
+        { name: "", isAnswer: 0, indexId:1},
+        { name: "", isAnswer: 0, indexId:2},
+        { name: "", isAnswer: 0, indexId:3},
+      ]
       this.questionSubTypeOptions = []
       this.open = true;
       this.title = "添加题库";

src/views/course/userCoursePeriod/index.vue

@@ -289,28 +289,6 @@
           >
           </el-date-picker>
         </el-form-item>
-
-<!--        <el-form-item label="看课时间" prop="timeRange">-->
-<!--          <el-time-picker-->
-<!--            is-range-->
-<!--            v-model="form.timeRange"-->
-<!--            @input="$forceUpdate()"-->
-<!--            range-separator="至"-->
-<!--            start-placeholder="开始时间"-->
-<!--            value-format="HH:mm:ss"-->
-<!--            end-placeholder="结束时间"-->
-<!--            placeholder="选择时间范围">-->
-<!--          </el-time-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="领取红包时间" prop="lastJoinTime">-->
-<!--          <el-time-picker-->
-<!--            v-model="form.lastJoinTime"-->
-<!--            :selectableRange="form.lastJoinTime"-->
-<!--            value-format="HH:mm:ss"-->
-<!--            placeholder="选择时间范围">-->
-<!--          </el-time-picker>-->
-<!--          <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间，只允许看课，不允许领取红包</p>-->
-<!--        </el-form-item>-->
       </el-form>
       <div class="drawer-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -359,7 +337,7 @@
 
     <!-- 添加课程对话框-->
     <el-dialog title="添加课程" :visible.sync="course.addOpen" width="500px" append-to-body>
-      <el-form ref="courseAddForm" :model="course.form" label-width="100px">
+      <el-form ref="courseAddForm" :model="course.form" :rules="courseAddRules" label-width="100px">
         <el-form-item label="课程" prop="courseId">
           <el-select filterable  v-model="course.form.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(course.form.courseId)" style="width: 100%" :value-key="'dictValue'">
             <el-option
@@ -370,7 +348,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="小节" prop="videoId">
+        <el-form-item label="小节" prop="videoIds">
           <el-select filterable  v-model="course.form.videoIds" placeholder="请选择小节" :multiple-limit="getDiff(course.row.periodStartingTime, course.row.periodEndTime) - course.total" multiple clearable size="small" style="width: 100%" :value-key="'dictValue'">
             <el-option
               v-for="dict in videoList"
@@ -380,6 +358,29 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="看课时间" prop="timeRange">
+          <el-time-picker
+            is-range
+            v-model="course.form.timeRange"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59'
+            }"
+            range-separator="至"
+            start-placeholder="开始时间"
+            value-format="HH:mm:ss"
+            format="HH:mm:ss"
+            end-placeholder="结束时间">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="领取红包时间" prop="lastJoinTime">
+          <el-time-picker
+            v-model="course.form.joinTime"
+            value-format="HH:mm:ss"
+            format="HH:mm:ss"
+            placeholder="选择时间范围">
+          </el-time-picker>
+          <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间，只允许看课，不允许领取红包</p>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitCourseForm">确 定</el-button>
@@ -387,27 +388,24 @@
       </div>
     </el-dialog>
     <el-dialog title="修改看课时间" :visible.sync="updateCourse.open" width="500px" append-to-body>
-      <el-form ref="courseUpdateForm" :model="updateCourse.form" label-width="100px">
+      <el-form ref="courseUpdateForm" :model="updateCourse.form" :rules="courseUpdateRules" label-width="100px">
         <el-form-item label="看课时间" prop="timeRange">
           <el-time-picker
             is-range
             v-model="updateCourse.form.timeRange"
             range-separator="至"
             start-placeholder="开始时间"
-            value-format="HH:mm:ss"
             end-placeholder="结束时间"
+            value-format="HH:mm:ss"
+            @change="onTimeRangeChange"
             placeholder="选择时间范围">
           </el-time-picker>
         </el-form-item>
-        <el-form-item label="领取红包时间" prop="lastJoinTime">
+        <el-form-item label="领取红包时间" prop="joinTime">
           <el-time-picker
             v-model="updateCourse.form.joinTime"
-            :selectableRange="updateCourse.form.timeRange"
             value-format="HH:mm:ss"
-            format="HH:mm:ss"
-            :picker-options="{
-              selectableRange: updateCourse.form.timeRange || '00:00:00 - 23:59:59'
-            }"
+            :picker-options="getPickerOptions()"
             placeholder="选择时间范围">
           </el-time-picker>
           <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间，只允许看课，不允许领取红包</p>
@@ -477,7 +475,7 @@
               >修改看课时间</el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="course.loading" :data="course.list" @selection-change="handleSelectionCourseChange" border>
+          <el-table ref="courseTable" v-loading="course.loading" :data="course.list" @selection-change="handleSelectionCourseChange" border>
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="课程" align="center" prop="courseName" width="180" />
             <el-table-column label="小节" align="center" prop="videoName" />
@@ -559,6 +557,7 @@ import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import RedPacket from './redPacket.vue'
 import BatchRedPacket from './batchRedPacket.vue'
 import CourseStatistics from './statistics.vue'
+import Da from "element-ui/src/locale/lang/da";
 
 export default {
   name: "Period",
@@ -632,7 +631,10 @@ export default {
         open: false,
         loading: true,
         ids: [],
-        form: {},
+        form: {
+          timeRange: null,
+          joinTime: null
+        },
       },
       // 表单校验
       rules: {
@@ -642,6 +644,9 @@ export default {
         companyId: [
           { required: true, message: '公司不能为空', trigger: 'change' }
         ],
+        courseStyle: [
+          { required: true, message: '课程风格不能为空', trigger: 'change' }
+        ],
         redPacketGrantMethod: [
           { required: true, message: '红包发放方式不能为空', trigger: 'change' }
         ],
@@ -676,6 +681,45 @@ export default {
           { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
         ]
       },
+      // 添加课程表单校验
+      courseAddRules: {
+        courseId: [
+          { required: true, message: '请选择课程', trigger: 'change' }
+        ],
+        videoIds: [
+          { required: true, message: '请选择小节', trigger: 'change' },
+          { type: 'array', min: 1, message: '请至少选择一个小节', trigger: 'change' }
+        ]
+      },
+      // 修改看课时间表单校验
+      courseUpdateRules: {
+        timeRange: [
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!value || !Array.isArray(value) || value.length !== 2) {
+                callback(new Error('请选择完整的看课时间范围'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        joinTime: [
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!value || typeof value !== 'string') {
+                callback(new Error('请选择领取红包时间'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ]
+      },
       // 滚动节流标志
       scrollThrottle: false,
       // 加载更多状态
@@ -861,7 +905,7 @@ export default {
         return;
       }
       const periodIds = row.periodId || this.ids;
-      this.$confirm('是否确认删除该营期？', "警告", {
+      this.$confirm('是否确认删除该营期？', "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -1191,8 +1235,6 @@ export default {
       if(type == 1){
         this.form.periodStartingTime = this.form.dateRange[0];
         this.form.periodEndTime = this.form.dateRange[1];
-
-
          // 转换为天数
         let days = this.getDiff(this.form.periodStartingTime, this.form.periodEndTime);
         for (let i = 0; i < days; i++) {
@@ -1250,6 +1292,8 @@ export default {
       this.course.form = {
         periodId: this.course.queryParams.periodId,
         courseId: null,
+        timeRange: null,
+        joinTime: null,
         videoIds: []
       };
       // 重置表单
@@ -1263,15 +1307,23 @@ export default {
       this.updateCourse.open = true;
       this.updateCourse.form = {
         ids: this.updateCourse.ids,
-        timeRange: [], // 初始化timeRange
-        joinTime: null // 初始化joinTime
+        timeRange: null,
+        joinTime: null
       };
+      // 重置表单校验状态（但不清空选中状态）
+      this.$nextTick(() => {
+        if (this.$refs.courseUpdateForm) {
+          this.$refs.courseUpdateForm.resetFields();
+        }
+      });
     },
     closeAddCourse() {
       this.course.addOpen = false;
       this.course.form = {
         periodId: null,
         courseId: null,
+        timeRange: null,
+        joinTime: null,
         videoIds: []
       };
       // 重置表单
@@ -1281,6 +1333,30 @@ export default {
     },
     closeUpdateCourse() {
       this.updateCourse.open = false;
+
+      // 清空选中的课程id，使【修改看课时间】按钮变为禁用状态
+      this.updateCourse.ids = [];
+
+      // 清空课程列表的选中状态
+      this.$nextTick(() => {
+        if (this.$refs.courseTable) {
+          this.$refs.courseTable.clearSelection();
+        }
+      });
+
+      // 重置表单数据
+      this.updateCourse.form = {
+        ids: [],
+        timeRange: null,
+        joinTime: null
+      };
+
+      // 重置表单校验
+      this.$nextTick(() => {
+        if (this.$refs.courseUpdateForm) {
+          this.$refs.courseUpdateForm.resetFields();
+        }
+      });
     },
     courseChange(row){
       this.course.form.videoIds = [];
@@ -1308,16 +1384,42 @@ export default {
     submitUpdateCourseForm(){
       this.$refs.courseUpdateForm.validate(valid => {
         if (valid) {
-          if(this.updateCourse.form.timeRange != null && this.updateCourse.form.timeRange.length === 2){
+          // 检查时间范围是否正确
+          if (this.updateCourse.form.timeRange &&
+              Array.isArray(this.updateCourse.form.timeRange) &&
+              this.updateCourse.form.timeRange.length === 2) {
             this.updateCourse.form.startTime = this.updateCourse.form.timeRange[0];
             this.updateCourse.form.endTime1 = this.updateCourse.form.timeRange[1];
+          } else {
+            this.$message.error('请先选择正确的看课时间范围');
+            return;
           }
+
+          // 检查领取红包时间是否正确
+          if (!this.updateCourse.form.joinTime) {
+            this.$message.error('请选择领取红包时间');
+            return;
+          }
+
           // 提交数据
           updateCourseTime(this.updateCourse.form).then(response => {
-            this.$message.success('添加成功');
+            this.$message.success('修改成功');
             this.updateCourse.open = false;
+
+            // 清空选中的课程ID，使【修改看课时间】按钮变为禁用状态
+            this.updateCourse.ids = [];
+
+            // 清空课程列表的选中状态
+            this.$nextTick(() => {
+              if (this.$refs.courseTable) {
+                this.$refs.courseTable.clearSelection();
+              }
+            });
+
             // 重新加载训练营列表
             this.getCourseList();
+          }).catch(error => {
+            this.$message.error('修改失败：' + (error.message || '未知错误'));
           });
         }
       });
@@ -1465,6 +1567,26 @@ export default {
     disabledDate(time) {
       return time.getTime() < new Date(new Date().setHours(0,0,0,0));
     },
+    getPickerOptions() {
+      // 如果已选择看课时间范围，则领取红包时间应在看课时间范围内
+      if (this.updateCourse.form.timeRange &&
+          Array.isArray(this.updateCourse.form.timeRange) &&
+          this.updateCourse.form.timeRange.length === 2) {
+        return {
+          selectableRange: `${this.updateCourse.form.timeRange[0]} - ${this.updateCourse.form.timeRange[1]}`
+        };
+      }
+      // 默认全天可选
+      return {
+        selectableRange: '00:00:00 - 23:59:59'
+      };
+    },
+    onTimeRangeChange() {
+      // 当看课时间范围改变时，清空领取红包时间
+      this.updateCourse.form.joinTime = null;
+      // 强制更新组件以刷新领取红包时间的可选范围
+      this.$forceUpdate();
+    },
   },
 };
 </script>
@@ -1681,7 +1803,7 @@ export default {
 
 /* 添加训练营表单样式 */
 .drawer-footer {
-  //position: absolute;
+  /* position: absolute; */
   bottom: 0;
   left: 0;
   right: 0;

src/views/course/videoResource/index.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item label="分类" prop="typeId">
-        <el-select v-model="queryParams.typeId" clearable placeholder="请选择分类" @change="changeCateType">
+        <el-select v-model="queryParams.typeId" clearable placeholder="请选择分类" @change="val => changeCateType(val, 1)">
           <el-option
             v-for="item in rootTypeList"
             :key="item.dictValue"
@@ -192,7 +192,7 @@
         </el-form-item>
 
         <el-form-item label="分类" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="请选择分类" style="width: 100%" @change="changeCateType">
+          <el-select v-model="form.typeId" placeholder="请选择分类" style="width: 100%" @change="val => changeCateType(val, 2)">
             <el-option
               v-for="item in rootTypeList"
               :key="item.dictValue"
@@ -407,7 +407,7 @@
         class="upload-dialog">
         <el-form :model="batchUploadForm" ref="batchUploadForm" label-width="80px">
           <el-form-item style="margin-top: 20px" label="分类" prop="typeId" :rules="[{ required: true, message: '请选择分类', trigger: 'blur' }]">
-            <el-select v-model="batchUploadForm.typeId" placeholder="请选择分类" style="width: 100%" @change="changeCateType">
+            <el-select v-model="batchUploadForm.typeId" placeholder="请选择分类" style="width: 100%" @change="val => changeCateType(val, 3)">
               <el-option
                 v-for="item in rootTypeList"
                 :key="item.dictValue"
@@ -559,7 +559,7 @@
             <el-table-column type="selection" reserve-selection width="55" align="center" />
             <el-table-column label="序号" width="60" align="center">
               <template slot-scope="scope">
-                {{ scope.$index + 1 }}
+                {{ scope.row.sort }}
               </template>
             </el-table-column>
             <el-table-column label="题目标题" align="center" prop="title" min-width="200" show-overflow-tooltip />
@@ -682,7 +682,8 @@ export default {
         pageSize: 10,
         resourceName: null,
         fileName: null,
-        typeId: null
+        typeId: null,
+        typeSubId: null
       },
       // 表单参数
       form: {
@@ -740,6 +741,7 @@ export default {
       showUpload: false,
       batchUploadForm: {
         typeId: null,
+        typeSubId: null,
         projectIds: [],
         files: []
       },
@@ -751,6 +753,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         questionType: null,
+        questionSubType: null,
         title: null
       },
       projectLoading: false,
@@ -840,6 +843,7 @@ export default {
         fileKey: null,
         videoUrl: null,
         typeId: null,
+        typeSubId: null,
         projectIds: []
       };
       // 重置表单验证状态
@@ -984,9 +988,18 @@ export default {
         this.rootTypeList = response.data
       });
     },
-    async changeCateType(val) {
+    async changeCateType(val, type) {
+      if (type === 1) {
+        this.queryParams.typeSubId = null
+      }
+      if (type === 2) {
+        this.form.typeSubId = null
+      }
+      if (type === 3) {
+        this.batchUploadForm.typeSubId = null
+      }
+      this.subTypeList = []
       if (!val) {
-        this.subTypeList = []
         return
       }
       await getCateListByPid(val).then(response => {
@@ -1489,15 +1502,22 @@ export default {
       return data.cateName.indexOf(value) !== -1;
     },
     /** 处理分类点击 */
-    handleCategoryClick(data) {
+    handleCategoryClick(data, node) {
       // 更新查询参数
       this.projectQueryParams.pageNum = 1;
 
       // 如果是全部分类，则清空分类过滤
-      if (data.cateId === 0) {
+      if (node.level === 1) {
         this.projectQueryParams.questionType = null;
-      } else {
+        this.projectQueryParams.questionSubType = null;
+      }
+      else if (node.level === 2) {
         this.projectQueryParams.questionType = data.cateId;
+        this.projectQueryParams.questionSubType = null;
+      }
+      else if (node.level === 3) {
+        this.projectQueryParams.questionType = null;
+        this.projectQueryParams.questionSubType = data.cateId;
       }
 
       // 重新加载项目列表

src/views/qw/sopTemp/index.vue

@@ -239,7 +239,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="课程" prop="courseId" v-if="form.sendType == 5 && !form.id">
+        <el-form-item label="课程" prop="courseId" v-if="form.sendType == 11 && !form.id">
           <el-select v-model="form.courseId" placeholder="请选择课程" style=" margin-right: 10px;" size="mini"
                      filterable>
             <el-option
@@ -250,16 +250,26 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="发课时间" prop="time" v-if="form.sendType == 11 && !form.id">
+          <el-time-picker
+            class="custom-input"
+            v-model="form.time"
+            value-format="HH:mm"
+            format="HH:mm"
+            placeholder="时间"
+            style="width: 100px;height: 20px;margin-left: 10px;margin-top: 10px">
+          </el-time-picker>
+        </el-form-item>
         <el-form-item label="间隔天数" prop="gap">
           <el-input-number v-model="form.gap" :min="1" label="间隔天数"></el-input-number>
         </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="form.sort" :min="0" label="排序"></el-input-number>
         </el-form-item>
-        <el-form-item label="每天发送次数" prop="num" v-if="form.sendType == 5 && !form.id">
+        <el-form-item label="每天发送次数" prop="num" v-if="form.sendType == 11 && !form.id">
           <el-input-number v-model="form.num" :min="1" label="每天发送次数" @change="sendNumChange"></el-input-number>
         </el-form-item>
-        <el-form-item label="发送时间" v-if="form.sendType == 5 && !form.id">
+        <el-form-item label="发送时间" v-if="form.sendType == 11 && !form.id">
           <el-time-picker
             v-for="item in form.timeList"
             class="custom-input"
@@ -451,6 +461,7 @@ export default {
     reset() {
       this.form = {
         gap: 1,
+        time: null,
         sendType: this.sendType,
         sort: 0,
         num: 1,

src/views/qw/sopTemp/updateSopTemp.vue

@@ -51,8 +51,8 @@
                         <el-input :disabled="formType == 3" v-model="item.name"
                                   placeholder="内容名称,仅内部可见"/>
                       </el-form-item>
-                      <el-form-item label="课程" v-if="form.sendType == 5 && item.content && item.content.length > 0" required>
-                        <el-select :disabled="(formType == 3 || form.sendType == 5) && item.id != null" v-model="item.content[0].courseId"
+                      <el-form-item label="课程" v-if="form.sendType == 11 && item.content && item.content.length > 0" required>
+                        <el-select :disabled="(formType == 3 || form.sendType == 11) && item.id != null" v-model="item.content[0].courseId"
                                    placeholder="请选择课程" style=" margin-right: 10px;" size="mini" remote
                                    filterable
                                    @change="courseChangeUpdate(item.content[0], index, 0)">
@@ -63,7 +63,7 @@
                             :value="parseInt(dict.dictValue)"
                           />
                         </el-select>
-                        <el-select :disabled="(formType == 3 || form.sendType == 5) && item.id != null" v-model="item.content[0].videoId"
+                        <el-select :disabled="(formType == 3 || form.sendType == 11) && item.id != null" v-model="item.content[0].videoId"
                                    placeholder="请选择小节" size="mini" style=" margin-right: 10px;" remote
                                    filterable
                                    @change="videoIdChange(item.content[0],index,0)">
@@ -141,7 +141,7 @@
                                   </el-radio-group>
                                 </el-form-item>
                                 <el-form-item label="课程" v-if="content.type == 2 && form.sendType != 5" required>
-                                  <el-select :disabled="formType == 3 || form.sendType == 5" v-model="content.courseId"
+                                  <el-select :disabled="formType == 3 || form.sendType == 11" v-model="content.courseId"
                                              placeholder="请选择课程" style=" margin-right: 10px;" size="mini" remote
                                              filterable
                                              @change="courseChangeUpdate(content,index,contentIndex)">
@@ -152,7 +152,7 @@
                                       :value="parseInt(dict.dictValue)"
                                     />
                                   </el-select>
-                                  <el-select :disabled="formType == 3 || form.sendType == 5" v-model="content.videoId"
+                                  <el-select :disabled="formType == 3 || form.sendType == 11" v-model="content.videoId"
                                              placeholder="请选择小节" size="mini" style=" margin-right: 10px;" remote
                                              filterable
                                              @change="videoIdChange(content,index,contentIndex)">
@@ -272,9 +272,9 @@
                                               </el-radio>
                                             </el-radio-group>
                                           </div>
-                                          <div v-if="form.sendType == 5">
+                                          <div v-if="form.sendType == 11">
                                             <el-radio-group v-model="setList.contentType"
-                                                            :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                            :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                             @change="handleContentTypeChange(content,index,contentIndex,setIndex, item, 'contentType', $event)">
                                               <el-radio
                                                 :key="item.dictValue"
@@ -312,20 +312,20 @@
                                             v-if="setList.contentType == 3  || (setList.contentType == 9 && content.type==2 )">
                                             <el-card class="box-card">
                                               <el-form-item label="链接标题:" label-width="100px" required>
-                                                <el-input :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkTitle"
+                                                <el-input :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkTitle"
                                                           @change="updateAll(setIndex, item, 'linkTitle', $event)"
                                                           placeholder="请输入链接标题"
                                                           style="width: 90%;"/>
                                               </el-form-item>
                                               <el-form-item label="链接描述:" label-width="100px" required>
-                                                <el-input :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)" type="textarea" :rows="3"
+                                                <el-input :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)" type="textarea" :rows="3"
                                                           v-model="setList.linkDescribe"
                                                           @change="updateAll(setIndex, item, 'linkDescribe', $event)"
                                                           placeholder="请输入链接描述"
                                                           style="width: 90%;margin-top: 1%;"/>
                                               </el-form-item>
                                               <el-form-item label="链接封面:" label-width="100px" required>
-                                                <ImageUpload :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkImageUrl"
+                                                <ImageUpload :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkImageUrl"
                                                              type="image" :num="1"
                                                              @input="updateAll(setIndex, item, 'linkImageUrl', $event)"
                                                              :file-size="2" :width="150" :height="150"
@@ -352,7 +352,7 @@
                                             <el-card class="box-card">
                                               <el-form-item label="标题" prop="miniprogramTitle">
                                                 <el-input v-model="setList.miniprogramTitle"
-                                                          :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                          :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                           @change="updateAll(setIndex, item, 'miniprogramTitle', $event)"
                                                           placeholder="请输入小程序消息标题，最长为64字节" :rows="2"
                                                           maxlength="64" type="textarea"
@@ -361,7 +361,7 @@
                                               <el-form-item label="封面" prop="miniprogramPicUrl">
                                                 <ImageUpload v-if="content.isOfficial !== '1'"
                                                              @change="updateAll(setIndex, item, 'miniprogramPicUrl', $event)"
-                                                             :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                             :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                              v-model="setList.miniprogramPicUrl" type="image" :num="10"
                                                              :width="150" :height="150"/>
                                               </el-form-item>
@@ -519,7 +519,7 @@
                                                       v-if="content.type == 2 && setList.isBindUrl == '1' && setList.contentType != 2  && setList.contentType != 5  && setList.contentType != 6 && setList.contentType != 8 && setList.contentType != 9 && setList.contentType != 10  ">
                                           <el-row>
                                             <el-input type="number" v-model="setList.expiresDays"
-                                                      :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                      :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                       @change="updateAll(setIndex, item, 'expiresDays', $event)"
                                                       style="width: 200px">
                                               <template slot="append">天</template>
@@ -566,7 +566,7 @@
                                     <el-col :span="1" :offset="1">
                                       <i class="el-icon-delete" @click="delSetList(index,contentIndex,setIndex)"
                                          style="margin-top: 20px;"
-                                         v-if="content.setting.length>1 && formType != 3 && !(form.sendType == 5 && setIndex == 0)"></i>
+                                         v-if="content.setting.length>1 && formType != 3 && !(form.sendType == 11 && setIndex == 0)"></i>
                                     </el-col>
                                   </el-row>
                                 </div>
@@ -1729,7 +1729,7 @@ export default {
 
     },
     updateAll(setIndex, list, fieldName, newVal) {
-      if(this.form.sendType == 5 && setIndex == 0) {
+      if(this.form.sendType == 11 && setIndex == 0) {
         console.info("更新数据", newVal)
         for (let index in list.content) {
           this.$set(list.content[index].setting[0], fieldName, newVal);

src/views/statistics/section/channel.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+          @change="handleMultiChange"
+        ></select-tree>
+      </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"
+                   @change="handleCompanyUserId"
+        >
+          <el-option
+            v-for="dict in companyUserList"
+            :key="`${dict.nickName} - ${dict.userName}`"
+            :label="`${dict.nickName} - ${dict.userName}`"
+            :value="dict.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间范围" prop="dateRange">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item label="SOP任务" prop="channel" label-width="70px">
+        <select-tree
+          v-model="selectedMultipleTasks"
+          :raw-data="channelList"
+          placeholder="请选择多个任务"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+          @change="handleMultiChange"
+        ></select-tree>
+      </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"
+          @click="handleExport"
+          v-hasPermi="['system:stats:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 警告提示 -->
+    <el-alert
+      title="待激活人数依赖进粉时的自动标记和员工手动标记是可变的，相应的目标人数和进线完播率受此影响；为了不受进粉期人数变化影响，第二天新进报名产生的观后数据不做统计；辅助工作台人数不一致可能是受进粉影响，也有可能是员工删除了好友或者取消了客户频道报名。"
+      type="warning"
+      :closable="false"
+      show-icon
+      class="mb8">
+    </el-alert>
+
+    <el-table border v-loading="loading" :data="statsList" @selection-change="handleSelectionChange" show-summary>
+      <!-- 未上线部分 -->
+      <el-table-column prop="periodName" label="sop营期" width="180" align="center"/>
+<!--      <el-table-column prop="deptName" label="所属部门" width="180" align="center"/>-->
+<!--      <el-table-column prop="companyUserName" label="员工"  />-->
+      <el-table-column prop="trainCampNum" label="营期人数"  align="center" />
+      <el-table-column prop="notRegisteredNum" label="待看课"  align="center" />
+      <el-table-column prop="registeredNum" label="看课中断"  align="center" />
+      <el-table-column prop="registeredNum" label="已完课"  align="center" />
+      <el-table-column prop="regRate" label="报名率"  align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.regRate }}%</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="finishedRate" label="完课率"  align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.finishedRate }}%</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 {
+  listEmployeeStats,
+  getEmployeeList,
+  getChannelList,
+  exportEmployeeStats,
+  getSOPTaskData,
+  listPeriodList,
+  getDeptData
+} from "@/api/system/employeeStats";
+import {getCompanyList} from "@/api/company/company";
+import {getUserList} from "@/api/company/companyUser";
+import SelectTree from "@/components/TreeSelect/index.vue";
+
+export default {
+  name: "EmployeeStats",
+  components: {SelectTree},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      companys:[],
+      selectedMultipleTasks: [],
+      selectedCompanyList: [],
+      deptList: [],
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工统计表格数据
+      statsList: [],
+      // 员工列表
+      employeeList: [],
+      companyUserList: [],
+      // 频道列表
+      channelList: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        channel: null,
+        startDate: null,
+        endDate: null,
+        companyId: null,
+        periodList: []
+      },
+      // 总体统计
+      totalStats: {
+        totalEmployees: 0,
+        onlineEmployees: 0,
+        offlineEmployees: 0,
+        completionRate: '0.00'
+      }
+    };
+  },
+  created() {
+    this.getList();
+
+    getCompanyList().then(response => {
+      this.companys = response.data;
+    });
+
+    getSOPTaskData().then(response => {
+      this.channelList = response.data;
+    });
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+  },
+  methods: {
+    handleCompanyUserId(val){
+      if(val == null || val === '') {
+        this.queryParams.companyUserId = null;
+        this.queryParams.userIds = [];
+      }
+    },
+    handleMultiChange(e){
+
+    },
+    handleSeller(){
+      if(this.queryParams.companyId != null) {
+        getUserList(this.queryParams.companyId).then(res=>{
+          if(res.code === 200) {
+            this.companyUserList = res.data
+          }
+        })
+      } else {
+        this.queryParams.companyUserId = null;
+      }
+    },
+    /** 查询员工统计列表 */
+    getList() {
+      this.loading = true;
+      if (this.dateRange && this.dateRange.length === 2) {
+        this.queryParams.startDate = this.dateRange[0];
+        this.queryParams.endDate = this.dateRange[1];
+      } else {
+        this.queryParams.startDate = null;
+        this.queryParams.endDate = null;
+      }
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }
+
+      listPeriodList(this.queryParams).then(response => {
+        console.log(response)
+        this.statsList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 获取员工列表 */
+    getEmployeeList() {
+      listPeriodList().then(response => {
+        this.employeeList = response.data || [];
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.periodList = this.selectedMultipleTasks;
+      if(this.queryParams.companyUserId) {
+        this.queryParams.userIds = [this.queryParams.companyUserId];
+      }
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/employeeStats/export', {
+        ...this.queryParams
+      }, `员工完成统计_${new Date().getTime()}.xlsx`);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.stats-card {
+  text-align: center;
+  margin-bottom: 16px;
+
+  .stats-number {
+    font-size: 24px;
+    font-weight: bold;
+    color: #409EFF;
+
+    &.online {
+      color: #67C23A;
+    }
+
+    &.offline {
+      color: #F56C6C;
+    }
+
+    &.rate {
+      color: #E6A23C;
+    }
+  }
+}
+
+.mb8 {
+  margin-bottom: 8px;
+}
+
+::v-deep .el-table .el-table__header th {
+  background-color: #f5f7fa;
+}
+
+::v-deep .el-alert {
+  margin-bottom: 16px;
+}
+</style>

src/views/statistics/section/index.vue

@@ -1,25 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公司名" prop="companyId">
-        <el-select filterable style="width: 220px" v-model="queryParams.companyId" @change="handleSeller" 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  style="width: 100%;" @keyup.enter.native="handleQuery">
-          <el-option
-            v-for="dict in companyUserList"
-            :key="`${dict.nickName} - ${dict.userName}`"
-            :label="`${dict.nickName} - ${dict.userName}`"
-            :value="dict.userId">
-          </el-option>
-        </el-select>
+      <el-form-item label="公司" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          :parentSelectable="true"
+          placeholder="请选择销售"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+          @change="handleMultiChange"
+        ></select-tree>
       </el-form-item>
       <el-form-item label="时间范围" prop="dateRange">
         <el-date-picker
@@ -32,13 +26,14 @@
           style="width: 240px"
         />
       </el-form-item>
-      <el-form-item label="SOP任务" prop="channel">
+      <el-form-item label="SOP任务" prop="channel" label-width="70px">
         <select-tree
           v-model="selectedMultipleTasks"
           :raw-data="channelList"
           placeholder="请选择多个任务"
+          :parentSelectable="true"
           :multiple="true"
-          component-width="400px"
+          component-width="300px"
           :max-display-tags="3"
           :check-strictly="false"
           :return-leaf-only="false"
@@ -74,24 +69,22 @@
       class="mb8">
     </el-alert>
 
-    <el-table v-loading="loading" :data="statsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-
+    <el-table border v-loading="loading" :data="statsList" @selection-change="handleSelectionChange" show-summary>
       <!-- 未上线部分 -->
-
-        <el-table-column prop="departmentName" label="所属部门" width="180" />
-        <el-table-column prop="employeeName" label="员工"  />
-        <el-table-column prop="totalTasks" label="营期人数"  align="center" />
-        <el-table-column prop="incompleteTasks" label="未报名"  align="center" />
-        <el-table-column prop="inProgressTasks" label="已报名"  align="center" />
-        <el-table-column prop="incompleteRate" label="报名率"  align="center">
+        <el-table-column prop="deptName" label="所属部门" width="180" align="center"/>
+        <el-table-column prop="companyUserName" label="员工"  />
+        <el-table-column prop="trainCampNum" label="营期人数"  align="center" />
+        <el-table-column prop="notRegisteredNum" label="待看课"  align="center" />
+        <el-table-column prop="registeredNum" label="看课中断"  align="center" />
+        <el-table-column prop="registeredNum" label="已完课"  align="center" />
+        <el-table-column prop="regRate" label="报名率"  align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.incompleteRate }}%</span>
+            <span>{{ scope.row.regRate }}%</span>
           </template>
         </el-table-column>
-        <el-table-column prop="completionRate" label="完课率"  align="center">
+        <el-table-column prop="finishedRate" label="完课率"  align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.completionRate }}%</span>
+            <span>{{ scope.row.finishedRate }}%</span>
           </template>
         </el-table-column>
     </el-table>
@@ -107,7 +100,7 @@
 </template>
 
 <script>
-import { listEmployeeStats, getEmployeeList, getChannelList, exportEmployeeStats,getSOPTaskData} from "@/api/system/employeeStats";
+import { listEmployeeStats, getEmployeeList, getChannelList, exportEmployeeStats,getSOPTaskData,getDeptData} from "@/api/system/employeeStats";
 import {getCompanyList} from "@/api/company/company";
 import {getUserList} from "@/api/company/companyUser";
 import SelectTree from "@/components/TreeSelect/index.vue";
@@ -121,6 +114,7 @@ export default {
       loading: true,
       companys:[],
       selectedMultipleTasks: [],
+      selectedCompanyList: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -140,6 +134,7 @@ export default {
       channelList: [],
       // 日期范围
       dateRange: [],
+      deptList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -170,8 +165,17 @@ export default {
       this.channelList = response.data;
     });
 
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
   },
   methods: {
+    handleCompanyUserId(val){
+      if(val == null || val === '') {
+        this.queryParams.companyUserId = null;
+        this.queryParams.userIds = [];
+      }
+    },
     handleMultiChange(e){
 
     },
@@ -182,6 +186,8 @@ export default {
             this.companyUserList = res.data
           }
         })
+      } else {
+        this.queryParams.companyUserId = null;
       }
     },
     /** 查询员工统计列表 */
@@ -194,11 +200,13 @@ export default {
         this.queryParams.startDate = null;
         this.queryParams.endDate = null;
       }
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }
 
       listEmployeeStats(this.queryParams).then(response => {
-        this.statsList = response.rows;
-        this.total = response.total;
-        this.totalStats = response.totalStats || this.totalStats;
+        this.statsList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -212,6 +220,9 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.queryParams.periodList = this.selectedMultipleTasks;
+      if(this.queryParams.companyUserId) {
+        this.queryParams.userIds = [this.queryParams.companyUserId];
+      }
       this.getList();
     },
     /** 重置按钮操作 */

src/views/statistics/section/today.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+          @change="handleMultiChange"
+        ></select-tree>
+      </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"
+                   @change="handleCompanyUserId"
+        >
+          <el-option
+            v-for="dict in companyUserList"
+            :key="`${dict.nickName} - ${dict.userName}`"
+            :label="`${dict.nickName} - ${dict.userName}`"
+            :value="dict.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间范围" prop="dateRange">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item label="SOP任务" prop="channel" label-width="70px">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="channelList"
+          placeholder="请选择多个任务"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+          @change="handleMultiChange"
+        ></select-tree>
+      </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"
+          @click="handleExport"
+          v-hasPermi="['system:stats:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 警告提示 -->
+    <el-alert
+      title="待激活人数依赖进粉时的自动标记和员工手动标记是可变的，相应的目标人数和进线完播率受此影响；为了不受进粉期人数变化影响，第二天新进报名产生的观后数据不做统计；辅助工作台人数不一致可能是受进粉影响，也有可能是员工删除了好友或者取消了客户频道报名。"
+      type="warning"
+      :closable="false"
+      show-icon
+      class="mb8">
+    </el-alert>
+
+    <el-table border v-loading="loading" :data="statsList" @selection-change="handleSelectionChange" show-summary>
+      <!-- 未上线部分 -->
+      <el-table-column prop="dataDate" label="日期" width="180" align="center"/>
+      <el-table-column prop="trainCampNum" label="营期人数"  align="center" />
+      <el-table-column prop="notRegisteredNum" label="待看课"  align="center" />
+      <el-table-column prop="registeredNum" label="看课中断"  align="center" />
+      <el-table-column prop="registeredNum" label="已完课"  align="center" />
+      <el-table-column prop="regRate" label="报名率"  align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.regRate }}%</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="finishedRate" label="完课率"  align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.finishedRate }}%</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 {
+  listTodayList,
+  getEmployeeList,
+  getChannelList,
+  exportEmployeeStats,
+  getSOPTaskData,
+  getDeptData
+} from "@/api/system/employeeStats";
+import {getCompanyList} from "@/api/company/company";
+import {getUserList} from "@/api/company/companyUser";
+import SelectTree from "@/components/TreeSelect/index.vue";
+
+export default {
+  name: "EmployeeStats",
+  components: {SelectTree},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      companys:[],
+      selectedMultipleTasks: [],
+      selectedCompanyList: [],
+      deptList: [],
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工统计表格数据
+      statsList: [],
+      // 员工列表
+      employeeList: [],
+      companyUserList: [],
+      // 频道列表
+      channelList: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        channel: null,
+        startDate: null,
+        endDate: null,
+        companyId: null,
+        periodList: []
+      },
+      // 总体统计
+      totalStats: {
+        totalEmployees: 0,
+        onlineEmployees: 0,
+        offlineEmployees: 0,
+        completionRate: '0.00'
+      }
+    };
+  },
+  created() {
+    this.getList();
+
+    getCompanyList().then(response => {
+      this.companys = response.data;
+    });
+
+    getSOPTaskData().then(response => {
+      this.channelList = response.data;
+    });
+
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
+  },
+  methods: {
+    handleCompanyUserId(val){
+      if(val == null || val === '') {
+        this.queryParams.companyUserId = null;
+        this.queryParams.userIds = [];
+      }
+    },
+    handleMultiChange(e){
+
+    },
+    handleSeller(){
+      if(this.queryParams.companyId != null) {
+        getUserList(this.queryParams.companyId).then(res=>{
+          if(res.code === 200) {
+            this.companyUserList = res.data
+          }
+        })
+      } else {
+        this.queryParams.companyUserId = null;
+      }
+    },
+    /** 查询员工统计列表 */
+    getList() {
+      this.loading = true;
+      if (this.dateRange && this.dateRange.length === 2) {
+        this.queryParams.startDate = this.dateRange[0];
+        this.queryParams.endDate = this.dateRange[1];
+      } else {
+        this.queryParams.startDate = null;
+        this.queryParams.endDate = null;
+      }
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }
+
+      listTodayList(this.queryParams).then(response => {
+        this.statsList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 获取员工列表 */
+    getEmployeeList() {
+      getEmployeeList().then(response => {
+        this.employeeList = response.data || [];
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.periodList = this.selectedMultipleTasks;
+      if(this.queryParams.companyUserId) {
+        this.queryParams.userIds = [this.queryParams.companyUserId];
+      }
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/employeeStats/export', {
+        ...this.queryParams
+      }, `员工完成统计_${new Date().getTime()}.xlsx`);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.stats-card {
+  text-align: center;
+  margin-bottom: 16px;
+
+  .stats-number {
+    font-size: 24px;
+    font-weight: bold;
+    color: #409EFF;
+
+    &.online {
+      color: #67C23A;
+    }
+
+    &.offline {
+      color: #F56C6C;
+    }
+
+    &.rate {
+      color: #E6A23C;
+    }
+  }
+}
+
+.mb8 {
+  margin-bottom: 8px;
+}
+
+::v-deep .el-table .el-table__header th {
+  background-color: #f5f7fa;
+}
+
+::v-deep .el-alert {
+  margin-bottom: 16px;
+}
+</style>