Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

# Conflicts:
#	vue.config.js

src/api/index1.js

@@ -222,6 +222,8 @@ export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCer
 
 //添加外部考试
 export const createExamination = (obj) => http.post('/examination/createExamination', obj)
+//催促考试
+export const batchSendMessage = (obj) => http.post('/admin/taskmanage/batchSendMessage', obj)
 // 外部考试导入成绩
 export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } })
 //分组

src/components/drawers/ActiveAttendance.vue

@@ -11,14 +11,14 @@
         <div class="titl">
           <div class="endtime">
             起止时间：{{
-              datasource.info && datasource.info.liveStartTime ? datasource.info.liveStartTime : "-"
+              datasource.startTime ? datasource.startTime : "-"
             }}
             ～
-            {{ datasource.info && datasource.info.liveEndTime ? datasource.info.liveEndTime : "-" }}
+            {{ datasource.endTime ? datasource.endTime : "-" }}
           </div>
 
-          <div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }}</div>
+          <div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }} ～ {{ endTime }}</div>
-          <div class="endtime" style="margin-left: 40px">签退时间：{{ endTime }}</div>
+            <!--<div class="endtime" style="margin-left: 40px">签退时间：{{ endTime }}</div>-->
         </div>
 
         <div class="search">
@@ -354,25 +354,24 @@ export default {
 
     // 计算签到时间
     const isSignClick = () => {
-      // debugger
+      console.log("计算签到时间", props.datasource);
-      console.log("计算签到时间", props.datasource.info);
+      let beginTime = new Date(props.datasource.startTime).getTime();
-      let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
+      let endTime = !props.datasource.afterStart
-      let endTime = !props.datasource.info.afterSignIn
+        ? new Date(props.datasource.endTime).getTime()
-        ? new Date(props.datasource.info.liveEndTime).getTime()
+        : new Date(props.datasource.startTime).getTime();
-        : new Date(props.datasource.info.liveStartTime).getTime();
 
-      if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+      if (props.datasource.beforeStart && props.datasource.afterStart) {
         //有开始前有开始后
-        beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
-        endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
         console.log("1111", beginTime, endTime);
-      } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) {
+      } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
         //只有开始前无开始后
-        beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
         console.log("11112222", beginTime);
-      } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+      } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
         //无开始前有开始后
-        endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
         console.log("1111333", endTime);
       }
 
@@ -393,7 +392,6 @@ export default {
     };
 
     const getTableData = () => {
-      debugger
       // debugger
       console.log('当前是项目还是路径图 1 项目 2 路径图', props)
       console.log('当前是项目还是路径图 1 项目 2 路径图', props.types)
@@ -690,7 +688,6 @@ export default {
               <div class="opa" style='display:flex;justify-content:center;align-items:center;'>
                 <div
                   onClick={() => {
-                    debugger
                     {/* debugger */ }
                     console.log("点击签到", value);
                     // 获取当前时间
@@ -858,20 +855,21 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
+      debugger
       {/* debugger */ }
       console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
       console.log("props.datasource", props.datasource);
-      if (props.types == 1) {
+      if (props.types == 2) {
         window.open(
           `${process.env.VUE_APP_BASE_API
           }/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
-          }&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
+          }&type=2&pid=${props.datasource.routerId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
         );
       } else {
         window.open(
           `${process.env.VUE_APP_BASE_API
           }/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId
-          }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
+          }&type=1&pid=${props.datasource.projectId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
         );
       }
 

src/components/drawers/AddCase.vue

@@ -3,20 +3,20 @@
     <slot></slot>
   </div>
   <a-drawer
-      :visible="visible"
+    :visible="visible"
-      class="drawerStyle addcaseDrawer"
+    class="drawerStyle addcaseDrawer"
-      width="1000"
+    width="1000"
-      title="添加案例"
+    title="添加案例"
-      placement="right"
+    placement="right"
   >
     <div class="drawerMain">
       <div class="header">
-        <div v-if="taskIndex>=0" class="headerTitle">编辑案例</div>
+        <div v-if="taskIndex >= 0" class="headerTitle">编辑案例</div>
         <div v-else class="headerTitle">添加案例</div>
         <img
-            style="width: 29px; height: 29px; cursor: pointer"
+          style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
+          src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          @click="closeDrawer"
         />
       </div>
       <div class="contentMain">
@@ -26,16 +26,21 @@
               <div class="ipt_name"></div>
               <div class="fi_input">
                 <a-input
-                    v-model:value="params.keyWord"
+                  v-model:value="params.keyWord"
-                    style="width: 200px; height: 40px; border-radius: 8px;margin-right:24px;"
+                  style="
-                    placeholder="请输入案例标题"
+                    width: 200px;
+                    height: 40px;
+                    border-radius: 8px;
+                    margin-right: 24px;
+                  "
+                  placeholder="请输入案例标题"
                 />
               </div>
               <div class="fi_input">
                 <a-input
-                    v-model:value="params.authorName"
+                  v-model:value="params.authorName"
-                    style="width: 200px; height: 40px; border-radius: 8px"
+                  style="width: 200px; height: 40px; border-radius: 8px"
-                    placeholder="请输入作者名字"
+                  placeholder="请输入作者名字"
                 />
               </div>
             </div>
@@ -51,18 +56,55 @@
             </div>
           </div>
         </div>
+        <div
+          class="main_notice"
+          v-if="taskIndex >= 0"
+          style="
+            background-color: #e9f6fe;
+            height: 40px;
+            display: flex;
+            align-items: center;
+          "
+        >
+          <div class="mntc_left" v-if="selectedRows">
+            <div class="notice_icon"></div>
+            <div>
+              <div>
+                <span class="title"
+                  >已选择
+                  <span class="data" style="color: #4ea6ff">{{ 1 }}</span>
+                  条&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
+                >
+                <span class="title"
+                  >案例标题：
+                  <span
+                    class="data"
+                    style="color: #4ea6ff; margin-right: 15px"
+                    >{{
+                      selectedRows?.name
+                        ? selectedRows?.name
+                        : selectedRows?.title
+                    }}</span
+                  >
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
 
         <div class="main_table">
           <a-table
-              :customRow="customRow"
+            :customRow="customRow"
-              class="ant-table-striped"
+            class="ant-table-striped"
-              :row-class-name="(_, index) => (index % 2 === 1 ? 'table-striped' : null)"
+            :row-class-name="
-              row-key="id"
+              (_, index) => (index % 2 === 1 ? 'table-striped' : null)
-              :columns="columns"
+            "
-              :data-source="data"
+            row-key="id"
-              :loading="loading"
+            :columns="columns"
-              :pagination="pagination"
+            :data-source="data"
-              :row-selection="rowSelection"
+            :loading="loading"
+            :pagination="pagination"
+            :row-selection="rowSelection"
           />
         </div>
       </div>
@@ -74,17 +116,17 @@
   </a-drawer>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
+import { computed, defineEmits, defineProps, ref, watch } from "vue";
-import {useBoeApiPage} from "@/api/request";
+import { useBoeApiPage } from "@/api/request";
-import {CASE_PAGE} from "@/api/ThirdApi";
+import { CASE_PAGE } from "@/api/ThirdApi";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 
 const props = defineProps({
   type: Number,
-  taskList: []
+  taskList: [],
-})
+});
-const visible = ref(false)
+const visible = ref(false);
-const emit = defineEmits({})
+const emit = defineEmits({});
 
 const columns = ref([
   {
@@ -101,40 +143,43 @@ const columns = ref([
     width: "200px",
     align: "center",
   },
-])
+]);
 const initParams = {
-  keyWord: '',
+  keyWord: "",
-  authorName: '',
+  authorName: "",
   pageIndex: 1,
   pageSize: 10,
-  orderAsc: true
+  orderAsc: true,
-}
+};
-const params = ref(initParams)
+const params = ref(initParams);
 
 const rowSelectKeys = ref([]);
 const selectsData = ref([]);
 const taskIndex = ref(-1);
 
-const {data, loading, total, fetch} = useBoeApiPage(CASE_PAGE, params.value, {
+const { data, loading, total, fetch } = useBoeApiPage(CASE_PAGE, params.value, {
   init: false,
-  result: res => res.result.list,
+  result: (res) => res.result.list,
-  totalPage: res => res.result.totalPages,
+  totalPage: (res) => res.result.totalPages,
-  total: res => res.result.count
+  total: (res) => res.result.count,
-})
+});
 
 watch(taskIndex, () => {
   if (taskIndex.value >= 0) {
-    rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]
+    rowSelectKeys.value = [props.taskList[taskIndex.value].courseId];
-    selectsData.value = data.value.find(t => t.id === props.taskList[taskIndex.value].courseId) || {}
+    selectsData.value =
+      data.value.find(
+        (t) => t.id === props.taskList[taskIndex.value].courseId
+      ) || {};
   }
-})
+});
 
 const customRow = (record) => ({
   onClick: () => {
-    rowSelectKeys.value = [record.id]
+    rowSelectKeys.value = [record.id];
-    selectsData.value = [record]
+    selectsData.value = [record];
-  }
+  },
-})
+});
 
 const pagination = computed(() => ({
   total: total.value,
@@ -146,76 +191,82 @@ const pagination = computed(() => ({
 
 const changePagination = (e) => {
   params.value.pageIndex = e;
-  fetch()
+  fetch();
 };
 const rowSelection = computed(() => ({
-  type: 'radio',
+  type: "radio",
   columnWidth: 20,
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
   preserveSelectedRowKeys: true,
-  getCheckboxProps: getCheckboxProps
+  getCheckboxProps: getCheckboxProps,
 }));
 const getCheckboxProps = () => ({
   // 某几项默认禁止选中(R: 当state等于1时)
-  disabled: false
+  disabled: false,
-})
+});
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;
   selectsData.value = l;
+  selectedRows.value = l[0];
+  console.log("llllllllll", l);
+  console.log("selectedRows", selectedRows);
 }
 
 function search() {
-  params.value.pageIndex = 1
+  params.value.pageIndex = 1;
-  fetch()
+  fetch();
 }
 
 function reset() {
   rowSelectKeys.value = [];
   selectsData.value = [];
-  params.value.pageIndex = 1
+  params.value.pageIndex = 1;
-  params.value.keyWord = ''
+  params.value.keyWord = "";
-  params.value.authorName = ''
+  params.value.authorName = "";
-  fetch()
+  fetch();
 }
 
 const closeDrawer = () => {
-  visible.value = false
+  visible.value = false;
-  taskIndex.value = -1
+  taskIndex.value = -1;
-  reset()
+  selectedRows.value = null;
+  reset();
 };
 
 function confirm() {
   if (!selectsData.value.length || !rowSelectKeys.value.length) {
     message.warning("请选择案例！");
-    return
+    return;
   }
   if (taskIndex.value === -1) {
-    const list = props.taskList
+    const list = props.taskList;
     list.push({
       name: selectsData.value[0].title,
       type: props.type,
       courseId: selectsData.value[0].id,
-      info: {...selectsData.value[0]}
+      info: { ...selectsData.value[0] },
-    })
+    });
   } else {
-    const data = props.taskList[taskIndex.value]
+    const data = props.taskList[taskIndex.value];
-    data.name = selectsData.value[0].title
+    data.name = selectsData.value[0].title;
-    data.courseId = selectsData.value[0].id
+    data.courseId = selectsData.value[0].id;
-    data.info = selectsData.value[0]
+    data.info = selectsData.value[0];
   }
-  emit('update:taskList', [...props.taskList])
+  emit("update:taskList", [...props.taskList]);
-  closeDrawer()
+  closeDrawer();
 }
-
+let selectedRows = ref(null);
 function openDrawer(i, row) {
+  console.log("iiiiiiiii", i, row);
   row && (rowSelectKeys.value = [row.info]);
-  row && (selectsData.value = [{title: row.name, id: row.courseId}]);
+  row && (selectsData.value = [{ title: row.name, id: row.courseId }]);
-  (i >= 0) && (taskIndex.value = i);
+  i >= 0 && (taskIndex.value = i);
-  visible.value = true
+  visible.value = true;
+  selectedRows.value = row;
 }
 
-defineExpose({openDrawer})
+defineExpose({ openDrawer });
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
@@ -376,8 +427,8 @@ defineExpose({openDrawer})
         }
 
         .ant-table-tbody
-        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-        > td {
+          > td {
           background: #f6f9fd;
         }
 
@@ -424,5 +475,31 @@ defineExpose({openDrawer})
       }
     }
   }
+  .main_notice {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 3px;
+    height: 40px;
+    background-color: #e9f6fe;
+
+    .mntc_left {
+      display: flex;
+      align-items: center;
+
+      .notice_icon {
+        width: 14px;
+        height: 14px;
+        margin-right: 9px;
+        margin-left: 9px;
+        background-image: url(@/assets/images/coursewareManage/gan.png);
+        background-size: 100% 100%;
+      }
+    }
+
+    .mntc_right {
+      cursor: pointer;
+    }
+  }
 }
 </style>

src/components/drawers/AddDiscuss.vue

@@ -41,6 +41,12 @@
           </div>
           <div class="main_item2">
             <div class="signbox">
+              <div class="sign">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
               <span style="margin-right: 3px">讨论说明：</span>
             </div>
             <div class="textarea">
@@ -91,6 +97,12 @@ const rulesRef = ref({
       message: '请输入讨论名称',
     },
   ],
+  discussExplain: [
+    {
+      required: true,
+      message: '请输入讨论说明',
+    },
+  ],
 });
 
 const {resetFields, validate} = Form.useForm(formData, rulesRef);

src/components/drawers/AddProject.vue

@@ -76,7 +76,11 @@
           <button class="xkbtn" @click="goProjectmanage">新建项目</button>
         </div>
 
-        <div class="main_notice" v-if="taskIndex >= 0">
+        <div
+          class="main_notice"
+          v-if="taskIndex >= 0"
+          style="background-color: #e9f6fe; height: 40px"
+        >
           <div class="mntc_left" v-if="selectedRows">
             <div class="notice_icon"></div>
             <div>
@@ -204,13 +208,22 @@ const columns = ref([
     width: "20%",
     ellipsis: true,
     customRender: ({ record: { gaName, faName, name } }) => (
-      <div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
+      <div
-        {
+        title={
-          faName ? gaName !== null
+          faName ? (gaName !== null ? gaName + "/" + faName : faName) : name
-            ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
-            : faName.length > 16 ? faName.slice(0, 16) + '...' : faName
-            : name.length > 16 ? name.slice(0, 16) + '...' : name
         }
+      >
+        {faName
+          ? gaName !== null
+            ? (gaName + "/" + faName).length > 16
+              ? (gaName + "/" + faName).slice(0, 16) + "..."
+              : gaName + "/" + faName
+            : faName.length > 16
+            ? faName.slice(0, 16) + "..."
+            : faName
+          : name.length > 16
+          ? name.slice(0, 16) + "..."
+          : name}
       </div>
     ),
   },
@@ -257,7 +270,7 @@ const { data, loading, total, fetch } = useRowsPage(
     total: (res) => res.result.count,
   }
 );
-console.log(data)
+console.log(data);
 watch(taskIndex, () => {
   // if (taskIndex.value >= 0) {
   //   rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]

src/components/drawers/AddTest.vue

@@ -236,7 +236,6 @@
 <script setup>
 import { defineEmits, defineProps, ref, watch } from "vue";
 import STest from "./SelectTest.vue";
-import { createExamination } from "@/api/index1";
 import dayjs from "dayjs";
 import { Form, message } from "ant-design-vue";
 
@@ -358,14 +357,6 @@ async function confirm() {
     data.name = formData.value.examinationName
     data.info = { ...formData.value }
   }
-  let obj = formData.value;
-  createExamination(obj).then(res => {
-    console.log(res)
-    message.success("成功");
-  }).catch(err => {
-    console.log(err)
-  })
-
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }

src/components/drawers/CheckWork.vue

@@ -183,6 +183,7 @@ export default {
     };
     //获取作业详情
     const getWorkDetail = () => {
+      debugger
       console.log("props.workId, props.stuId", props.workId, props.stuId);
       getWorkSubmitInfo(props.workId, props.stuId)
         .then((res) => {
@@ -346,4 +347,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/components/drawers/EvList.vue

@@ -129,10 +129,16 @@
             如项目中有测评需求，请您联系BOEU测评部
           </div>
         </div>
-        <div class="limitsRow">
+        <div class="limitsRow" style="align-items: flex-start">
           <div class="limitsRowDrop"></div>
-          <div class="limitsRowText">
+          <div style="margin-top: 10px">
-            联系人：王逸（10167304） 联系电话：010-60965646
+            <div class="limitsRowText">联系人：</div>
+            <div class="limitsRowText">
+              王逸（10167304） 联系电话：010-60965646
+            </div>
+            <div class="limitsRowText">
+              宋哲（10157955） 联系电话：010-60965435
+            </div>
           </div>
         </div>
       </div>
@@ -186,10 +192,6 @@ const toolList = ref([
         text1: "PDP性格类型测验",
         text2: "各层级人员",
       },
-      {
-        text1: "RTC综合评估",
-        text2: "各层级人员",
-      },
       {
         text1: "大五职业性格测评",
         text2: "各层级人员",

src/components/drawers/ExportScore.vue

@@ -236,6 +236,12 @@ export default {
       if (status === "done") {
         state.fileName = info.file.name;
         let i = 0;
+        let timeouts = setTimeout(() => {
+          clearInterval(timer)
+          state.addLoading = false;
+          message.destroy(); 
+          message.error(`文件导入超时`);
+        }, 30000);
         let timer = setInterval(() => {
           let uid = info.file.response.data;
           api
@@ -256,25 +262,21 @@ export default {
                   state.downloadErrUrl = res.data.data.url;
                   console.log("props.getStudent", props.getStudent);
                   clearInterval(timer);
+                  clearTimeout(timeouts);
                 }
               } else {
                 state.addLoading = false;
                 message.destroy();
-                message.error(`文件导入超时`);
+                clearTimeout(timeouts);
               }
             })
             .catch((err) => {
               state.addLoading = false;
               clearInterval(timer);
+              clearTimeout(timeouts);
               console.log("查询导入状态失败", err);
             });
         }, 500);
-        setTimeout(() => {
-          clearInterval(timer)
-          state.addLoading = false;
-          message.destroy();
-          message.error(`文件导入超时`);
-        }, 30000);
       } else if (status === "error") {
         state.uploadErr = true;
         message.error(`${info.file.name}上传失败`);

src/components/drawers/ProjectAudit.vue

@@ -304,7 +304,7 @@ export default {
       faceclassScene: [],
       projectInfo: {},
 
-      tableDataTotal: 20,
+      tableDataTotal: 2,
       pageSize: 10,
       currentPage: 1,
       tableData: [],

src/components/drawers/ProjectScore.vue

@@ -13,7 +13,7 @@
               placeholder="请输入姓名"
             />
           </div>
-          <div class="groupright">
+          <div class="groupright" style="margin-left: 16px;">
             <div class="btn1" @click="searchStu">
               <img src="../../assets/images/courseManage/search0.png" />
               <span class="btn1text">搜索</span>
@@ -75,7 +75,7 @@
               <div class="groupname">姓名：</div>
               <a-input
                 class="ant-input"
-                style="width: 152px"
+                style="width: 152px;"
                 v-model:value="searchRankName"
                 placeholder="请输入姓名"
               />

src/components/drawers/StuScoreDetail.vue

@@ -109,8 +109,8 @@ export default {
         },
         {
           title: "类型",
-          dataIndex: "type",
+          dataIndex: "typeDesc",
-          key: "type",
+          key: "typeDesc",
           width: 60,
           align: "center",
           className: "h",

src/components/drawers/project/AddCertificate.vue

@@ -603,6 +603,7 @@ export default {
               props.ACertificateEdit ? "证书修改成功" : "证书添加成功"
             );
             props.getCertificate && props.getCertificate();
+            closeDrawer();
           }
         })
         .catch((err) => {

src/components/drawers/project/ProjectExamManage.vue

@@ -56,11 +56,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-        <!-- 
+        
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促考试</div>
-          </div>-->
+          </div>
           <div class="btn btn2" @click="exportData">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -126,6 +126,7 @@ import { message } from "ant-design-vue";
 import EScore from "../ExportScore.vue";
 import CheckAnsware from '../CheckAnsware.vue'
 import * as api from '../../../api/indexTaskManage';
+import { batchSendMessage } from "@/api/index1";
 
 // import * as api from "../../../api/index";
 export default {
@@ -364,7 +365,22 @@ export default {
 
     //催促学员学习
     const godie = () => {
-      message.destroy();
+      //项目催促请求报文
+      var obj = {
+        'courseId': props.datasource.courseId,//任务的Id
+        'courseName': props.title,//任务的名称
+        'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课
+        'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld
+        'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话
+        'taskType': props.datasource.type,//催促的任务的类型
+        'chapterId': props.datasource.chapterId,//阶段或关卡Id
+      };
+      batchSendMessage(obj).then(res => {
+        console.log(res)
+        message.success("成功");
+      }).catch(err => {
+        console.log(err)
+      })
       message.success("催促" + props.title + "成功");
     };
     //导入成绩

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -57,11 +57,11 @@
             </div>
           </div>
           <div class="btnss" style="margin-top: 20px">
-          <!-- 
+          
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
               <div class="img1"></div>
               <div class="wz">催促考试</div>
-            </div>-->
+            </div>
             <div class="btn btn2" @click="exportData">
               <div class="img2"></div>
               <div class="wz">导出数据</div>
@@ -130,6 +130,7 @@
   import { message } from "ant-design-vue";
   import ExportAchievement from "../ExportAchievement.vue";
   import * as api from '../../../api/indexTaskManage';
+  import { batchSendMessage } from "@/api/index1";
   
   export default {
     name: "ProjectExternalExamManage",
@@ -295,7 +296,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"} </span>
                 </div>
               );
             },
@@ -359,7 +360,22 @@
   
       //催促学员学习
       const godie = () => {
-        message.destroy();
+        //项目催促请求报文
+        var obj = {
+          'courseId': props.datasource.courseId,//任务的Id
+          'courseName': props.title,//任务的名称
+          'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课
+          'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld
+          'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话
+          'taskType': props.datasource.type,//催促的任务的类型
+          'chapterId': props.datasource.chapterId,//阶段或关卡Id
+        };
+        batchSendMessage(obj).then(res => {
+          console.log(res)
+          message.success("成功");
+        }).catch(err => {
+          console.log(err)
+        })
         message.success("催促" + props.title + "成功");
       };
       //导入成绩

src/components/drawers/project/ProjectVoteManage.vue

@@ -428,8 +428,8 @@
       // 导出数据
       function exportTaskStu() {
           console.log("导出数据")
-          console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
+          console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
-        window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
       }
 
       return {

src/components/drawers/router/RouterCommonManage.vue

@@ -465,6 +465,9 @@ export default {
       if(props.datasource.type==1){
         {/* 在线课导出 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
+      }else if(props.datasource.type==11){
+        {/* 评估导出 */}
+        window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -57,10 +57,10 @@
             </div>
           </div>
           <div class="btnss" style="margin-top: 20px">
-            <!-- <div class="btn btn1" @click="godie" style="margin-right: 20px">
+            <div class="btn btn1" @click="godie" style="margin-right: 20px">
               <div class="img1"></div>
               <div class="wz">催促考试</div>
-            </div>-->
+            </div>
             <div class="btn btn2" @click="exportData">
               <div class="img2"></div> 
               <div class="wz">导出数据</div>
@@ -129,6 +129,7 @@
   import { message } from "ant-design-vue";
   import ExportAchievement from "../ExportAchievement.vue";
   import * as api from '../../../api/indexTaskManage';
+  import { batchSendMessage } from "@/api/index1";
   
   // import * as api from "../../../api/index";
   export default {
@@ -299,7 +300,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"}</span>
                 </div>
               );
             },
@@ -363,6 +364,22 @@
       //催促学员学习
       const godie = () => {
         message.destroy();
+        //考试催促请求报文
+        var obj = {
+          'courseId': props.datasource.courseId,//任务的Id
+          'courseName': props.title,//任务的名称
+          'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课
+          'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld
+          'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话
+          'taskType': props.datasource.type,//催促的任务的类型
+          'chapterId': props.datasource.chapterId,//阶段或关卡Id
+        };
+        batchSendMessage(obj).then(res => {
+          console.log(res)
+          message.success("成功");
+        }).catch(err => {
+          console.log(err)
+        })
         message.success("催促" + props.title + "成功");
       };
       //导入成绩

src/components/drawers/router/RouterExaminationManage.vue

@@ -33,10 +33,10 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <!-- <div class="btn btn1" @click="godie" style="margin-right: 20px">
+          <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促考试</div>
-          </div>-->
+          </div>
           <div class="btn btn2" @click="exportData">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -88,6 +88,7 @@ import { message } from "ant-design-vue";
 import EScore from "../ExportScore.vue";
 import CheckAnsware from '../CheckAnsware.vue'
 import * as api from '../../../api/indexTaskManage';
+import { batchSendMessage } from "@/api/index1";
 
 // import * as api from "../../../api/index";
 export default {
@@ -365,7 +366,22 @@ export default {
 
     //催促学员学习
     const godie = () => {
-      message.destroy();
+      //考试催促请求报文
+      var obj = {
+        'courseId': props.datasource.courseId,//任务的Id
+        'courseName': props.title,//任务的名称
+        'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课
+        'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld
+        'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话
+        'taskType': props.datasource.type,//催促的任务的类型
+        'chapterId': props.datasource.chapterId,//阶段或关卡Id
+      };
+      batchSendMessage(obj).then(res => {
+        console.log(res)
+        message.success("成功");
+      }).catch(err => {
+        console.log(err)
+      })
       message.success("催促" + props.title + "成功");
     };
     //导入成绩

src/components/drawers/router/RouterVoteManage.vue

@@ -381,7 +381,7 @@
             "studentName": state.name,
             "targetId":props.datasource.projectId,
             "taskId": props.datasource.courseId,
-            "type": 1
+            "type": 2
           });
           api.QueryVoteManagementDetail({
             "pageNo": state.currentPage,
@@ -391,7 +391,7 @@
             "studentName": state.name,
             "targetId":props.datasource.routerId,
             "taskId": props.datasource.courseId,
-            "type": 1
+            "type": 2
           }).then(res=>{
             console.log('投票数据获取', res)
             if(res.data.code==200){
@@ -448,8 +448,8 @@
 
       // 导出数据
       function exportTaskStu() {
-        console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
+        console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
-        window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
       }
 
       return {

src/components/student/ChangeGroupModal.vue

@@ -85,7 +85,6 @@ const selectGroup = (e, v) => {
 };
 //确认换组
 const changeGroup = (item) => {
-  debugger
   console.log("换组", selectGroupId.value, item);
   props.checkgroupStuId.forEach(stu => {
     let obj = {

src/components/student/CommonStudent.vue

@@ -295,7 +295,7 @@ import {
   AUDIENCE_LIST,
   ORG_CHILD_LIST,
   ORG_LIST,
-  // USER_LIST, 
+  // USER_LIST,
   USER_LIST_PAGE,
 } from "@/api/ThirdApi";
 import {
@@ -395,6 +395,7 @@ const getStu = () => {
           realName: value.studentName,
           userNo: value.studentId,
           isLeader: value.isLeader,
+          groupId: value.groupId,
           orgName: value.studentOrgName ? value.studentOrgName : "-",
           departName: value.studentDepartName ? value.studentDepartName : "-",
         };
@@ -458,8 +459,8 @@ const searchOrgName = ref({
 const stageIds = computed(() => props.stage);
 const {
   data: stuData,
-  fetch: searchStu,
   page: stuPageNo,
+  fetch: searchStu,
   pageSize: stuPageSize,
   loading: stuLoading,
   total: stuTotal,
@@ -700,7 +701,7 @@ function onOrgSelectChange(e, l) {
   selectsData.value.deptList = l.selectedNodes;
 
   // 获取被点击的树节点
-  
+
 }
 
 function onAuditSelectChange(e, l) {
@@ -742,6 +743,7 @@ const resetStu = () => {
 const deleteDepSelect = () => {
   stuSelectKeys.value = [];
   selectedOrgKeys.value = [];
+  projectSelectKeys.value = [];
 };
 //重置组织
 const resetOrg = () => {
@@ -775,13 +777,23 @@ const submitAuth = () => {
 function handleStageOk() {
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
-    if (props.groupMemberCount < selectsData.value.projectMemberList.length + Number(props.groupMemberNumber)) {
+    let selectMember = 0;
+    if (activeKey.value === 4) { // 项目内选人
+      selectMember = selectsData.value.projectMemberList.length
+    } else if (activeKey.value === 1) {
+      selectMember = selectsData.value.studentList.length
+    } else if (activeKey.value === 2) {
+      selectMember = selectsData.value.groupList.length
+    } else if (activeKey.value === 3) {
+      selectMember = selectsData.value.deptList.length
+    }
+    if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
       return message.warning("添加小组学员超过最大值");
     }
     // 判断是否是组长，组长不能添加
     const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1');
     if (leaderArray.length > 0) {
-      return message.warning("当前选学员"+leaderArray[0].realName+"已在其他小组为小组长，请勿重复选择。");
+      return message.warning("当前选中学员"+leaderArray[0].realName+"已是小组长，请勿重复选择。");
     }
     // 对选中的人员进行判断是否已经分组了
     let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);

src/components/student/TableStudent.vue

@@ -427,7 +427,6 @@ const stuRowSelection = computed(() => ({
 
 //显示学员换组弹窗
 function showChangeGroupModal() {
-  debugger
   console.log("批量")
   const d = props.groupList
   console.log("d" + d)

src/views/courselibrary/CoursewareManage.vue

@@ -1109,7 +1109,7 @@
               </div>
             </div>
           </div>
-          <div class="cstm_items main_item">
+          <div class="cstm_items main_item" style="margin-bottom: 0px">
             <div class="signbox"></div>
             <div class="btnbox">
               <add-test v-model:info="examInfo">
@@ -1151,7 +1151,7 @@
               </a-checkbox>
             </div>
           </div> -->
-          <div class="cstm_items items_fj" style="height: 80px">
+          <div class="cstm_items items_fj">
             <div class="signbox">
               <span style="margin-right: 3px"></span>
             </div>
@@ -1211,7 +1211,14 @@
                   {{ currentPlanItem.name }}课程-第1期-
                   {{ currentPlanItem.createTime }}
                 </span>
-                <span style="color: #ffb751">已开课 4.5</span>
+                <span style="color: #ffb751"
+                  >已开课
+                  {{
+                    currentPlanItem.courseScore !== -1
+                      ? currentPlanItem.courseScore
+                      : "-"
+                  }}</span
+                >
               </div>
               <div class="stmm_i2">
                 <span style="color: #999ba3">时间：</span>
@@ -2327,159 +2334,7 @@ export default defineComponent({
           slots: { customRender: "operation" },
         },
       ],
-      //新加
-      stuColumns: [
-        {
-          title: "岗位",
-          width: "8%",
-          dataIndex: "studentJobName",
-          key: "7",
-          align: "center",
-          customRender: (text) => {
-            return (
-              <div class="racona">
-                <span>
-                  {text && text.record.studentJobName
-                    ? text.record.studentJobName
-                    : "-"}
-                </span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "Band",
-          width: "8%",
-          dataIndex: "studentBandDesc",
-          key: "7",
-          align: "center",
-          customRender: (record) => {
-            return (
-              <div class="racona">
-                <span>
-                  {record.studentBandDesc ? record.studentBandDesc : "-"}
-                </span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "报名状态",
-          width: "8%",
-          dataIndex: "status",
-          key: "5",
-          align: "center",
-          customRender: ({ record }) => {
-            switch (String(record.status)) {
-              case "0":
-                return "审核通过";
-              case "1":
-                return "待审核";
-              case "2":
-                return "审核拒绝";
-            }
-          },
-        },
 
-        {
-          title: "签到状态",
-          width: "8%",
-          dataIndex: "signstatus",
-          key: "7",
-          align: "center",
-          customRender: ({ record }) =>
-            record.signStatus ? "已签到" : "未签到",
-        },
-        {
-          title: "评估状态",
-          width: "8%",
-          dataIndex: "evastatus",
-          key: "8",
-          align: "center",
-          customRender: ({ record }) =>
-            record.assessmentStatus ? "已评估" : "未评估",
-        },
-        {
-          title: "作业成绩",
-          width: "8%",
-          dataIndex: "workScore",
-          key: "7",
-          align: "center",
-          customRender: ({ record }) => {
-            return (
-              <div class="racona">
-                {record.workScore === -2 ? (
-                  "-"
-                ) : record.workScore ? (
-                  <span>{record.workScore}</span>
-                ) : (
-                  <span
-                    style={{ color: "#4EA6FF", cursor: "pointer" }}
-                    onClick={() => {
-                      handlJoinStu(record);
-                    }}
-                  >
-                    成绩录入
-                  </span>
-                )}
-              </div>
-            );
-            // switch (String(record.status)) {
-            //   case "0":
-            //     return (
-            //       <span
-            //         style={{ color: "#4EA6FF", cursor: "pointer" }}
-            //         onClick={() => {
-            //           handlJoinStu(record);
-            //         }}
-            //       >
-            //         成绩录入
-            //       </span>
-            //     );
-            //   case "1":
-            //     return "-";
-            //   case "2":
-            //     return "-";
-            // }
-          },
-        },
-        {
-          title: "考试成绩",
-          width: "8%",
-          dataIndex: "examinationScore",
-          key: "8",
-          align: "center",
-        },
-        {
-          title: "结业状态",
-          width: "15%",
-          dataIndex: "completionStatus",
-          key: "8",
-          align: "center",
-          customRender: ({ record }) => {
-            return (
-              <div>
-                {record.finishStatus == 1 &&
-                record.workScore != -2 &&
-                record.signStatus == 1 ? (
-                  <div
-                    style={{ color: "#4EA6FF", cursor: "pointer" }}
-                    onClick={() => {
-                      handleOverStu(record);
-                    }}
-                  >
-                    结业
-                  </div>
-                ) : record.completionStatus == 1 ? (
-                  <div>已结业</div>
-                ) : (
-                  <div>-</div>
-                )}
-              </div>
-            );
-          },
-        },
-      ],
       shipType: 1,
       addLoading: false,
       currentPlanItem: {},
@@ -2586,6 +2441,7 @@ export default defineComponent({
         //   overstatus: "-",
         // },
       ],
+      stuColumns: [],
       currentPage1: 1,
       tableDataTotal1: -1,
       pageSize1: 10,
@@ -3891,6 +3747,204 @@ export default defineComponent({
       state.cstm_hs = true;
       state.kk_eidt = true;
     };
+    const columnFun = (itm) => {
+      console.log("itm", itm);
+      //新加
+      state.stuColumns = [
+        {
+          title: "岗位",
+          width: "8%",
+          dataIndex: "studentJobName",
+          key: "7",
+          align: "center",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span>
+                  {text && text.record.studentJobName
+                    ? text.record.studentJobName
+                    : "-"}
+                </span>
+              </div>
+            );
+          },
+        },
+        {
+          title: "Band",
+          width: "8%",
+          dataIndex: "studentBandDesc",
+          key: "7",
+          align: "center",
+          customRender: (record) => {
+            return (
+              <div class="racona">
+                <span>
+                  {record.studentBandDesc ? record.studentBandDesc : "-"}
+                </span>
+              </div>
+            );
+          },
+        },
+        {
+          title: "报名状态",
+          width: "8%",
+          dataIndex: "status",
+          key: "5",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.status)) {
+              case "0":
+                return "审核通过";
+              case "1":
+                return "待审核";
+              case "2":
+                return "审核拒绝";
+            }
+          },
+        },
+
+        {
+          title: "签到状态",
+          width: "8%",
+          dataIndex: "signstatus",
+          key: "7",
+          align: "center",
+          customRender: ({ record }) =>
+            record.signStatus ? "已签到" : "未签到",
+        },
+        {
+          title: "评估状态",
+          width: "8%",
+          dataIndex: "evastatus",
+          key: "8",
+          align: "center",
+          customRender: ({ record }) =>
+            record.assessmentStatus ? "已评估" : "未评估",
+        },
+        {
+          title: "评分",
+          width: "8%",
+          dataIndex: "studentScore",
+          key: "8",
+          align: "center",
+          customRender: ({ record }) => {
+            return (
+              <div class="racona">
+                {record.studentScore !== -1 ? record.studentScore : "-"}
+              </div>
+            );
+            // switch (String(record.status)) {
+            //   case "0":
+            //     return (
+            //       <span
+            //         style={{ color: "#4EA6FF", cursor: "pointer" }}
+            //         onClick={() => {
+            //           handlJoinStu(record);
+            //         }}
+            //       >
+            //         成绩录入
+            //       </span>
+            //     );
+            //   case "1":
+            //     return "-";
+            //   case "2":
+            //     return "-";
+            // }
+          },
+        },
+        {
+          title: "作业成绩",
+          width: "8%",
+          dataIndex: "workScore",
+          key: "7",
+          align: "center",
+          customRender: ({ record }) => {
+            return (
+              <div class="racona">
+                {record.workScore === -2 ? (
+                  "-"
+                ) : record.workScore ? (
+                  <span>{record.workScore}</span>
+                ) : (
+                  <span
+                    style={{ color: "#4EA6FF", cursor: "pointer" }}
+                    onClick={() => {
+                      handlJoinStu(record);
+                    }}
+                  >
+                    成绩录入
+                  </span>
+                )}
+              </div>
+            );
+            // switch (String(record.status)) {
+            //   case "0":
+            //     return (
+            //       <span
+            //         style={{ color: "#4EA6FF", cursor: "pointer" }}
+            //         onClick={() => {
+            //           handlJoinStu(record);
+            //         }}
+            //       >
+            //         成绩录入
+            //       </span>
+            //     );
+            //   case "1":
+            //     return "-";
+            //   case "2":
+            //     return "-";
+            // }
+          },
+        },
+        {
+          title: "考试成绩",
+          width: "8%",
+          dataIndex: "examinationScore",
+          key: "8",
+          align: "center",
+        },
+        {
+          title: "结业状态",
+          width: "15%",
+          dataIndex: "completionStatus",
+          key: "8",
+          align: "center",
+          customRender: ({ record }) => {
+            return (
+              <div>
+                {record.finishStatus == 1 &&
+                record.workScore != -2 &&
+                record.signStatus == 1 ? (
+                  <div
+                    style={{ color: "#4EA6FF", cursor: "pointer" }}
+                    onClick={() => {
+                      handleOverStu(record);
+                    }}
+                  >
+                    结业
+                  </div>
+                ) : record.completionStatus == 1 ? (
+                  <div>已结业</div>
+                ) : (
+                  <div>-</div>
+                )}
+              </div>
+            );
+          },
+        },
+      ];
+      // if (itm.courseScore !== -1) {
+      //   let obj = {
+      //     title: "评分",
+      //     width: "8%",
+      //     dataIndex: "studentScore",
+      //     key: "8",
+      //     align: "center",
+      //   };
+
+      //   state.stuColumns.splice(6, 0, obj);
+      // }
+    };
     const handelGuan = (itm) => {
       console.log("开课信息", itm);
       state.offcourseId = itm.id;
@@ -3906,6 +3960,7 @@ export default defineComponent({
       state.sm_hs = true;
       // getTableDate2();
       state.homeWorkId = itm.homeWorkId;
+      columnFun(itm);
     };
     const sm_exit = () => {
       state.sm_hs = false;
@@ -7166,6 +7221,12 @@ export default defineComponent({
       }
     }
   }
+  .tableShow2 {
+    display: inline-block;
+  }
+  .tableHiddle2 {
+    display: none;
+  }
 }
 
 .tag-content {

src/views/courselibrary/courseModal.vue

@@ -904,21 +904,16 @@ export default defineComponent({
       ];
       console.log("checkList", checkList);
       if (
-        !postData.organizationIds &&
+        (!postData.organizationIds &&
-        !postData.jobTypeIds &&
+          !postData.jobTypeIds &&
-        !postData.bandIds
+          !postData.bandIds) ||
+        !checkVal(checkList)
       ) {
         message.destroy();
         return message.error("请输入必填项");
       } else {
         state.addLoading = true;
       }
-      if (!checkVal(checkList)) {
-        message.destroy();
-        return message.error("请输入必填项");
-      } else {
-        state.addLoading = true;
-      }
 
       edit(postData).then((res) => {
         state.addLoading = false;

src/views/examine/CourseReviewedN.vue

@@ -148,10 +148,10 @@
 		</a-modal>
 		<!-- 邀请审核弹窗 -->
 		<a-modal v-model:visible="courInvitationAuditModal" :footer="null" :closable="closeBack" wrapClassName="courAuditModal"
-			centered="true">
+			centered="true" style="height:400px;">
 			<div class="delete">
 				<div class="del_header"></div>
-				<div class="del_main">
+				<div class="del_main" style="height:400px;">
 					<div class="header">
 						<div class="icon"></div>
 						<span>请选择教师</span>

src/views/learningpath/LevelAddDetail.vue

@@ -325,7 +325,9 @@
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
-    <div><div style="height:80px;width:100%;" /></div>
+    <div>
+      <div style="height:80px;width:100%;"/>
+    </div>
     <!-- 移动任务到阶段 -->
     <a-modal style="padding: 0" v-model:visible="visiblene" :footer="null" :centered="true"
              wrapClassName="moveModal">
@@ -533,8 +535,20 @@ const temporaryStorage = async () => {
 };
 
 const submitStorage = async () => {
+  if (routerInfo.value.routerInfo.status === 1) {
+    dialog({
+      content: '该路径图已经发布，修改后如未点击暂存当前操作未保存数据将丢失，确认保存?',
+      ok: async () => {
+        confirmLoading.value = true
+        await releaseRouter(routerId)
+        message.success("关卡和任务数据已保存");
+        confirmLoading.value = false
+      },
+    })
+    return
+  }
   confirmLoading.value = true
-  routerInfo.value.routerInfo.status === 1 ? await releaseRouter(routerId) : await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
+  await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
   message.success("关卡和任务数据已保存")
   confirmLoading.value = false
 };
@@ -1028,9 +1042,10 @@ const cancelStorage = async () => {
       // width: 86%;
       margin-top: 20px;
       position: sticky;
-      top:0;
+      top: 0;
       height: 80vh;
       overflow-y: auto;
+
       .tit {
         font-size: 18px;
         color: #363636;
@@ -1295,8 +1310,9 @@ const cancelStorage = async () => {
       align-items: center;
       flex-wrap: wrap;
       position: sticky;
-      top:0;
+      top: 0;
       z-index: 999;
+
       .item {
         height: 115px;
         // width: 7.7%;
@@ -2136,6 +2152,7 @@ const cancelStorage = async () => {
     }
   }
 }
+
 .footBox {
   position: fixed;
   bottom: 0;

src/views/projectcenter/LibraryAdd.vue

@@ -1114,7 +1114,7 @@ export default defineComponent({
       routered.push({
         path: "/templateAdd",
         query: {
-          projectTemplateId: state.projectInfo.projectTemplateId,
+          projectTemplateId: projectTemplateId,
         },
       });
     };
@@ -1163,29 +1163,34 @@ export default defineComponent({
     };
     const getScoreRule = () => {
       scoreRule({
-        projectId: localStorage.getItem("projectTemplateId"),
+        projectId: projectTemplateId,
       })
           .then((res) => {
-            console.log("获取了项目积分规则", res.data.data);
             let result = res.data.data;
-            console.log("获取了项目积分规则:", result);
+           //Write operation failed: computed value is readonly 总积分
-            if (result.size > 0) {
+
-              scoresum.value = result.totalScore == null ? 0 : result.totalScore; //Write operation failed: computed value is readonly
+            state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
-              state.seven1 = result.leaderScore;
+
-              state.score1 = result.courseScore;
+            state.score1 = result[0].pointsCount; 
-              state.done2 = result.homeworkItem[1].scoreLimit;
+
-              state.done3 = result.homeworkItem[1].score;
+            state.done2 = result[1].typeDescConfig;
-              state.four1 = result.topCompleteCourseItem[0].numLimit;
+            state.done3 = result[1].pointsCount;
-              state.four2 = result.topCompleteCourseItem[0].score;
+
-              state.four3 = result.homeworkItem[0].numLimit;
+            state.four1 = result[2].typeDescConfig;
-              state.four4 = result.homeworkItem[0].scoreLimit;
+            state.four2 = result[2].pointsCount;
-              state.four5 = result.homeworkItem[0].score;
+
-              state.five1 = result.examItem[0].scoreLimit;
+            state.four3 = result[3].typeDescConfig.slice(0,result[3].typeDescConfig.indexOf(';'));
-              state.five2 = result.examItem[0].score;
+            state.four4 = result[3].typeDescConfig.slice(result[3].typeDescConfig.indexOf(';')+1);
-              state.six1 = result.signScore;
+            state.four5 = result[3].pointsCount;
-              state.seven1 = result.leaderScore;
+
-              state.seven2 = result.topStudentScore;
+            state.five1 = result[4].typeDescConfig;
-            }
+            state.five2 = result[4].pointsCount;
+
+            state.six1 = result[5].pointsCount;
+
+            state.seven1 = result[6].pointsCount;
+
+            state.seven2 = result[7].pointsCount;
 
           })
           .catch((err) => {
@@ -1307,45 +1312,57 @@ export default defineComponent({
     //设置积分规则
     const editRule = () => {
       let obj = {
-        courseScore: state.score1,
+        projectId: projectTemplateId,
-        examItem: [
+        datas:[
           {
-            numLimit: 0,
+              "type": 1,
-            score: state.five2,
+              "pointsCount": Number(state.score1),
-            scoreLimit: state.five1,
+              "typeDesc": "完成【必修/选修】获得%p积分",
-            type: 3,
+              "typeDescConfig": ""
           },
-        ],
-
-        homeworkItem: [
-          //有名次要求的提交作业
           {
-            numLimit: state.four3,
+              "type": 2,
-            score: state.four5,
+              "pointsCount": Number(state.done3),
-            scoreLimit: state.four4,
+              "typeDesc": "完成作业成绩不低于%d分获得%p积分",
-            type: 2,
+              "typeDescConfig": state.done2
           },
-          //无名次要求的提交作业
           {
-            numLimit: 0,
+              "type": 3,
-            score: state.done3,
+              "pointsCount": Number(state.four2),
-            scoreLimit: state.done2,
+              "typeDesc": "前%d名学完在线课程获得%p积分",
-            type: 2,
+              "typeDescConfig": state.four1
           },
-        ],
-        leaderScore: state.seven1,
-        projectId: localStorage.getItem("projectTemplateId"),
-        signScore: state.six1,
-        topCompleteCourseItem: [
           {
-            numLimit: state.four1,
+              "type": 4,
-            score: state.four2,
+              "pointsCount": Number(state.four5),
-            scoreLimit: 0,
+              "typeDesc": "前%d名提交作业且成绩不低于%d分获得%p积分",
-            type: 1,
+              "typeDescConfig":  state.four3 + ';' + state.four4
           },
-        ],
+          {
-        topStudentScore: state.seven2,
+              "type": 5,
-        totalScore: scoresum.value,
+              "pointsCount": Number(state.five2),
+              "typeDesc": "考试成绩高于%d分获得%p积分",
+              "typeDescConfig": state.five1
+          },
+          {
+              "type": 6,
+              "pointsCount": Number(state.six1),
+              "typeDesc": "考勤正常学员获得%p积分",
+              "typeDescConfig": ""
+          },
+          {
+              "type": 7,
+              "pointsCount": Number(state.seven1),
+              "typeDesc": "成为小组长获得%p积分",
+              "typeDescConfig": ""
+          },
+          {
+              "type": 8,
+              "pointsCount": Number(state.seven2),
+              "typeDesc": "优秀学员可获得%p积分",
+              "typeDescConfig": ""
+          }
+        ]
       };
       console.log(obj);
       setScoreRule(obj)

src/views/projectcenter/TaskAdd.vue

@@ -584,8 +584,20 @@ const temporaryStorage = async () => {
 };
 //确定
 const submitStorage = async () => {
+  if (projectInfo.value.projectInfo.status === 3) {
+    dialog({
+      content: '该项目已经发布，修改后如未点击暂存当前操作未保存数据将丢失，确认保存?',
+      ok: async () => {
+        confirmLoading.value = true
+        await request(PROJECT_RELEASE, {projectId: route.query.projectId})
+        message.success("保存成功");
+        confirmLoading.value = false
+      },
+    })
+    return
+  }
   confirmLoading.value = true
-  projectInfo.value.projectInfo.status === 3 ? await request(PROJECT_RELEASE, {projectId: route.query.projectId}) : await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
+  await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
   message.success("阶段和任务数据已保存")
   confirmLoading.value = false
 };
@@ -821,7 +833,7 @@ const cancelStorage = async () => {
   .ant-modal {
     width: 549px !important;
     height: 245px !important;
-    
+
     .ant-modal-content {
       width: 549px !important;
       height: 245px !important;
@@ -949,9 +961,10 @@ const cancelStorage = async () => {
     .leftmain {
       margin-top: 20px;
       position: sticky;
-      top:0;
+      top: 0;
       height: 80vh;
       overflow-y: auto;
+
       .tit {
         margin-left: 20px;
         font-size: 18px;

src/views/projectcenter/TaskPage.vue

@@ -275,7 +275,21 @@
                   </div>
                   <div class="setc_name"><span>项目说明：</span></div>
                   <div class="setc_main" style="width: 400px">
-                    <span style="color: #999999">{{ remark }}</span>
+                    <div
+                      style="
+                        width: 400px;
+                        color: #999999;
+                        word-wrap: break-word;
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                        display: -webkit-box;
+                        -webkit-line-clamp: 6;
+                        -webkit-box-orient: vertical;
+                      "
+                      :title="remark"
+                    >
+                      {{ remark }}
+                    </div>
                   </div>
                 </template>
                 <div
@@ -755,7 +769,7 @@
                     <a-button @click="settingTopFlag(record)" type="link"
                       >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
                     </a-button>
-                    <a-button type="link" @click="showChangeGroupModal(record)"
+                    <a-button type="link" :disabled="record.isLeader === '1'" @click="showChangeGroupModal(record)"
                       >换组
                     </a-button>
                   </template>
@@ -895,6 +909,7 @@
         </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">
           <ProjectScore
+            v-if="activeKey=='5'"
             :permissions="permissions"
             :projectId="projectId"
           ></ProjectScore>
@@ -2356,7 +2371,7 @@ export default {
       ],
       //小组信息列表
       groupList: [],
-       isBatch: false, // 批量
+      isBatch: false, // 批量
       // stuName: "", //搜索的学员姓名
       // stuGroup: "", //搜索的学员小组名称
       // stuBum: "", //搜索的学员小组部门
@@ -2442,6 +2457,7 @@ export default {
       valueaddm: "", //创建小组输入小组长
       valueaddg: "", //创建小组输入名称
       groupInfo: { leaderName: "", leaderId: "" }, //创建小组
+      groupMemberCountContrast: null,
       groupPageList: [], //小组列表
       groupNumber: 0, //组员人数
       valuestun: "", //学员管理姓名
@@ -3069,21 +3085,22 @@ export default {
     };
     //显示学员换组弹窗
     const showChangeGroupModal = (record) => {
-      debugger
+      console.log("单个");
-      console.log("单个")
       state.changegroupV = true;
       console.log("点击换组", record.id);
       state.checkgroupStuId = [];
-      state.checkgroupStuId.push(record.id) ;
+      state.checkgroupStuId.push(record.id);
     };
     const showModal2 = (item, isEdit) => {
       state.isEdit = isEdit;
       state.stugroup = true;
       state.groupInfo = item || {};
+      state.groupMemberCountContrast = item.groupMemberCount;
     };
     const closeModal2 = () => {
       state.stugroup = false;
       state.groupInfo = {};
+      state.groupMemberCountContrast = null;
     };
     //点击确定创建小组
     const createG = () => {
@@ -3100,7 +3117,6 @@ export default {
         return message.warning("请输入组员数量");
       }
       createGroup();
-      closeModal2();
     };
     const showFaceIn = () => {
       state.TaskFaceImpStuvisible = true;
@@ -3151,7 +3167,6 @@ export default {
     }
     //考勤的抽屉
     const showAA = (course, a, data) => {
-      debugger
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";
@@ -3918,20 +3933,24 @@ export default {
     //创建小组
     const createGroup = async () => {
       console.log("state.groupPageList" + state.groupPageList);
-      const d = state.groupPageList.filter(
+      const id = state.groupInfo.id;
+      const d = state.groupPageList.filter(item => item.id !== id).filter(
         (item) => item.leaderId === state.groupInfo.leaderId
       );
-      const id = state.groupInfo.id;
       if (state.isEdit) {
         if (d.length > 0 && d[0].id !== id) {
           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
+        // 小组人数只能由小改大，不能由大改小
+        if (state.groupMemberCountContrast > state.groupInfo.groupMemberCount) {
+          return message.warn("当前不支持修改组员人数小于原组员数量。");
+        }
       } else {
         if (d.length > 0) {
-          return message.warn(d[0].leaderName + "已是小组长，请重新选择");
+           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
       }
-      // 过滤掉编辑时候，只修改了组员最大值时候
+
 
       state.isEdit = false;
       await editGroup({ ...state.groupInfo, projectId: state.projectId });
@@ -3939,6 +3958,7 @@ export default {
       getGroup();
       console.log("state.groupPageList:");
       getStu();
+      closeModal2();
     };
     //搜索小组重置
     const resetGroupName = () => {

src/views/projectcenter/templateAdd.vue

@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层模板</span>
       <div
-          @click="backPage"
+        @click="backPage"
-          style="cursor: pointer"
+        style="cursor: pointer"
-          to="/libraryAdd"
+        to="/libraryAdd"
-          class="goback"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -31,18 +31,18 @@
             />
           </div>
         </div>
-        <div class="name" style="align-items: flex-start">
+        <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
+              class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
-          <div class="in select" style="display: flex">
+          <div class="in select" style="flex: 1; display: flex">
             <div
-                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-                style="
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -50,23 +50,52 @@
                 position: relative;
                 overflow: hidden;
               "
-                v-for="(src, index) in projectPic"
+              v-for="(src, index) in projectPic"
-                :key="index"
+              :key="index"
-                @click="() => (projectInfo.picUrl = src.value)"
+              :style="{
+                display: index >= 3 ? 'none' : 'flex',
+              }"
+              @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                  style="
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                  :src="src.value"
+                :src="src.value"
-                  alt="avatar"
+                alt="avatar"
               />
             </div>
+            <div
+              @click="showLearnBgMore"
+              v-if="projectPic.length > 3"
+              style="
+                width: 100px;
+                height: 100px;
+                padding-left: 15px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                border: 1px solid #c7cbd2;
+                font-size: 14px;
+                font-weight: 400;
+                color: #4ea6ff;
+                line-height: 36px;
+              "
+            >
+              查看更多
+              <img src="../../assets/images/projectadd/go.png" alt="" />
+            </div>
           </div>
         </div>
+
+
         <div class="name">
           <div class="namebox">
             <img
@@ -242,7 +271,7 @@ const projectPic = ref([]);
 const courseSyncFlag = ref(true)
 onMounted(() => {
   getDetail();
-  projectPic.value = store.state.projectPic.map((e) => ({
+  projectPic.value = store.state.project_pic.map((e) => ({
     value: e.dictValue,
     label: e.dictName,
   }));
@@ -262,11 +291,15 @@ const getDetail = () =>
       projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
         dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
       ];
-      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
+      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
+      console.log("查询到的模板库数据：" + JSON.stringify(projectInfo.value));
     });
 
 const backPage = () => {
-  router.back();
+  router.push({
+    path: "/libraryAdd",
+    query: { projectTemplateId : route.query.projectTemplateId}
+  });
 };
 
 function timeChange(e) {

src/views/research/components/ResearchAddItem.vue

@@ -17,7 +17,7 @@
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
-    
+
     <div class="name uploadContent">
       <a-upload
         v-show="!curItem.imgVal"
@@ -44,7 +44,6 @@
         />
       </div>
     </div>
-   
   </div>
 </template>
 <script>
@@ -64,6 +63,8 @@ export default {
   },
   setup(props, { emit }) {
     const curItem = ref(props.item);
+    console.log("选项信息", curItem.value, process.env.VUE_APP_FILE_PATH);
+    curItem.value.imgVal = process.env.VUE_APP_FILE_PATH + curItem.value.imgVal;
     const state = reactive({
       hasImgName: "",
     });