Merge remote-tracking branch 'origin/master'

.env.prod-test

@@ -7,7 +7,7 @@ ICP_RECORD =蜀ICP备2023036719号
 # ICP网站访问地址
 ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
-VUE_APP_LOG_URL =@/assets/logo/logo.png
+VUE_APP_LOG_URL =@/assets/logo/ylzr.png
 # 存储桶配置
 VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
 # 存储桶配置
@@ -15,13 +15,15 @@ VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
 # 存储桶配置
 VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
 # 存储桶配置
-VUE_APP_OBS_BUCKET = hzyy-1323137866
+VUE_APP_OBS_BUCKET = ylrz-obs2024
 # 存储桶配置
-VUE_APP_COS_BUCKET = ap-chongqing
+VUE_APP_COS_BUCKET = hylj-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
 # 线路一地址
-VUE_APP_COS_REGION = https://hzyytcpv.ylrzcloud.com
+VUE_APP_VIDEO_LINE_1 = https://rttcpv.ylrzcloud.com
 # 线路二地址
-VUE_APP_VIDEO_LINE_1 = https://hzyyobs.ylrztop.com
+VUE_APP_VIDEO_LINE_2 = https://rtobs.ylrztop.com
 
 # 生产环境配置
 ENV = 'production'

src/api/system/employeeStats.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询员工完成统计列表
+export function listEmployeeStats(query) {
+  return request({
+    url: '/stats/seller/pageList',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询员工完成统计详细
+export function getEmployeeStats(id) {
+  return request({
+    url: '/system/employeeStats/' + id,
+    method: 'get'
+  })
+}
+
+// 获取员工列表
+export function getEmployeeList() {
+  return request({
+    url: '/system/employee/list',
+    method: 'get'
+  })
+}
+
+// 获取频道列表
+export function getChannelList() {
+  return request({
+    url: '/system/channel/list',
+    method: 'get'
+  })
+}
+
+// 导出员工完成统计
+export function exportEmployeeStats(query) {
+  return request({
+    url: '/system/employeeStats/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 获取SOP任务数据
+export function getSOPTaskData(param){
+  return request({
+    url: '/stats/sopTaskData',
+    method: 'get'
+  })
+}

src/components/MinimizableDialog/index.vue

@@ -7,7 +7,6 @@
       :title="title"
       v-bind="$attrs"
       v-on="$listeners"
-      :before-close="handleClose"
     >
       <template #title>
         <span>{{ title }}</span>
@@ -99,10 +98,6 @@ export default {
       this.visibleSync = true;
       this.$emit("restore");
     },
-    handleClose(done) {
-      this.$emit("close");
-      done();
-    }
   }
 };
 </script>

src/components/TreeSelect/index.vue

@@ -0,0 +1,590 @@
+<template>
+  <div class="task-select-tree" :style="{ width: componentWidth }">
+    <el-popover
+      ref="popover"
+      placement="bottom-start"
+      :width="popoverComputedWidth"
+      trigger="click"
+      v-model="popoverVisible"
+      popper-class="task-select-tree-popper"
+      :disabled="disabled"
+      @show="onPopoverShow"
+    >
+      <div class="popover-content-wrapper">
+        <el-input
+          v-if="filterable"
+          placeholder="输入关键字过滤"
+          v-model="filterText"
+          size="mini"
+          clearable
+          class="filter-input"
+        >
+        </el-input>
+        <el-scrollbar :style="{ height: treeHeight + 'px' }" class="tree-scrollbar">
+          <el-tree
+            ref="taskTree"
+            :data="processedTreeData"
+            :props="treeProps"
+            show-checkbox
+            :node-key="nodeKey"
+            :default-expand-all="defaultExpandAll"
+            :expand-on-click-node="false"
+            :check-strictly="checkStrictly"
+            :filter-node-method="filterNode"
+            @check="handleTreeCheck"
+            :default-checked-keys="tempCheckedKeys"
+            class="task-tree-in-popover"
+          >
+            <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>
+            </span>
+          </el-tree>
+        </el-scrollbar>
+        <div class="popover-footer">
+          <el-button size="mini" @click="handleClearInPopover">清空</el-button>
+          <el-button type="primary" size="mini" @click="handleConfirm">确定</el-button>
+        </div>
+      </div>
+
+      <div
+        slot="reference"
+        :class="['select-trigger-wrapper', { 'is-disabled': disabled, 'is-active': popoverVisible }]"
+        @mouseenter="inputHovering = true"
+        @mouseleave="inputHovering = false"
+      >
+        <div class="tags-or-value-container">
+          <template v-if="multiple && currentSelectedDisplayNodes.length > 0">
+            <el-tag
+              v-for="node in currentSelectedDisplayNodes"
+              :key="node[nodeKey]"
+              type="info"
+              size="small"
+              closable
+              :disable-transitions="true"
+              @close.stop="removeTag(node)"
+              class="trigger-tag"
+            >
+              {{ node[treeProps.label] }}
+            </el-tag>
+            <el-tag
+              v-if="currentSelectedNodes.length > maxDisplayTags"
+              type="info"
+              size="small"
+              class="trigger-tag"
+            >
+              + {{ currentSelectedNodes.length - maxDisplayTags }}
+            </el-tag>
+          </template>
+          <span v-else-if="!multiple && currentSelectedNodes.length > 0" class="single-value-display">
+            {{ currentSelectedNodes[0][treeProps.label] }}
+            </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>
+        </span>
+      </div>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SelectTree',
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    rawData: {
+      type: Array,
+      required: true
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    checkStrictly: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: true
+    },
+    maxDisplayTags: {
+      type: Number,
+      default: 2
+    },
+    componentWidth: {
+      type: String,
+      default: '100%'
+    },
+    popoverWidth: {
+      type: [String, Number],
+      default: 'auto'
+    },
+    treeProps: {
+      type: Object,
+      default: () => ({
+        children: 'children',
+        label: 'label',
+        isLeaf: 'isLeaf'
+      })
+    },
+    nodeKey: {
+      type: String,
+      default: 'id'
+    },
+    defaultExpandAll: {
+      type: Boolean,
+      default: false
+    },
+    showNodeDetail: {
+      type: Boolean,
+      default: true
+    },
+    treeHeight: {
+      type: Number,
+      default: 280
+    },
+    returnLeafOnly: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      popoverVisible: false,
+      filterText: '',
+      processedTreeData: [],
+      nodeMap: {},
+      tempCheckedKeys: [...this.value],
+      currentSelectedNodes: [],
+      inputHovering: false,
+      triggerElRect: null
+    };
+  },
+  computed: {
+    popoverComputedWidth() {
+      if (this.popoverWidth === 'auto') {
+        return this.triggerElRect ? this.triggerElRect.width : 250;
+      }
+      return parseInt(this.popoverWidth, 10);
+    },
+    currentSelectedDisplayNodes() {
+      if (!this.multiple) return [];
+      return this.currentSelectedNodes.slice(0, this.maxDisplayTags);
+    },
+    showClearIcon() {
+      return (
+        !this.disabled &&
+        this.inputHovering &&
+        this.currentSelectedNodes.length > 0 &&
+        !this.multiple
+      );
+    }
+  },
+  watch: {
+    rawData: {
+      immediate: true,
+      handler(newData) {
+        this.processRawData(newData);
+        // 过滤掉父节点，只保留子节点
+        const leafOnlyKeys = this.value.filter(key => {
+          const node = this.nodeMap[key];
+          return node && !node.isParent;
+        });
+        this.updateCurrentSelectedNodesFromKeys(leafOnlyKeys, true);
+      }
+    },
+    value: {
+      handler(newVal) {
+        // 过滤掉父节点，只保留子节点
+        const leafOnlyKeys = newVal.filter(key => {
+          const node = this.nodeMap[key];
+          return node && !node.isParent;
+        });
+
+        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]);
+        const sortedCurrentInternalNodeKeysStr = JSON.stringify([...currentInternalNodeKeys].sort());
+
+        if (sortedNewValStr !== sortedValidKeysFromNewValStr) {
+          this.$emit('input', [...validKeysFromNewVal]);
+          return;
+        }
+
+        if (sortedNewValStr !== sortedCurrentInternalNodeKeysStr) {
+          this.tempCheckedKeys = [...leafOnlyKeys];
+          this.updateCurrentSelectedNodesFromKeys(validKeysFromNewVal, true);
+        }
+      },
+      deep: true
+    },
+    filterText(val) {
+      if (this.$refs.taskTree) {
+        this.$refs.taskTree.filter(val);
+      }
+    },
+    popoverVisible(isVisible) {
+      if (isVisible) {
+        if (this.$refs.popover && this.$refs.popover.$refs.reference) {
+          this.triggerElRect = this.$refs.popover.$refs.reference.getBoundingClientRect();
+        }
+        this.tempCheckedKeys = [...this.value];
+        this.$nextTick(() => {
+          if (this.$refs.taskTree) {
+            this.$refs.taskTree.setCheckedKeys(this.tempCheckedKeys);
+          }
+        });
+      } else {
+        this.filterText = '';
+      }
+    }
+  },
+  mounted() {
+    // 过滤掉父节点，只保留子节点
+    const leafOnlyKeys = this.value.filter(key => {
+      const node = this.nodeMap[key];
+      return node && !node.isParent;
+    });
+    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 }
+        };
+        mapNode(parentNode); // Add parent and its children to map
+        return parentNode;
+      });
+      this.nodeMap = newMap;
+    },
+    updateCurrentSelectedNodesFromKeys(keys, updateTreeVisualState = false) {
+      const newSelectedNodes = [];
+      const actualFoundKeys = [];
+
+      if (keys && Array.isArray(keys)) {
+        keys.forEach(key => {
+          const node = this.nodeMap[key];
+          // 只添加子节点到选中列表
+          if (node && !node.isParent) {
+            newSelectedNodes.push(node);
+            actualFoundKeys.push(key);
+          }
+        });
+      }
+
+      this.currentSelectedNodes = newSelectedNodes;
+
+      if (updateTreeVisualState && this.$refs.taskTree) {
+        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) {
+        // 恢复之前的选中状态
+        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
+        } else {
+          this.tempCheckedKeys = [];
+        }
+      } 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 = [];
+
+      if (this.$refs.taskTree) {
+        // 获取所有选中的节点
+        const allCheckedNodes = this.$refs.taskTree.getCheckedNodes();
+        // 只保留子节点（叶子节点）
+        finalSelectedNodes = allCheckedNodes.filter(node => !node.isParent);
+        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;
+          });
+          finalSelectedKeys = leafKeys;
+          finalSelectedNodes = finalSelectedKeys.map(key => this.nodeMap[key]).filter(Boolean);
+        }
+      }
+
+      this.$emit('input', finalSelectedKeys);
+      this.$emit('change', finalSelectedKeys, finalSelectedNodes);
+      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 = [];
+      this.$emit('input', []);
+      this.$emit('change', [], []);
+      this.updateCurrentSelectedNodesFromKeys([], true);
+      if (this.$refs.taskTree) {
+        this.$refs.taskTree.setCheckedKeys([]);
+      }
+      this.popoverVisible = false;
+    },
+    removeTag(nodeToRemove) {
+      if (this.disabled) return;
+      const newKeys = this.value.filter(key => key !== nodeToRemove[this.nodeKey]);
+
+      this.$emit('input', newKeys);
+      this.$emit('change', newKeys, newKeys.map(k => this.nodeMap[k]).filter(Boolean));
+
+      this.tempCheckedKeys = [...newKeys];
+      this.updateCurrentSelectedNodesFromKeys(newKeys, true);
+      if (this.$refs.taskTree) {
+        this.$refs.taskTree.setCheckedKeys(newKeys);
+      }
+    },
+    onPopoverShow() {
+      if (this.$refs.popover && this.$refs.popover.$refs.reference) {
+        this.triggerElRect = this.$refs.popover.$refs.reference.getBoundingClientRect();
+      }
+      this.tempCheckedKeys = [...this.value];
+      this.$nextTick(() => {
+        if (this.$refs.taskTree) {
+          this.$refs.taskTree.setCheckedKeys(this.tempCheckedKeys);
+        }
+        if (this.filterable && this.$refs.popover && this.$refs.popover.$el) {
+          const inputEl = this.$refs.popover.$el.querySelector('.filter-input input');
+          if (inputEl) inputEl.focus();
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.task-select-tree {
+  display: inline-block;
+  position: relative;
+  font-size: 14px;
+}
+
+.select-trigger-wrapper {
+  background-color: #fff;
+  border-radius: 4px;
+  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 */
+  position: relative;
+  transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+  width: 100%;
+  cursor: pointer;
+  overflow: hidden; /* Hide overflow from tags */
+}
+.select-trigger-wrapper.is-disabled {
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  color: #c0c4cc;
+  cursor: not-allowed;
+}
+.select-trigger-wrapper.is-disabled .trigger-tag {
+  background-color: #f0f2f5;
+  border-color: #e9e9eb;
+  color: #909399;
+}
+.select-trigger-wrapper.is-disabled .trigger-tag .el-tag__close {
+  color: #909399;
+}
+.select-trigger-wrapper:hover:not(.is-disabled) {
+  border-color: #c0c4cc;
+}
+.select-trigger-wrapper.is-active:not(.is-disabled) {
+  border-color: #409eff;
+}
+
+.tags-or-value-container {
+  flex-grow: 1; /* Allow this container to take available space */
+  display: flex;
+  flex-wrap: wrap; /* For multiple tags */
+  gap: 5px; /* Space between tags */
+  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; */
+}
+
+.single-value-display {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #606266;
+  line-height: 30px; /* Adjust if trigger height changes */
+}
+
+.placeholder-text {
+  color: #c0c4cc;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  line-height: 30px; /* Adjust if trigger height changes */
+}
+
+.icons-container {
+  position: absolute;
+  right: 5px;
+  top: 50%;
+  transform: translateY(-50%);
+  display: flex;
+  align-items: center;
+  color: #c0c4cc;
+}
+.icons-container .clear-icon {
+  cursor: pointer;
+  margin-right: 5px;
+  display: none;
+  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 {
+  transition: transform .3s;
+  font-size: 14px;
+}
+.icons-container .arrow-icon.is-reverse {
+  transform: rotate(180deg);
+}
+
+/* Popover Content */
+.popover-content-wrapper {
+  display: flex;
+  flex-direction: column;
+}
+.filter-input {
+  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 */
+  overflow-x: hidden;
+}
+.task-tree-in-popover {
+  min-height: 50px; /* Prevent collapse if empty */
+}
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+.node-detail-text {
+  font-size: 12px;
+  color: #909399;
+  margin-left: 8px;
+}
+
+.popover-footer {
+  text-align: right;
+  padding-top: 10px;
+  border-top: 1px solid #ebeef5;
+  margin-top: 10px;
+}
+</style>
+
+<style>
+/* Global style for popper to customize padding */
+.task-select-tree-popper.el-popover {
+  padding: 12px; /* Adjust padding of the popper itself */
+}
+</style>

src/components/VideoUpload/index.vue

@@ -389,6 +389,9 @@ export default {
       // 设置预览URL
       this.$emit("update:videoUrl", this.selectedVideo.videoUrl);
 
+      // 题目
+      this.$emit("selectProjects", this.selectedVideo.projectIds)
+
       this.libraryOpen = false;
     },
     /** 取消视频选择 */

src/router/index.js

@@ -141,19 +141,19 @@ export const constantRoutes = [
         path: 'updateSopTemp/:id/:type(\\d+)', // 确保 :type 的正则匹配数字
         component: () => import('@/views/qw/sopTemp/updateSopTemp'),
         name: 'updateSopTemp',
-        meta: { title: '改动SOP模板', activeMenu: '/course/addSopTemp' }
+        meta: { title: '修改SOP模板', activeMenu: '/course/addSopTemp' }
       },
       {
         path: 'updateTemp/:id/:type(\\d+)', // 确保 :type 的正则匹配数字
         component: () => import('@/views/qw/sopTemp/updateTemp'),
         name: 'updateTemp',
-        meta: { title: '改动SOP模板', activeMenu: '/course/updateTemp' }
+        meta: { title: '修改SOP模板', activeMenu: '/course/updateTemp' }
       },
       {
         path: 'updateAiChatTemp/:id/:type(\\d+)', // 确保 :type 的正则匹配数字
         component: () => import('@/views/qw/sopTemp/updateAiChatTemp'),
         name: 'updateAiChatTemp',
-        meta: { title: '改动SOP模板', activeMenu: '/course/addSopTemp' }
+        meta: { title: '修改SOP模板', activeMenu: '/course/addSopTemp' }
       }
     ]
   },

src/views/components/course/userCourseCatalogDetails.vue

@@ -192,6 +192,7 @@
           :uploadType.sync="form.uploadType"
           @video-duration="handleVideoDuration"
           @change="handleVideoChange"
+          @selectProjects="handleSelectProjects"
           ref="videoUpload"
           append-to-body
         />
@@ -362,6 +363,7 @@ import {
 import QuestionBank from "@/views/course/courseQuestionBank/QuestionBank.vue";
 import VideoUpload from "@/components/VideoUpload/index.vue";
 import { listVideoResource } from '@/api/course/videoResource';
+import {getByIds} from "@/api/course/courseQuestionBank";
 
 export default {
     name: "userCourseCatalog",
@@ -554,6 +556,25 @@ export default {
         }
         // console.log("选择的video=======>>>>>>>",this.videoUrl)
       },
+      // 视频库课题
+      handleSelectProjects(projectIds) {
+        this.form.questionBankList = []
+        if (!projectIds || projectIds.length === 0 || this.isPrivate === 0) {
+          return
+        }
+
+        const params = {ids: projectIds}
+        getByIds(params).then(response => {
+          if (response.code === 200) {
+            response.data.forEach(item => {
+              let isExist = this.form.questionBankList.some(q => q.id === item.id)
+              if (!isExist) {
+                this.form.questionBankList.push(item)
+              }
+            });
+          }
+        })
+      },
       handleVideoDuration(duration) {
         this.form.duration = duration;
       },
@@ -811,6 +832,13 @@ export default {
         });
       },
       batchVideoSave(){
+        if (this.addBatchData.select.length===0){
+          this.$message({
+            message: '请选择视频！！',
+            type: 'warning'
+          });
+          return
+        }
         this.addBatchData.form.ids = this.addBatchData.select;
         batchSaveVideo(this.addBatchData.form).then(response => {
           this.addBatchData.open = false;

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/statistics/index.vue

@@ -51,7 +51,7 @@
               企微数量
             </div>
             <div class="card-value highlight">
-              <count-to :start-val="0" :end-val="memberCount" :duration="3600" class="card-panel-num" /></div>
+              <count-to :start-val="0" :end-val="qwMemberNum" :duration="3600" class="card-panel-num" /></div>
             <div class="card-badge">
             </div>
           </div>

src/views/statistics/section/index.vue

@@ -0,0 +1,274 @@
+<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>
+      <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">
+        <select-tree
+          v-model="selectedMultipleTasks"
+          :raw-data="channelList"
+          placeholder="请选择多个任务"
+          :multiple="true"
+          component-width="400px"
+          :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 v-loading="loading" :data="statsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+
+      <!-- 未上线部分 -->
+
+        <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">
+          <template slot-scope="scope">
+            <span>{{ scope.row.incompleteRate }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="completionRate" label="完课率"  align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.completionRate }}%</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} 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: [],
+      // 选中数组
+      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;
+    });
+
+  },
+  methods: {
+    handleMultiChange(e){
+
+    },
+    handleSeller(){
+      if(this.queryParams.companyId != null) {
+        getUserList(this.queryParams.companyId).then(res=>{
+          if(res.code === 200) {
+            this.companyUserList = res.data
+          }
+        })
+      }
+    },
+    /** 查询员工统计列表 */
+    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;
+      }
+
+      listEmployeeStats(this.queryParams).then(response => {
+        this.statsList = response.rows;
+        this.total = response.total;
+        this.totalStats = response.totalStats || this.totalStats;
+        this.loading = false;
+      });
+    },
+    /** 获取员工列表 */
+    getEmployeeList() {
+      getEmployeeList().then(response => {
+        this.employeeList = response.data || [];
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.periodList = this.selectedMultipleTasks;
+      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/system/config/config.vue

@@ -527,6 +527,79 @@
            </div>
          </el-form>
        </el-tab-pane>
+       <el-tab-pane label="erp配置" name="erp.config">
+         <el-form ref="form13" :model="form13" :rules="rules13" label-width="180px">
+          <el-form-item   label="是否开启erp">
+            <el-switch
+              v-model="form13.erpOpen"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-value=1
+              inactive-value=0>
+            </el-switch>
+        </el-form-item>
+        <el-form-item   label="erp类型" v-if="form13.erpOpen == 1">
+          <el-radio v-model="form13.erpType" label=1>管易</el-radio>
+          <el-radio v-model="form13.erpType" label=2>旺店通</el-radio>
+          <el-radio v-model="form13.erpType" label=3>金博</el-radio>
+        </el-form-item>
+        <el-form-item   label="erpAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpAppKey">
+            <el-input   v-model="form13.erpAppKey"  label="请输入erpAppKey"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpSessionKey" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpSessionKey">
+            <el-input   v-model="form13.erpSessionKey"  label="请输入erpSessionKey"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpSecret" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpSecret">
+            <el-input   v-model="form13.erpSecret"  label="请输入erpSecret"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpUrl" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpUrl">
+            <el-input   v-model="form13.erpUrl"  label="请输入erpUrl"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpShopCode" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpShopCode">
+            <el-input   v-model="form13.erpShopCode"  label="请输入erpShopCode"></el-input>
+        </el-form-item>
+
+        <el-form-item   label="erpWdAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdAppKey">
+            <el-input   v-model="form13.erpWdAppKey"  label="请输入erpAppKey"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpWdAppsecret" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdAppsecret">
+            <el-input   v-model="form13.erpWdAppsecret"  label="erpWdAppsecret"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpWdSid" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdSid">
+            <el-input   v-model="form13.erpWdSid"  label="请输入erpWdSid"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpWdShopCode" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdShopCode">
+            <el-input   v-model="form13.erpWdShopCode"  label="请输入erpWdShopCode"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpWdBaseUrl" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdBaseUrl">
+            <el-input   v-model="form13.erpWdBaseUrl"  label="请输入erpWdBaseUrl"></el-input>
+        </el-form-item>
+        <el-form-item   label="erpWarehouseCode" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWarehouseCode">
+            <el-input   v-model="form13.erpWarehouseCode"  label="请输入erpWarehouseCode"></el-input>
+        </el-form-item>
+        <el-form-item   label="kingbosan" v-if="form13.erpOpen == 1 && form13.erpType == 3 " prop="kingbosan">
+            <el-input   v-model="form13.kingbosan"  label="请输入账套名称(kingbosan)"></el-input>
+        </el-form-item>
+        <el-form-item   label="kingbosSecret" v-if="form13.erpOpen == 1 && form13.erpType == 3 " prop="kingbosSecret">
+            <el-input   v-model="form13.kingbosSecret"  label="请输入密钥(kingbosSecret)"></el-input>
+        </el-form-item>
+        <el-form-item   label="kingbosUrl" v-if="form13.erpOpen == 1 && form13.erpType == 3 " prop="kingbosUrl">
+            <el-input   v-model="form13.kingbosUrl"  label="请输入金博地址(kingbosUrl)"></el-input>
+        </el-form-item>
+        <el-form-item   label="corgid" v-if="form13.erpOpen == 1 && form13.erpType == 3 " prop="corgid">
+            <el-input   v-model="form13.corgid"  label="请输入机构编码(corgid)"></el-input>
+        </el-form-item>
+        <el-form-item   label="cwarehouseCode" v-if="form13.erpOpen == 1 && form13.erpType == 3 " prop="cwarehouseCode">
+            <el-input   v-model="form13.cwarehouseCode"  label="请输入仓库编码(cwarehouseCode)"></el-input>
+        </el-form-item>
+        <el-form-item   label="cwarehouseName" v-if="form13.erpOpen == 1 && form13.erpType == 3 " prop="cwarehouseName">
+            <el-input   v-model="form13.cwarehouseName"  label="请输入仓库名称(cwarehouseName)"></el-input>
+        </el-form-item>
+        <div   class="footer">
+          <el-button type="primary" @click="submitForm13">提  交</el-button>
+        </div>
+      </el-form>
+    </el-tab-pane>
 
     </el-tabs>
      <el-dialog :title="sign.title" :visible.sync="sign.open" width="500px" append-to-body>
@@ -646,7 +719,9 @@ export default {
       // 表单校验
       rules5: {
 
-      }
+      },
+      form13:{},
+      rules13:{}
     };
   },
   created() {
@@ -771,6 +846,14 @@ export default {
              }
 
            }
+          else if(key == "erp.config"){
+             this.configId=response.data.configId;
+             this.configKey=response.data.configKey;
+             if(response.data.configValue != null) {
+               this.form13 =JSON.parse(response.data.configValue);
+             }
+
+          } 
         });
      },
     /** 提交按钮 */
@@ -895,6 +978,14 @@ export default {
         }
       });
     },
+    submitForm13(){
+      var param={configId:this.configId,configValue:JSON.stringify(this.form13)}
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("修改成功");
+        }
+      });
+    },
     /** 清理缓存按钮操作 */
     handleClearCache() {
       clearCache().then(response => {