Merge branch 'develop'

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.0.2------------");
+		console.log("版本1.10------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

src/components/NavTop.vue

@@ -77,7 +77,7 @@ export default {
         {
           id: 1,
           name: "管理员",
-          go: "/learningpath",
+          go: "/manage/learningpath",
         },
         {
           id: 2,

src/components/drawers/AddFaceteach.vue

@@ -722,7 +722,7 @@ export default {
             console.log(e);
             state.isClick = false;
             message.destroy();
-            message.error(`添加失败`);
+            // message.error(`添加失败`);
           });
       }
     };
@@ -840,8 +840,9 @@ export default {
           }
         })
         .catch((err) => {
+          console.log(err)
           message.destroy();
-          message.error("获取员工失败" + err);
+          // message.error("获取员工失败" + err);
         });
     };
     const handleSearch = debounce((memberValue) => {

src/components/drawers/AddTest.vue

@@ -437,8 +437,8 @@ export default {
       ctx.emit("update:addtestVisible", false);
       ctx.emit("update:edit", false);
       ctx.emit("update:EditTestId", state.EditTestId);
-      ctx.emit("update:testName", state.testName);
-      console.log("statetestName", state.testName);
+      ctx.emit("update:testName", state.test.examinationName);
+      console.log("statetestName", state.test.examinationName);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
       state.addLoading = false;
@@ -687,7 +687,8 @@ export default {
       state.paperId = value.paperId;
       state.paperName = value.testName;
       state.id = value.id;
-      state.testName = value.testName;
+      //state.testName = value.testName;
+      console.log("value",value);
     };
 
     const range = (start, end) => {

src/components/drawers/SeeStu.vue

@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
   <a-drawer
     :visible="Seevisible"
@@ -47,6 +48,7 @@
               <span class="total">/{{ totalReqCnt }}</span>
             </div>
           </div>
+          <!--
           <a-divider
             type="vertical"
             style="
@@ -61,13 +63,11 @@
               <span class="nub1">{{ certCnt }}</span>
             </div>
           </div>
+       -->
         </div>
         <div class="secondrow">
           <div class="rowleft">{{ name }}</div>
-          <div class="rowbox" @click="showProMess">
-            <div class="shuom">说明</div>
-            <div><img src="../../assets/images/studentimg/chak.png" /></div>
-          </div>
+       
         </div>
         <div class="mainbox">
           <a-collapse v-model:activeKey="stageListActive">
@@ -86,12 +86,28 @@
               v-for="value in stageList"
               :key="value.stageId"
               :header="value.stageName"
+             
             > 
+            <template #extra >
+            <div @click.stop="">
+              <div class="rowbox">
+                <a-popover title="阶段说明">
+                <template #content>
+                  <p>{{value.remark}}</p>
+                </template>
+              <div class="shuom">说明</div>
+              </a-popover>
+              <div><img src="../../assets/images/studentimg/chak.png" /></div>
+            </div>
+           </div> 
+            </template>
+         
               <div 
                 class="rowclass"
                 v-for="(item, key) in value.taskProcessList"
                 :key="key"
               >
+            
                 <div class="leftclass">
                   <div>
                     <img
@@ -141,6 +157,7 @@
                   </div>
                   <div class="altext">{{ item.complete }}</div>
                 </div>
+               
               </div>
             </a-collapse-panel>
           </a-collapse>
@@ -293,14 +310,32 @@ export default {
     const setStageList = (tableData) => {
       let data = tableData;
       let array = [];
-      data.map((value) => {
+      //无阶段任务
+      if(data?.length ==1 && data[0].stageId ==0){
+        data.map((value) => {
         let obj = {
-          stageName: value.stageName,
-          stageId: value.stageId,
+          stageName:"无阶段任务",
+          stageId:0,
+          remark:value.remark,
           taskProcessList: taskProcessList(value.taskProcessList),
         };
         array.push(obj);
       });
+      }else{ //有阶段
+        data.map((value) => {
+        let obj = {
+          stageName: value.stageName,
+          stageId: value.stageId,
+          remark:value.remark,
+          taskProcessList: taskProcessList(value.taskProcessList),
+        };
+        if(value.stageId >0){
+          array.push(obj);
+        }
+       
+      });
+      }
+     
       state.stageList = array;
     };
     const check = () => {
@@ -433,6 +468,14 @@ export default {
           color: rgba(51, 51, 51, 1);
           font-size: 16px;
         }
+        
+      }
+      .mainbox {
+        // height: 463px;
+        margin-right: 37px;
+        margin-top: 32px;
+        //border: 1px solid rgba(221, 238, 255, 1);
+        //border-radius: 6px;
         .rowbox {
           width: 64px;
           height: 24px;
@@ -442,6 +485,7 @@ export default {
           margin-left: 24px;
           border: 1px solid rgba(64, 158, 255, 1);
           background: rgba(64, 158, 255, 0.1);
+          margin-right: 480px;
           cursor: pointer;
           .shuom {
             color: rgba(64, 158, 255, 1);
@@ -450,13 +494,6 @@ export default {
             margin-right: 5px;
           }
         }
-      }
-      .mainbox {
-        // height: 463px;
-        margin-right: 37px;
-        margin-top: 32px;
-        //border: 1px solid rgba(221, 238, 255, 1);
-        //border-radius: 6px;
         .ant-collapse {
           background-color: #ffffff;
           border: 0;

src/components/drawers/SelFacet.vue

@@ -420,7 +420,7 @@ export default {
 		const getClassData = (tabledata) => {
 			let data = tabledata;
 			let array = [];
-			let options = state.options2222;
+			// let options = state.options2222;
 			data.map((value) => {
 				let obj = {
 					key: value.offcourseId,
@@ -430,30 +430,31 @@ export default {
 					creator: value.createName || "-",
 					time: value.publishTime,
 					categoryId: value.categoryId,
-					category: "",
+					category: changeTreeSelectValue(String(value.categoryId)),
 					//需要判断content
 				};
 				console.log("obj", obj);
-				var breaked = false;
+				// var breaked = false;
+				// obj.category = changeTreeSelectValue(String(value.categoryId))
 
-				for (let i = 0; i < options.length; i++) {
-					for (let j = 0; j < options[i].children.length; j++) {
-						if (
-							String(options[i].children[j].value) ===
-							String(obj.categoryId)
-						) {
-							obj.category = changeTreeSelectValue(String(obj.categoryId))
-							// console.log("obj.categoryId", obj.categoryId);
-							// obj.category = options[i].children[j].title;
-							// console.log("obj. obj.category ", obj.category);
-							breaked = true;
-							break;
-						}
-					}
-					if (breaked) {
-						break;
-					}
-				}
+				// for (let i = 0; i < options.length; i++) {
+				// 	for (let j = 0; j < options[i].children.length; j++) {
+				// 		if (
+				// 			String(options[i].children[j].value) ===
+				// 			String(obj.categoryId)
+				// 		) {
+				// 			obj.category = changeTreeSelectValue(String(obj.categoryId))
+				// 			// console.log("obj.categoryId", obj.categoryId);
+				// 			// obj.category = options[i].children[j].title;
+				// 			// console.log("obj. obj.category ", obj.category);
+				// 			breaked = true;
+				// 			break;
+				// 		}
+				// 	}
+				// 	if (breaked) {
+				// 		break;
+				// 	}
+				// }
 				if (!obj.category) {
 					obj.category = "-";
 				}

src/components/student/TableStudent.vue

@@ -165,9 +165,10 @@ const tablecolumns = ref([
     title: "姓名",
     dataIndex: "studentName",
     key: "studentName",
-    width: "8%",
+    width: "12%",
     align: "left",
     className: "h",
+    ellipsis: true,
     customRender: ({record: {studentName, topFlag}}) => (topFlag ? <div
         style={{
           display: "flex",
@@ -188,7 +189,7 @@ const tablecolumns = ref([
     title: "工号",
     dataIndex: "studentUserNo",
     key: "studentUserNo",
-    width: "20%",
+    width: "15%",
     align: "center",
     className: "h",
     ellipsis: true,

src/views/courselibrary/components/seeModal.vue

@@ -111,6 +111,9 @@
 							</div>
 							<div class="mbl_items2" v-if="detail.intro">
 								<div class="item_nam">
+									<div class="asterisk_icon">
+										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
+									</div>
 									<span style="margin-right: 14px">课程简介：</span>
 								</div>
 								<div class="item_inp">

src/views/courselibrary/courseModal.vue

@@ -283,7 +283,7 @@
 						<div class="fotnam">
 							<span>课程大纲</span>
 						</div>
-						<div class="fotarea">
+						<div v-if="ft_hs" class="fotarea">
 							<div style="border: 1px solid #ccc">
 								<Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig"
 									:mode="mode" />

src/views/examine/CourseReviewed.vue

@@ -217,7 +217,7 @@ export default {
 					width: "10%",
 					ellipsis: true,
 					customRender: (time) => {
-						return <div style="color:#387DF7">{time.record.time}</div>;
+						return <div>{time.record.time}</div>;
 					},
 				},
 				{

src/views/learningpath/LevelAddDetail.vue

@@ -1490,7 +1490,8 @@ export default {
           state.deleteModal = false;
         })
         .catch((err) => {
-          message.error(err);
+          console.log(err)
+          // message.error(err);
         });
     };
 
@@ -1697,6 +1698,7 @@ export default {
       deleteStudyTask({ routerTaskIds: state.deleteID })
         .then((res) => {
           state.deleteModal = false;
+          message.destroy();
           message.success("删除成功");
           state.selectRow = []; //选择行
           state.selectAll = 0; //0：未选择，1：全选，2：部分选择
@@ -1704,6 +1706,7 @@ export default {
           console.log("删除成功", res);
         })
         .catch((err) => {
+          message.destroy();
           message.error("删除失败");
           console.log(err);
         });