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

src/api/qw/im.js

@@ -91,6 +91,67 @@ export function exportMessage(query) {
   })
 }
 
+// 获取外部联系人详情
+export function getQwExternalContactDetails(query) {
+  return request({
+    url: '/qw/qwMsg/getQwExternalContactDetails',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取用户信息
+export function getQwUserInfo(query) {
+  return request({
+    url: '/qw/qwMsg/getQwUserInfo',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改用户信息
+export function updateQwUserInfo(data) {
+  return request({
+    url: '/qw/qwMsg/updateQwUserInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取看课记录
+export function queryCourseWatchStatistics(data) {
+  return request({
+    url: '/qw/qwMsg/course/watch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取课程列表
+export function getFsCourseListBySidebar(data) {
+  return request({
+    url: '/qw/qwMsg/getFsCourseListBySidebar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取课程小节列表
+export function getFsCourseVideoListBySidebar(data) {
+  return request({
+    url: '/qw/qwMsg/getFsCourseVideoListBySidebar',
+    method: 'post',
+    data: data
+  })
+}
 
+// 创建小程序链接
+export function createMiniLink(data) {
+  return request({
+    url: '/qw/qwMsg/createMiniLink',
+    method: 'post',
+    data: data
+  })
+}
 
 

src/api/system/employeeStats.js

@@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+// 查询员工完成统计列表
+export function listEmployeeStats(query) {
+  return request({
+    url: '/stats/seller/pageList',
+    method: 'post',
+    data: 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({
+    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'
+  })
+}
+
+// 获取部门数据
+export function getDeptData(){
+  return request({
+    url: '/stats/getDeptData',
+    method: 'get'
+  })
+}

src/api/users/user.js

@@ -88,12 +88,3 @@ export function enabledUsers(data) {
     data: data
   })
 }
-
-// 根据sessionId获取用户信息
-export function getUserInfoBySessionId(query) {
-  return request({
-    url: '/users/user/getUserInfoBySessionId',
-    method: 'get',
-    params: query
-  })
-}

src/assets/icons/svg/miniprogram.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1748500743664" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5042" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z m256.717 460.186a151.962 151.962 0 0 1-87.347 65.74 83.251 83.251 0 0 1-24.474 4.096 29.082 29.082 0 0 1 0-58.163 15.667 15.667 0 0 0 6.451-1.229 91.443 91.443 0 0 0 55.91-40.96 75.264 75.264 0 0 0 11.06-39.628c0-45.978-42.496-83.866-94.31-83.866a105.267 105.267 0 0 0-51.2 13.414 81.92 81.92 0 0 0-43.725 70.452v244.224a138.445 138.445 0 0 1-72.704 120.422 159.642 159.642 0 0 1-79.77 20.48c-84.378 0-153.6-63.488-153.6-142.029a136.192 136.192 0 0 1 19.763-69.837 151.962 151.962 0 0 1 87.347-65.74 85.914 85.914 0 0 1 24.474-4.096 29.082 29.082 0 1 1 0 58.163 15.667 15.667 0 0 0-6.451 1.229 95.949 95.949 0 0 0-55.91 40.96 75.264 75.264 0 0 0-11.06 39.628c0 45.978 42.496 83.866 94.925 83.866a105.267 105.267 0 0 0 51.2-13.414 81.92 81.92 0 0 0 43.622-70.452V390.35a138.752 138.752 0 0 1 72.807-120.525 151.245 151.245 0 0 1 79.155-21.504c84.378 0 153.6 63.488 153.6 142.029a136.192 136.192 0 0 1-19.763 69.837z" fill="#00B240" p-id="5043"></path></svg>

src/components/LemonUI/components/message/miniprogram.vue

@@ -0,0 +1,118 @@
+<script>
+import SvgIcon from '@/components/SvgIcon'
+
+export default {
+  name: "lemonMessageMiniprogram",
+  inheritAttrs: false,
+  inject: ["IMUI"],
+  components: {
+    SvgIcon
+  },
+  render() {
+    return (
+      <lemon-message-basic
+        class="lemon-message-miniprogram"
+        props={{...this.$attrs}}
+        scopedSlots={{
+          content: props => {
+            return this.renderHtml(props.content)
+          }
+        }}
+      />
+    );
+  },
+  methods: {
+    renderHtml(data) {
+      let content = data
+      if (typeof data === 'string') {
+        try {
+          // 尝试将字符串解析为JSON对象
+          content = JSON.parse(data)
+        } catch (e) {
+          console.error('解析小程序消息内容失败:', e)
+          content = { title: '小程序' }
+        }
+      }
+      
+      return (
+        <div>
+          <div class="lemon-message-miniprogram__header">
+            <div class="lemon-message-miniprogram__title">{content.title || '小程序'}</div>
+          </div>
+          <div class="lemon-message-miniprogram__body">
+            {content.thumbnail && (
+              <div class="lemon-message-miniprogram__cover">
+                <img src={content.thumbnail} alt=""/>
+              </div>
+            )}
+          </div>
+          <div class="lemon-message-miniprogram__footer">
+            <svg-icon icon-class="miniprogram" class="lemon-message-miniprogram__icon"></svg-icon>
+            <span>小程序</span>
+          </div>
+        </div>
+      )
+    }
+  }
+};
+</script>
+
+<style lang="stylus">
+@import '../../styles/utils/index'
+
++b(lemon-message-miniprogram)
+  +b(lemon-message)
+    +e(content)
+      width 240px // 设置小程序卡片宽度
+      border-radius 4px // 设置圆角
+      background-color #fff // 设置背景色
+      overflow hidden // 防止内容溢出
+      box-shadow 0 2px 8px rgba(0, 0, 0, 0.1) // 添加阴影效果
+      padding 0 // 重置内边距
+
+  +e(header)
+    padding 10px // 设置内边距
+    border-bottom 1px solid #f0f0f0 // 添加底部边框
+
+  +e(title)
+    font-size 14px // 设置字体大小
+    font-weight 500 // 设置字体粗细
+    color #333 // 设置字体颜色
+    line-height 1.4 // 设置行高
+    overflow hidden // 防止文本溢出
+    text-overflow ellipsis // 文本溢出显示省略号
+    white-space nowrap // 不换行
+
+  +e(body)
+    position relative // 设置相对定位
+
+  +e(cover)
+    width 100% // 设置图片容器宽度
+    height 120px // 设置图片容器高度
+    overflow hidden // 防止图片溢出
+
+    img
+      width 100% // 设置图片宽度
+      height 100% // 设置图片高度
+      object-fit cover // 图片填充方式
+      display block // 设置为块级元素
+      background transparent // 设置背景透明
+
+  +e(footer)
+    display flex // 使用弹性布局
+    align-items center // 垂直居中
+    padding 8px 10px // 设置内边距
+    font-size 12px // 设置字体大小
+    color #999 // 设置字体颜色
+    background-color #f8f8f8 // 设置背景色
+
+    i
+      margin-right 4px // 设置图标右边距
+      font-size 14px // 设置图标大小
+      color color-primary // 使用主题色变量
+
+  +e(icon)
+    margin-right 4px // 设置右边距
+    font-size 16px // 设置图标大小
+    color color-primary // 使用主题色变量
+</style>

src/components/LemonUI/components/message/voice.vue

@@ -29,8 +29,7 @@ export default {
         const {url, content} = JSON.parse(data.content)
         return <div class="lemon-message-voice-context">
             <audio block="true" showDuration='false' controls src={url}
-            controlslist='nodownload noplaybackrate'
-            oncontextmenu="return false"/>
+            controlslist='nodownload noplaybackrate'/>
             <div class="lemon-message-voice-context-text">
               <span>{content}</span>
               <span class="el-icon-check lemon-message-voice-context-text-transfer">转换完成</span>

src/components/LemonUI/index.js

@@ -15,6 +15,7 @@ import lemonMessageEvent from "./components/message/event";
 import LemonMessageVoice from "./components/message/voice";
 import LemonMessageVideo from "./components/message/video";
 import LemonMessageEmotionDynamic from "./components/message/emotionDynamic.vue";
+import LemonMessageMiniprogram from "./components/message/miniprogram.vue";
 
 
 import LemonIMUI from "./components/index";
@@ -41,7 +42,8 @@ const components = [
   LemonMessageVoice,
   LemonMessageVideo,
   LemonRecords,
-  LemonMessageEmotionDynamic
+  LemonMessageEmotionDynamic,
+  LemonMessageMiniprogram
 ];
 const install = (Vue) => {
   Vue.directive("LemonContextmenu", Contextmenu);

src/components/LemonUI/lastContentRender.js

@@ -21,4 +21,7 @@ export default {
   emotionDynamic(message) {
     return '[自定义表情]';
   },
+  miniprogram(message) {
+    return '[小程序]';
+  }
 };

src/components/LemonUI/utils/constant.js

@@ -6,7 +6,7 @@ export const DEFAULT_MENUS = [DEFAULT_MENU_LASTMESSAGES, DEFAULT_MENU_CONTACTS];
 /**
  * 聊天消息类型
  */
-export const MESSAGE_TYPE = ["voice", "file", "video", "image", "text"];
+export const MESSAGE_TYPE = ["voice", "file", "video", "image", "text", "emotionDynamic", "miniprogram"];
 
 /**
  * 聊天消息状态

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

@@ -359,6 +359,9 @@ export default {
 .qw-im-content {
   width: 100%;
   height: 100%;
+  /* 可选：让内容区自动撑满弹窗 */
+  display: flex;
+  flex-direction: column;
 }
 
 </style>

src/store/index.js

@@ -6,6 +6,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
+import qwIm from './modules/qwIm'
 
 Vue.use(Vuex)
 
@@ -15,7 +16,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    qwIm
   },
   getters
 })

src/store/modules/qwIm.js

@@ -0,0 +1,22 @@
+const state = {
+  shareCourse: null,
+}
+
+const mutations = {
+  SHARE_COURSE: (state, data) => {
+    state.shareCourse = data
+  }
+}
+
+const actions = {
+  shareCourse({ commit }, data) {
+    commit('SHARE_COURSE', data)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}

src/views/company/companyUser/index.vue

@@ -144,6 +144,12 @@
           </el-table-column>
           <el-table-column label="区域" align="center" prop="addressId">
           </el-table-column>
+          <el-table-column label="是否单独注册会员" align="center" prop="isNeedRegisterMember" width="80px">
+            <template slot-scope="scope">
+              <el-tag
+                :type="scope.row.isNeedRegisterMember === 1 ? 'success' : 'info'">{{scope.row.isNeedRegisterMember === 1 ? '是' : '否' }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="创建时间"  sortable align="center" prop="createTime" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/course/courseFinishTemp/index.vue

@@ -397,7 +397,7 @@
           <span v-if="form.isAllCompanyUser == '1'" style="margin-left: 10px;color: #13ce66">是</span>
           <span v-else style="margin-left: 10px;color: #ff4949">否</span>
         </el-form-item>
-        <el-form-item label="所属销售" prop="companyUserIds">
+        <el-form-item label="所属销售" prop="companyUserIds" v-if="form.isAllCompanyUser == '2'">
           <el-select v-model="companyUserIds" remote multiple placeholder="请选择" filterable style="width: 100%;">
             <el-option
               v-for="dict in userList"
@@ -443,6 +443,7 @@ export default {
       // 状态字典
       statusOptions: [],
       allowSelect: [],
+      parentId: "",
       courseList: [],
       videoList: [],
       // 遮罩层
@@ -501,6 +502,7 @@ export default {
   },
   created() {
     this.queryParams.parentId = this.$route.params && this.$route.params.parentId;
+    this.parentId = this.queryParams.parentId;
     getUserList().then(response => {
       this.userList = response.data;
       console.log("this.userList", this.userList)
@@ -730,6 +732,7 @@ export default {
             this.form.isAllCompanyUser = 2;
           }
           this.form.companyUserIds = this.companyUserIds.toString()
+          this.form.parentId = this.parentId
 
           this.form.setting = JSON.stringify(this.setting)
           this.form.chatSetting = JSON.stringify(this.chatSetting)

src/views/course/courseFinishTempParent/index.vue

@@ -351,7 +351,7 @@
           <span v-if="form.isAllCompanyUser == '1'" style="margin-left: 10px;color: #13ce66">是</span>
           <span v-else style="margin-left: 10px;color: #ff4949">否</span>
         </el-form-item>
-        <el-form-item label="所属销售" prop="companyUserIds" v-if="!form.id">
+        <el-form-item label="所属销售" prop="companyUserIds" v-if="!form.id && form.isAllCompanyUser == '2'">
           <el-select v-model="companyUserIds" remote multiple placeholder="请选择" filterable style="width: 100%;">
             <el-option
               v-for="dict in userList"

src/views/course/userCoursePeriod/index.vue

@@ -66,7 +66,7 @@
 <!--          :disabled="batchSetRedPacketDisabled"-->
 <!--        >批量设置红包-->
 <!--        </el-button>-->
-      </el-col>
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/qw/qwChat/qq.vue

@@ -43,6 +43,19 @@
             />
           </div>
         </template>
+        <template #message-title="contact">
+<!--          <div @click="openDrawer('right')" style="position: absolute;right: 14px;top: 10px;">-->
+<!--            <i class="el-icon-more" style="cursor: pointer"/>-->
+<!--          </div>-->
+          <div>
+            <el-button
+              type="primary"
+              size="small"
+              style="position: absolute;right: 14px;top: 10px;z-index: 1000"
+              @click="showDetail(contact.extId)"
+            >详情</el-button>
+          </div>
+        </template>
       </lemon-imui>
     </div>
 
@@ -65,7 +78,8 @@
     <el-drawer
       append-to-body
       :with-header="false"
-      size="75%"
+      size="35%"
+      :destroy-on-close="true"
       :title="detail.title" :visible.sync="detail.open">
       <userDetail ref="userDetail" />
     </el-drawer>
@@ -84,6 +98,8 @@ import UserDetail from "@/views/qw/qwChat/userDetail/index.vue";
 import {ImSocket} from "@/utils/ImSocket";
 import {getToken} from '@/utils/auth'
 import {uploadOss} from "@/api/common";
+import {mapState} from "vuex";
+import {generateUUID} from "@/components/LemonUI/utils";
 
 let pages = {};
 export default {
@@ -166,6 +182,9 @@ export default {
       }
     });
   },
+  computed: {
+    ...mapState('qwIm', ['shareCourse'])
+  },
   watch: {
     showQw(nv, ov) {
       if (nv) {
@@ -173,6 +192,35 @@ export default {
           this.$refs.IMUI.messageViewToBottom();
         });
       }
+    },
+    shareCourse(nv) {
+      if (nv) {
+        // 发送小程序卡片消息
+        const IMUI = this.$refs.IMUI;
+        const contact = IMUI.currentContact;
+        if (!contact) {
+          return;
+        }
+
+        // 创建消息对象
+        let message = {
+          type: 'miniprogram',
+          content: nv,
+          toContactId: contact.conversationId,
+        };
+
+        this.detail.open = false
+        this.$store.dispatch('qwIm/shareCourse', null)
+
+        // 使用handleSend方法发送消息
+        this.handleSend(
+          message,
+          (replaceMessage = { status: "succeed" }) => {
+            IMUI.updateMessage(Object.assign(message, replaceMessage));
+          },
+          null
+        );
+      }
     }
   },
   mounted() {
@@ -207,10 +255,11 @@ export default {
         const { IMUI } = this.$refs;
         let message = JSON.parse(data);
         this.appendRemoteMessage(message)
+
         let conversation = IMUI.findConversation(message.toContactId);
         if (conversation.msgId) {
           conversation.lastSendTime = message.sendTime;
-          conversation.lastContent = message.content;
+          conversation.lastContent = IMUI.lastContentRender(message)//message.content;
           IMUI.topPopConversations(conversation);
         }
       })
@@ -245,17 +294,17 @@ export default {
     openDrawer(position) {
       const IMUI = this.$refs.IMUI;
       const params = {
+        width: '30%',
         position,
         render: contact => {
           return (
             <div style="padding:15px">
               <h5>{contact.displayName}</h5>
-              <span style="cursor:pointer;" on-click={IMUI.closeDrawer}>关闭侧边栏</span>
             </div>
           );
         },
       };
-      IMUI.openDrawer(params);
+      IMUI.changeDrawer(params);
     },
     handlePullMessages(contact, next,instance) {
       const { IMUI } = this.$refs;
@@ -343,15 +392,16 @@ export default {
             this.appendRemoteMessage(data)
             let conversation = IMUI.findConversation(message.toContactId);
             conversation.lastSendTime = message.sendTime;
-            conversation.lastContent = message.content;
+            conversation.lastContent = IMUI.lastContentRender(message)
             IMUI.topPopConversations(conversation);
             next();
+          } else {
+            next({status:'failed'})
           }
         });
       }
       // image
       else if(message.type === "image"){
-        console.log("Event:image-click", message, next, file)
         const formData = new FormData();
         formData.append("file", file);
         uploadOss(formData).then(response => {
@@ -363,14 +413,36 @@ export default {
               if(code === 200){
                 let conversation = IMUI.findConversation(message.toContactId);
                 conversation.lastSendTime = message.sendTime;
-                conversation.lastContent = message.content;
+                conversation.lastContent = IMUI.lastContentRender(message)
                 IMUI.topPopConversations(conversation);
                 next();
+              } else {
+                next({status:'failed'})
               }
             });
           }
         })
       }
+      // 小程序
+      else if(message.type === "miniprogram"){
+        // 小程序消息参数
+        params = {
+          "sessionId": message.toContactId,
+          "appKey": this.qwUser.appKey,
+          "content": message.content,
+          "msgType": 5 // 小程序消息类型
+        };
+        sendMsg(params).then(response => {
+          const {code, data} = response
+          if(code === 200){
+            this.appendRemoteMessage(data)
+            let conversation = IMUI.findConversation(message.toContactId);
+            conversation.lastSendTime = message.sendTime;
+            conversation.lastContent = IMUI.lastContentRender(message)
+            IMUI.topPopConversations(conversation);
+          }
+        });
+      }
       // file
       else if(message.type === "file"){
         console.log("Event:file-click", message, next, file)
@@ -400,7 +472,7 @@ export default {
     },
     handleMessageClick(e, key, message, instance) {
       if (key === 'avatar') {
-        this.qwUser.id !== message.fromUser.id && this.showDetail(message.toContactId)
+        this.qwUser.id !== message.fromUser.id && this.showDetail(message.extId)
         return
       }
 
@@ -506,10 +578,10 @@ export default {
       this.dialogVisible = true;
     },
     // 详情
-    showDetail(sessionId) {
+    showDetail(extId) {
       this.detail.open = true
       setTimeout(() => {
-        this.$refs.userDetail.getDetail(sessionId);
+        this.$refs.userDetail.getDetail(extId);
       }, 1);
     },
     // 搜索

src/views/qw/qwChat/userDetail/courseManage.vue

@@ -0,0 +1,406 @@
+<template>
+  <div>
+    <!-- 顶部标题栏 -->
+    <div>
+      <div style="position: relative; display: flex; align-items: center; justify-content: center; height: 48px; background: #fff;">
+        <span style="position: absolute; left: 16px; cursor: pointer;" @click="handleBack">
+          <i class="el-icon-arrow-left" style="font-size: 20px; color: #333;"></i>
+        </span>
+        <span style="font-weight: bold; font-size: 16px;">课程管理</span>
+      </div>
+
+      <el-select
+        v-model="courseId"
+        placeholder="请点击选择课程"
+        class="courseSelect"
+        popper-class="courseSelectList"
+        @visible-change="handleSelectOpen"
+        @change="courseChange"
+        ref="courseSelect"
+      >
+        <el-option
+          v-for="item in courseList"
+          :key="item.courseId"
+          :label="item.courseName"
+          :value="item.courseId">
+        </el-option>
+        <div
+          v-if="courseQueryParams.hasNextPage"
+          class="load-more"
+          v-loading="courseQueryParams.loading"
+        >
+          <span v-if="!courseQueryParams.loading">加载更多</span>
+        </div>
+      </el-select>
+
+      <el-input
+        placeholder="请输入课程名称"
+        v-model="videoQueryParams.keyword"
+        class="videoSearch"
+        @keyup.enter.native="handleSearch"
+      >
+      </el-input>
+    </div>
+
+    <!-- 列表 -->
+    <div class="infinite-list-wrapper" style="overflow:auto">
+      <ul class="video-list" v-infinite-scroll="loadMoreVideo">
+        <li v-for="item in videoList" :key="item.videoId" class="video-item">
+          <div class="video-thumbnail">
+            <img :src="item.thumbnail || defaultImage" alt="" @error="handleImgError">
+            <div class="video-duration">{{formatDuration(item.duration)}}</div>
+          </div>
+          <div class="video-info">
+            <div class="video-title">{{item.title}}</div>
+            <div class="video-meta">
+              <i class="el-icon-s-order" style="font-size: 18px;margin-right: 5px"></i>
+              <span class="video-date">{{formatDate(item.createTime)}}</span>
+            </div>
+          </div>
+          <div class="video-actions">
+            <el-button 
+              type="primary" 
+              size="mini" 
+              round 
+              :loading="sharingVideoId === item.videoId" 
+              :disabled="sharingVideoId === item.videoId" 
+              @click="handleShare(item)">分享课程</el-button>
+          </div>
+        </li>
+      </ul>
+      <div v-if="videoList.length === 0 && !videoQueryParams.loading" class="empty-tip">
+        <i class="el-icon-video-camera"></i>
+        <p>暂无视频</p>
+      </div>
+      <div v-if="videoQueryParams.loading" class="loading-more">
+        <i class="el-icon-loading"></i>
+        <span>加载中...</span>
+      </div>
+      <div v-if="!videoQueryParams.hasNextPage && videoList.length > 0" class="no-more">
+        <span>没有更多了</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {createMiniLink, getFsCourseListBySidebar, getFsCourseVideoListBySidebar} from "@/api/qw/im";
+
+export default {
+  name: "courseManage",
+  props: {
+    userId: {
+      type: Number,
+      default: () => null
+    }
+  },
+  data() {
+    return {
+      courseId: null,
+      courseQueryParams: {
+        extId: this.userId,
+        page: 1,
+        limit: 10,
+        hasNextPage: false,
+        loading: false,
+      },
+      courseList: [],
+      scrollEvent: null,
+      videoQueryParams: {
+        courseId: null,
+        keyword: '',
+        page: 1,
+        limit: 10,
+        hasNextPage: false,
+        loading: false,
+      },
+      videoList: [],
+      defaultImage: require('@/assets/image/default-image.png'),
+      sharingVideoId: null
+    }
+  },
+  created() {
+    this.getFsCourseListBySidebar()
+  },
+  methods: {
+    handleBack() {
+      this.$emit('back')
+    },
+    getFsCourseListBySidebar() {
+      this.courseQueryParams.loading = true;
+      getFsCourseListBySidebar(this.courseQueryParams).then(response => {
+        if (this.courseQueryParams.page === 1) {
+          this.courseList = response.data.list;
+        } else {
+          this.courseList = [...this.courseList, ...response.data.list];
+        }
+        this.courseQueryParams.hasNextPage = response.data.hasNextPage;
+        this.courseQueryParams.loading = false;
+      }).catch(() => {
+        this.courseQueryParams.loading = false;
+      });
+    },
+    loadMore() {
+      if (!this.courseQueryParams.hasNextPage || this.courseQueryParams.loading) return;
+
+      this.courseQueryParams.page += 1;
+      this.getFsCourseListBySidebar();
+    },
+    handleSelectOpen(visible) {
+      if (visible) {
+        // 下拉框打开时，添加滚动监听
+        this.$nextTick(() => {
+          const selectDropdown = document.querySelector('.el-select-dropdown.courseSelectList');
+          if (selectDropdown) {
+            const dropdownList = selectDropdown.querySelector('.el-select-dropdown__wrap');
+            if (dropdownList) {
+              // 移除之前可能存在的事件监听
+              if (this.scrollEvent) {
+                dropdownList.removeEventListener('scroll', this.scrollEvent);
+              }
+
+              // 添加新的滚动监听
+              this.scrollEvent = () => {
+                const { scrollTop, scrollHeight, clientHeight } = dropdownList;
+                // 当滚动到距离底部20px时，加载更多
+                if (scrollHeight - scrollTop - clientHeight < 20) {
+                  this.loadMore();
+                }
+              };
+
+              dropdownList.addEventListener('scroll', this.scrollEvent);
+            }
+          }
+        });
+      } else {
+        // 下拉框关闭时，移除滚动监听
+        if (this.scrollEvent) {
+          const selectDropdown = document.querySelector('.el-select-dropdown.courseSelectList');
+          if (selectDropdown) {
+            const dropdownList = selectDropdown.querySelector('.el-select-dropdown__wrap');
+            if (dropdownList) {
+              dropdownList.removeEventListener('scroll', this.scrollEvent);
+            }
+          }
+        }
+      }
+    },
+    courseChange(courseId) {
+      this.videoQueryParams.courseId = courseId;
+      this.handleSearch()
+    },
+    handleSearch() {
+      if (!this.videoQueryParams.courseId) {
+        return
+      }
+      this.videoQueryParams.page = 1;
+      this.getFsCourseVideoListBySidebar()
+    },
+    getFsCourseVideoListBySidebar() {
+      this.videoQueryParams.loading = true;
+      getFsCourseVideoListBySidebar(this.videoQueryParams).then(response => {
+        if (this.videoQueryParams.page === 1) {
+          this.videoList = response.data.list;
+        } else {
+          this.videoList = [...this.videoList, ...response.data.list];
+        }
+        this.videoQueryParams.hasNextPage = response.data.hasNextPage;
+        this.videoQueryParams.loading = false;
+        console.log(this.videoList)
+      }).catch(() => {
+        this.videoQueryParams.loading = false;
+      })
+    },
+    loadMoreVideo() {
+      if (!this.videoQueryParams.hasNextPage || this.videoQueryParams.loading) return;
+      this.videoQueryParams.page += 1;
+      this.getFsCourseVideoListBySidebar()
+    },
+    handleImgError(e) {
+      e.target.src = this.defaultImage;
+    },
+    formatDate(timestamp) {
+      if (!timestamp) return '';
+      const date = new Date(timestamp);
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+    },
+    formatDuration(seconds) {
+      if (!seconds) return '00:00';
+      const minutes = Math.floor(seconds / 60);
+      const remainingSeconds = seconds % 60;
+      return `${String(minutes).padStart(2, '0')}:${String(remainingSeconds).padStart(2, '0')}`;
+    },
+    handleShare(item) {
+      const params = {
+        extId: this.userId,
+        courseId: item.courseId,
+        videoId: item.videoId,
+        title: item.title,
+      }
+      this.sharingVideoId = item.videoId;
+      createMiniLink(params).then(response => {
+        if (response.code === 200) {
+          this.$store.dispatch('qwIm/shareCourse', response.data)
+        }
+        this.sharingVideoId = null;
+      }).catch(error => {
+        this.$message.error('分享课程失败');
+        this.sharingVideoId = null;
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+.courseSelect {
+  width: 100%;
+}
+.courseSelectList li {
+  text-align: center;
+}
+::v-deep .courseSelect input {
+  border: unset;
+  text-align: center;
+}
+.load-more {
+  text-align: center;
+  height: 34px;
+  line-height: 34px;
+  color: #909399;
+  font-size: 12px;
+  cursor: pointer;
+  background-color: #f5f7fa;
+}
+.load-more:hover {
+  background-color: #e4e7ed;
+}
+.videoSearch {
+  padding: 10px;
+  border-radius: 8px;
+}
+::v-deep .videoSearch input {
+  border-radius: 22px;
+}
+
+.infinite-list-wrapper {
+  height: calc(100vh - 200px);
+  overflow-y: auto;
+  padding: 0 10px;
+  background-color: #f5f7fa;
+}
+
+.video-list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.video-item {
+  display: flex;
+  padding: 15px;
+  margin-bottom: 5px;
+  background-color: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  transition: transform 0.2s;
+}
+
+.video-item:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+
+.video-thumbnail {
+  position: relative;
+  flex: 0 0 120px;
+  height: 80px;
+  margin-right: 15px;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.video-thumbnail img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.video-duration {
+  position: absolute;
+  bottom: 5px;
+  right: 5px;
+  background-color: rgba(0, 0, 0, 0.7);
+  color: #fff;
+  padding: 2px 4px;
+  border-radius: 2px;
+  font-size: 12px;
+}
+
+.video-info {
+  flex: 1;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+
+.video-title {
+  font-size: 16px;
+  font-weight: 500;
+  color: #303133;
+  margin-bottom: 5px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.video-meta {
+  display: flex;
+  align-items: flex-end;
+  font-size: 12px;
+  color: #909399;
+  margin-bottom: 5px;
+}
+
+.video-date {
+  margin-right: 15px;
+}
+
+.video-actions {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 8px;
+  margin-left: 10px;
+}
+
+.loading-more {
+  text-align: center;
+  padding: 15px 0;
+  color: #909399;
+}
+
+.no-more {
+  text-align: center;
+  padding: 15px 0;
+  color: #909399;
+  font-size: 13px;
+}
+
+.empty-tip {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: #909399;
+}
+
+.empty-tip i {
+  font-size: 48px;
+  margin-bottom: 10px;
+  color: #dcdfe6;
+}
+</style>

src/views/qw/qwChat/userDetail/index.vue

@@ -1,148 +1,363 @@
 <template>
+  <div style="background-color: #f0f2f5; padding-bottom: 20px; min-height: 100%;">
+    <!-- 客户详情 -->
+    <div v-if="showDetail">
+      <div style="padding: 20px; background-color: #fff;">
+        客户详情
+      </div>
 
-  <div style="background-color: #f0f2f5; padding-bottom: 20px; min-height: 100%; " >
-    <div style="padding: 20px; background-color: #fff;">
-      用户详情
-    </div>
-
-    <div class="contentx">
-      <div class="desct">
-        基本信息
+      <!-- 用户头像 -->
+      <div style="padding: 20px 10px 0 10px;background-image: linear-gradient(to right, #e0edff, #dfe0fe)">
+        <div style="padding: 20px 10px 0 10px;background-image: linear-gradient(to right, #edf5ff, #ecedff);display: flex;border-radius: 8px;">
+          <div style="padding: 10px">
+            <el-avatar :size="50" :src="qwUserInfo.avatar"/>
+          </div>
+          <div style="padding: 10px;display: flex;flex-direction: column;align-items: flex-start;justify-content: center;">
+            <div>
+              <span style="font-size: 16px;">{{qwUserInfo.name}}</span>
+            </div>
+            <div>
+              <span style="font-size: 14px;color: #8c939d">备注：{{qwUserInfo.remark}}</span>
+            </div>
+          </div>
+        </div>
       </div>
-      <el-descriptions title="" :column="3" border>
-
-        <el-descriptions-item label="会员id" >
-          <span>{{item.userId}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="用户昵称" >
-          <span>{{item.nickname}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="用户头像" >
-          <el-image v-if="item.avatar!=null"
-                    style="width: 50px;"
-                    :src="item.avatar">
-          </el-image>
-        </el-descriptions-item>
-        <el-descriptions-item label="手机号码" >
-          <span>{{item.phone}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="用户积分" >
-          <span>{{item.integral}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="状态" >
-             <span>
-                   <dict-tag :options="userOptions" :value="item.status"/>
-             </span>
-        </el-descriptions-item>
-
-        <el-descriptions-item label="上级昵称" >
-          <span>{{item.tuiName}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="上级手机号码" >
-          <span>{{item.tuiPhone}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="推广员关联时间" >
-          <span>{{item.tuiTime}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="下级人数" >
-          <span>{{item.tuiUserCount}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="最后一次登录ip" >
-          <span>{{item.lastIp}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="余额" >
-          <span>{{item.balance}}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="创建时间" >
-          <span>{{item.createTime}}</span>
-        </el-descriptions-item>
-
-        <el-descriptions-item label="更新时间" >
-          <span>{{item.updateTime}}</span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </div>
 
-    <div class="contentx" v-if="item.userId != null" >
-      <div class="desct">
-        用户订单
+      <!--  基本信息 -->
+      <div>
+        <div style="display: flex;justify-content: space-between;align-items: center;flex-direction: row;background: #FFF;padding: 10px">
+          <div>
+            基本信息
+          </div>
+          <div>
+            <el-button size="mini" round @click="updateQwDetail">修改用户信息</el-button>
+          </div>
+        </div>
+        <div style="background: #FFF; padding: 0 10px 10px 20px;color: #8c939d">
+          <el-row>
+            <span style="font-size: 14px;">性别:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.sex || '未知'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">年龄:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.age || '未知'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">行为习惯:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.habits || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">患病时间:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.illnessTime || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">疾病:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.disease || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">家人的疾病:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.familyDisease || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">是否线下就诊:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.isLine || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">体质:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.constitution || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">使用药品:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.medicine || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">咨询产品:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.consultProduct || '无'}}</span>
+          </el-row>
+          <el-row style="margin-top: 10px">
+            <span style="font-size: 14px;">是否已经购买产品:</span>
+            <span style="font-size: 14px;margin-left: 10px">{{qwUserDetail.isBuy || '无'}}</span>
+          </el-row>
+        </div>
       </div>
-      <userStorerDetails  ref="userDetails" />
-    </div>
 
-    <div class="contentx" v-if="item.userId != null" >
-      <div class="desct">
-        用户看客记录
+      <!-- 看课记录 -->
+      <div style="background-color: #FFF">
+        <div style="padding: 10px;">
+          看课记录
+        </div>
+        <!-- 状态 -->
+        <div class="status-container">
+          <div
+            v-for="(item, index) in logTypeList"
+            :key="index"
+            class="status-item"
+          >
+            <div
+              class="status-color-block"
+              :style="{ backgroundColor: item.color }"
+            ></div>
+            <span class="status-text">{{ item.text }}</span>
+          </div>
+        </div>
+        <!-- 近七天看课记录 -->
+        <div>
+          <div style="display: flex;justify-content: space-between;align-items: center;flex-direction: row;background: #FFF;padding: 10px 0 20px 0">
+            <div class="section-title">
+              近七天看课记录
+            </div>
+            <el-button size="mini" round @click="courseManage">课程管理</el-button>
+          </div>
+          <div class="course-record-container">
+            <div
+              v-for="item in courseWatch7day"
+              :key="item.id"
+              class="course-record-item"
+            >
+              <span class="course-date">{{ item.date.split('-')[2] }}日</span>
+              <div
+                class="course-status-block"
+                :style="{ backgroundColor: getLogTypeColor(item.logType) }"
+                :title="getLogTypeText(item.logType)"
+              ></div>
+            </div>
+            <div v-if="courseWatch7day.length === 0" class="empty-record">
+              暂无看课记录
+            </div>
+          </div>
+        </div>
       </div>
-      <userCourseWatchLog  ref="userWatchLog" />
+
     </div>
+
+    <!-- 修改用户信息 -->
+    <user-info-edit
+      v-if="showUpdate"
+      :userDetail="qwUserDetail"
+      @back="handleBack"
+      @save-success="handleSaveSuccess"
+    />
+
+    <!-- 课程管理 -->
+    <course-manage
+      v-if="showCourseManage"
+      :userId="qwUserInfo.id"
+      @back="handleBack"
+    />
+    <!-- 催课管理 -->
+    <remind-course-manage
+      v-if="showRemindCourseManage"
+      :user-id="qwUserDetail.id"
+      @back="handleBack"
+    />
+
+<!--    <div class="contentx" v-if="item.userId != null" >-->
+<!--      <div class="desct">-->
+<!--        用户订单-->
+<!--      </div>-->
+<!--      <userStorerDetails  ref="userDetails" />-->
+<!--    </div>-->
+
+<!--    <div class="contentx" v-if="item.userId != null" >-->
+<!--      <div class="desct">-->
+<!--        用户看客记录-->
+<!--      </div>-->
+<!--      <userCourseWatchLog  ref="userWatchLog" />-->
+<!--    </div>-->
   </div>
 </template>
 
 <script>
-import {getUserInfoBySessionId} from "@/api/users/user";
 import userStorerDetails from "@/views/qw/qwChat/userDetail/userStorerDetails.vue"
 import userCourseWatchLog from "@/views/qw/qwChat/userDetail/userCourseWatchLog.vue";
+import userInfoEdit from "@/views/qw/qwChat/userDetail/userInfoEdit.vue";
+import courseManage from "@/views/qw/qwChat/userDetail/courseManage.vue";
+import remindCourseManage from "@/views/qw/qwChat/userDetail/remindCourseManage.vue";
+import {getQwExternalContactDetails, getQwUserInfo, queryCourseWatchStatistics} from "@/api/qw/im";
 
 export default {
   name: "userDetail",
   components: {
     userStorerDetails,
-    userCourseWatchLog
+    userCourseWatchLog,
+    userInfoEdit,
+    courseManage,
+    remindCourseManage
   },
   data() {
+    // 定义颜色常量
+    const logTypeColors = {
+      notWatched: '#909399', // 未看课
+      watching: '#0bc6ff',   // 看课中
+      completed: '#67c23a',  // 完课
+      pending: '#f55a4f',    // 待看课
+      interrupted: '#ffd700' // 看课中断
+    };
+
     return {
-      userOptions: [],
-      item: {},
+      extId: null,
+      qwUserInfo: {},
+      qwUserDetail: {},
+      showDetail: true,
+      showUpdate: false,
+      courseWatch7day: [],
+      logTypeColors,
+      // 定义状态列表用于渲染
+      logTypeList: [
+        { type: 0, text: '未看课', color: logTypeColors.notWatched },
+        { type: 1, text: '看课中', color: logTypeColors.watching },
+        { type: 2, text: '完课', color: logTypeColors.completed },
+        { type: 3, text: '待看课', color: logTypeColors.pending },
+        { type: 4, text: '看课中断', color: logTypeColors.interrupted }
+      ],
+      showCourseManage: false,
+      showRemindCourseManage: false
     }
   },
-  created() {
-    this.getDicts("sys_user_status").then(response => {
-      this.userOptions = response.data;
-    });
-  },
   methods: {
-    getDetail(sessionId) {
-      this.item = {}
-      const params = {
-        sessionId: sessionId
+    getDetail(extId) {
+      this.extId = extId
+      this.getQwExternalContactDetails()
+      this.getQwUserInfo()
+      this.queryCourseWatchStatistics()
+    },
+    queryCourseWatchStatistics() {
+      const data = {
+        type: 0,
+        qwExternalContactId: this.extId
+      }
+      queryCourseWatchStatistics(data).then(response => {
+        this.courseWatch7day = response.data.data
+      })
+    },
+    getQwExternalContactDetails() {
+      const query = {
+        qwExternalContactId: this.extId
+      }
+      getQwExternalContactDetails(query).then(response => {
+        this.qwUserInfo = response.data
+      })
+    },
+    getQwUserInfo() {
+      const query = {
+        qwExternalContactId: this.extId
       }
-      getUserInfoBySessionId(params).then(response => {
-        this.item = response.data;
-        if (this.item.userId != null) {
-            setTimeout(() => {
-              this.$refs.userDetails.getUserDetails(this.item.userId);
-            }, 1);
-          setTimeout(() => {
-            this.$refs.userWatchLog.getUserWatchLog(this.item.userId);
-          }, 1);
-        }
+      getQwUserInfo(query).then(response => {
+        this.qwUserDetail = response.moreInfo
       })
     },
+    updateQwDetail() {
+      this.showDetail = false
+      this.showUpdate = true
+    },
+    handleBack() {
+      this.getQwUserInfo()
+      this.showDetail = true
+      this.showUpdate = false
+      this.showCourseManage = false
+      this.showRemindCourseManage = false
+    },
+    handleSaveSuccess() {
+      this.handleBack()
+    },
+    getLogTypeColor(logType) {
+      const type = parseInt(logType);
+      // 使用对象映射替代switch语句
+      const colorMap = {
+        0: this.logTypeColors.notWatched,
+        1: this.logTypeColors.watching,
+        2: this.logTypeColors.completed,
+        3: this.logTypeColors.pending,
+        4: this.logTypeColors.interrupted
+      };
+      return colorMap[type] || '';
+    },
+    getLogTypeText(logType) {
+      const type = parseInt(logType);
+      // 使用对象映射替代switch语句
+      const textMap = {
+        0: '未看课',
+        1: '看课中',
+        2: '完课',
+        3: '待看课',
+        4: '看课中断'
+      };
+      return textMap[type] || '';
+    },
+    courseManage() {
+      this.showDetail = false
+      this.showCourseManage = true
+    },
+    remindCourseManage() {
+      this.showDetail  = false
+      this.showRemindCourseManage = true
+    }
   }
 }
 </script>
-<style>
+<style scoped>
+.status-container {
+  display: flex;
+  gap: 20px;
+  padding: 10px 0 0 20px;
+  color: #8c939d;
+}
 
-.contentx{
-  height: 100%;
-  background-color: #fff;
-  padding: 0px 20px 20px;
+.status-item {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
 
+.status-color-block {
+  border-radius: 4px;
+  width: 20px;
+  height: 20px;
+}
 
-  margin: 20px;
+.status-text {
+  font-size: 12px;
 }
-.el-descriptions-item__label.is-bordered-label{
-  font-weight: normal;
+
+.section-title {
+  padding: 10px;
+  font-size: 12px;
+  color: #8c939d;
 }
-.el-descriptions-item__content {
-  max-width: 150px;
-  min-width: 100px;
+
+.course-record-container {
+  display: flex;
+  padding: 0 10px 15px 10px;
+  gap: 10px;
+  overflow-x: auto;
 }
-.desct{
-  padding-top: 20px;
-  padding-bottom: 20px;
-  color: #524b4a;
-  font-weight: bold;
+
+.course-record-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-width: 40px;
+}
+
+.course-date {
+  font-size: 12px;
+  color: #606266;
+  margin-bottom: 5px;
+}
+
+.course-status-block {
+  width: 20px;
+  height: 20px;
+  border-radius: 4px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.empty-record {
+  width: 100%;
+  text-align: center;
+  color: #909399;
+  font-size: 14px;
 }
 </style>

src/views/qw/qwChat/userDetail/remindCourseManage.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    <!-- 顶部标题栏 -->
+    <div>
+      <div style="position: relative; display: flex; align-items: center; justify-content: center; height: 48px; background: #fff; border-bottom: 1px solid #eee;">
+        <span style="position: absolute; left: 16px; cursor: pointer;" @click="handleBack">
+          <i class="el-icon-arrow-left" style="font-size: 20px; color: #333;"></i>
+        </span>
+        <span style="font-weight: bold; font-size: 16px;">催课面板</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "remindCourseManage",
+  methods: {
+    handleBack() {
+      this.$emit("back");
+    }
+  }
+};
+</script>
+
+<style scoped>
+
+</style>

src/views/qw/qwChat/userDetail/userInfoEdit.vue

@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <!-- 顶部标题栏 -->
+    <div>
+      <div style="position: relative; display: flex; align-items: center; justify-content: center; height: 48px; background: #fff; border-bottom: 1px solid #eee;">
+        <span style="position: absolute; left: 16px; cursor: pointer;" @click="handleBack">
+          <i class="el-icon-arrow-left" style="font-size: 20px; color: #333;"></i>
+        </span>
+        <span style="font-weight: bold; font-size: 16px;">修改用户信息</span>
+      </div>
+    </div>
+    <!-- 表单内容 -->
+    <div class="user-form">
+      <div class="form-row">
+        <div class="form-label">姓名</div>
+        <div class="form-input">
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">性别</div>
+        <div class="form-input">
+          <input
+            v-model="formData.sex"
+            placeholder="请输入性别"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">年龄</div>
+        <div class="form-input">
+          <input
+            v-model="formData.age"
+            placeholder="请输入年龄"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">行为习惯</div>
+        <div class="form-input">
+          <input
+            v-model="formData.habits"
+            placeholder="请输入行为习惯"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">患病时间</div>
+        <div class="form-input">
+          <input
+            v-model="formData.illnessTime"
+            placeholder="请输入患病时间"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">疾病</div>
+        <div class="form-input">
+          <input
+            v-model="formData.disease"
+            placeholder="请输入疾病"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">家人的疾病</div>
+        <div class="form-input">
+          <input
+            v-model="formData.familyDisease"
+            placeholder="请输入家人的疾病"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">是否线下就诊</div>
+        <div class="form-input">
+          <input
+            v-model="formData.isLine"
+            placeholder="请输入是否线下就诊"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">体质</div>
+        <div class="form-input">
+          <input
+            v-model="formData.constitution"
+            placeholder="请输入体质"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">使用药品</div>
+        <div class="form-input">
+          <input
+            v-model="formData.medicine"
+            placeholder="请输入使用药品"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">咨询产品</div>
+        <div class="form-input">
+          <input
+            v-model="formData.consultProduct"
+            placeholder="请输入咨询产品"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-label">是否已经购买产品</div>
+        <div class="form-input">
+          <input
+            v-model="formData.isBuy"
+            placeholder="请输入是否已经购买产品"
+            class="input"
+            type="text"
+          />
+        </div>
+      </div>
+    </div>
+    <!-- 底部按钮 -->
+    <div class="user-edit-footer">
+      <button class="save-btn" v-loading="loading" :disabled="loading" @click="handleSave">保存修改</button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {updateQwUserInfo} from "@/api/qw/im";
+
+export default {
+  name: "UserInfoEdit",
+  props: {
+    // 用户详情数据
+    userDetail: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      // 表单数据
+      formData: {},
+      // 加载状态
+      loading: false
+    }
+  },
+  created() {
+    // 初始化表单数据
+    this.formData = Object.assign({}, this.userDetail);
+  },
+  methods: {
+    // 返回
+    handleBack() {
+      this.$emit('back');
+    },
+    // 保存修改
+    handleSave() {
+      this.loading = true;
+      updateQwUserInfo(this.formData).then(response => {
+        if (response.code === 200) {
+          this.loading = false;
+          this.$message.success("修改成功");
+          this.$emit('save-success');
+        } else {
+          this.$message.error(response.msg || "修改失败");
+          this.loading = false;
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+.user-form {
+  margin-top: 10px;
+  background: #fff;
+}
+.form-row {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #f2f2f2;
+  padding: 0 16px;
+  height: 44px;
+}
+.form-label {
+  flex: 0 0 150px;
+  color: #333;
+  font-size: 15px;
+}
+.form-input {
+  flex: 1;
+  text-align: right;
+}
+.input {
+  border: none;
+  outline: none;
+  background: transparent;
+  font-size: 15px;
+  color: #999;
+  width: 100%;
+  text-align: right;
+}
+.input::placeholder {
+  color: #ccc;
+}
+.user-edit-footer {
+  width: 100%;
+  padding: 10px;
+  background: #fff;
+  border-top: 1px solid #f2f2f2;
+}
+.save-btn {
+  width: 100%;
+  height: 35px;
+  background: #1890ff;
+  color: #fff;
+  border: none;
+  border-radius: 22px;
+  font-size: 12px;
+  cursor: pointer;
+  transition: background 0.2s;
+}
+.save-btn:hover {
+  background: #40a9ff;
+}
+</style>

src/views/qw/sopTemp/index.vue

@@ -225,7 +225,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
               v-for="dict in courseList"
@@ -235,16 +235,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"
@@ -438,6 +448,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) || !roles.includes('update_sop_temp_scourse')" 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) || !roles.includes('update_sop_temp_scourse')" 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) || !roles.includes('update_sop_temp_scourse')" v-model="item.content[0].videoId"
+                        <el-select :disabled="((formType == 3 || form.sendType == 11) && item.id != null) || !roles.includes('update_sop_temp_scourse')" 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 || !roles.includes('edit_sop_temp_content')" v-model="content.courseId"
+                                  <el-select :disabled="formType == 3 || form.sendType == 11 || !roles.includes('edit_sop_temp_content')" 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 || !roles.includes('edit_sop_temp_content')" v-model="content.videoId"
+                                  <el-select :disabled="formType == 3 || form.sendType == 11 || !roles.includes('edit_sop_temp_content')" 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>
@@ -520,7 +520,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="!roles.includes('edit_sop_temp_content') && (formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0))"
+                                                      :disabled="!roles.includes('edit_sop_temp_content') && (formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0))"
                                                       @change="updateAll(setIndex, item, 'expiresDays', $event)"
                                                       style="width: 200px">
                                               <template slot="append">天</template>
@@ -567,7 +567,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) && roles.includes('del_sop_temp_content') && !(form.sendType == 5 && setIndex == 0)"></i>
+                                         v-if="content.setting.length>1 && (formType != 3) && roles.includes('del_sop_temp_content') && !(form.sendType == 11 && setIndex == 0)"></i>
                                     </el-col>
                                   </el-row>
                                 </div>
@@ -1738,7 +1738,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,290 @@
+<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"
+                   @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="请选择多个任务"
+          :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} 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: {
+    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;
+      }
+
+      listPeriodList(this.queryParams).then(response => {
+        console.log(response)
+        this.statsList = response.data;
+        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

@@ -0,0 +1,289 @@
+<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"
+                   @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="请选择多个任务"
+          :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="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} 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: {
+    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;
+      }
+
+      listEmployeeStats(this.queryParams).then(response => {
+        console.log(response)
+        this.statsList = response.data;
+        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>

src/views/statistics/section/today.vue

@@ -0,0 +1,288 @@
+<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"
+                   @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="请选择多个任务"
+          :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} 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: {
+    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;
+      }
+
+      listTodayList(this.queryParams).then(response => {
+        console.log(response)
+        this.statsList = response.data;
+        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>