From 026040d8052861003a7b8b640f570a0e1949aee2 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Thu, 9 May 2024 16:52:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/common/menuData.js               |  18 +-
 .../pages/control/device/manage/index.vue     |  33 +++
 .../device}/topology/index.vue                |   0
 .../device}/topology/left-bg-action.png       | Bin
 .../device}/topology/left-bg.png              | Bin
 .../device}/topology/switch0.png              | Bin
 .../device}/topology/switch1.png              | Bin
 .../device}/topology/t01-1.svg                |   0
 .../device}/topology/t01-2.svg                |   0
 .../device}/topology/t01-4.svg                |   0
 .../device}/topology/t01-5.svg                |   0
 .../device}/topology/t010.svg                 |   0
 .../device}/topology/t011.svg                 |   0
 .../device}/topology/t012.svg                 |   0
 .../device}/topology/t013.svg                 |   0
 .../device}/topology/t014.svg                 |   0
 .../device}/topology/t015.svg                 |   0
 .../device}/topology/t02-1.svg                |   0
 .../device}/topology/t03.svg                  |   0
 .../device}/topology/t05.svg                  |   0
 .../device}/topology/t06.svg                  |   0
 .../device}/topology/t07.svg                  |   0
 .../device}/topology/t08.svg                  |   0
 .../device}/topology/t11-1.svg                |   0
 .../device}/topology/t11-2.svg                |   0
 .../device}/topology/t11-4.svg                |   0
 .../device}/topology/t11-5.svg                |   0
 .../device}/topology/t110.svg                 |   0
 .../device}/topology/t111.svg                 |   0
 .../device}/topology/t112.svg                 |   0
 .../device}/topology/t113.svg                 |   0
 .../device}/topology/t114.svg                 |   0
 .../device}/topology/t115.svg                 |   0
 .../device}/topology/t12-1.svg                |   0
 .../device}/topology/t13.svg                  |   0
 .../device}/topology/t15.svg                  |   0
 .../device}/topology/t16.svg                  |   0
 .../device}/topology/t17.svg                  |   0
 .../device}/topology/t18.svg                  |   0
 .../chargeableOperations/_index.vue           | 185 +++++++++++++++
 .../chargeableOperations/index.vue            | 224 +++++-------------
 41 files changed, 283 insertions(+), 177 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/index.vue (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/left-bg-action.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/left-bg.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/switch0.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/switch1.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t01-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t01-2.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t01-4.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t01-5.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t010.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t011.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t012.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t013.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t014.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t015.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t02-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t03.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t05.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t06.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t07.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t08.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t11-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t11-2.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t11-4.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t11-5.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t110.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t111.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t112.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t113.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t114.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t115.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t12-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t13.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t15.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t16.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t17.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{perception => control/device}/topology/t18.svg (100%)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/_index.vue

diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 7b0a1767..89ccd0e4 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -36,12 +36,6 @@ export default [
         path: "/perception/trafficSituation",
         name: "perceptionTrafficSituation",
         component: "perception/trafficSituation/index.vue",
-      },
-      {
-        title: "网络拓扑",
-        name: "perceptionTopology",
-        path: "/perception/topology",
-        component: "perception/topology/index.vue"
       }
     ],
   },
@@ -119,6 +113,18 @@ export default [
             path: "/control/device/strategy",
             name: "controlDeviceStrategy",
             component: "control/device/strategy/index.vue",
+          },
+          {
+            title: "网络拓扑",
+            name: "controlDeviceTopology",
+            path: "/control/device/topology",
+            component: "control/device/topology/index.vue"
+          },
+          {
+            title: "设备管理",
+            name: "controlDeviceMange",
+            path: "/control/device/manage",
+            component: "control/device/manage/index.vue"
           }
         ],
       },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue
new file mode 100644
index 00000000..a609e984
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class='developing'>
+    <p>功能开发中...</p>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'InDevelopment',
+  components: {
+  },
+  mounted() {
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.developing {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  z-index: 6;
+  color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  p {
+    font-size: 24px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/index.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/index.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/left-bg-action.png b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg-action.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/left-bg-action.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg-action.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/left-bg.png b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/left-bg.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/switch0.png b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch0.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/switch0.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch0.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/switch1.png b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch1.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/switch1.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch1.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-2.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-2.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-2.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-2.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-4.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-4.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-4.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-4.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-5.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-5.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t01-5.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-5.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t010.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t010.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t010.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t010.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t011.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t011.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t011.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t011.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t012.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t012.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t012.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t012.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t013.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t013.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t013.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t013.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t014.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t014.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t014.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t014.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t015.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t015.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t015.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t015.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t02-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t02-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t02-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t02-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t03.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t03.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t03.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t03.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t05.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t05.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t05.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t05.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t06.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t06.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t06.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t06.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t07.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t07.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t07.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t07.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t08.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t08.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t08.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t08.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-2.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-2.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-2.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-2.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-4.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-4.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-4.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-4.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-5.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-5.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11-5.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-5.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t110.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t110.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t110.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t110.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t111.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t111.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t111.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t111.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t112.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t112.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t112.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t112.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t113.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t113.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t113.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t113.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t114.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t114.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t114.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t114.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t115.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t115.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t115.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t115.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t12-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t12-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t12-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t12-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t13.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t13.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t13.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t13.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t15.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t15.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t15.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t15.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t16.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t16.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t16.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t16.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t17.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t17.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t17.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t17.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t18.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t18.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t18.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t18.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/_index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/_index.vue
new file mode 100644
index 00000000..89ea269f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/_index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="TrafficFlow">
+    <section class="foot">
+      <div class="content">
+        <div class="content-l">
+          <RoadNetwork />
+          <LaneTolls />
+        </div>
+        <div class="content-l">
+          <VehicleTolls />
+          <TruckLaneTolls />
+        </div>
+        <RoadSectionTolls class="content-r" />
+      </div>
+    </section>
+    <section class="foot">
+      <div class="content" style="position: relative; top: -10px">
+        <AccessAnalysis class="content-m" />
+        <AuxiliaryFlowcharts class="content-rm" />
+      </div>
+    </section>
+    <section class="foot">
+      <div class="content">
+        <MonthlyAnalysis class="content-mi" />
+        <DaylyAnalysis class="content-mi" />
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+import RoadNetwork from "./components/roadNetworkTraffic";
+import LaneTolls from "./components/laneTolls";
+import VehicleTolls from "./components/vehicleTolls";
+import TruckLaneTolls from "./components/truckLaneTolls";
+import RoadSectionTolls from "./components/RoadSectionTolls";
+import AccessAnalysis from "./components/accessAnalysis";
+import AuxiliaryFlowcharts from "./components/auxiliaryFlowcharts";
+import MonthlyAnalysis from "./components/monthlyAnalysis";
+import DaylyAnalysis from "./components/daylyAnalysis";
+
+export default {
+  name: "publicService",
+  components: {
+    RoadNetwork,
+    LaneTolls,
+    VehicleTolls,
+    TruckLaneTolls,
+    RoadSectionTolls,
+    AccessAnalysis,
+    AuxiliaryFlowcharts,
+    MonthlyAnalysis,
+    DaylyAnalysis,
+  },
+  data() {
+    return {
+      activeName: "first",
+    };
+  },
+  methods: {
+    changeTabs() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-tabs__item {
+  display: inline-flex;
+  justify-content: center;
+  font-size: 16px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 500;
+  color: #ffffff;
+  min-width: 128px;
+  position: relative;
+  left: 10px;
+}
+
+::v-deep .el-tabs__active-bar {
+  min-width: 128px;
+}
+
+::v-deep .el-tabs__nav-wrap::after {
+  background-color: #133242;
+  opacity: 0.1;
+}
+
+.footTabs {
+  display: inline;
+  width: 100%;
+}
+
+.TrafficFlow {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  z-index: 6;
+  color: white;
+  padding-top: 15px;
+
+  .header-shot {
+    width: 98%;
+    margin: auto;
+    margin-top: 15px;
+    height: 160px;
+  }
+
+  .content {
+    width: 100%;
+    margin: auto;
+    display: flex;
+    flex: 1;
+    pointer-events: none;
+    margin-top: 0px;
+
+    > div {
+      pointer-events: auto;
+    }
+
+    .content-l {
+      width: calc(32.2%);
+      margin-right: 20px;
+      display: inline-flex;
+      flex-direction: column;
+
+      > div {
+        margin-bottom: 15px;
+      }
+    }
+
+    .content-r {
+      width: calc(33%);
+      display: inline-flex;
+    }
+
+    .content-rm {
+      width: calc(33%);
+      margin-right: 10px;
+    }
+
+    .content-mi {
+      width: calc(50%);
+
+      margin-right: 20px;
+    }
+
+    .content-mi:last-child {
+      margin-right: 10px;
+    }
+
+    .content-m {
+      display: inline-flex;
+      width: 66%;
+      margin-right: 20px;
+    }
+  }
+
+  .foot {
+    width: 98%;
+    margin: auto;
+    display: flex;
+    justify-content: space-between;
+    flex: 1;
+    pointer-events: none;
+    margin-top: 8px;
+    > div {
+      pointer-events: auto;
+    }
+
+    .foot-w {
+      width: 100%;
+    }
+
+    .foot-l {
+      width: 726px;
+    }
+    .foot-m {
+      width: 613px;
+    }
+    .foot-r {
+      width: 493px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
index 89ea269f..afef2b62 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
@@ -1,185 +1,67 @@
-<template>
-  <div class="TrafficFlow">
-    <section class="foot">
-      <div class="content">
-        <div class="content-l">
-          <RoadNetwork />
-          <LaneTolls />
-        </div>
-        <div class="content-l">
-          <VehicleTolls />
-          <TruckLaneTolls />
-        </div>
-        <RoadSectionTolls class="content-r" />
-      </div>
-    </section>
-    <section class="foot">
-      <div class="content" style="position: relative; top: -10px">
-        <AccessAnalysis class="content-m" />
-        <AuxiliaryFlowcharts class="content-rm" />
-      </div>
-    </section>
-    <section class="foot">
-      <div class="content">
-        <MonthlyAnalysis class="content-mi" />
-        <DaylyAnalysis class="content-mi" />
-      </div>
-    </section>
-  </div>
+<!-- <template>
+    <div>
+        <img class="img" src="@screen/images/digital/gisAndBim.jpg" />
+    </div>
 </template>
-
 <script>
-import RoadNetwork from "./components/roadNetworkTraffic";
-import LaneTolls from "./components/laneTolls";
-import VehicleTolls from "./components/vehicleTolls";
-import TruckLaneTolls from "./components/truckLaneTolls";
-import RoadSectionTolls from "./components/RoadSectionTolls";
-import AccessAnalysis from "./components/accessAnalysis";
-import AuxiliaryFlowcharts from "./components/auxiliaryFlowcharts";
-import MonthlyAnalysis from "./components/monthlyAnalysis";
-import DaylyAnalysis from "./components/daylyAnalysis";
 
-export default {
-  name: "publicService",
-  components: {
-    RoadNetwork,
-    LaneTolls,
-    VehicleTolls,
-    TruckLaneTolls,
-    RoadSectionTolls,
-    AccessAnalysis,
-    AuxiliaryFlowcharts,
-    MonthlyAnalysis,
-    DaylyAnalysis,
-  },
-  data() {
-    return {
-      activeName: "first",
-    };
-  },
-  methods: {
-    changeTabs() {},
-  },
-};
 </script>
-
-<style lang="scss" scoped>
-::v-deep .el-tabs__item {
-  display: inline-flex;
-  justify-content: center;
-  font-size: 16px;
-  font-family: PingFang SC, PingFang SC;
-  font-weight: 500;
-  color: #ffffff;
-  min-width: 128px;
-  position: relative;
-  left: 10px;
-}
-
-::v-deep .el-tabs__active-bar {
-  min-width: 128px;
-}
-
-::v-deep .el-tabs__nav-wrap::after {
-  background-color: #133242;
-  opacity: 0.1;
-}
-
-.footTabs {
-  display: inline;
-  width: 100%;
-}
-
-.TrafficFlow {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  z-index: 6;
-  color: white;
-  padding-top: 15px;
-
-  .header-shot {
-    width: 98%;
-    margin: auto;
-    margin-top: 15px;
-    height: 160px;
-  }
-
-  .content {
-    width: 100%;
-    margin: auto;
-    display: flex;
-    flex: 1;
-    pointer-events: none;
-    margin-top: 0px;
-
-    > div {
-      pointer-events: auto;
-    }
-
-    .content-l {
-      width: calc(32.2%);
-      margin-right: 20px;
-      display: inline-flex;
-      flex-direction: column;
-
-      > div {
-        margin-bottom: 15px;
-      }
+<style lang='scss' scoped>
+    .img {
+        height: 1030px;
+        width: 1920px;
     }
+</style> -->
+<template>
+    <div class='comp_box'>
+        <iframe class="iframe" :src="alarmUrl" frameborder="0"></iframe>
+    </div>
+</template>
 
-    .content-r {
-      width: calc(33%);
-      display: inline-flex;
-    }
-
-    .content-rm {
-      width: calc(33%);
-      margin-right: 10px;
-    }
-
-    .content-mi {
-      width: calc(50%);
-
-      margin-right: 20px;
-    }
+<script>
 
-    .content-mi:last-child {
-      margin-right: 10px;
-    }
+import { getConfigKey } from "@/api/system/config.js";
 
-    .content-m {
-      display: inline-flex;
-      width: 66%;
-      margin-right: 20px;
+export default {
+    name: 'InDevelopment',
+    components: {
+    },
+    props: {
+        text: {
+            type: String,
+            default: "暂无数据"
+        },
+        alarmUrl: {
+            type: String,
+            default: "",
+        }
+    },
+    mounted() {
+        // this.alarmUrl = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
+        getConfigKey("dc.gisAndBim").then((res) => {
+            this.alarmUrl = res.msg
+        });
     }
-  }
+}
+</script>
 
-  .foot {
-    width: 98%;
-    margin: auto;
+<style lang='scss' scoped>
+.comp_box {
+    // padding-top:160px;
+    width: 100%;
+    height: 100%;
+    color: #8A9EAA;
     display: flex;
-    justify-content: space-between;
-    flex: 1;
-    pointer-events: none;
-    margin-top: 8px;
-    > div {
-      pointer-events: auto;
-    }
-
-    .foot-w {
-      width: 100%;
-    }
-
-    .foot-l {
-      width: 726px;
-    }
-    .foot-m {
-      width: 613px;
-    }
-    .foot-r {
-      width: 493px;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+
+    .iframe {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
     }
-  }
 }
 </style>

From d45fffd06613a6f0984aa8b6da669a8b618199fc Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Thu, 9 May 2024 17:23:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=83=85=E6=8A=A5?=
 =?UTF-8?q?=E6=9D=BF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/service/boardRecord/index.vue       | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
index 3c45b286..061b54d9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -22,18 +22,23 @@
     <!-- 内容 -->
     <div class="body">
       <Table :data="tableData" height="100%">
-        <el-table-column label="序号" type="index" :index="indexMethod" width="100" />
-        <ElTableColumn label="发布时间" prop="operTime" width="280">
+        <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
+          header-align="center" />
+        <ElTableColumn label="发布时间" prop="operTime" width="280" align="center" header-align="center">
           <template slot-scope="scope">
             {{ moment(scope.row.operTime).format("yyyy/MM/DD hh:mm") }}
           </template>
         </ElTableColumn>
-        <ElTableColumn label="设备ID" prop="dcDeviceId" width="120">
+        <ElTableColumn label="设备ID" prop="dcDeviceId" width="120" align="center" header-align="center">
           <template slot-scope="scope">
             {{ JSON.parse(scope.row.dcDeviceId).join("、") }}
           </template>
         </ElTableColumn>
-        <ElTableColumn label="设备名称" prop="dcDeviceName" />
+        <ElTableColumn label="设备名称" prop="dcDeviceName" align="center" header-align="center">
+          <template slot-scope="scope">
+            {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
+          </template>
+        </ElTableColumn>
         <ElTableColumn label="内容" prop="operParam" width="400" header-align="center">
           <template slot-scope="scope">
             <el-carousel direction="horizontal" :autoplay="false" indicator-position="inside" height="80px"
@@ -45,13 +50,18 @@
             </el-carousel>
           </template>
         </ElTableColumn>
-        <ElTableColumn label="状态" prop="status" width="140" :formatter="formatterStatus" />
-        <ElTableColumn label="用户名" prop="operName" width="160" />
-        <ElTableColumn label="用户IP" prop="operIp" width="200">
+        <ElTableColumn label="用户名" prop="operName" width="160" align="center" header-align="center" />
+        <ElTableColumn label="用户IP" prop="operIp" width="200" align="center" header-align="center">
           <template slot-scope="scope">
             {{ ["unknown"].includes(scope.row.operIp) ? "" : scope.row.operIp }}
           </template>
         </ElTableColumn>
+        <ElTableColumn label="发布结果" prop="status" width="140" align="center" header-align="center">
+          <template slot-scope="scope">
+            <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.status == 1"></i>
+            <i class="el-icon-error" style="font-size: 24px; color:#BBB;" v-else></i>
+          </template>
+        </ElTableColumn>
       </Table>
     </div>
 
@@ -149,9 +159,6 @@ export default {
     formatterDirection(row, column) {
         return DirectionTypes[row.direction];
       },
-    formatterStatus(row, column) {
-      return ["失败", "成功"][row.releaseStatus];
-      },
     initData() {
       request({
         url: `/business/dcOperLog/list`,