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 @@
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
+
+
+
+
+
+
- .content-r {
- width: calc(33%);
- display: inline-flex;
- }
-
- .content-rm {
- width: calc(33%);
- margin-right: 10px;
- }
-
- .content-mi {
- width: calc(50%);
-
- margin-right: 20px;
- }
+
- .foot {
- width: 98%;
- margin: auto;
+
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 @@
-
-
+
+
{{ moment(scope.row.operTime).format("yyyy/MM/DD hh:mm") }}
-
+
{{ JSON.parse(scope.row.dcDeviceId).join("、") }}
-
+
+
+ {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
+
+
-
-
-
+
+
{{ ["unknown"].includes(scope.row.operIp) ? "" : scope.row.operIp }}
+
+
+
+
+
+
@@ -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`,