Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
#	src/views/courselibrary/courseModal.vue

src/components/BreadCrumb.vue

@@ -430,6 +430,20 @@ export default {
             },
           ];
         }
+        if (
+          n.indexOf("/sonproject") !== -1 ||
+          n.indexOf("/SonProject") !== -1
+        ) {
+          state.list = [
+            {
+              name: "项目",
+              href: "",
+            },
+            {
+              name: "基础信息",
+            },
+          ];
+        }
       }
     );
 

src/components/drawers/AddLive.vue

@@ -407,7 +407,7 @@ const beforeUpload = (file) => {
     return false;
   }
   
-  let isLt1M = file.size < 2097152;
+  let isLt1M = file.size < 2000000;
   console.log(file.size, isLt1M)
   if (!isLt1M) {
     message.error("图片大小超过2MB!");

src/components/drawers/AddProject.vue

@@ -11,7 +11,7 @@
   >
     <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"
@@ -65,32 +65,25 @@
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
+            <div class="btn btn2" @click="reset">
+              <div class="search"></div>
+              <div class="btnText">刷新</div>
+            </div>
           </div>
         </div>
 
-        <div class="main_item" style="margin-top: 16px;margin-bottom: 32px;">
+        <div class="main_item" style="margin-top: 16px; margin-bottom: 32px">
-          <button class="xkbtn" @click="goProjectmanage">
+          <button class="xkbtn" @click="goProjectmanage">新建项目</button>
-            新建项目
-          </button>
         </div>
 
-        <div class="main_notice" v-if="edit" style="display:none;">
+        <div class="main_notice" v-if="taskIndex >= 0">
-          <div class="mntc_left">
+          <div class="mntc_left" v-if="selectedRows">
             <div class="notice_icon"></div>
-            <div v-if="selectedRows.length == 0">
+            <div>
-              <span class="title"
-              >已选择
-                <span class="data" style="color: #4ea6ff">{{ 0 }}</span>
-                条</span
-              >
-            </div>
-            <div v-else>
               <div>
                 <span class="title"
                   >已选择
-                  <span class="data" style="color: #4ea6ff">{{
+                  <span class="data" style="color: #4ea6ff">{{ 1 }}</span>
-                      selectedRows.length
-                    }}</span>
                   条&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
                 >
                 <span class="title"
@@ -98,7 +91,7 @@
                   <span
                     class="data"
                     style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].name }}</span
+                    >{{ selectedRows?.name }}</span
                   >
                 </span>
                 <span class="title"
@@ -106,7 +99,7 @@
                   <span
                     class="data"
                     style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].manager }}</span
+                    >{{ selectedRows?.manager }}</span
                   >
                 </span>
                 <span class="title"
@@ -114,13 +107,13 @@
                   <span
                     class="data"
                     style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].creater }}</span
+                    >{{ selectedRows?.createName }}</span
                   >
                 </span>
                 <span class="title"
                   >创建时间：
                   <span class="data" style="color: #4ea6ff">{{
-                      selectedRows[0].time
+                    selectedRows?.createTime
                   }}</span>
                 </span>
               </div>
@@ -132,7 +125,9 @@
             <a-table
               :customRow="customRow"
               class="ant-table-striped"
-                :row-class-name="(_, index) => (index % 2 === 1 ? 'table-striped' : null)"
+              :row-class-name="
+                (_, index) => (index % 2 === 1 ? 'table-striped' : null)
+              "
               row-key="id"
               :columns="columns"
               :data-source="data"
@@ -180,28 +175,45 @@
   </a-drawer>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
+import { computed, defineEmits, defineProps, ref, watch } from "vue";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
-import {useRouter} from "vue-router";
+// import { useRouter } from "vue-router";
-import {useRowsPage} from "@/api/request";
+import { useRowsPage } from "@/api/request";
-import {PROJECT_AUDIT_PAGE} from "@/api/apis";
+import { PROJECT_AUDIT_PAGE } from "@/api/apis";
-
+import { getProjectDetail } from "@/api/index";
 const props = defineProps({
   type: Number,
-  taskList: []
+  taskList: [],
-})
+});
-const visible = ref(false)
+const visible = ref(false);
-const sameModal = ref(false)
+const sameModal = ref(false);
-const emit = defineEmits({})
+const emit = defineEmits({});
 
 const columns = ref([
   {
     title: "项目名称",
     dataIndex: "name",
     key: "projectName",
-    width: "40%",
+    width: "20%",
     ellipsis: true,
   },
+  {
+    title: "所属项目",
+    dataIndex: "topName",
+    key: "topName",
+    width: "20%",
+    ellipsis: true,
+    customRender: ({ record: { gaName, faName, name } }) => (
+      <div title={faName ? gaName !== null ? gaName + "/" + faName : faName : 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>
+    ),
+  },
   {
     title: "项目经理",
     dataIndex: "manager",
@@ -223,38 +235,42 @@ const columns = ref([
     width: "20%",
     align: "center",
   },
-])
+]);
 const initParams = {
   pageNo: 1,
   pageSize: 10,
-  orderAsc: true
+  orderAsc: true,
-}
+};
-const params = ref(initParams)
+const params = ref(initParams);
-const router = useRouter();
+// const router = useRouter();
 const rowSelectKeys = ref([]);
 const selectsData = ref([]);
 const taskIndex = ref(-1);
 
-const {data, loading, total, fetch} = useRowsPage(PROJECT_AUDIT_PAGE, params.value, {
+const { data, loading, total, fetch } = useRowsPage(
+  PROJECT_AUDIT_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,
-})
+  }
-
+);
+console.log(data)
 watch(taskIndex, () => {
   // if (taskIndex.value >= 0) {
   //   rowSelectKeys.value = [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,
@@ -266,10 +282,10 @@ const pagination = computed(() => ({
 
 const changePagination = (e) => {
   params.value.pageNo = e;
-  fetch()
+  fetch();
 };
 const rowSelection = computed(() => ({
-  type: 'radio',
+  type: "radio",
   columnWidth: 20,
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
@@ -279,73 +295,90 @@ const rowSelection = computed(() => ({
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;
   selectsData.value = l;
+  selectedRows.value = l[0];
+  console.log("selectedRows", selectedRows);
 }
 
 function search() {
-  params.value.pageNo = 1
+  params.value.pageNo = 1;
-  fetch()
+  fetch();
 }
 
 function reset() {
   rowSelectKeys.value = [];
   selectsData.value = [];
-  params.value.pageNo = 1
+  params.value.pageNo = 1;
-  params.value.keyWord = ''
+  params.value.keyWord = "";
-  params.value.createName = ''
+  params.value.createName = "";
-  params.value.manager = ''
+  params.value.manager = "";
-  params.value.name = ''
+  params.value.name = "";
-  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].name,
       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].name
+    data.name = selectsData.value[0].name;
-    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();
 }
 
 const goProjectmanage = () => {
-  router.push({path: "/projectmanage"});
+  // router.push({path: "/projectmanage"});
-}
+  window.open(process.env.VUE_APP_BASE + "/projectmanage");
+};
 
 function closeSameModal() {
-  sameModal.value = false
+  sameModal.value = false;
-}
-
-function sureSameModal() {
-
 }
 
+function sureSameModal() {}
+let selectedRows = ref(null);
 function openDrawer(i, row) {
+  console.log("row", row);
+
   row && (rowSelectKeys.value = [row.courseId]);
-  row && (selectsData.value = [{name: row.name, id: row.courseId}]);
+  row && (selectsData.value = [{ name: row.name, id: row.courseId }]);
-  (i >= 0) && (taskIndex.value = i)
+  i >= 0 && (taskIndex.value = i);
-  visible.value = true
+  visible.value = true;
+
+  //获取项目详情
+  if (row && row.courseId) {
+    getProjectDetail({
+      projectId: row.courseId,
+    }).then((res) => {
+      console.log("获取选中项目详情", res);
+      if (res.data.code === 200) {
+        selectedRows.value = res.data.data.projectInfo;
+        console.log("selectedRows", selectedRows);
+      }
+    });
+  }
 }
 
-defineExpose({openDrawer})
+defineExpose({ openDrawer });
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {

src/components/drawers/AddTest.vue

@@ -355,6 +355,7 @@ async function confirm() {
   }).catch(err => {
     console.log(err)
   })
+  
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }

src/components/drawers/AssessmentAll.vue

@@ -17,10 +17,16 @@
       <div class="search"></div>
       <div class="btnText">重置</div>
     </div>
+    <div class="btnsn" @click="reset">
+      <div class="search"></div>
+      <div class="btnText">刷新</div>
+    </div>
   </div>
 
   <div class="main_item">
-    <button class="xkbtn" style="margin:0" @click="goResearchmanage">新建评估</button>
+    <button class="xkbtn" style="margin: 0" @click="goResearchmanage">
+      新建评估
+    </button>
   </div>
 
   <div class="main_notice" style="display: none">
@@ -44,7 +50,7 @@
 </template>
 <script setup>
 import { computed, defineEmits, defineProps, ref, watch } from "vue";
-import { useRouter } from "vue-router";
+// import { useRouter } from "vue-router";
 import { useRowsPage } from "@/api/request";
 import { ASSESSMENT_PAGE } from "@/api/apis";
 
@@ -105,7 +111,7 @@ const initParams = {
   pageSize: 10,
   releaseStatus: 2,
 };
-const router = useRouter();
+// const router = useRouter();
 const params = ref(initParams);
 
 const rowSelectKeys = ref([]);
@@ -147,7 +153,7 @@ const pagination = computed(() => ({
 }));
 
 const changePagination = (e) => {
-  params.value.pageIndex = e;
+  params.value.pageNo = e;
   fetch();
 };
 const rowSelection = computed(() => ({
@@ -156,12 +162,12 @@ const rowSelection = computed(() => ({
   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;
@@ -180,12 +186,13 @@ function reset() {
   selectsData.value = [];
   params.value.pageIndex = 1;
   params.value.keyWord = "";
-  params.value.assessmentName ="";
+  params.value.assessmentName = "";
   fetch();
 }
 
 const goResearchmanage = () => {
-  router.push({ path: "/researchmanage" });
+  // router.push({ path: "/researchmanage" });
+  window.open(process.env.VUE_APP_BASE + "/researchmanage");
 };
 </script>
 <style lang="scss">

src/components/drawers/ViewAssess.vue

@@ -195,7 +195,7 @@ export default {
         console.log('我是传递过来的参数2', props.basicdata)
         api.QueryAssessmentDetail({
           "assessmentSubmitId": props.datasource.assessmentSubmitId,
-          "courseId": props.basicdata.assessmentId,
+          "courseId": props.basicdata.id,
           "studentId": props.datasource.studentId
         }).then(res=>{
           console.log(res)

src/components/drawers/project/AddCertificate.vue

@@ -470,7 +470,7 @@ export default {
       if (info.file.status === "done") {
         console.log("上传图片返回的信息 %o", info.file.name);
         state.imageUrl = process.env.VUE_APP_FILE_PATH + info.file.name;
-        state.imageName = info.file.name;
+        state.imageName = process.env.VUE_APP_FILE_PATH + info.file.name;
       }
       if (info.file.status === "error") {
         message.error("upload error");

src/components/drawers/project/ProjectOnlineManage.vue

@@ -55,7 +55,7 @@
                 placeholder="请输入姓名"
               />
             </div>
-            <div v-if="datasource.type !==1" class="namecon" style="margin-right: 50px">
+            <div class="namecon" style="margin-right: 50px">
               <div class="name">任务状态：</div>
               <div class="select">
                 <a-select
@@ -128,6 +128,8 @@
       </div>-->
     </div>
   </a-drawer>
+  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info?.assessmentName"
+    :basicdata="datasource.info" />
 </template>
 
 <script>
@@ -135,9 +137,11 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import ViewAssess from "../ViewAssess";
+
 export default {
   name: "ProjectOnlineManage",
-
+  components: { ViewAssess },
   props: {
     Tvisible: {
       type: Boolean,
@@ -195,6 +199,8 @@ export default {
       ],
       tabledata: [],
       tableDataTotalLoading: true, // 表格loading加载配置
+      evalDataSource: "",
+      Assessvisible: false
     });
     const tableDataFunc = () => {
       const columns = [
@@ -309,9 +315,42 @@ export default {
           },
         },
       ];
+
+      let obj = {
+          title: "操作",
+          dataIndex: "finishStatus",
+          key: "finishStatus",
+          width: 60,
+          align: "center",
+          ellipsis: true,
+          className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <a
+                  onClick={()=>{
+                    console.log('iyiy', text.record)
+                    showassess(text.record);
+                  }}>查看</a>
+              </div>
+            );
+          },
+        }
+
+        {/* 评估查看操作 */}
+        if(props.datasource.type==11){
+          columns.push(obj)
+        }
+
       return columns;
     };
 
+    {/* 查看评估弹框 */}
+    const showassess = (data) => {
+      state.evalDataSource = data;
+      state.Assessvisible = true;
+    };
+
     const closeDrawer = () => {
       ctx.emit("update:Tvisible", false);
       state.currentPage = 1;
@@ -405,20 +444,20 @@ export default {
           if(res.data.code==200){
             state.tableDataTotalLoading = false;
             let newData = []
-            for(let i=0;i<res.data.data.studyDetailList.length;i++){
+            for(let i=0;i<res.data.data.studyDetailList.records.length;i++){
               // 处理在线课字段和表格中字段保持一致
               let obj = {
-                studentUserNo: res.data.data.studyDetailList[i].studentCode,
+                studentUserNo: res.data.data.studyDetailList.records[i].studentCode,
-                studentName: res.data.data.studyDetailList[i].studentName,
+                studentName: res.data.data.studyDetailList.records[i].studentName,
-                studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
+                studentDepartName: res.data.data.studyDetailList.records[i].studentDepartName,
-                studentJobName: res.data.data.studyDetailList[i].studentJobName,
+                studentJobName: res.data.data.studyDetailList.records[i].studentJobName,
-                lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
+                lastStudyTime: res.data.data.studyDetailList.records[i].finishedTime,
-                finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
+                finishStatus: res.data.data.studyDetailList.records[i].status?res.data.data.studyDetailList.records[i].status:0
               }
               newData.push(obj)
             }
             state.tabledata = newData;
-            state.tableDataTotal = res.data.data.total;
+            state.tableDataTotal = res.data.data.studyDetailList.total;
           }
         }).catch(err=>{
           console.log(err)
@@ -454,13 +493,18 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
+      if(props.datasource.type==1){
+        {/* 在线课导出 */}
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
+      }else{
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
-      // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`)
+      }
     }
 
     return {
       ...toRefs(state),
       selectProjectName,
+      showassess,
       closeDrawer,
       afterVisibleChange,
       tableDataFunc,

src/components/drawers/router/RouterCommonManage.vue

@@ -55,7 +55,7 @@
                 placeholder="请输入姓名"
               />
             </div>
-            <div v-if="datasource.type !==1" class="namecon" style="margin-right: 50px">
+            <div class="namecon" style="margin-right: 50px">
               <div class="name">任务状态：</div>
               <div class="select">
                 <a-select
@@ -390,7 +390,7 @@ export default {
         console.log("我是传递的查询参数", {
           "pageNo": state.currentPage,
           "pageSize": state.pageSize,
-          "chapterId": props.outchapter,
+          "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
           "taskId": props.datasource.courseId,
@@ -401,7 +401,7 @@ export default {
         api.QueryOnlineManagementDetail({
           "pageNo": state.currentPage,
           "pageSize": state.pageSize,
-          "chapterId": props.outchapter,
+          "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.routerId,
@@ -413,20 +413,20 @@ export default {
           if(res.data.code==200){
             state.tableDataTotalLoading = false;
             let newData = []
-            for(let i=0;i<res.data.data.studyDetailList.length;i++){
+            for(let i=0;i<res.data.data.studyDetailList.records.length;i++){
               // 处理在线课字段和表格中字段保持一致
               let obj = {
-                studentUserNo: res.data.data.studyDetailList[i].studentCode,
+                studentUserNo: res.data.data.studyDetailList.records[i].studentCode,
-                studentName: res.data.data.studyDetailList[i].studentName,
+                studentName: res.data.data.studyDetailList.records[i].studentName,
-                studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
+                studentDepartName: res.data.data.studyDetailList.records[i].studentDepartName,
-                studentJobName: res.data.data.studyDetailList[i].studentJobName,
+                studentJobName: res.data.data.studyDetailList.records[i].studentJobName,
-                lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
+                lastStudyTime: res.data.data.studyDetailList.records[i].finishedTime,
-                finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
+                finishStatus: res.data.data.studyDetailList.records[i].status?res.data.data.studyDetailList.records[i].status:0
               }
               newData.push(obj)
             }
             state.tabledata = newData;
-            state.tableDataTotal = res.data.data.total;
+            state.tableDataTotal = res.data.data.studyDetailList.total;
           }
         }).catch(err=>{
           console.log(err)
@@ -462,9 +462,12 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
-      console.log(`${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}`)
+      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{
         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}`)
-      // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`)
+      }
     }
 
     return {

src/components/project/OrgClassCheck.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-02-23 14:57:21
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-23 20:42:25
+ * @LastEditTime: 2023-02-24 09:58:42
  * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -88,7 +88,7 @@ function onLoadData(treeNode) {
 }
 
 function change(e) {
-  // console.log("label", e, emit);
+  console.log("label", e, emit);
   // let label = [];
   // let value = [];
   // for (let i = 0; i < e.length; i++) {

src/components/vote/CreateVote.vue

@@ -11,7 +11,9 @@
   >
     <div class="researchadd">
       <div class="header">
-        <div class="headerTitle">{{ options.length ? "编辑投票题干" : "创建投票题干" }}</div>
+        <div class="headerTitle">
+          {{ options.length ? "编辑投票题干" : "创建投票题干" }}
+        </div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -34,8 +36,13 @@
           </div>
         </div>
       </div>
-      <div v-for="(item, index) in formData" :key="index+Math.random()">
+      <div v-for="(item, index) in formData" :key="index + Math.random()">
-        <VoteQuestion v-if="!item.deleted" :item="item" :index="index" @del="itemDel"/>
+        <VoteQuestion
+          v-if="!item.deleted"
+          :item="item"
+          :index="index"
+          @del="itemDel"
+        />
       </div>
 
       <div class="footer">
@@ -43,11 +50,7 @@
           <a-button
             type="primary"
             ghost
-              style="
+            style="width: 100px; height: 40px; border-radius: 8px"
-              width: 100px;
-              height: 40px;
-              border-radius: 8px;
-            "
             @click="closeDrawer"
           >
             取消
@@ -71,62 +74,80 @@
   </a-drawer>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref, watch} from "vue";
+import { defineEmits, defineProps, ref, watch } from "vue";
 import VoteQuestion from "./VoteQuestion.vue";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 
 const props = defineProps({
-  options: []
+  options: [],
-})
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
-const formData = ref(props.options && props.options.length ? [...props.options] : [{
+const formData = ref(
-  voteStemName: '',
+  props.options && props.options.length
-  optionDetailList: []
+    ? [...props.options]
-}])
+    : [
+        {
+          voteStemName: "",
+          optionDetailList: [],
+        },
+      ]
+);
 
-const visible = ref(false)
+const visible = ref(false);
 
-watch(() => props.options.length, () => {
+watch(
-  formData.value = props.options && props.options.length ? [...props.options] : [{
+  () => props.options.length,
-    voteStemName: '',
+  () => {
-    optionDetailList: []
+    formData.value =
-  }]
+      props.options && props.options.length
-})
+        ? [...props.options]
+        : [
+            {
+              voteStemName: "",
+              optionDetailList: [],
+            },
+          ];
+  }
+);
 
 function openDrawer() {
-  visible.value = true
+  visible.value = true;
 }
 
 const closeDrawer = () => {
-  visible.value = false
+  visible.value = false;
-  formData.value = props.options && props.options.length ? [...props.options] : [{
+  formData.value =
-    voteStemName: '',
+    props.options && props.options.length
-    optionDetailList: []
+      ? [...props.options]
-  }]
+      : [
+          {
+            voteStemName: "",
+            optionDetailList: [],
+          },
+        ];
 };
 
 async function confirm() {
-  console.log(formData.value)
+  console.log(formData.value);
-  if (formData.value.some(t => !t.voteStemName && !t.deleted)) {
+  if (formData.value.some((t) => !t.voteStemName && !t.deleted)) {
-    message.warning('请输入题干名称')
+    message.warning("请输入题干名称");
-    return
+    return;
   }
-  visible.value = false
+  visible.value = false;
-  emit('update:options', formData.value)
+  emit("update:options", formData.value);
 }
 
 function handleAdd() {
   formData.value.push({
-    voteStemName: '',
+    voteStemName: "",
-    optionDetailList: []
+    optionDetailList: [],
-  })
+  });
 }
 
 function itemDel(i) {
-  formData.value[i].deleted = true
+  formData.value[i].deleted = true;
 }
-
 </script>
 <style lang="scss">
 .researchadd {

src/components/vote/VoteQuestion.vue

@@ -4,13 +4,13 @@
   <div class="content">
     <div class="tagbox">
       <div class="deleteop" @click="handleDel">
-        <div><img src="../../assets/images/projectadd/delete.png"/></div>
+        <div><img src="../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题干</div>
       </div>
     </div>
     <div class="name">
       <div class="namebox">
-        <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
+        <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
         <div class="inname">题干</div>
       </div>
       <div class="in">
@@ -23,8 +23,16 @@
         />
       </div>
     </div>
-    <div v-for="(item, index) in formData.optionDetailList" :key="index+Math.random()">
+    <div
-      <VoteQuestionItem v-if="!item.deleted" :item="item" :index="index" @del="delItem"/>
+      v-for="(item, index) in formData.optionDetailList"
+      :key="index + Math.random()"
+    >
+      <VoteQuestionItem
+        v-if="!item.deleted"
+        :item="item"
+        :index="index"
+        @del="delItem"
+      />
     </div>
     <div class="name">
       <div class="in" style="margin-left: 85px; margin-bottom: 20px">
@@ -45,34 +53,33 @@
   </div>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref, watch} from "vue";
+import { defineEmits, defineProps, ref, watch } from "vue";
 import VoteQuestionItem from "./VoteQuestionItem.vue";
 
 const props = defineProps({
   index: Number,
-  item: {}
+  item: {},
-})
+});
 
-const emit = defineEmits(['del'])
+const emit = defineEmits(["del"]);
 
-const formData = ref(props.item)
+const formData = ref(props.item);
 
 watch(props, () => {
-  formData.value = props.item
+  formData.value = props.item;
-})
+});
 
 function handleSingleAdd() {
-  formData.value.optionDetailList.push({})
+  formData.value.optionDetailList.push({});
 }
 
 function delItem(i) {
-  formData.value.optionDetailList[i].deleted = true
+  formData.value.optionDetailList[i].deleted = true;
 }
 
 function handleDel() {
   emit("del", props.index);
 }
-
 </script>
 <style lang="scss">
 .researchadd {

src/views/projectcenter/SonProject.vue

@@ -3,7 +3,12 @@
   <div class="sonproject">
     <div class="header">
       <span class="title">创建/编辑单层子项目</span>
-			<div @click="backPage" style="cursor: pointer" to="/projectmanage" class="goback">
+      <div
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
+      >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
     </div>
@@ -11,7 +16,10 @@
       <div class="main">
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">项目归属</div>
           </div>
           <div class="in">
@@ -22,73 +30,150 @@
         </div>
         <div class="name">
           <div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">项目名称</div>
           </div>
           <div class="in">
-						<NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate"
+            <NameInput
-							:maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
+              placeholder="请输入项目名称"
+              v-model:value="projectInfo.name"
+              v-model:validate="projectInfo.validate"
+              :maxlength="30"
+              show-count
+              :id="projectInfo.projectId"
+            ></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
-						<div :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`" style="
+            <div
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
                 cursor: pointer;
                 position: relative;
                 overflow: hidden;
-              " v-for="(src, index) in projectPic" :key="index" @click="() => (projectInfo.picUrl = src.value)">
+              "
-							<img style="
+              v-for="(src, index) in projectPic"
+              :key="index"
+              :style="{
+                display: index >= 3 ? 'none' : 'flex',
+              }"
+              @click="() => (projectInfo.picUrl = src.value)"
+            >
+              <img
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                " :src="src.value" alt="avatar" />
+                "
+                :src="src.value"
+                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 class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
-						<a-range-picker :show-time="{ format: 'HH:mm' }" :disabled-date="disabledDate"
+            <a-range-picker
-							:disabled-time="disabledRangeTime" separator="至" :placeholder="['      开始时间', '        结束时间']"
+              :show-time="{ format: 'HH:mm' }"
-							v-model:value="projectInfo.rangeTime" style="width: 100%; height: 40px; border-radius: 5px"
+              :disabled-date="disabledDate"
-							valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="viewDetail ? true : false" />
+              :disabled-time="disabledRangeTime"
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="projectInfo.rangeTime"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              valueFormat="YYYY-MM-DD HH:mm"
+              @change="timeChange"
+              :disabled="viewDetail ? true : false"
+            />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
-						<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
+            <ProjectManager
-							@onChange="managerChange" mode="multiple"></ProjectManager>
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
+            ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
-						<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName" v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
+            <OrgClass
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
+              v-model:fullName="projectInfo.sourceBelongFullName"
+            ></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">项目级别</div>
           </div>
           <div class="in select">
@@ -97,7 +182,10 @@
         </div>
         <div class="name">
           <div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">培训分类</div>
           </div>
           <div class="in select">
@@ -106,11 +194,17 @@
         </div>
         <div class="name">
           <div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-						<a-radio-group v-model:value="projectInfo.boeFlag" :disabled="viewDetail ? true : false">
+            <a-radio-group
+              v-model:value="projectInfo.boeFlag"
+              :disabled="viewDetail ? true : false"
+            >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
             </a-radio-group>
@@ -121,11 +215,18 @@
             <div class="inname">同步学习记录</div>
           </div>
           <div class="in">
-						<a-checkbox v-model:checked="courseSyncFlag" :disabled="viewDetail ? true : false"><span style="
+            <a-checkbox
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-checkbox>
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
+            >
           </div>
         </div>
         <div class="name name2" v-if="projectInfo.remark">
@@ -133,8 +234,14 @@
             <div class="inname" style="margin-top: 13px">项目说明</div>
           </div>
           <div class="in">
-						<a-textarea v-model:value="projectInfo.remark" style="height: 80px" placeholder="请输入说明" show-count
+            <a-textarea
-							:maxlength="200" :disabled="viewDetail ? true : false" />
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
+            />
           </div>
         </div>
 
@@ -150,15 +257,63 @@
     </div>
     <div class="footer">
       <div class="btn">
-				<a-button v-on:click="createProject" type="primary" class="btn1">确定
+        <a-button
+          :loading="loading"
+          v-on:click="createProject"
+          type="primary"
+          class="btn1"
+          >确定
         </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
     </div>
+    <!-- 更多背景图 v-model:visible="learnBgMore"  -->
+    <a-modal
+      :closable="sh"
+      centered="true"
+      v-model:visible="learnBgMore"
+      :footer="null"
+      :width="650"
+      wrapClassName="learnBgMoreModal"
+      :z-index="9999"
+    >
+      <div class="main">
+        <div class="top">
+          <div class="topc">封面图</div>
+        </div>
+        <div class="imagesBox">
+          <!-- <div
+                  @click="() => (projectInfo.picUrl = src.value)"
+                  v-for="item in projectPic"
+                  :key="item.code"
+                  class="learnBgItem"
+            > -->
+          <div
+            @click="chooseImg2(item)"
+            v-for="item in projectPic"
+            :key="item.code"
+            class="learnBgItem"
+            :style="{
+              border:
+                projectInfo.picUrl === item.value
+                  ? '3px solid rgba(78, 166, 255, 1)'
+                  : '1px solid #ccc',
+              'background-image': 'url(' + item.value.split(',')[0] + ')',
+            }"
+          >
+            <!-- <img class="im" :src="item.source" /> -->
+          </div>
+        </div>
+        <div class="btn">
+          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, computed, onMounted } from "vue";
+import { reactive, toRefs, ref, onMounted } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import * as api from "../../api/index";
@@ -211,16 +366,26 @@ export default {
       currentPage1: 1, //项目经理
       pageSize1: 10, //项目经理
       projectInfo: {},
-			courseSyncFlag: false
+      courseSyncFlag: false,
+      learnBgMore: false,
+      projectPic: [],
+      loading: false,
     });
 
-		const projectPic = computed(() => store.state.projectPic.map((e) => ({
+    // const projectPic = computed(() =>
-			value: e.dictValue,
+    //   store.state.project_pic.map((e) => ({
-			label: e.dictName,
+    //     code: e.id,
-		})));
+    //     value: e.dictValue,
-
+    //     label: e.dictName,
+    //   }))
+    // );
 
     onMounted(() => {
+      state.projectPic = store.state.project_pic.map((e) => ({
+        code: e.id,
+        value: e.value,
+        label: e.name,
+      }));
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
     });
@@ -230,7 +395,8 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.projectId = routers.query.projectId;
       (state.projectInfo.projectId || state.projectInfo.parentId) &&
-				api.getProjectDetail({
+        api
+          .getProjectDetail({
             projectId: state.projectInfo.projectId,
           })
           .then((res) => {
@@ -251,7 +417,6 @@ export default {
       }, 400);
     };
 
-
     const errorMsgs = {
       name: "请输入项目名称",
       picUrl: "请选择项目封面图",
@@ -284,8 +449,10 @@ export default {
     }
 
     const createProject = async () => {
+      state.loading = true;
       console.log("我是否要编辑项目", isEdit.value);
       if (!validate(state.projectInfo, errorMsgs)) {
+        state.loading = false;
         return;
       }
       /**
@@ -294,32 +461,48 @@ export default {
 				message.warning('项目名称重复，请修改名称！');
 				return;
 			}*/
+      console.log("state.projectInfo", state.projectInfo);
       const offName = await validateName({
         name: state.projectInfo.name,
         type: 1,
-				id: state.projectInfo.projectId
+        id: state.projectInfo.id,
-			}).then(res => {
+      }).then((res) => {
         return res.data.data == 1;
       });
       if (offName) {
         message.destroy();
+        state.loading = false;
         return message.warning("项目名称重复，请重新填写");
       }
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
       api.createProject(state.projectInfo).then(() => {
+        state.loading = false;
         message.destroy();
-				message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
+        message.success(state.projectInfo.id ? "编辑成功" : "创建成功");
-				router.back()
+        router.back();
       });
     };
 
-		function managerChange(e, l, d, t,orgName) {
+    function managerChange(e, l, d, t, orgName) {
-			state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongId = d;
-			state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongName = t;
-      state.projectInfo.sourceBelongFullName = orgName
+      state.projectInfo.sourceBelongFullName = orgName;
     }
     const disabledDate = (current) => {
-			return current && current < dayjs().startOf('day');
+      return current && current < dayjs().startOf("day");
+    };
+
+    //显示更多路径背景弹窗
+    const showLearnBgMore = () => {
+      state.learnBgMore = true;
+    };
+    //关闭更多路径背景弹窗
+    const closeLearnBgMore = () => {
+      state.learnBgMore = false;
+    };
+    const chooseImg2 = (item) => {
+      console.log("itemmmmmmm", item);
+      state.projectInfo.picUrl = item.value;
     };
 
     return {
@@ -327,10 +510,12 @@ export default {
       disabledDate,
       managerChange,
       timeChange,
-			projectPic,
       createProject,
       isEdit,
       backPage,
+      showLearnBgMore,
+      closeLearnBgMore,
+      chooseImg2,
     };
   },
 };
@@ -632,5 +817,94 @@ export default {
     }
   }
 }
+.learnBgMoreModal {
+  .ant-modal {
+    width: 680px !important;
+    height: 528px !important;
+
+    .ant-modal-content {
+      width: 680px !important;
+      height: 528px !important;
+
+      .ant-modal-body {
+        width: 680px !important;
+        height: 528px !important;
+        padding: 0 !important;
+
+        .main {
+          display: flex;
+          flex-direction: column;
+
+          .top {
+            padding-left: 51px;
+            padding-right: 51px;
+            padding-top: 28px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            cursor: pointer;
+
+            .topc {
+              font-size: 16px;
+              font-weight: bold;
+              color: #000000;
+              line-height: 36px;
+            }
+          }
+
+          .imagesBox {
+            display: flex;
+            //  justify-content: space-between;
+            flex-wrap: wrap;
+            padding-left: 51px;
+            padding-right: 39px;
+            margin-top: 20px;
+            height: 350px;
+            overflow-y: auto;
+
+            .learnBgItem {
+              border-radius: 8px;
+              width: 136px;
+              height: 106px;
+              background-size: 100%;
+              background-repeat: no-repeat;
+              margin-bottom: 20px;
+              margin-right: 10px;
+            }
+          }
+
+          .btn {
+            width: 100%;
+            position: absolute;
+            bottom: 30px;
+            margin-top: 30px;
+            display: flex;
+            justify-content: center;
+
+            .samtn {
+              width: 100px;
+              height: 40px;
+              font-size: 14px;
+              border: 1px solid #4ea6ff;
+              border-radius: 8px;
+              cursor: pointer;
+            }
+
+            .btn1 {
+              background-color: #fff;
+              color: #4ea6ff;
+            }
+
+            .btn2 {
+              background-color: #4ea6ff;
+              color: #fff;
+              margin-left: 16px;
+            }
+          }
+        }
+      }
+    }
+  }
+}
 </style>
 

src/views/projectcenter/TaskAdd.vue

@@ -394,7 +394,7 @@
           <div class="header">
             <div class="icon"></div>
             <span>提示</span>
-            <div class="close_exit" @click="closeCancel"></div>
+            <!-- <div class="close_exit" @click="closeCancel"></div> -->
           </div>
           <div class="body">
             <span>您确定要删除所有阶段吗？</span>
@@ -699,7 +699,14 @@ const closeDelete = () => {
 };
 // 删除所有阶段
 const removeAllLevel = () => {
-
+  console.log(projectInfo.value.stageList)
+  projectInfo.value.stageList.forEach(t => {
+    if(t.id!=='0'){
+      t.checked = false;
+      t.deleted = true;
+    }
+  })
+  cancelModal.value = false;
 };
 //全选任务或全不选任务
 const selectRowAll = () => {
@@ -723,6 +730,7 @@ const closeDeAll = () => {
 //暂存
 const temporaryStorage = async () => {
   templateLoading.value = true
+  console.log(projectInfo.value)
   await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
   await getTask()
   message.success("暂存成功");

src/views/projectcenter/TaskPage.vue

@@ -641,7 +641,7 @@
                         <div class="more">
                           <span style="color: rgba(0, 0, 0, 0.45); cursor: pointer">. . .</span>
                           <div class="moreItems" v-if="checkPer(permissions)">
-                            <div class="sammo" @click="showModal2(item)">
+                            <div class="sammo" @click="showModal2(item,true)">
                               编辑
                             </div>
                             <div class="sammo" @click="deleteGroupBtn(item.id)">
@@ -1828,6 +1828,7 @@ export default {
       allDelete: false, //批量删除弹窗
       pubproject: false,
       stugroup: false,
+            isEdit: false,
       canclestu: false,
       canclestu1: false,
       deleteOneStu: false, //删除单个学员弹窗
@@ -2479,7 +2480,8 @@ export default {
       console.log("点击换组", record.studentId);
       state.checkgroupStuId = record.studentId;
     };
-    const showModal2 = (item) => {
+    const showModal2 = (item,isEdit) => {
+      state.isEdit = isEdit;
       state.stugroup = true;
       state.groupInfo = item || {};
     };
@@ -3320,12 +3322,18 @@ export default {
       console.log("state.groupPageList" + state.groupPageList)
       const d = state.groupPageList.filter(item => item.leaderId === state.groupInfo.leaderId);
       const id = state.groupInfo.id;
-      // 过滤掉编辑时候，只修改了组员最大值时候
+      if (state.isEdit) {
-      if(id !== d[0].id) {
+        if (d.length > 0 && d[0].id !== id ) {
+          return message.warn(d[0].leaderName + "已是小组长，请重新选择");
+        }
+      }else{
         if (d.length > 0 ) {
           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
       }
+      // 过滤掉编辑时候，只修改了组员最大值时候
+
+      state.isEdit = false;
       await editGroup({ ...state.groupInfo, projectId: state.projectId })
       message.success(id ? '小组编辑成功' : "小组创建成功");
       getGroup();

vue.config.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:38:38
+ * @LastEditTime: 2023-02-24 09:03:55
  * @FilePath: /fe-manage/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */