From 739ac56a49abf6ee47ee66bebab0b9fd4527ec5d Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 2 Apr 2024 11:37:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20x=E8=BD=B4=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/postTrendsMonth/assets/charts.js                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
index 28f57d2a..4ea30c4e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
@@ -49,7 +49,7 @@ let options = {
       },
     },
     axisLabel: {
-      interval: 0,
+      interval: 1,
       align: "center",
       rotate: "1",
       margin: "20",

From c17ac70da27142b6188bfa22a17170f96bf18dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= <lbp608@126.com>
Date: Tue, 2 Apr 2024 14:45:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=9C=AA=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8A=E6=AC=A1=E6=89=93=E5=BC=80=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ModifyDutyInformationTable.vue | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
index 332f538e..7b81d0e1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
@@ -61,7 +61,7 @@
     <template #footer>
       <Button
         :style="{ backgroundColor: '#0E708B' }"
-        @click.native="$emit('close')"
+        @click.native="closeWindow()"
       >
         取消</Button
       >
@@ -138,14 +138,7 @@ export default {
         return this.visible;
       },
       set(bool) {
-        //关闭弹窗组件,清空数据
-        if(!bool) {
-          this.dayShift = [];
-          this.graveyardShift = [];
-          this.peopleList = [];
-        }
-
-        this.$emit("close", bool);
+        this.closeWindow();
       },
     },
     getActive() {
@@ -157,6 +150,7 @@ export default {
     visible: {
       immediate: true,
       async handler(bool) {
+        this.clearData();
         if (!bool) return;
 
         this.dayShift = [...(this.data?.dayShift || [])];
@@ -235,11 +229,9 @@ export default {
           },
         })
           .then((result) => {
-            console.log("result.data:", result.data);
             this.dayShift = result.data.filter(
               (item) => item.scheduling === "1"
             );
-            console.log("this.dayShift11:", this.dayShift);
             this.graveyardShift = result.data.filter(
               (item) => item.scheduling === "2"
             );
@@ -386,7 +378,16 @@ export default {
         }
       }
     },
-  },
+    closeWindow(bool){
+      this.$emit("close", false);
+    },
+    clearData(){
+      //关闭弹窗组件,清空数据
+      this.dayShift = [];
+      this.graveyardShift = [];
+      this.peopleList = [];
+    }
+  }
 };
 </script>