diff --git a/.history/src/router/index_20231102144141.js b/.history/src/router/index_20231102144141.js new file mode 100644 index 0000000..5a73214 --- /dev/null +++ b/.history/src/router/index_20231102144141.js @@ -0,0 +1,180 @@ +import Vue from "vue"; +import VueRouter from "vue-router"; +Vue.use(VueRouter); + +const routes = [ + { + path: "/", + component: () => import("../views/Index.vue"), + }, + { + path: "/cockpit", + name: "cockpit", + component: () => import("../views/Cockpit.vue"), + }, + { + path: "/datacollect", + name: "datacollect", + component: () => import("../views/DataCollect.vue"), + }, + + // 刘龙龙新加的全部路由 + //db网关-ip配置-无线网关 + { + path: "/wirelessgatewayip", + name: "wirelessgatewayip", + component: () => import("../views/WirelessGatewayIP.vue"), + }, + //db网关-ip配置-有线网关 + { + path: "/wiredgatewayip", + name: "wiredgatewayip", + component: () => import("../views/WiredGatewayIP.vue"), + }, + //db网关-数据采集配置-网关配置 + { + path: "/dbcollectiongate", + name: "dbcollectiongate", + component: () => import("../views/DbCollectiongate.vue"), + }, + // db网关-数据采集配置-网口配置 + { + path: "/channelconfig", + name: "channelconfig", + component: () => import("../views/ChannelConfig.vue"), + }, + // db网关-数据采集配置-串口配置 + { + path: "/dbcollectserial", + name: "dbcollectserial", + component: () => import("../views/DbCollectserial.vue"), + }, + // db网关-数据采集配置-设备配置 + { + path: "/dbcollectdevice", + name: "dbcollectdevice", + component: () => import("../views/DbCollectdevice.vue"), + }, + // db网关-数据采集配置-采集点配置 + { + path: "/dbcollect", + name: "dbcollect", + component: () => import("../views/DbCollection.vue"), + }, + //db网关-MQTT上云-MQTT1配置 + { + path: "/mqttconfig", + name: "mqttconfig", + component: () => import("../views/MqttConfig.vue"), + }, + //斥候工业网关-ip配置-无线网关 + { + path: "/chwirelessgatewayip", + name: "chwirelessgatewayip", + component: () => import("../views/ChWirelessGatewayIP.vue"), + }, + //斥候工业网关-ip配置-有线网关 + { + path: "/chwiredgatewayip", + name: "chwiredgatewayip", + component: () => import("../views/ChWiredGatewayIP.vue"), + }, + //斥候工业网关-数据采集配置-网关配置 + { + path: "/gatewayconfiguration", + name: "gatewayconfiguration", + component: () => import("../views/GatewayConfiguration.vue"), + }, + //斥候工业网关-数据采集配置-设备配置 + { + path: "/configuration", + name: "configuration", + component: () => import("../views/Configuration.vue"), + }, + //斥候工业网关-数据采集配置-采集点配置 + { + path: "/collectionpoint", + name: "collectionpoint", + component: () => import("../views/CollectionPoint.vue"), + }, + //斥候工业网关-数据上云配置-MQTT上云 + { + path: "/chmqtt", + name: "chmqtt", + component: () => import("../views/ChMqtt.vue"), + }, + //串口服务器-Ip配置 + { + path: "/ckipconfig", + name: "ckipconfig", + component: () => import("../views/CkIpConfig.vue"), + }, + //串口服务器-端口配置 + { + path: "/ckportconfig", + name: "ckportconfig", + component: () => import("../views/CkPortConfig.vue"), + }, + //串口服务器-485towifi-串口及网络协议设置 + { + path: "/towifi", + name: "towifi", + component: () => import("../views/ToWifi.vue"), + }, + //串口服务器-485towifi-网口配置 + { + path: "/cknet", + name: "cknet", + component: () => import("../views/CkNet.vue"), + }, + //串口服务器-485towifi-无线配置 + { + path: "/ckwireless", + name: "ckwireless", + component: () => import("../views/CkWireless.vue"), + }, + //工业网闸配置-网络管理 + { + path: "/networkmanagement", + name: "networkmanagement", + component: () => import("../views/NetworkManagement.vue"), + }, + //工业网闸配置-对象管理 + { + path: "/objmanagement", + name: "objmanagement", + component: () => import("../views/ObjManagement.vue"), + }, + //工业网闸配置-策略管理 + { + path: "/strategyManagement", + name: "strategyManagement", + component: () => import("../views/StrategyManagement.vue"), + }, + //工业网闸配置-策略管理-添加策略 + { + path: "/addstrategy", + name: "addstrategy", + component: () => import("../views/AddStrategy.vue"), + }, + //网络优化-网关配置 + { + path: "/ntconfig", + name: "ntconfig", + component: () => import("../views/NtConfig.vue"), + }, + //网络优化-网关维护 + { + path: "/ntmaintenance", + name: "ntmaintenance", + component: () => import("../views/NtMaintenance.vue"), + }, +]; + +const router = new VueRouter({ + mode: "history", + base: process.env.BASE_URL, + routes, +}); + +export default router; diff --git a/.history/src/views/ChMqtt_20231102144203.vue b/.history/src/views/ChMqtt_20231102144203.vue new file mode 100644 index 0000000..f4ceafa --- /dev/null +++ b/.history/src/views/ChMqtt_20231102144203.vue @@ -0,0 +1,33 @@ + + + + + + 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/components/ChiClone.vue b/src/components/ChiClone.vue index 843c56c..cfc2290 100644 --- a/src/components/ChiClone.vue +++ b/src/components/ChiClone.vue @@ -1,122 +1,185 @@ \ No newline at end of file + diff --git a/src/components/ChiGate.vue b/src/components/ChiGate.vue index 79e52dd..22a69a3 100644 --- a/src/components/ChiGate.vue +++ b/src/components/ChiGate.vue @@ -1,185 +1,209 @@ \ No newline at end of file + diff --git a/src/components/PolicyManagement.vue b/src/components/PolicyManagement.vue index 863e276..6621819 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/router/index.js b/src/router/index.js index 01a7b71..5a73214 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,6 +7,11 @@ const routes = [ path: "/", component: () => import("../views/Index.vue"), }, + { + path: "/cockpit", + name: "cockpit", + component: () => import("../views/Cockpit.vue"), + }, { path: "/datacollect", name: "datacollect", @@ -30,7 +35,7 @@ const routes = [ { path: "/dbcollectiongate", name: "dbcollectiongate", - component: () => import("../views/DbCollectiongate.vue") + component: () => import("../views/DbCollectiongate.vue"), }, // db网关-数据采集配置-网口配置 { @@ -164,11 +169,6 @@ const routes = [ name: "ntmaintenance", component: () => import("../views/NtMaintenance.vue"), }, - { - path: "/cockpit", - name: "cockpit", - component: () => import("../views/Cockpit.vue"), - }, ]; const router = new VueRouter({ 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: { diff --git a/src/views/ChMqtt.vue b/src/views/ChMqtt.vue index b4f9736..f4ceafa 100644 --- a/src/views/ChMqtt.vue +++ b/src/views/ChMqtt.vue @@ -8,7 +8,7 @@ - \ No newline at end of file + 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 @@