From 003c3b0e00616366159a0d3ea72f876411c68fd8 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 23:25:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98-=E5=A4=9A=E9=80=89=E9=A2=98-?=
 =?UTF-8?q?=E9=97=AE=E7=AD=94=E9=A2=98-=E8=AF=84=E5=88=86=E6=8F=90?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E9=80=89=E9=A1=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchAdd.vue            | 133 +++++++++++-------
 .../research/components/ResearchAddItem.vue   |   2 +-
 .../research/components/ResearchAddMulti.vue  |  38 +++--
 .../research/components/ResearchAddSingle.vue |  42 ++++--
 4 files changed, 138 insertions(+), 77 deletions(-)

diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index f31cd393..fa0efaaf 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -22,25 +22,25 @@
       :key="index + new Date().getTime()"
     >
       <ResearchAddSingle
-        v-if="item.type === 1"
+        v-if="item.type === 1 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
       />
       <ResearchAddMulti
-        v-if="item.type === 2"
+        v-if="item.type === 2 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
       />
       <ResearchAddAsk
-        v-if="item.type === 3"
+        v-if="item.type === 3 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
       />
       <ResearchAddPin
-        v-if="item.type === 4"
+        v-if="item.type === 4 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
@@ -109,8 +109,8 @@ import {
   queryResearchDetailById,
   editResearchMessage,
   createResearch,
-  deleteChoiceQuestion,
-  deleteQuestionScAndQa,
+  // deleteChoiceQuestion,
+  // deleteQuestionScAndQa,
 } from "@/api/indexResearch";
 import {useRoute, useRouter} from "vue-router";
 import {message} from "ant-design-vue";
@@ -157,6 +157,7 @@ export default {
           ...res.scoringQuestionVoList,
         ];
         sortBy(renderArr, "orderNumber"); //序号
+        console.log(renderArr)
         state.allFormsData = parseData(renderArr, "questionType"); //类型
       }
     };
@@ -171,6 +172,7 @@ export default {
         if (key === 1) {
           let restList = traverseArr(item.assessmentSingleChoiceVoList, {
             ids:"id",
+            deleted:"deleted",
             inputVal: "singleOptionName",
             imgVal: "singleOptionPictureAddress",
             optionId: "singleOptionId",
@@ -190,6 +192,7 @@ export default {
         if (key === 2) {
           let restList = traverseArr(item.multipleChoiceVoList, {
             ids:"id",
+            deleted:"deleted",
             inputVal: "multipleOptionName",
             imgVal: "multipleOptionPictureAddress",
             optionId: "multipleOptionId",
@@ -209,6 +212,7 @@ export default {
         if (key === 3) {
           obj = {
             ids: item.id,
+            deleted:item.deleted,
             type: key,
             valueAsk: item.assessmentQaTitle,
             valueAskDesc: item.assessmentQaDescribe,
@@ -219,6 +223,7 @@ export default {
         if (key === 4) {
           obj = {
             ids: item.id,
+            deleted:item.deleted,
             type: key,
             valuePin: item.assessmentScTitle,
             minScore: item.assessmentMinScore,
@@ -244,6 +249,7 @@ export default {
         if (item[typeKey] === 1) {
           let restList = traverseArr(item.singleList, {
             id:"ids",
+            deleted:"deleted",
             singleOptionName: "inputVal",
             singleOptionPictureAddress: "imgVal",
             singleOptionId: "optionId",
@@ -268,6 +274,7 @@ export default {
         if (item[typeKey] === 2) {
           let restList = traverseArr(item.mutilList, {
             id:"ids",
+            deleted:"deleted",
             multipleOptionName: "inputVal",
             multipleOptionPictureAddress: "imgVal",
             multipleOptionId: "optionId",
@@ -292,6 +299,7 @@ export default {
         if (item[typeKey] === 3) {
           obj = {
             id:item.ids,
+            deleted:item.deleted,
             questionType: item[typeKey],
             assessmentQaTitle: item.valueAsk,
             assessmentQaDescribe: item.valueAskDesc,
@@ -302,6 +310,7 @@ export default {
         if (item[typeKey] === 4) {
           obj = {
             id:item.ids,
+            deleted:item.deleted,
             questionType: item[typeKey],
             assessmentScTitle: item.valuePin,
             assessmentMinScore: item.minScore,
@@ -425,67 +434,90 @@ export default {
     };
 
     const handleDel = ({ id, type, curItem }) => {
+      
       // 接口删除
+      // if (state.assessmentId && (curItem.orderNumber || curItem.optionId)) {
+      //   if (type === 1) {
+      //     deleteChoiceQuestion({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "1",
+      //       orderNumber: curItem.orderNumber,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      //   if (type === 2) {
+      //     deleteChoiceQuestion({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "2",
+      //       orderNumber: curItem.orderNumber,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      //   if (type === 3) {
+      //     deleteQuestionScAndQa({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "3",
+      //       optionId: curItem.optionId,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      //   if (type === 4) {
+      //     deleteQuestionScAndQa({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "4",
+      //       optionId: curItem.optionId,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      // } else {
+      //   virtualDel(id);
+      // }
       if (state.assessmentId && (curItem.orderNumber || curItem.optionId)) {
         if (type === 1) {
-          deleteChoiceQuestion({
-            assessmentId: state.assessmentId,
-            questionType: "1",
-            orderNumber: curItem.orderNumber,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
         if (type === 2) {
-          deleteChoiceQuestion({
-            assessmentId: state.assessmentId,
-            questionType: "2",
-            orderNumber: curItem.orderNumber,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
         if (type === 3) {
-          deleteQuestionScAndQa({
-            assessmentId: state.assessmentId,
-            questionType: "3",
-            optionId: curItem.optionId,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
         if (type === 4) {
-          deleteQuestionScAndQa({
-            assessmentId: state.assessmentId,
-            questionType: "4",
-            optionId: curItem.optionId,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
       } else {
         virtualDel(id);
       }
     };
     const virtualDel = (id) => {
+      // 前端删除
+      // state.allFormsData.forEach((item, index) => {
+      //   if (item.id === id) {
+      //     state.allFormsData.splice(index, 1);
+      //   }
+      // });
+      // state.allFormsData.map((item, index) => {
+      //   item.id = index + 1;
+      //   return item;
+      // });
       // 前端删除
       state.allFormsData.forEach((item, index) => {
         if (item.id === id) {
-          state.allFormsData.splice(index, 1);
+          state.allFormsData[index].deleted = true;
         }
       });
-      state.allFormsData.map((item, index) => {
-        item.id = index + 1;
-        return item;
-      });
     };
 
     // 处理id为空的字段
@@ -500,6 +532,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -513,6 +546,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -526,6 +560,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -539,6 +574,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -649,6 +685,9 @@ export default {
         }
         console.log("CountNum");
         console.log(CountNum);
+        if(CountNum>100){
+          CountNum = 100;
+        }
         if (CountNum !== 100) {
           message.error("当前权重设置是百分制 请重新配置");
           return false;
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index e685ab4c..6e7adbec 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -1,6 +1,6 @@
 <!-- 评估管理-创建评估页面 -->
 <template>
-  <div class="itemRow">
+  <div class="itemRow" v-if="!item.deleted">
     <div class="options">
       <div class="name">
         <div class="namebox">
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue
index f69d79da..70c2bfbe 100644
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -56,7 +56,7 @@
 <script>
 import { ref } from "vue";
 import ResearchAddItem from "./ResearchAddItem.vue";
-import { deleteChoiceQuestion } from "@/api/indexResearch";
+// import { deleteChoiceQuestion } from "@/api/indexResearch";
 
 export default {
   name: "ResearchAddMulti",
@@ -110,30 +110,40 @@ export default {
     };
     const delMutil = ({ id, optionId }) => {
       // 接口删除
+      // if (assessmentId.value && optionId) {
+      //   deleteChoiceQuestion({
+      //     assessmentId: assessmentId.value,
+      //     questionType: "2",
+      //     optionId,
+      //   }).then((res) => {
+      //     if (res.data.code === 200) {
+      //       virtualDel(id);
+      //     }
+      //   });
+      // } else {
+      //   virtualDel(id);
+      // }
       if (assessmentId.value && optionId) {
-        deleteChoiceQuestion({
-          assessmentId: assessmentId.value,
-          questionType: "2",
-          optionId,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            virtualDel(id);
-          }
-        });
+        virtualDel(id);
       } else {
         virtualDel(id);
       }
     };
     const virtualDel = (id) => {
       // 前端删除
+      // curItem.value.mutilList.forEach((item, index) => {
+      //   if (item.id === id) {
+      //     curItem.value.mutilList.splice(index, 1);
+      //   }
+      // });
+      // curItem.value.mutilList.map((item, index) => {
+      //   item.id = index + 1;
+      // });
       curItem.value.mutilList.forEach((item, index) => {
         if (item.id === id) {
-          curItem.value.mutilList.splice(index, 1);
+          curItem.value.mutilList[index].deleted = true;
         }
       });
-      curItem.value.mutilList.map((item, index) => {
-        item.id = index + 1;
-      });
     };
 
     return {
diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue
index ad1f27a0..ed39e78b 100644
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -56,7 +56,7 @@
 <script>
 import { ref } from "vue";
 import ResearchAddItem from "./ResearchAddItem.vue";
-import { deleteChoiceQuestion } from "@/api/indexResearch";
+// import { deleteChoiceQuestion } from "@/api/indexResearch";
 
 export default {
   name: "ResearchAddSingle",
@@ -104,32 +104,44 @@ export default {
         }
       });
     };
-    const del = ({ id, optionId }) => {
+    const del = ({ id, optionId}) => {
       // 接口删除
+      // if (assessmentId.value && optionId) {
+      //   deleteChoiceQuestion({
+      //     assessmentId: assessmentId.value,
+      //     questionType: "1",
+      //     optionId,
+      //   }).then((res) => {
+      //     if (res.data.code === 200) {
+      //       virtualDel(id);
+      //     }
+      //   });
+      // } else {
+      //   virtualDel(id);
+      // }
       if (assessmentId.value && optionId) {
-        deleteChoiceQuestion({
-          assessmentId: assessmentId.value,
-          questionType: "1",
-          optionId,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            virtualDel(id);
-          }
-        });
+        virtualDel(id);
       } else {
         virtualDel(id);
       }
     };
     const virtualDel = (id) => {
+      // 前端删除
+      // curItem.value.singleList.forEach((item, index) => {
+      //   if (item.id === id) {
+      //     curItem.value.singleList.splice(index, 1);
+      //   }
+      // });
+      // curItem.value.singleList.map((item, index) => {
+      //   item.id = index + 1;
+      // });
+
       // 前端删除
       curItem.value.singleList.forEach((item, index) => {
         if (item.id === id) {
-          curItem.value.singleList.splice(index, 1);
+          curItem.value.singleList[index].deleted = true;
         }
       });
-      curItem.value.singleList.map((item, index) => {
-        item.id = index + 1;
-      });
     };
 
     return {