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 @@
- 新增策略
+ 新增策略
@@ -12,8 +14,11 @@
-
-
+
@@ -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: {