From 17c352ebfa234e1dd5092d22bf0f1288bedeef70 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Sun, 7 Apr 2024 15:04:53 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/MonthlyEquipment/index.js    |  9 +++
 .../components/deviceSummary/index.vue        | 30 ++++----
 .../statisticalAnalysis/index.vue             | 73 ++++++++++++-------
 .../components/flowstate/assets/charts.js     |  2 +-
 4 files changed, 70 insertions(+), 44 deletions(-)

diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js
index 9921dfbb..f1a14095 100644
--- a/ruoyi-ui/src/api/MonthlyEquipment/index.js
+++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js
@@ -53,3 +53,12 @@ export function getSystemStatusExport(query) {
     }
   );
 }
+
+// 拖拽排序
+
+export function getStatusRule(rule) {
+  return request({
+    url: "/system/status/rule?rule=" + rule,
+    method: "get",
+  });
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
index 64f65685..b33ed278 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
@@ -113,6 +113,7 @@
 
 <script>
 import draggable from "vuedraggable";
+import { getStatusRule } from "@/api/MonthlyEquipment";
 export default {
   name: "",
   components: { draggable },
@@ -125,27 +126,22 @@ export default {
   data() {
     return {};
   },
+  inject: ["initDataList"],
   watch: {},
   created() {},
   methods: {
-    ____onDragend(event) {
-      console.log("____onDragend", event);
-      let oldIndex = event.oldIndex; //移动初始位置
-      let newIndex = event.newIndex; //运动终止位置
-      let diff = Math.abs(newIndex - oldIndex); //插值绝对值
-      let index = this.dataList[oldIndex];
-      if (eval(oldIndex) > eval(newIndex)) {
-        for (let i = 0; i < diff; i++) {
-          this.dataList[oldIndex - i] = this.dataList[oldIndex - i - 1];
-        }
-        this.dataList[newIndex] = index;
-      } else {
-        for (let i = 0; i < diff; i++) {
-          this.dataList[oldIndex + i] = this.dataList[oldIndex + i + 1];
-        }
-        this.dataList[newIndex] = index;
-      }
+    ____onDragend() {
       console.log(789, this.dataList);
+      let data = [];
+      this.dataList.forEach((item, index) => {
+        data.push(item.title);
+      });
+      getStatusRule(data).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          this.initDataList();
+        }
+      });
     },
   },
   mounted() {},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 3c30c3c0..10c4a6f9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -125,7 +125,7 @@ import {
   getSystemStatusTabList,
   getSystemStatusType,
   getSystemStatusExport,
-} from "../../../../../api/MonthlyEquipment";
+} from "@/api/MonthlyEquipment";
 // import { download } from "../../../../../utils/request.js";
 import Pagination from "@screen/components/Pagination.vue";
 import InputSearch from "@screen/components/InputSearch/index.vue";
@@ -180,11 +180,16 @@ export default {
       interval: null,
     };
   },
+  provide() {
+    return {
+      initDataList: this.initDevice,
+    };
+  },
   destroyed() {
     clearInterval(this.interval);
   },
   methods: {
-    handleSizeChange(size){
+    handleSizeChange(size) {
       this.pageSize = size;
       this.initData();
     },
@@ -295,28 +300,35 @@ export default {
               pctOnl: Math.floor(100 * Math.random()) + "%",
               pctOffl: "25%",
               pctLose: "15%",
-              sumUseState: "90%"
+              sumUseState: "90%",
             });
           });
           return;
         }
         let allList = [];
-        for (let key in res.data) {
-          let val = res.data[key];
-          let item = {
-            title: key,
-            total: val.sum,
-            pctOnl: val.sucessRate,
-            pctOffl: val.failRate,
-            pctLose: val.lostRate,
-            sumUseState: val.sumUseState
-          };
-          if (key.includes("全部设备")) {
-            allList.unshift(item);
-          } else {
-            allList.push(item);
+        let sort = res.data["排序规则"].rule.split(",");
+        sort.forEach((i) => {
+          for (let key in res.data) {
+            let val = res.data[key];
+            let item = {
+              title: key,
+              total: val.sum,
+              pctOnl: val.sucessRate,
+              pctOffl: val.failRate,
+              pctLose: val.lostRate,
+              sumUseState: val.sumUseState,
+            };
+            if (i === key) {
+              allList.push(item);
+            }
+            // if (key.includes("全部设备")) {
+            //   allList.unshift(item);
+            // } else {
+            // allList.push(item);
+            // }
           }
-        }
+        });
+
         this.equipments = allList;
       });
     },
@@ -431,7 +443,8 @@ export default {
   display: inline-flex;
   width: 100%;
   flex-direction: row;
-  flex:1; height: 0;
+  flex: 1;
+  height: 0;
 
   .tabs-lo {
     display: inline-flex;
@@ -537,16 +550,24 @@ export default {
 .full_tab {
   width: 100%;
   height: 100%;
-  display: flex; flex-direction: column; flex: 1;
-  ::v-deep .el-tabs__header{}
-  ::v-deep .el-tabs__content{ flex: 1;
-    .el-tab-pane{ width: 100%; height: 100%;}
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  ::v-deep .el-tabs__header {
+  }
+  ::v-deep .el-tabs__content {
+    flex: 1;
+    .el-tab-pane {
+      width: 100%;
+      height: 100%;
+    }
   }
 }
 
-.tab_con{ display: flex; flex-direction: column;}
-
-
+.tab_con {
+  display: flex;
+  flex-direction: column;
+}
 
 .topdiv {
   display: inline-flex;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
index 65450f3e..2dc7dcd1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
@@ -55,7 +55,7 @@ var options = {
         " ",
         " ",
         " ",
-        " ",
+        // " ",
         // "枢纽",
         // "立交",
         // "立交",

From 0611e487d632057259daef1354e61d396f545d80 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Sun, 7 Apr 2024 15:28:05 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix=20#3196=20bug=20=20=E6=B8=85=E9=99=A4ln?=
 =?UTF-8?q?gLatMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue               | 1 +
 .../pages/Home/components/RoadAndEvents/utils/map.js            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index cff1caf4..259b629c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -182,6 +182,7 @@ export default {
   },
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
+    Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
   },
   methods: {
     selectedCompletedHandle(item) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index ab20e917..8049cd56 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -250,7 +250,7 @@ export class MarkerCluster {
       if (window.openInfoWindow) {
         // console.log("窗口位移结束", new Date());
         window.openInfoWindow = false;
-        // window.infoWindow?.open?.();
+        // !window.infoWindow.getIsOpen() && window.infoWindow?.open?.();
       }
     });
 

From 336702a70a5543dfb2b614ad0239e98e8e37b031 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Sun, 7 Apr 2024 16:45:32 +0800
Subject: [PATCH 3/5] fix bug

---
 .../pages/Home/components/RoadAndEvents/utils/map.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 8049cd56..619bf64a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -127,7 +127,7 @@ export class MarkerCluster {
       const startIndex = (page - 1) * pageSize;
       const endIndex = startIndex + pageSize;
       let num = (page - 1) * pageSize;
-      if (data.length === 0 || data.length === 1) {
+      if (!data || data.length === 0 || data.length === 1) {
         return this.infoWindow.close();
       }
       const { latitude: lat, longitude: lng } = data[0].extData;

From 3f0c6be278b031c159178adfb8dcf64f5c34b0ba Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 8 Apr 2024 14:50:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix=20bug=20=E9=A2=91=E9=81=93=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=90=8E=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue        | 1 +
 .../pages/Home/components/RoadAndEvents/utils/map.js     | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 259b629c..f062538e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -183,6 +183,7 @@ export default {
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
     Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
+    window.renderData = undefined;
   },
   methods: {
     selectedCompletedHandle(item) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 619bf64a..8775cb68 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -39,7 +39,7 @@ export class MarkerCluster {
   markerCluster;
   infoWindow;
 
-  data = [];
+  data = []; //标注集合
 
   constructor() {}
 
@@ -115,7 +115,7 @@ export class MarkerCluster {
     window.totalPages = totalPages;
     let num = (page - 1) * pageSize;
     function renderData(page) {
-      if (page < 1 || page > totalPages) return;
+      if (!data || page < 1 || page > totalPages) return;
       window.page = page;
       const pageSize = window.pageSize;
       const dataContainer = document.getElementById("dataContainer");
@@ -127,7 +127,7 @@ export class MarkerCluster {
       const startIndex = (page - 1) * pageSize;
       const endIndex = startIndex + pageSize;
       let num = (page - 1) * pageSize;
-      if (!data || data.length === 0 || data.length === 1) {
+      if (data.length === 0 || data.length === 1) {
         return this.infoWindow.close();
       }
       const { latitude: lat, longitude: lng } = data[0].extData;
@@ -391,6 +391,9 @@ export class MarkerCluster {
   setData() {
     this.markerCluster.setData(this.data);
   }
+  clear() {
+    this.data = [];
+  }
 }
 
 export function getContent(data) {

From 89651a665ccbcabb722a008b1ee04b8c64c2cd3e Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 8 Apr 2024 14:56:11 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat=20=E7=BC=BA=E5=A4=B1=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=A1=A5=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index f062538e..74a6d568 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -51,7 +51,7 @@ import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
 import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue";
 
 import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue";
-import { addInGraphHandle } from "./utils/map"
+import { addInGraphHandle, markerClusterIns } from "./utils/map"
 import { lngLatMap } from "./utils/buttonEvent";
 
 export default {
@@ -183,6 +183,7 @@ export default {
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
     Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
+    markerClusterIns.clear();
     window.renderData = undefined;
   },
   methods: {