Merge branch 'develop'

# Conflicts:
#	src/App.vue

src/api/indexProjStu.js

@@ -26,6 +26,7 @@ export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
 export const removeGroupStudent = (obj) => http.post('/admin/project/removeGroupStudent', obj)
 //查看学员
 export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
+export const studentRank = (obj) => http.get('/admin/project/studentRank', { params: obj })
 
 //是否优秀学员
 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)

src/api/indexTask.js

@@ -2,7 +2,7 @@ import http from "./config";
 
 
 // 获取路径图详情-包含关卡及任务列表
-export const GetRouterDetail = (routerId) => http.get(`/admin/router/detail?routerId=${routerId}`)
+export const GetRouterDetail = (routerId,useTask="") => http.get(`/admin/router/detail?routerId=${routerId}&useTask=${useTask}`)
 
 // 新建或编辑阶段任务
 export const ProjectEditTask = (obj) => http.post('/admin/project/editTask',obj)

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);
+      ctx.emit("update:testName", state.test.examinationName);
-      console.log("statetestName", state.testName);
+      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/EvList.vue

@@ -1,20 +1,11 @@
 <template>
-  <a-drawer
+	<a-drawer :visible="EvalListVisible" class="drawerStyle addonlineDrawer" width="80%" title="选择测评" placement="right"
-    :visible="EvalListVisible"
+		@after-visible-change="afterVisibleChange">
-    class="drawerStyle addonlineDrawer"
-    width="80%"
-    title="选择测评"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
 		<div class="drawerMain">
 			<div class="header">
 				<div class="headerTitle">选择测评</div>
-        <img
+				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+					@click="closeDrawer" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
 			</div>
 			<div class="contentMain">
 				<div class="main_items">
@@ -22,11 +13,8 @@
 						<div class="mii_ipt">
 							<div class="ipt_name"></div>
 							<div class="fi_input">
-                <a-input
+								<a-input v-model:value="inputV1" style="width: 424px; height: 40px; border-radius: 8px"
-                  v-model:value="inputV1"
+									placeholder="请输入项目名称" />
-                  style="width: 424px; height: 40px; border-radius: 8px"
-                  placeholder="请输入项目名称"
-                />
 							</div>
 						</div>
 					</div>
@@ -42,31 +30,17 @@
 					</div>
 				</div>
 				<div class="main_table">
-          <a-table
+					<a-table style="border: 1px solid #f2f6fe" :columns="columns" :data-source="tableData"
-            style="border: 1px solid #f2f6fe"
+						:loading="tableDataTotal === -1 ? true : false" :pagination="false" :row-selection="{
-            :columns="columns"
-            :data-source="tableData"
-            :loading="tableDataTotal === -1 ? true : false"
-            :pagination="false"
-            :row-selection="{
 	type: 'radio',
 	selectedRowKeys: selectedRowKeys,
 	onChange: onSelectChange,
-            }"
+}" />
-          />
 					<div class="tableBox" style="margin-top: 85px">
 						<div class="pa">
-              <a-pagination
+							<a-pagination v-if="tableDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
-                v-if="tableDataTotal > 10"
+								hideOnSinglePage="true" :pageSize="pageSize" :current="currentPage" :total="tableDataTotal"
-                :showSizeChanger="false"
+								class="pagination" @change="changePagination" />
-                showQuickJumper="true"
-                hideOnSinglePage="true"
-                :pageSize="pageSize"
-                :current="currentPage"
-                :total="tableDataTotal"
-                class="pagination"
-                @change="changePagination"
-              />
 						</div>
 					</div>
 				</div>
@@ -196,9 +170,9 @@ export default {
 						quiz_code: value.quiz_code,
 						quiz_kid: value.quiz_kid,
 						title: value.title,
-            theme_desc: value.theme_desc,
+						theme_desc: value.notes,
 						quiz_price: value.quiz_price,
-            quiz_range: value.quiz_range,
+						quiz_range: value.limit_number,
 						quiz_type: value.quiz_type,
 					};
 					array.push(obj);
@@ -216,9 +190,9 @@ export default {
 						quiz_code: value.quiz_code,
 						quiz_kid: value.quiz_kid,
 						title: value.title,
-            theme_desc: value.theme_desc,
+						theme_desc: value.notes,
 						quiz_price: value.quiz_price,
-            quiz_range: value.quiz_range,
+						quiz_range: value.limit_number,
 						quiz_type: value.quiz_type,
 					};
 					array.push(obj);
@@ -236,7 +210,7 @@ export default {
 				.choiceEvaluation(objael)
 				.then((res) => {
 					state.tableDataTotal = 9;
-          // console.log("测评列表", res.data.data);
+					console.log("测评列表", res.data.data);
 					getTableDataList(res.data.data);
 				})
 				.catch(() => { });
@@ -275,6 +249,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
 	background-color: #fafafa !important;
 }
+
 .addonlineDrawer {
 	.drawerMain {
 		.header {
@@ -284,6 +259,7 @@ export default {
 			justify-content: space-between;
 			align-items: center;
 			flex-shrink: 0;
+
 			.headerTitle {
 				font-size: 18px;
 				font-weight: 600;
@@ -292,29 +268,36 @@ export default {
 				margin-left: 24px;
 			}
 		}
+
 		.contentMain {
 			padding-right: 12px;
+
 			.main_items {
 				display: flex;
 
 				margin-bottom: 12px;
 				flex-wrap: wrap;
+
 				.mi_ipts {
 					display: flex;
 					margin-bottom: 20px;
+
 					.mii_ipt {
 						display: flex;
 						align-items: center;
 						margin-right: 24px;
+
 						.ipt_name {
 							white-space: nowrap;
 						}
 					}
 				}
+
 				.mi_btns {
 					display: flex;
 
 					cursor: pointer;
+
 					.btn {
 						padding: 0px 26px 0px 26px;
 						height: 38px;
@@ -325,9 +308,11 @@ export default {
 						justify-content: center;
 						margin-left: 14px;
 						flex-shrink: 0;
+
 						.search {
 							background-size: 100%;
 						}
+
 						.btnText {
 							font-size: 14px;
 							font-weight: 400;
@@ -335,48 +320,61 @@ export default {
 							margin-left: 5px;
 						}
 					}
+
 					.btn1 {
 						background: rgb(64, 158, 255);
+
 						.search {
 							width: 15px;
 							height: 17px;
 							background-image: url("@/assets/images/coursewareManage/search0.png");
 						}
+
 						.btnText {
 							color: rgb(255, 255, 255);
 						}
 					}
+
 					.btn2 {
 						background: rgb(255, 255, 255);
+
 						.search {
 							width: 15px;
 							height: 17px;
 							background-image: url("@/assets/images/coursewareManage/reset1.png");
 						}
+
 						.btnText {
 							color: rgb(64, 158, 255);
 						}
 					}
+
 					.btn1:hover {
 						background: rgb(255, 255, 255);
+
 						.search {
 							background-image: url("@/assets/images/courseManage/search1.png");
 						}
+
 						.btnText {
 							color: #4ea6ff;
 						}
 					}
+
 					.btn2:hover {
 						background: rgba(64, 158, 255, 1);
+
 						.search {
 							background-image: url("@/assets/images/courseManage/reset0.png");
 						}
+
 						.btnText {
 							color: #ffffff;
 						}
 					}
 				}
 			}
+
 			.main_notice {
 				display: flex;
 				justify-content: space-between;
@@ -384,9 +382,11 @@ export default {
 				margin-bottom: 32px;
 				height: 40px;
 				background-color: #e9f6fe;
+
 				.mntc_left {
 					display: flex;
 					align-items: center;
+
 					.notice_icon {
 						width: 14px;
 						height: 14px;
@@ -396,37 +396,43 @@ export default {
 						background-size: 100% 100%;
 					}
 				}
+
 				.mntc_right {
 					cursor: pointer;
 				}
 			}
+
 			.main_table {
 				position: relative;
 				padding-bottom: 80px;
+
 				.classify {
 					margin-left: 10px !important;
 					padding-left: 9px !important;
 				}
+
 				.ant-checkbox-wrapper {
 					align-items: center;
 					margin-top: -2px;
 				}
+
 				.ant-table-selection-column {
 					padding: 0px !important;
 					padding-left: 5px !important;
 				}
+
 				.ant-table-thead>tr>th {
 					background-color: rgba(239, 244, 252, 1);
 				}
+
 				th.h {
 					background-color: #eff4fc !important;
 				}
 
-        .ant-table-tbody
+				.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
 					background: #f6f9fd;
 				}
+
 				.pa {
 					left: 0;
 					width: 100%;
@@ -447,6 +453,7 @@ export default {
 			align-items: center;
 			justify-content: center;
 			box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
 			.btn1 {
 				width: 100px;
 				height: 40px;
@@ -456,6 +463,7 @@ export default {
 				background-color: #fff;
 				cursor: pointer;
 			}
+
 			.btn2 {
 				cursor: pointer;
 				width: 100px;

src/components/drawers/SeeStu.vue

@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
   <a-drawer
     :visible="Seevisible"
@@ -28,8 +29,8 @@
           <div class="sortbox">
             <div class="sortname">进度排名</div>
             <div class="sortnub">
-              <span class="nub1">2</span>
+              <span class="nub1">{{rank.current}}</span>
-              <span class="total">/10</span>
+              <span class="total">/{{rank.total}}</span>
             </div>
           </div>
           <a-divider
@@ -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>
@@ -157,7 +174,7 @@
 <script>
 import { reactive, toRefs } from "vue";
 import ProMess from "./ProMess.vue";
-import { studentProcess } from "../../api/indexProjStu";
+import {studentProcess, studentRank} from "../../api/indexProjStu";
 export default {
   name: "SeeStu",
   components: { ProMess },
@@ -188,6 +205,7 @@ export default {
       Provisible: false,
       showDown: true,
       showDown1: false,
+      rank:{total:1,current:1},
       stageList: [
         // {
         //   stageName: "阶段1腾飞班阶段1",
@@ -227,6 +245,15 @@ export default {
       ctx.emit("update:Seevisible", false);
     };
 
+    const getStuRank = () => {
+      studentRank({
+        projectId: props.projectId,
+        studentId: props.checkStuId,
+      }).then(res=>{
+        state.rank = res.data.data
+      })
+    }
+
     const showProMess = () => {
       state.Provisible = true;
     };
@@ -234,6 +261,7 @@ export default {
       console.log("state", bool);
       if (bool == true) {
         check();
+        getStuRank()
       }
     };
     const changeDown = () => {
@@ -293,14 +321,32 @@ export default {
     const setStageList = (tableData) => {
       let data = tableData;
       let array = [];
+      //无阶段任务
+      if(data?.length ==1 && data[0].stageId ==0){
         data.map((value) => {
         let obj = {
-          stageName: value.stageName,
+          stageName:"无阶段任务",
-          stageId: value.stageId,
+          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 +479,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 +496,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 +505,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 i = 0; i < options.length; i++) {
-					for (let j = 0; j < options[i].children.length; j++) {
+				// 	for (let j = 0; j < options[i].children.length; j++) {
-						if (
+				// 		if (
-							String(options[i].children[j].value) ===
+				// 			String(options[i].children[j].value) ===
-							String(obj.categoryId)
+				// 			String(obj.categoryId)
-						) {
+				// 		) {
-							obj.category = changeTreeSelectValue(String(obj.categoryId))
+				// 			obj.category = changeTreeSelectValue(String(obj.categoryId))
-							// console.log("obj.categoryId", obj.categoryId);
+				// 			// console.log("obj.categoryId", obj.categoryId);
-							// obj.category = options[i].children[j].title;
+				// 			// obj.category = options[i].children[j].title;
-							// console.log("obj. obj.category ", obj.category);
+				// 			// console.log("obj. obj.category ", obj.category);
-							breaked = true;
+				// 			breaked = true;
-							break;
+				// 			break;
-						}
+				// 		}
-					}
+				// 	}
-					if (breaked) {
+				// 	if (breaked) {
-						break;
+				// 		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/LevelAdd.vue

@@ -1796,7 +1796,7 @@ export default {
         });
     };
     const reget = () => {
-      GetRouterDetail(state.routerId).then((res) => {
+      GetRouterDetail(state.routerId,"N").then((res) => {
         // console.log("获取路径图详情", res);
         state.styTitle = res.data.data.routerInfo.name;
         state.cretime = res.data.data.routerInfo.createTime;
@@ -1868,6 +1868,7 @@ export default {
 
     // 获取路径列表
     const myGetRouterDetail = () => {
+      console.log('执行-------myGetRouterDetail')
       GetRouterDetail(state.routerId)
         .then((res) => {
           console.log("router-list", res);

src/views/learningpath/LevelAddDetail.vue

@@ -1460,7 +1460,7 @@ export default {
       getDetail();
     };
     const getDetail = () => {
-      GetRouterDetail(state.routerId)
+      GetRouterDetail(state.routerId,"N")
         .then((res) => {
           //给level赋初始值
           state.level = res.data.data.chapterList;
@@ -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);
         });