From 03c64462083d51174fa63ba57fc4c02fd56b99c0 Mon Sep 17 00:00:00 2001 From: lll Date: Thu, 2 Nov 2023 13:09:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PolicyManagement.vue | 71 ++++++++++++++++++----------- src/util/chartConfig.js | 8 +++- 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/components/PolicyManagement.vue b/src/components/PolicyManagement.vue index ca89f7a..1523685 100644 --- a/src/components/PolicyManagement.vue +++ b/src/components/PolicyManagement.vue @@ -2,7 +2,9 @@
- 新增策略 + 新增策略 @@ -28,7 +33,9 @@ @@ -59,7 +66,7 @@ export default { { label: "无线区策略", value: "无线区策略", - } + }, ], options2: [ { @@ -73,13 +80,15 @@ export default { { label: "DNP3", value: "DNP3", - }, { + }, + { label: "S7", value: "S7", - }, { + }, + { label: "EC104", value: "EC104", - } + }, ], options3: [ { @@ -89,30 +98,31 @@ export default { { label: "路由模式", value: "路由模式", - }, { + }, + { label: "透明模式", value: "透明模式", - } + }, ], options4: [ { label: "有线区交换机", - value: "有线区交换机" + value: "有线区交换机", }, { label: "无线区路由器", - value: "无线区路由器" - } + value: "无线区路由器", + }, ], options5: [ { label: "拒绝", - value: "拒绝" + value: "拒绝", }, { label: "允许", - value: "允许" - } + value: "允许", + }, ], options6: [ { @@ -122,7 +132,8 @@ export default { { label: "读输入状态", value: "读输入状态", - }, { + }, + { label: "读线保持寄存器", value: "读线保持寄存器", }, @@ -133,14 +144,15 @@ export default { { label: "强制单个线圈", value: "强制单个线圈", - }, { + }, + { label: "预置单个寄存器", value: "预置单个寄存器", }, { label: "强制多个寄存器", value: "强制多个寄存器", - } + }, ], options7: [ { @@ -150,25 +162,27 @@ export default { { label: "无线区路由器命令", value: "无线区路由器命令", - } + }, ], options8: [ { label: "有线区网闸(外网)", value: "有线区网闸(外网)", - }, { + }, + { label: "无线区网闸(外网)", value: "无线区网闸(外网)", - } + }, ], options9: [ { label: "有线区网闸(内网)", value: "有线区网闸(内网)", - }, { + }, + { label: "无线区网闸(内网)", value: "无线区网闸(内网)", - } + }, ], dialogVisible: true, labelPosition: "left", @@ -252,10 +266,15 @@ export default { flag: false, }; }, + watch: { + $route(to, from) { + this.dialogVisible = true; + }, + }, methods: { addPolicy() { - this.$router.push("/addstrategy") - } + this.$router.push("/addstrategy"); + }, }, }; diff --git a/src/util/chartConfig.js b/src/util/chartConfig.js index 3d36368..c3d88c6 100644 --- a/src/util/chartConfig.js +++ b/src/util/chartConfig.js @@ -22,6 +22,7 @@ export let productChart = { fontSize: 10, }, interval: 0, //代表显示所有x轴标签显示 + rotate: 20, }, }, yAxis: { @@ -77,6 +78,7 @@ export let mainshaftChart = { fontSize: 10, }, interval: 0, //代表显示所有x轴标签显示 + rotate: 20, }, }, yAxis: { @@ -173,6 +175,7 @@ export let loadChartChart = { fontSize: 10, }, interval: 0, //代表显示所有x轴标签显示 + rotate: 20, }, }, yAxis: { @@ -246,6 +249,7 @@ export let ratedChart = { fontSize: 10, }, interval: 0, //代表显示所有x轴标签显示 + rotate: 20, }, }, yAxis: { @@ -304,6 +308,7 @@ export let CuttingSpeedChart = { fontSize: 10, }, interval: 0, //代表显示所有x轴标签显示 + rotate: 20, }, }, yAxis: { @@ -386,7 +391,7 @@ export let stopChart = { tooltip: { //悬浮框 show: true, // 是否显示 - trigger: "item", // + // trigger: "item", // }, xAxis: { type: "category", @@ -410,6 +415,7 @@ export let stopChart = { fontSize: 10, }, interval: 0, //代表显示所有x轴标签显示 + rotate: 20, }, }, yAxis: { From a7b110d6e8546ea15fe4709acbc8e2e147ffc129 Mon Sep 17 00:00:00 2001 From: lll Date: Thu, 2 Nov 2023 14:17:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 + src/router/index.js | 15 +++-- src/views/Cockpit.vue | 132 +++++++++++++++++------------------------- 3 files changed, 60 insertions(+), 88 deletions(-) diff --git a/src/App.vue b/src/App.vue index f1bb4a6..e10c9bb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,6 +10,7 @@ export default { data() { return {}; }, + created() {}, methods: {}, components: {}, }; diff --git a/src/router/index.js b/src/router/index.js index 39635ff..9209052 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,7 +12,6 @@ const routes = [ name: "datacollect", component: () => import("../views/DataCollect.vue"), }, - // 刘龙龙新加的全部路由 //db网关-ip配置-无线网关 { @@ -30,7 +29,7 @@ const routes = [ { path: "/dbcollectiongate", name: "dbcollectiongate", - component: () => import("../views/DbCollectiongate.vue") + component: () => import("../views/DbCollectiongate.vue"), }, // db网关-数据采集配置-网口配置 { @@ -50,12 +49,12 @@ const routes = [ name: "dbcollectdevice", component: () => import("../views/DbCollectdevice.vue"), }, - // db网关-数据采集配置-采集点配置 - { - path: "/dbcollect", - name: "dbcollect", - component: () => import("../views/DbCollection.vue"), - }, + // db网关-数据采集配置-采集点配置 + { + path: "/dbcollect", + name: "dbcollect", + component: () => import("../views/DbCollection.vue"), + }, //db网关-MQTT上云-MQTT1配置 { path: "/mqttconfig", diff --git a/src/views/Cockpit.vue b/src/views/Cockpit.vue index 6390c20..b1706e5 100644 --- a/src/views/Cockpit.vue +++ b/src/views/Cockpit.vue @@ -1,11 +1,5 @@ - \ No newline at end of file + diff --git a/src/views/Index.vue b/src/views/Index.vue index 93692d9..d21a384 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -8,113 +8,63 @@ db网关-ip配置-无线网关 db网关-ip配置-有线网关 - db网关-数据采集配置-网关配置 - db网关-数据采集配置-网口通道配置 - db网关-数据采集配置-串口通道配置 - db网关-数据采集配置-设备配置 + db网关-数据采集配置-网关配置 + db网关-数据采集配置-网口通道配置 + db网关-数据采集配置-串口通道配置 + db网关-数据采集配置-设备配置 db网关-数据采集配置-采集点配置 db-网关-MQTT上云-MQTT1配置 - 斥候工业网关-ip配置-无线网关 - 斥候工业网关-ip配置-有线网关 - 斥候工业网关-数据采集配置-网关配置 - 斥候工业网关-数据采集配置-设备配置 - 斥候工业网关-数据采集配置-采集点配置 + 斥候工业网关-ip配置-无线网关 + 斥候工业网关-ip配置-有线网关 + 斥候工业网关-数据采集配置-网关配置 + 斥候工业网关-数据采集配置-设备配置 + 斥候工业网关-数据采集配置-采集点配置 斥候工业网关-数据上云配置-MQTT上云 串口服务器-Ip配置 串口服务器-端口配置 - 串口服务器-485towifi-串口及网络协议设置 + 串口服务器-485towifi-串口及网络协议设置 串口服务器-485towifi-网口配置 串口服务器-485towifi-无线配置 工业网闸配置-网络管理 工业网闸配置-对象管理 工业网闸配置-策略管理 - 工业网闸配置-策略管理-添加策略 + 工业网闸配置-策略管理-添加策略 网络优化-网关配置 网络优化-网关维护 - - -
- - - -
- - - - - - - - - - - - - - - - -
- -