feat:合并

package-lock.json

@@ -13,6 +13,7 @@
 				"ant-design-vue": "^3.2.12",
 				"axios": "^1.1.3",
 				"core-js": "^3.8.3",
+				"dayjs": "^1.11.6",
 				"element-plus": "^2.2.17",
 				"element-resize-detector": "^1.2.4",
 				"html2canvas": "^1.4.1",
@@ -4949,9 +4950,9 @@
 			}
 		},
 		"node_modules/dayjs": {
-			"version": "1.11.5",
+			"version": "1.11.6",
-			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
+			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
-			"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
+			"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
 		},
 		"node_modules/debug": {
 			"version": "4.3.4",
@@ -15686,9 +15687,9 @@
 			}
 		},
 		"dayjs": {
-			"version": "1.11.5",
+			"version": "1.11.6",
-			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
+			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
-			"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
+			"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
 		},
 		"debug": {
 			"version": "4.3.4",

src/components/drawers/ AssessmentList.vue

@@ -47,6 +47,7 @@
               expandRowByClick="true"
               @expand="expandTable"
               :pagination="false"
+              :row-key="(record) => record.assessmentId"
               :row-selection="{
                 selectedRowKeys: selectedRowKeys,
                 onChange: onSelectChange,
@@ -74,7 +75,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, watch } from "vue";
 import * as api from "../../api/indexInvist.js";
 import dayjs from "dayjs";
 export default {
@@ -97,9 +98,17 @@ export default {
     assessmentName: {
       type: String,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
+    watch(
+      props,
+      (newVal) => {
+        state.selectedRowKeys = [newVal.assessmentId];
+      },
+      { deep: true }
+    );
+
     const state = reactive({
       assessmentVisible: false,
       assessment: null,
@@ -116,7 +125,6 @@ export default {
       state.selectedRowKeys = [];
       ctx.emit("update:assessmentVisible", false);
       ctx.emit("update:titleTag", true);
-     
     };
     const afterVisibleChange = (bool) => {
       console.log("state getAllInvistText", bool, "======", props.titleTag);
@@ -162,7 +170,6 @@ export default {
     const rowSelection = {
       type: "radio",
       onSelect: (selectedRows) => {
-       
         state.assessment = selectedRows;
 
         /* state.assessmentId = selectedRows.assessmentId;
@@ -182,15 +189,13 @@ export default {
     const onSelectChange = (selectedRowKeys, selectRow) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow);
       state.selectedRowKeys = selectedRowKeys;
-      state.selectedRows = selectRow;
+      console.log(selectRow);
-      console.log(selectRow)
       state.assessment = selectRow[0];
       state.assessmentId = selectRow[0].assessmentId;
       ctx.emit("checkedAss", state.assessment);
       ctx.emit("update:assessmentId", state.assessmentId);
       ctx.emit("update:assessmentName", state.assessment.name);
 
-      state.selectedRowKeys = [];
       closeDrawer();
     };
 
@@ -251,7 +256,7 @@ export default {
       getAllInvistText,
       resetInvist,
       handelChangePage,
-      onSelectChange
+      onSelectChange,
     };
   },
 };

src/components/drawers/AddEval.vue

@@ -276,7 +276,7 @@ export default {
         evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD") : "",
         evaluationTypeId: state.evaluationTypeId,
         evaluationTypeName: state.evaluationTypeName,
-        evaluationFlag: state.description,
+        evaluationExplain: state.description,
         evaluationPictureAddress: "",
         evaluationTag: "",
         updateTime: "",

src/components/drawers/AddInvist.vue

@@ -83,6 +83,7 @@
                     <AssessmentList
                       v-model:assessmentVisible="assessmentVisible"
                       v-model:titleTag="titleTag"
+                      :assessmentId="assessmentId"
                       @checkedAss="getCheckedAss"
                     />
                   </div>
@@ -160,7 +161,7 @@ export default {
     projectTemplateId: {
       type: Number,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -178,6 +179,7 @@ export default {
       titleTag: false,
     });
     const getCheckedAss = (ass) => {
+      state.assessmentId = ass.assessmentId;
       state.assessment = ass;
       state.assessment1 = null;
     };
@@ -207,7 +209,7 @@ export default {
         api
           .queryAppraiseDetailById({ assessmentId: props.EditInvistId })
           .then((res) => {
-            console.log(res)
+            console.log(res);
             //更新讨论信息
             state.assessment1 = res.data.data;
           })

src/components/drawers/AddLive.vue

@@ -50,7 +50,6 @@
                 show-count
                 :maxlength="200"
                 :rows="6"
-                 
               />
             </div>
           </div>
@@ -111,8 +110,10 @@
               <span style="margin-right: 3px">授课老师：</span>
             </div>
             <div class="btnbox">
-              <ProjectManager v-model:value="memberValue.value"
+              <ProjectManager
-                              v-model:name="memberValue.label"></ProjectManager>
+                v-model:value="memberValue.value"
+                v-model:name="memberValue.label"
+              ></ProjectManager>
             </div>
           </div>
           <div class="mbl_items2">
@@ -196,19 +197,18 @@
                 v-model:checked="needEval"
                 @click="needEval = !needEval"
                 >需要评估
-              </a-checkbox
+              </a-checkbox>
-              >
             </div>
           </div>
           <div v-if="needEval" class="main_item">
             <div class="signbox"></div>
             <div class="btnbox">
               <button class="xkbtn" @click="showAssessment">选择评估</button>
-              <div v-if="(assessmentId > 0)">
+              <div v-if="assessmentId > 0">
                 <a-tag closable @close="removePG" color="processing">
-                  <span style="font-size: 14px; line-height: 33px"
+                  <span style="font-size: 14px; line-height: 33px">{{
-                  >{{assessmentName}}</span
+                    assessmentName
-                  >
+                  }}</span>
                 </a-tag>
               </div>
               <AssessmentList
@@ -303,7 +303,6 @@
             </div>
           </div>
 
-
           <div class="main_item">
             <div class="signbox">
               <span style="margin-right: 3px">其他设置：</span>
@@ -313,8 +312,7 @@
                 v-model:checked="switchC2"
                 @onclick="switchC2 = !switchC2"
                 >学员请假后记为任务完成
-              </a-checkbox
+              </a-checkbox>
-              >
             </div>
           </div>
         </div>
@@ -402,7 +400,6 @@ export default {
       type: Number,
       default: null,
     },
-    
   },
   setup(props, ctx) {
     // const router = useRouter();
@@ -494,13 +491,13 @@ export default {
       api
         .getLiveBroadcastInfor({ liveId: d })
         .then((res) => {
-            console.log("获取的数据",res)
+          console.log("获取的数据", res);
           state.inputV1 = res.data.data.liveName;
           state.time = [
             dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
             dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
           ];
-            console.log(state.time)
+          console.log(state.time);
 
           state.inputV2 = res.data.data.liveDuration;
           state.inputV3 = res.data.data.liveTeacherId;
@@ -515,10 +512,13 @@ export default {
           //state.= res.data.data
           state.assessmentId = res.data.data.assessmentId;
           state.imageUrl = res.data.data.liveCover;
-            state.switchC1 = res.data.data.livePlayback === '1' ? true : false;
+          state.switchC1 = res.data.data.livePlayback === "1" ? true : false;
           state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
-            state.needEval = res.data.data.isEvaluate == '1' ? true : false;
+          state.needEval = res.data.data.isEvaluate == "1" ? true : false;
-            state.memberValue = {value: res.data.data.liveTeacherId || '', label: res.data.data.liveTeacherName || ''};
+          state.memberValue = {
+            value: res.data.data.liveTeacherId || "",
+            label: res.data.data.liveTeacherName || "",
+          };
         })
         .catch(() => {
           //message.error(`查询失败`);
@@ -607,7 +607,6 @@ export default {
     };
     const showAssessment = () => {
       state.assessmentVisible = true;
-    
     };
     //创建直播
     const updateLiveBroadcast = () => {
@@ -648,7 +647,10 @@ export default {
       state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
-        assessmentId: state.assessmentId == null || state.assessmentId == "" ? 0 : Number(state.assessmentId),
+        assessmentId:
+          state.assessmentId == null || state.assessmentId == ""
+            ? 0
+            : Number(state.assessmentId),
         liveCover: state.imageUrl, //直播封面
         liveDuration: Number(state.inputV2),
         liveEndTime: endTime,
@@ -667,21 +669,20 @@ export default {
         standardSettings: state.radioV1, //1或2
         isEvaluate: state.needEval ? "1" : "0",
       };
-      console.log('我是要更新的数据',state.obj )
+      console.log("我是要更新的数据", state.obj);
 
       if (props.edit) {
         api
           .updateLiveBroadcastMessage(state.obj)
           .then(async (res) => {
-              console.log(res)
+            console.log(res);
             message.destroy();
             message.success("提交成功");
             closeDrawer();
             await updateTask(res);
-              
           })
           .catch((err) => {
-              console.log(err)
+            console.log(err);
           });
       } else {
         api
@@ -692,8 +693,7 @@ export default {
             await updateTask(res);
             closeDrawer();
           })
-            .catch(() => {
+          .catch(() => {});
-            });
       }
     };
     const beforeUpload = (file) => {
@@ -800,10 +800,10 @@ export default {
 
     // 删除评估
     const removePG = () => {
-      console.log("11111")
+      console.log("11111");
       state.assessmentId = "";
       state.isEvaluate = "0";
-    }
+    };
 
     return {
       ...toRefs(state),
@@ -821,7 +821,7 @@ export default {
       templateScroll,
       handleSearch,
       showAssessment,
-      removePG
+      removePG,
     };
   },
 };

src/components/drawers/NoticeHis.vue

@@ -117,7 +117,7 @@ export default {
     width: 74%;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 20px;
+    margin-bottom: 66px;
     .itemcontent {
       width: 500px;
       word-break: break-all;

src/components/project/ProjectManager.vue

@@ -69,7 +69,7 @@ export default {
 
     onMounted(() => {
       console.log("onMounted");
-      // init()
+      init()
     });
 
     function getMember() {
@@ -138,13 +138,13 @@ export default {
         } else {
           state.managerArray = [];
         }
-        getMemberData();
+        // getMemberData();
         return;
       }
       if (!props.value) {
         if (!(state.options && state.options.length)) {
           state.options = [];
-          getMember();
+          // getMember();
         }
         return;
       }

src/components/vote/AddVote.vue

@@ -129,13 +129,22 @@
                 action="/manageApi/vote/baseVoteupload"
                 v-model:file-list="fileList"
               > -->
-              <a-upload
+              <a-upload :before-upload="beforeUpload" :max-count="1">
-                :before-upload="beforeUpload"
-                :multiple="false"
-                :max-count="1"
-                v-model:file-list="fileList"
-              >
                 <button class="xkbtn">点击上传</button>
+                <template #itemRender="{ file, actions }">
+                  <a-space v-if="file.type.indexOf('sheet') > -1">
+                    <span :style="file.status === 'error' ? 'color: red' : ''">
+                      {{ file.name }}
+                    </span>
+                    <a href="javascript:;" @click="actions.remove">
+                      <img
+                        src="../../assets/del.png"
+                        alt="del"
+                        style="width: 12px; height: 12px"
+                      />
+                    </a>
+                  </a-space>
+                </template>
               </a-upload>
               <div v-if="voteCount > 0">
                 <a-tag color="processing">
@@ -144,6 +153,8 @@
                   </span>
                 </a-tag>
               </div>
+              <button class="xkbtn" @click="downloadTemplate">下载模板
+              </button>
             </div>
           </div>
           <div class="main_item" style="margin-top: -25px">
@@ -286,36 +297,22 @@ export default {
 
     // 限制文件格式上传
     const beforeUpload = (file) => {
-      console.log(file);
       if (file.type.indexOf("sheet") == -1) {
         message.destroy();
         message.error("请上传正确的文件格式");
 
-        console.log(state.fileList);
-
         state.fileList = [];
-        return;
+        return false;
       }
 
-      // let resFileList = [...info.fileList];
-
-      // resFileList.map((file) => {
-      //   if (file.response) {
-      //     // Component will show file.url as link
-      //     file.url = file.response.url;
-      //     console.log("file========", file);
-      //     console.log("file========", file.response);
-      //     state.voteCount = file.response.data;
-      //   }
-      // });
-
       const formData = new FormData();
       formData.append("uploadFile", file);
       baseVoteupload(formData).then((res) => {
         if (res.data.code === 200) {
-          console.log(res);
+          state.basevote = res.data.data;
         }
       });
+      return false;
     };
 
     //删除题干信息接口
@@ -470,8 +467,14 @@ export default {
       state.ballotId = null;
       console.log(e);
     };
+
+    function downloadTemplate() {
+      window.open('/manageApi/投票基础数据模版.xlsx')
+    }
+
     return {
       ...toRefs(state),
+      downloadTemplate,
       showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,

src/components/vote/CreateVote.vue

@@ -264,6 +264,7 @@ export default {
     };
 
     const handleDel = ({ id, curItem }) => {
+      if (state.allFormsData.length > 1) {
         // 接口删除
         if (curItem.voteStemId) {
           api.deleteVoteStem(curItem.voteStemId).then((res) => {
@@ -274,6 +275,7 @@ export default {
         } else {
           virtualDel(id);
         }
+      }
     };
     const virtualDel = (id) => {
       // 前端删除

src/views/courselibrary/CoursewareManage.vue

@@ -270,7 +270,7 @@
       :closable="false"
       wrapClassName="modalStyle facteachModal"
       width="80%"
-      @cancel="ft_exit"
+      @cancel="ft_exit_1"
     >
       <div class="modalHeader">
         <div class="headerLeft">
@@ -283,7 +283,7 @@
         </div>
         <div style="margin-right: 57px; cursor: pointer">
           <img
-            @click="ft_exit"
+            @click="ft_exit_1"
             style="width: 22px; height: 22px"
             src="../../assets/images/basicinfo/close22.png"
           />
@@ -672,7 +672,7 @@
                     :mode="mode"
                   />
                   <Editor
-                    style="height: 500px; overflow-y: hidden"
+                    style="height: 300px; overflow-y: hidden"
                     v-model="valueHtml"
                     :defaultConfig="editorConfig"
                     :mode="mode"
@@ -682,14 +682,14 @@
               </div>
             </div>
             <div class="m_btn">
-              <div class="btn btn5" @click="ft_exit">
+              <div class="btn btn5" @click="ft_exit_1">
                 <div class="btnText">取消</div>
               </div>
               <div class="btn btn6" v-if="isEdit == 0" @click="handlePush">
-                <div class="btnText">确定</div>
+                <div class="btnText">保存</div>
               </div>
               <div class="btn btn6" v-if="isEdit == 1">
-                <div class="btnText">已保存</div>
+                <div class="btnText">未提交</div>
               </div>
               <div class="btn btn6" @click="reviewClick">
                 <div class="btnText">提交审核</div>
@@ -3041,6 +3041,7 @@ import {
   watch,
 } from "vue";
 import { message } from "ant-design-vue";
+import { useRouter, useRoute } from "vue-router";
 // import StuAdd from "../../components/drawers/StuAdd";
 // import OwnPower from "../../components/drawers/OwnPower.vue";
 // import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
@@ -3836,16 +3837,16 @@ export default defineComponent({
     const valueHtml = ref("");
     // // 模拟 ajax 异步获取内容
     onMounted(() => {
-      // setTimeout(() => {
+      setTimeout(() => {
-      //   //     valueHtml.value = "<p>模拟 Ajax 异步设置内容</p>";
+        //     valueHtml.value = "<p>模拟 Ajax 异步设置内容</p>";
-      //   console.log("toolbar222222222222222");
+        console.log("toolbar222222222222222");
-      //   console.log(editorRef.value);
+        console.log(editorRef.value);
-      //   // const toolbar = DomEditor.getToolbar(editorRef.value);
+        // const toolbar = DomEditor.getToolbar(editorRef.value);
-      //   // const menu = editorRef.value.getAllMenuKeys();
+        // const menu = editorRef.value.getAllMenuKeys();
-      //   // const bar = toolbar.getConfig().toolbarKeys;
+        // const bar = toolbar.getConfig().toolbarKeys;
-      //   // console.log(menu);
+        // console.log(menu);
-      //   // console.log(bar);
+        // console.log(bar);
-      // }, 3500);
+      }, 3500);
     });
 
     const toolbarConfig = {
@@ -3865,17 +3866,41 @@ export default defineComponent({
         });
       },
     };
+    const handleCreated = (editor) => {
+      console.log("toolbar2222222222333333322222");
+      console.log(editorRef.value);
+      editorRef.value = editor; // 记录 editor 实例，重要！
+    };
     // 组件销毁时，也及时销毁编辑器
     onBeforeUnmount(() => {
       const editor = editorRef.value;
       if (editor == null) return;
       editor.destroy();
     });
-    const handleCreated = (editor) => {
+    watch(
-      editorRef.value = editor; // 记录 editor 实例，重要！
+      () => state,
-    };
+      (newVal) => {
+        console.log("newVal3333333333333333333");
+        console.log(newVal.ft_hs);
+        if (!newVal.ft_hs) {
+          console.log("newVal.ft_hs11111111111111");
+          // const editor = editorRef.value;
+          // if (editor == null) return;
+          // editor.destroy();
+          // router.go(0);
+        }
+      },
+      {
+        deep: true,
+      }
+    );
     //  富文本 eeeeeeeeeeeeee
 
+    const route = useRoute();
+    console.log(route);
+    const router = useRouter();
+    console.log(router);
+
     const beforeUpload = (file) => {
       return new Promise((resolve, reject) => {
         const isJpgOrPng =
@@ -4517,8 +4542,11 @@ export default defineComponent({
       }
       return count ? false : true;
     };
-    const ft_exit = () => {
+    const ft_exit_1 = () => {
       state.ft_hs = false;
+      router.go(0);
+    };
+    const ft_exit = () => {
       state.ft_eidt = false;
       state.hideshow = true;
 
@@ -4542,13 +4570,9 @@ export default defineComponent({
     const handlelookMs = () => {
       state.lookMs = false;
     };
+
     //保存面授课
     const handlePush = (param) => {
-      //state.isEdit = 1;
-
-      console.log("========", state.addLoading);
-      console.log("state.imgList");
-      console.log(state.imgList);
       let files = "";
       if (state.imgList.length) {
         state.imgList.forEach((item) => {
@@ -4556,7 +4580,7 @@ export default defineComponent({
         });
       }
       files = files.slice(0, files.length - 1);
-      console.log(files);
+      console.log("filesfiles", files);
       const postData = {
         offcourseId: state.offcourseId, //不传代表新增
         name: state.qdms_inputV1,
@@ -4594,9 +4618,10 @@ export default defineComponent({
       edit(postData).then((res) => {
         if (res.data.code === 200) {
           getTableDate();
-          ft_exit();
+          // ft_exit_1();
           rest();
           state.addLoading = false;
+          state.isEdit = 1;
           // console.log("res.data", res.data);
           if (param === "review") {
             //新建时点击审核按钮
@@ -5064,10 +5089,8 @@ export default defineComponent({
     };
     //获取教师
     const getTea = async () => {
-      console.log("获取授课教师信息33333333333");
       options4CurName.value = state.teacher;
       options4CurId.value = state.teacherId;
-
       const item1 = await getMemberInfoApi({
         pageNo: state.currentPageTea1,
         pageSize: state.pageSizeTea1,
@@ -5141,7 +5164,6 @@ export default defineComponent({
       state.teacherId = item.teacherId;
       state.qdms_inputV6 = item.intro;
       state.member = { value: item.teacherId, name: item.teacher };
-
       if (item.attach == "") {
         state.imgList = [];
       } else {
@@ -5411,6 +5433,8 @@ export default defineComponent({
     //提交审核
     const reviewClick = () => {
       console.log("ft_eidt", state.ft_eidt);
+      handlePush("review");
+      /*
       if (state.ft_eidt) {
         //编辑面授课
         submitReview();
@@ -5419,6 +5443,7 @@ export default defineComponent({
         //shouke
         handlePush("review");
       }
+      */
     };
     const submitReview = (id) => {
       state.addLoading = true;
@@ -5434,7 +5459,7 @@ export default defineComponent({
       handle(obj).then((res) => {
         console.log("提交审核成功", res.data);
         if (res.data.code === 200) {
-          ft_exit();
+          ft_exit_1();
           rest();
           getTableDate();
           state.addLoading = false;
@@ -5586,6 +5611,7 @@ export default defineComponent({
       bs_hShow,
       createft,
       ft_exit,
+      ft_exit_1,
       om_exit,
       ckxq_hs,
       ftsr_exit,

src/views/projectcenter/ProjectAdd.vue

@@ -68,36 +68,62 @@
             />
             <div class="inname">封面图</div>
           </div>
-          <div
+          <div class="in select" style="flex:1">
-            :class="`box ${projectInfo.picUrl == src ? 'active' : ''}`"
+            <a-select
-            style="
+                :getPopupContainer="
-              width: 100px;
+                        (triggerNode) => {
-              height: 100px;
+                          return triggerNode.parentNode || document.body;
-              border-radius: 5px;
-              cursor: pointer;
-              position: relative;
-              overflow: hidden;
-            "
-            v-for="(src, index) in projectPic"
-            :key="index"
-            @click="
-              () => {
-                projectInfo.picUrl = src;
                         }
                       "
-          >
+                v-model:value="projectInfo.picUrl"
+                dropdownClassName="dropdown-style"
+                style="width: 440px"
+                placeholder="请选择"
+                :options="projectPic"
+                allowClear
+            ></a-select>
             <img
-              style="
+                style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
-                width: 100px;
+                v-if="projectInfo.picUrl"
-                height: 100px;
+                :src="projectInfo.picUrl"
-                margin-bottom: 4px;
-                margin-right: 4px;
-              "
-              :src="src"
                 alt="avatar"
             />
+            <div class="i_bottom">
+                      <span style="color: #999ba3">
+                        高宽比为16:9 (如:800*450) png或jpg图片
+                      </span>
             </div>
           </div>
+<!--          <div-->
+<!--            :class="`box ${projectInfo.picUrl == src ? '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;-->
+<!--              }-->
+<!--            "-->
+<!--          >-->
+<!--            <img-->
+<!--              style="-->
+<!--                width: 100px;-->
+<!--                height: 100px;-->
+<!--                margin-bottom: 4px;-->
+<!--                margin-right: 4px;-->
+<!--              "-->
+<!--              :src="src"-->
+<!--              alt="avatar"-->
+<!--            />-->
+<!--          </div>-->
+        </div>
         <div class="name">
           <div class="namebox">
             <img
@@ -333,7 +359,7 @@ export default {
     });
 
     onMounted(() => {
-      state.projectPic = store.state.projectPic.map((e) => e.dictValue);
+      state.projectPic = store.state.projectPic.map((e) => ({value:e.dictValue,label:e.dictName}));
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();

src/views/projectcenter/ProjectManage.vue

@@ -901,6 +901,7 @@ export default {
       {value: 2, label: "审核通过"},
       {value: 3, label: "已发布"},
       {value: -2, label: "未通过"},
+      {value: -1, label: "已结束"}
     ]);
     const searchReset = () => {
       state.searchParam = {pageNo: 1, pageSize: 10};

src/views/projectcenter/TaskPage.vue

@@ -2511,6 +2511,12 @@ export default {
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
               let taskarr = res.data.data.stageList;
+              console.log('11-22-33',taskarr)
+              if(taskarr.length==1){
+                if(taskarr[0].stageId == '0'){
+                  taskarr[0].name = '无阶段任务'
+                }
+              }
               state.taskSyllabus = taskarr;
             }
           }