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

src/components/drawers/AddTest.vue

@@ -212,7 +212,7 @@
             </div>
             <div class="btnbox">
               <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
-                placeholder="请输入数据来源" :maxlength="20" />
+                placeholder="请输入数据来源" :maxlength="120" />
             </div>
           </div>
           <div class="main_item2">

src/components/drawers/CheckVote.vue

@@ -27,7 +27,7 @@
                                     <div class="queabox" v-for="items,index in item.optionDetailList" :key="index">
                                         <a-radio
                                             v-model:checked="checked"
-                                            :value="items.optionId"
+                                            :value="items.id"
                                         >
                                             {{items.optionName}}
                                         </a-radio>
@@ -50,8 +50,7 @@
 import { toRefs,reactive } from '@vue/reactivity';
 import {computed} from "vue";
 import { useStore } from "vuex";
-// import * as api from "../../api/indexTaskManage";
-import {queryStemByStemId} from '@/api/indexVote';
+import * as api from "../../api/indexTaskManage";
 
 export default {
     name:"CheckWork",
@@ -127,19 +126,23 @@ export default {
         function getData() {
             console.log('我是请求的参数', {
                 "courseId": props.courseID,
-                "userInfo": userInfo.value,
-                "voteId": props.voteID
+                "studentId": userInfo.value.id,
+                "voteSubmitId": props.voteID
             })
-            queryStemByStemId(props.courseID).then(res=>{
+            api.QueryVoteTaskDetailById({
+                "courseId": props.courseID,
+                "studentId": userInfo.value.id,
+                "voteSubmitId": props.voteID
+            }).then(res=>{
                 console.log(res)
                 state.voteResource = res.data.data
+
                 let choiceArr = []
-                //2023-02-28
                 let dataQuestion = state.voteResource.voteStemDtoList
                 for(let i=0;i<dataQuestion.length;i++){
                     for(let j=0;j<dataQuestion[i].optionDetailList.length;j++){
                         if(dataQuestion[i].optionDetailList[j].isAnswer){
-                            choiceArr.push(dataQuestion[i].optionDetailList[j].optionId)
+                            choiceArr.push(dataQuestion[i].optionDetailList[j].id)
                             break
                         }
                         if(j==dataQuestion[i].optionDetailList.length - 1 && dataQuestion[i].optionDetailList[j].isAnswer == false){

src/components/drawers/CommonTest.vue

@@ -287,7 +287,7 @@
                   v-model:value="formData.source"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   placeholder="请输入数据来源"
-                  :maxlength="20"
+                  :maxlength="120"
               />
             </div>
           </div>

src/components/drawers/CreVote.vue

@@ -375,6 +375,7 @@ export default {
   background-color: #fafafa !important;
 }
 .crevoteDrawer {
+  z-index: 9999;
   .drawerMain {
     .header {
       height: 73px;

src/components/drawers/project/ProjectExamManage.vue

@@ -117,7 +117,7 @@
     <EScore v-model:eScorevisible="eScorevisible" />
   </a-drawer>
   <!-- 查看答卷抽屉 -->
-  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/>
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1"/>
 </template>
 
 <script>
@@ -321,7 +321,7 @@ export default {
                 {text.record.status === 1 || text.record.status === 9 ? 
                   <a onClick={()=>{
                     state.studentKid = text.record.studentKid;
-                    state.datasource = text.record;
+                    state.datasource1 = text.record;
                     state.CAvisible = true;
                   }}>查看答卷 </a> : 
                   <span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;">  查看答卷 </span>
@@ -334,7 +334,7 @@ export default {
       loadingData: true,
       studentKid: '',
       CAvisible: false,
-      datasource: ''
+      datasource1: ''
     });
 
     const closeDrawer = () => {

src/components/drawers/router/RouterExaminationManage.vue

@@ -79,7 +79,7 @@
     <EScore v-model:eScorevisible="eScorevisible" />
   </a-drawer>
   <!-- 查看答卷抽屉 -->
-  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource" />
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1" />
 </template>
 
 <script>
@@ -306,7 +306,7 @@ export default {
                     type="link"
                     onClick={() => {
                       state.studentKid = text.record.studentKid;
-                      state.datasource = text.record;
+                      state.datasource1 = text.record;
                       state.CAvisible = true;
                     }}>
                     查看答卷
@@ -321,7 +321,7 @@ export default {
                     disabled
                     onClick={() => {
                       state.studentKid = text.record.studentKid;
-                      state.datasource = text.record;
+                      state.datasource1 = text.record;
                       state.CAvisible = true;
                     }}>
                     查看答卷
@@ -336,7 +336,7 @@ export default {
       loadingData: true,
       studentKid: '',
       CAvisible: false,
-      datasource: ''
+      datasource1: ''
     });
 
     const closeDrawer = () => {

src/views/projectcenter/TaskPage.vue

@@ -366,12 +366,13 @@
                 :key="item.stageId"
                 @click="stageChange(item, index)"
               >
-                {{ item.name || "无阶段" }}
+                <div v-if="item.id === '0'">无阶段</div>
+                <div v-else>{{ "阶段" + (index + 1) }}</div>
               </div>
               <!-- <div class="stage1">阶段1</div>
                     <div class="stage2">阶段2</div> -->
             </div>
-            <div class="stagesecond">
+            <div class="stagesecond" v-if="choosedStageName">
               <div class="staname">阶段名称：</div>
               <div class="stamess">{{ choosedStageName }}</div>
             </div>
@@ -465,7 +466,7 @@
                 <button class="edit">
                   <img
                     class="editimg"
-                    src="../../assets/images/projectadd/edit.png"
+                    src="../../assets/images/projectadd/edit1.png"
                   />
                   <span class="editext">编辑</span>
                 </button>
@@ -2918,13 +2919,16 @@ export default {
           }
         }
         levelList.stageList = res.data.data.stageList;
-        if (levelList.stageList.length === 1) {
+        if (
+          levelList.stageList.length === 1 &&
+          levelList.stageList[0].id === "0"
+        ) {
           // 无解段任务
           state.rankjieduan = [{ value: 0, label: "无阶段" }];
           state.valuestu2 = 0;
         } else {
           // 有阶段任务
-          console.log(levelList.stageList);
+          console.log("有阶段任务", levelList.stageList);
           let arrStage = [];
           for (let i = 0; i < levelList.stageList.length; i++) {
             if (levelList.stageList[i].id !== "0") {
@@ -5962,12 +5966,13 @@ export default {
         position: absolute;
         right: 38px;
         top: 0;
-        color: #4ea6ff;
-        background: #ffffff;
+        color: #fff;
+        background: #4ea6ff;
         width: 100px;
         height: 40px;
         border: 1px solid #4ea6ff;
         border-radius: 8px;
+        cursor: pointer;
 
         .editimg {
           width: 15px;
@@ -5981,15 +5986,15 @@ export default {
         }
       }
 
-      .edit:hover {
-        color: #ffffff;
-        background-color: #4ea6ff;
-        cursor: pointer;
+      // .edit:hover {
+      //   color: #ffffff;
+      //   background-color: #4ea6ff;
+      //   cursor: pointer;
 
-        .editimg {
-          background-image: url("../../assets/images/projectadd/edit1.png");
-        }
-      }
+      //   .editimg {
+      //     background-image: url("../../assets/images/projectadd/edit1.png");
+      //   }
+      // }
     }
 
     .second {