Merge branch 'zcwy-zsx0223' into 'dev0223'

Zcwy zsx0223

See merge request !170

src/components/drawers/ViewAssess.vue

@@ -126,11 +126,11 @@
               </div>
             </div>
             <div class="lastbox">
-              <div class="sorcetext">非常不满意</div>
+              <div class="sorcetext">{{values?.minimumEvaluation || "非常不满意"}}</div>
               <div class="sorcebox" v-for="(iittem, index) in [1,2,3,4,5,6,7,8,9,10] " :key="index">
                 <div v-if="iittem >= values.assessmentMinScore && iittem <= values.assessmentMaxScore" :class="iittem == values.selectAnswer  ? 'numbox' : 'numbox1'">{{ iittem }}</div>
               </div>
-              <div class="sorcetext">非常满意</div>
+              <div class="sorcetext">{{values?.highestEvaluation || "非常满意"}}</div>
             </div>
           </div>
 

src/views/research/ResearchAdd.vue

@@ -96,10 +96,13 @@ const handleSave = () => {
         orderNumber: item.orderNumber,
         assessmentId: id,
       }));
-  request('/activitySubmit/editAssessmentScore post',listsss).then((res)=>{
-    console.log(res,'sss')
-    
-  })
+  // // 如果 assessmentId 有值调用
+  // if(id){
+  //   request('/activitySubmit/editAssessmentScore post',listsss).then((res)=>{
+  //     console.log(res,'sss')
+  //
+  //   })
+  // }
   editResearchMessage({
     id,
     assessmentName: data.value.assessmentName,
@@ -109,7 +112,11 @@ const handleSave = () => {
     assessmentScoringQuestionDtoList: data.value.scoringQuestionVoList
   }).then(() => {
     loading.value = false;
-    message.success("编辑成功");
+    if(id){
+      message.success("编辑成功");
+    }else{
+      message.success("创建成功");
+    }
     router.push({ path: "/researchmanage"});
   });
 };