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

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",
+  });
+}

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 {
@@ -182,6 +182,9 @@ export default {
   },
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
+    Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
+    markerClusterIns.clear();
+    window.renderData = undefined;
   },
   methods: {
     selectedCompletedHandle(item) {

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");
@@ -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?.();
       }
     });
 
@@ -391,6 +391,9 @@ export class MarkerCluster {
   setData() {
     this.markerCluster.setData(this.data);
   }
+  clear() {
+    this.data = [];
+  }
 }
 
 export function getContent(data) {

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() {},

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,12 +300,14 @@ export default {
               pctOnl: Math.floor(100 * Math.random()) + "%",
               pctOffl: "25%",
               pctLose: "15%",
-              sumUseState: "90%"
+              sumUseState: "90%",
             });
           });
           return;
         }
         let allList = [];
+        let sort = res.data["排序规则"].rule.split(",");
+        sort.forEach((i) => {
           for (let key in res.data) {
             let val = res.data[key];
             let item = {
@@ -309,14 +316,19 @@ export default {
               pctOnl: val.sucessRate,
               pctOffl: val.failRate,
               pctLose: val.lostRate,
-            sumUseState: val.sumUseState
+              sumUseState: val.sumUseState,
             };
-          if (key.includes("全部设备")) {
-            allList.unshift(item);
-          } else {
+            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;

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js

@@ -55,7 +55,7 @@ var options = {
         " ",
         " ",
         " ",
-        " ",
+        // " ",
         // "枢纽",
         // "立交",
         // "立交",