From 3ce9e7aa4864b8933a9fe3b6071fbe78cfd48014 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Thu, 9 May 2024 18:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/common/menuData.js               |  26 ++++++-------
 .../pages/datav/roadNet/sensors.vue           |   2 +-
 .../chargeableOperations/index.vue            |  35 +++++++++++-------
 .../smart}/manage/index.vue                   |   0
 .../statisticalAnalysis/assets/charts.js      |   0
 .../assets/shexiangtou.png                    | Bin
 .../components/deviceSummary/index.vue        |   0
 .../components/deviceUptime/assets/charts.js  |   0
 .../components/deviceUptime/index.vue         |   2 +-
 .../monthlyEquipment/EllipseData.vue          |   0
 .../monthlyEquipment/assets/charts.js         |   0
 .../components/monthlyEquipment/index.vue     |   2 +-
 .../onLineBarCharts/assets/barCharts.js       |   0
 .../components/onLineBarCharts/index.vue      |   2 +-
 .../{ => smart}/statisticalAnalysis/data.js   |   0
 .../{ => smart}/statisticalAnalysis/index.vue |   0
 .../statisticalAnalysis/testDeviceData.js     |   0
 .../smart}/topology/index.vue                 |   0
 .../smart}/topology/left-bg-action.png        | Bin
 .../smart}/topology/left-bg.png               | Bin
 .../smart}/topology/switch0.png               | Bin
 .../smart}/topology/switch1.png               | Bin
 .../smart}/topology/t01-1.svg                 |   0
 .../smart}/topology/t01-2.svg                 |   0
 .../smart}/topology/t01-4.svg                 |   0
 .../smart}/topology/t01-5.svg                 |   0
 .../smart}/topology/t010.svg                  |   0
 .../smart}/topology/t011.svg                  |   0
 .../smart}/topology/t012.svg                  |   0
 .../smart}/topology/t013.svg                  |   0
 .../smart}/topology/t014.svg                  |   0
 .../smart}/topology/t015.svg                  |   0
 .../smart}/topology/t02-1.svg                 |   0
 .../smart}/topology/t03.svg                   |   0
 .../smart}/topology/t05.svg                   |   0
 .../smart}/topology/t06.svg                   |   0
 .../smart}/topology/t07.svg                   |   0
 .../smart}/topology/t08.svg                   |   0
 .../smart}/topology/t11-1.svg                 |   0
 .../smart}/topology/t11-2.svg                 |   0
 .../smart}/topology/t11-4.svg                 |   0
 .../smart}/topology/t11-5.svg                 |   0
 .../smart}/topology/t110.svg                  |   0
 .../smart}/topology/t111.svg                  |   0
 .../smart}/topology/t112.svg                  |   0
 .../smart}/topology/t113.svg                  |   0
 .../smart}/topology/t114.svg                  |   0
 .../smart}/topology/t115.svg                  |   0
 .../smart}/topology/t12-1.svg                 |   0
 .../smart}/topology/t13.svg                   |   0
 .../smart}/topology/t15.svg                   |   0
 .../smart}/topology/t16.svg                   |   0
 .../smart}/topology/t17.svg                   |   0
 .../smart}/topology/t18.svg                   |   0
 .../pages/service/boardRecord/data.js         |   8 ++--
 .../pages/service/boardRecord/index.vue       |   7 ++--
 ruoyi-ui/vue.config.js                        |   4 +-
 57 files changed, 48 insertions(+), 40 deletions(-)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/manage/index.vue (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/assets/charts.js (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/assets/shexiangtou.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/deviceSummary/index.vue (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/deviceUptime/assets/charts.js (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/deviceUptime/index.vue (97%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/monthlyEquipment/EllipseData.vue (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/monthlyEquipment/assets/charts.js (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/monthlyEquipment/index.vue (98%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/onLineBarCharts/assets/barCharts.js (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/components/onLineBarCharts/index.vue (98%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/data.js (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/index.vue (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/{ => smart}/statisticalAnalysis/testDeviceData.js (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/index.vue (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/left-bg-action.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/left-bg.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/switch0.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/switch1.png (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t01-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t01-2.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t01-4.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t01-5.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t010.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t011.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t012.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t013.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t014.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t015.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t02-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t03.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t05.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t06.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t07.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t08.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t11-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t11-2.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t11-4.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t11-5.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t110.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t111.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t112.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t113.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t114.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t115.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t12-1.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t13.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t15.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t16.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t17.svg (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/{control/device => maintenanceOperations/smart}/topology/t18.svg (100%)

diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 89ccd0e4..8d5b959f 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -113,18 +113,6 @@ 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"
           }
         ],
       },
@@ -179,7 +167,19 @@ export default [
            title: "统计分析",
            name: "smartStatistic",
            path: "/maintain/smart/statistic",
-           component: "maintenanceOperations/statisticalAnalysis/index.vue",
+           component: "maintenanceOperations/smart/statisticalAnalysis/index.vue",
+          },
+          {
+            title: "网络拓扑",
+            name: "smartTopology",
+            path: "/maintain/smart/topology",
+            component: "maintenanceOperations/smart/topology/index.vue"
+          },
+          {
+            title: "设备管理",
+            name: "smartDeviceMange",
+            path: "/maintain/smart/manage",
+            component: "maintenanceOperations/smart/manage/index.vue"
           }
         ]
       }, {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue
index 5dbf5634..735b0d12 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue
@@ -194,7 +194,7 @@ export default {
             })
 
             let subItems = [
-                "可变新消息标志",
+                "可变信息标志",
                 "气象检测器",
                 "一类交通量调查站",
                 "枪机",
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 afef2b62..1f61c756 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
@@ -14,33 +14,40 @@
 </style> -->
 <template>
     <div class='comp_box'>
-        <iframe class="iframe" :src="alarmUrl" frameborder="0"></iframe>
+        <iframe class="iframe" :src="url" frameborder="0"></iframe>
     </div>
 </template>
 
 <script>
 
 import { getConfigKey } from "@/api/system/config.js";
-
+import request from "@/utils/request";
 export default {
     name: 'InDevelopment',
     components: {
     },
-    props: {
-        text: {
-            type: String,
-            default: "暂无数据"
-        },
-        alarmUrl: {
-            type: String,
-            default: "",
+    data(){
+        return {
+            url:""
         }
     },
+    props: {
+    },
     mounted() {
-        // this.alarmUrl = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
-        getConfigKey("dc.gisAndBim").then((res) => {
-            this.alarmUrl = res.msg
-        });
+        // this.url = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
+        // getConfigKey("AESEncryption").then((res) => {
+        //     alert(res.msg)
+        //     this.url = res.msg
+        // });
+        request({
+            url: `/AESEncryption`,
+            method: "get",
+        }).then((res) => {
+            this.url = res.msg
+            console.log(res, "AESEncryption获取iframe url成功。。。")
+        }).catch(err => {
+            console.log(err, "AESEncryption获取iframe url失败。。。")
+        });;
     }
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/shexiangtou.png b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/shexiangtou.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/shexiangtou.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/assets/shexiangtou.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceSummary/index.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceSummary/index.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue
similarity index 97%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue
index 6f62deb1..2fff6663 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue
@@ -9,7 +9,7 @@
 </template>
   
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import * as echarts from "echarts";
 import chartOptions from "./assets/charts";
 let chartsStatistics = chartOptions.options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/EllipseData.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/EllipseData.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/EllipseData.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/EllipseData.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/index.vue
similarity index 98%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/index.vue
index c1cceb6c..489f1a27 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/index.vue
@@ -13,7 +13,7 @@
 </template>
   
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import EllipseData from "./EllipseData.vue"
 export default {
   name: 'MonthlyEquipment',
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/assets/barCharts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/onLineBarCharts/assets/barCharts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/assets/barCharts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/onLineBarCharts/assets/barCharts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/onLineBarCharts/index.vue
similarity index 98%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/onLineBarCharts/index.vue
index c37e9398..39a42974 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/onLineBarCharts/index.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import * as echarts from "echarts";
 import chartOptions from "./assets/barCharts";
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/data.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/data.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/index.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/index.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/testDeviceData.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/testDeviceData.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/testDeviceData.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/testDeviceData.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg-action.png b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/left-bg-action.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg-action.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/left-bg-action.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg.png b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/left-bg.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/left-bg.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/left-bg.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch0.png b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/switch0.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch0.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/switch0.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch1.png b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/switch1.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/switch1.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/switch1.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-2.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-2.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-2.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-2.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-4.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-4.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-4.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-4.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-5.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-5.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t01-5.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t01-5.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t010.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t010.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t010.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t010.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t011.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t011.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t011.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t011.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t012.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t012.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t012.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t012.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t013.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t013.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t013.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t013.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t014.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t014.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t014.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t014.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t015.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t015.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t015.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t015.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t02-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t02-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t02-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t02-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t03.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t03.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t03.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t03.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t05.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t05.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t05.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t05.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t06.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t06.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t06.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t06.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t07.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t07.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t07.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t07.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t08.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t08.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t08.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t08.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-2.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-2.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-2.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-2.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-4.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-4.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-4.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-4.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-5.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-5.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t11-5.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t11-5.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t110.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t110.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t110.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t110.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t111.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t111.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t111.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t111.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t112.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t112.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t112.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t112.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t113.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t113.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t113.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t113.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t114.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t114.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t114.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t114.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t115.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t115.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t115.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t115.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t12-1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t12-1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t12-1.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t12-1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t13.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t13.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t13.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t13.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t15.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t15.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t15.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t15.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t16.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t16.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t16.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t16.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t17.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t17.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t17.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t17.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t18.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t18.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/t18.svg
rename to ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/t18.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
index 10913a15..57b15cab 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
@@ -14,20 +14,20 @@ export const searchFormList = [
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
   },
-  PresetFormItems.directionCreater("RadioGroup"),
+  // PresetFormItems.directionCreater("RadioGroup"),
   {
     label: "发布状态:",
-    key: "releaseStatus",
+    key: "status",
     type: "RadioGroup",
     default: [],
     options: {
       options: [
         {
-          key: "1",
+          key: 0,
           label: "成功",
         },
         {
-          key: "0",
+          key: 1,
           label: "失败",
         },
       ],
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 061b54d9..7b3f477f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -26,7 +26,7 @@
           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") }}
+            {{ moment(scope.row.operTime).format("yyyy/MM/DD HH:mm") }}
           </template>
         </ElTableColumn>
         <ElTableColumn label="设备ID" prop="dcDeviceId" width="120" align="center" header-align="center">
@@ -34,6 +34,7 @@
             {{ JSON.parse(scope.row.dcDeviceId).join("、") }}
           </template>
         </ElTableColumn>
+        <!-- <ElTableColumn label="方向" prop="direction" width="160" align="center" header-align="center" /> -->
         <ElTableColumn label="设备名称" prop="dcDeviceName" align="center" header-align="center">
           <template slot-scope="scope">
             {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
@@ -58,7 +59,7 @@
         </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-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.status == 0"></i>
             <i class="el-icon-error" style="font-size: 24px; color:#BBB;" v-else></i>
           </template>
         </ElTableColumn>
@@ -145,7 +146,7 @@ export default {
         ...this.searchData,
         // releaseContent: data.releaseContent || "",
         direction: data.direction || "",
-        releaseStatus: data.releaseStatus,
+        status: data.status,
         startTime,
         endTime,
         // stakeMark: stakeMark,
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 59319d90..77f27227 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -52,8 +52,8 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        target: `http://10.168.68.42:8087`, //王思祥
+        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        // target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝