Merge branch 'dev0223' into zcwy-0306

src/components/NavLeft.vue

@@ -1090,6 +1090,10 @@ export default {
           console.log("监听路由", n, store.state.openpages, state.keysList);
           // console.log("new:" + n.toLowerCase() + ",old:" + o);
           let arr = state.keysList;
+          if(!arr.some(page => page.href === n)){
+            console.log('不存在',n)
+            return
+          }
           arr.map((value) => {
             if (n.toLowerCase() === value.href) {
               localStorage.setItem("openKeys", JSON.stringify([value.openKeys]));

src/components/drawers/router/RouterEvaluationManage.vue

@@ -429,6 +429,9 @@ 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.routerTaskId}&taskType=${props.datasource.type}`)
+      if(!props.datasource.routerTaskId){
+        props.datasource.routerTaskId = ''
+      }
       window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&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}`)
     }

src/views/learningpath/LevelAdd.vue

@@ -2299,7 +2299,7 @@ export default {
 
       state.addLoading = true;
       getOverview();
-      // myGetRouterDetail();
+      myGetRouterDetail();
       reget();
     });
     const closePub = () => {

src/views/projectcenter/TaskPage.vue

@@ -2475,7 +2475,7 @@ export default {
         if(qrCodeItems.value.length==1){
           qrCode({
             title: "【签到】二维码",
-            courseName: state.name+'项目',
+            courseName: state.name,
             name: qrCodeItems.value[0].name+'课程签到',
             createName:qrCodeItems.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItems.value[0].teacher,
             url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${qrCodeItems.value[0].id}&taskType=${2}&type=${3}&openCourseId=${qrCodeItems.value[0].id}`,
@@ -2493,7 +2493,7 @@ export default {
       const offteachers = qrCodeItems.value[key].offteachers.map(teacher => teacher.teacherName).join(', ');
       qrCode({
         title: "【签到】二维码",
-        courseName: state.name+'项目',
+        courseName: state.name,
         name: name+'课程签到',
         createName:offteachers||teacher,
         url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${id}&taskType=${2}&type=${3}&openCourseId=${id}`,
@@ -2518,7 +2518,7 @@ export default {
         }));
           qrCodeItemspg.value = qrCodeItemspgItem.filter(item => item.assessmentId !== null);
           if(qrCodeItemspg.value.length==1){
-            const courseName = state.name+'项目'
+            const courseName = state.name
             qrCode({
               title: "【评估】二维码",
               courseName,
@@ -2535,7 +2535,7 @@ export default {
       const teacher = qrCodeItemspg.value[key].teacher;
       const id = qrCodeItemspg.value[key].id;
       const assessmentId = qrCodeItemspg.value[key].assessmentId;
-      const courseName = state.name+'项目'
+      const courseName = state.name
       qrCode({
           title: "【评估】二维码",
           courseName,

src/views/research/ResearchAdd.vue

@@ -90,6 +90,16 @@ const handleSave = () => {
     loading.value = false;
     return false;
   }
+   const listsss = data.value.scoringQuestionVoList.map((item) => ({
+        minimumEvaluation: item.minimumEvaluation || '非常满意',
+        highestEvaluation: item.highestEvaluation || '非常不满意',
+        orderNumber: item.orderNumber,
+        assessmentId: id,
+      }));
+  request('/activitySubmit/editAssessmentScore post',listsss).then((res)=>{
+    console.log(res,'sss')
+    
+  })
   editResearchMessage({
     id,
     assessmentName: data.value.assessmentName,
@@ -175,6 +185,8 @@ function addScoringQuestionItem() {
     questionType: 4,
     assessmentScTitle: "",
     assessmentMaxScore: 10,
+    minimumEvaluation: '非常满意',
+    highestEvaluation: '非常不满意',
     assessmentMinScore: 1,
     weightScale: 100,
     orderNumber: orderList.value?.length + 1,

src/views/research/components/ResearchAddPin.vue

@@ -52,7 +52,11 @@
       </div>
     </div>
     <div class="scorebox">
-      <div class="scoretext">非常满意</div>
+      <div class="scoretext">
+        <a-input
+          v-model:value="item.minimumEvaluation"
+        />
+      </div>
       <div class="number">
         <div
           style="margin-left: 10px"
@@ -63,7 +67,11 @@
           {{ value.text }}
         </div>
       </div>
-      <div class="scoretext">非常不满意</div>
+      <div class="scoretext">
+        <a-input
+        v-model:value="item.highestEvaluation"
+        />
+      </div>
     </div>
     <div class="name" style="margin-bottom: 20px">
       <div class="namebox">