Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue

@@ -31,7 +31,7 @@
               <p
                 v-for="(item, index) in dayShift"
                 :key="`${item.id}_${index}`"
-                @click="removeDutyPerson(item)"
+                @click="removeDutyPerson(item,'dayShift')"
               >
                 {{ item.name }}
               </p>
@@ -45,7 +45,7 @@
               <p
                 v-for="(item, index) in graveyardShift"
                 :key="`${index}_${item.id}`"
-                @click="removeDutyPerson(item)"
+                @click="removeDutyPerson(item,'graveyardShift')"
               >
                 {{ item.name }}
               </p>
@@ -137,6 +137,13 @@ export default {
         return this.visible;
       },
       set(bool) {
+        //关闭弹窗组件,清空数据
+        if(!bool) {
+          this.dayShift = [];
+          this.graveyardShift = [];
+          this.peopleList = [];
+        }
+
         this.$emit("close", bool);
       },
     },
@@ -175,7 +182,9 @@ export default {
 
       this[this.active].push(item);
     },
-    removeDutyPerson(item) {
+    removeDutyPerson(item, activeCheck) {
+      if(activeCheck != this.active) return;
+
       const index = this[this.active].findIndex(
         (_item) => _item.id === item.id
       );
@@ -273,7 +282,7 @@ export default {
       // console.log("%c [ data ]-202-「ModifyDutyInformationTable.vue」", "font-size:15px; background:#9afce6; color:#deffff;", data, this.value2);
 
       const closeMessage = loadingMessage({
-        message: "正在保存值班信息111...",
+        message: "正在保存值班信息...",
       });
 
       if (!this.data) {