From 88e497e20a51a2a127c4bc59f036f5367ab0670e Mon Sep 17 00:00:00 2001
From: whycwx <1272078254@qq.com>
Date: 星期五, 23 七月 2021 10:18:45 +0800
Subject: [PATCH] 动图
---
src/pages/testedMotor/testedMotor.vue | 1
src/pages/boostingTransformer/boostingTransformer.vue | 3
src/pages/AFEinverter/afeInverter.vue | 4
src/pages/monitoring/js/diagramStates.js | 84 ---------------------
src/pages/monitoring/intoLineMonitoring.vue | 1
src/pages/boostingTransformer/js/diagramStates.js | 48 ++++++++++++
src/pages/AFEinverter/js/diagramStates.js | 45 +++++++++++
src/pages/switchboard/switchboard.vue | 3
src/pages/dcSwitchboard/dcSwitchboard.vue | 1
src/pages/dynamometerMmotor/dynamometerMmotor.vue | 1
src/pages/AFEinverter/js/gridCircuitDiagram.js | 2
11 files changed, 106 insertions(+), 87 deletions(-)
diff --git a/src/pages/AFEinverter/afeInverter.vue b/src/pages/AFEinverter/afeInverter.vue
index c123dec..541f7a7 100644
--- a/src/pages/AFEinverter/afeInverter.vue
+++ b/src/pages/AFEinverter/afeInverter.vue
@@ -111,7 +111,7 @@
import * as echarts from 'echarts';
// import ContentBox from "@/components/ContentBox";
import gridCircuitDiagram from '@/pages/AFEinverter/js/gridCircuitDiagram'
-// import diagramStates from '@/pages/home/topoGraphdiagram/js/diagramStates'
+import diagramStates from '@/pages/AFEinverter/js/diagramStates'
let diagram;
export default {
chart: {},
@@ -150,6 +150,7 @@
mounted() {
let self = this;
diagram = gridCircuitDiagram(this.$refs.static, this.$refs.flush);
+ diagramStates(diagram, 'run1');
self.initEcharts();
self.openSocket();
window.addEventListener('resize', () => {
@@ -264,6 +265,7 @@
bottom: '30'
},
tooltip: {
+ "trigger":"axis",
show: true
},
xAxis: {
diff --git a/src/pages/AFEinverter/js/diagramStates.js b/src/pages/AFEinverter/js/diagramStates.js
new file mode 100644
index 0000000..5b8d807
--- /dev/null
+++ b/src/pages/AFEinverter/js/diagramStates.js
@@ -0,0 +1,45 @@
+// 鍩虹閰嶇疆
+let springGreen = "#50cef5";
+let red = "#b370fe";
+let scalcRadius = 3;
+// 鏀剧數鐘舵��
+function diagramStates(diagram, type) {
+ // 鏂紑鎵�鏈夌殑寮�鍏�
+ // diagram.setOption('km1', 'state', false);
+ // diagram.setOption('km2', 'state', false);
+ // diagram.setOption('km3', 'state', false);
+ // diagram.setOption('km4', 'state', false);
+ // 娓呴櫎鐢垫祦
+ // diagram.del(/^line.*dot$/);
+ if (type == "run1") {
+ run1Charge(diagram);
+ }
+
+}
+
+// 杩愯鐘舵��1
+function run1Charge(diagram) {
+ // // 绾挎潯1
+ let line1 = diagram.getOption('line5').points;
+ diagram.moveDot({
+ id: 'line1_dot',
+ fillStyle: springGreen,
+ strokeStyle: springGreen,
+ radius: scalcRadius,
+ flush: true,
+ points: [line1[1], line1[0]],
+ });
+ // 绾挎潯1
+ let line2 = diagram.getOption('line3').points;
+ // 绾挎潯2
+ let line3 = diagram.getOption('line2').points;
+ diagram.moveDot({
+ id: 'line2_dot',
+ fillStyle: springGreen,
+ strokeStyle: springGreen,
+ radius: scalcRadius,
+ flush: true,
+ points: [line2[1], line3[0]],
+ });
+}
+export default diagramStates;
\ No newline at end of file
diff --git a/src/pages/AFEinverter/js/gridCircuitDiagram.js b/src/pages/AFEinverter/js/gridCircuitDiagram.js
index 14e08b7..ad3cf11 100644
--- a/src/pages/AFEinverter/js/gridCircuitDiagram.js
+++ b/src/pages/AFEinverter/js/gridCircuitDiagram.js
@@ -74,7 +74,7 @@
lineWidth: lineWidth,
points: [
[line3[0][0],line3[0][1]],
- [line2[1][0]-10, line2[1][1]]
+ [line2[1][0], line2[1][1]]
]
});
diff --git a/src/pages/boostingTransformer/boostingTransformer.vue b/src/pages/boostingTransformer/boostingTransformer.vue
index a9155e0..5c980af 100644
--- a/src/pages/boostingTransformer/boostingTransformer.vue
+++ b/src/pages/boostingTransformer/boostingTransformer.vue
@@ -86,6 +86,7 @@
import getWsUrl from "@/assets/js/getWsUrl";
import * as echarts from 'echarts';
import gridCircuitDiagram from '@/pages/boostingTransformer/js/gridCircuitDiagram'
+import diagramStates from '@/pages/boostingTransformer/js/diagramStates'
let diagram;
export default {
chart: {},
@@ -121,6 +122,7 @@
let self = this;
diagram = gridCircuitDiagram(this.$refs.static, this.$refs.flush);
+ diagramStates(diagram, 'run1');
self.initEcharts();
self.openSocket();
},
@@ -222,6 +224,7 @@
bottom: '30'
},
tooltip: {
+ "trigger":"axis",
show: true
},
xAxis: {
diff --git a/src/pages/boostingTransformer/js/diagramStates.js b/src/pages/boostingTransformer/js/diagramStates.js
new file mode 100644
index 0000000..dbeabef
--- /dev/null
+++ b/src/pages/boostingTransformer/js/diagramStates.js
@@ -0,0 +1,48 @@
+// 鍩虹閰嶇疆
+let springGreen = "#50cef5";
+let red = "#b370fe";
+let scalcRadius = 3;
+// 鏀剧數鐘舵��
+function diagramStates(diagram, type) {
+ // 鏂紑鎵�鏈夌殑寮�鍏�
+ // diagram.setOption('km1', 'state', false);
+ // diagram.setOption('km2', 'state', false);
+ // diagram.setOption('km3', 'state', false);
+ // diagram.setOption('km4', 'state', false);
+ // 娓呴櫎鐢垫祦
+ // diagram.del(/^line.*dot$/);
+ if (type == "run1") {
+ run1Charge(diagram);
+ }
+
+}
+
+// 杩愯鐘舵��1
+function run1Charge(diagram) {
+ // 绾挎潯1
+ let line1 = diagram.getOption('line6').points;
+ // 绾挎潯2
+ let line2 = diagram.getOption('line5').points;
+ diagram.moveDot({
+ id: 'line1_dot',
+ fillStyle: springGreen,
+ strokeStyle: springGreen,
+ radius: scalcRadius,
+ flush: true,
+ points: [line1[1], line2[0]],
+ });
+
+ // 绾挎潯1
+ let line3 = diagram.getOption('line3').points;
+ // 绾挎潯2
+ let line4 = diagram.getOption('line2').points;
+ diagram.moveDot({
+ id: 'line2_dot',
+ fillStyle: springGreen,
+ strokeStyle: springGreen,
+ radius: scalcRadius,
+ flush: true,
+ points: [line3[1], line4[0]],
+ });
+}
+export default diagramStates;
\ No newline at end of file
diff --git a/src/pages/dcSwitchboard/dcSwitchboard.vue b/src/pages/dcSwitchboard/dcSwitchboard.vue
index 5825a78..b080135 100644
--- a/src/pages/dcSwitchboard/dcSwitchboard.vue
+++ b/src/pages/dcSwitchboard/dcSwitchboard.vue
@@ -278,6 +278,7 @@
bottom: '30'
},
tooltip: {
+ "trigger":"axis",
show: true
},
xAxis: {
diff --git a/src/pages/dynamometerMmotor/dynamometerMmotor.vue b/src/pages/dynamometerMmotor/dynamometerMmotor.vue
index 099dbc0..f937aa8 100644
--- a/src/pages/dynamometerMmotor/dynamometerMmotor.vue
+++ b/src/pages/dynamometerMmotor/dynamometerMmotor.vue
@@ -293,6 +293,7 @@
bottom: '30'
},
tooltip: {
+ "trigger":"axis",
show: true
},
xAxis: {
diff --git a/src/pages/monitoring/intoLineMonitoring.vue b/src/pages/monitoring/intoLineMonitoring.vue
index a2ab130..04d50cd 100644
--- a/src/pages/monitoring/intoLineMonitoring.vue
+++ b/src/pages/monitoring/intoLineMonitoring.vue
@@ -284,6 +284,7 @@
bottom: '30'
},
tooltip: {
+ "trigger":"axis",
show: true
},
xAxis: {
diff --git a/src/pages/monitoring/js/diagramStates.js b/src/pages/monitoring/js/diagramStates.js
index 17e8e3a..a6ad3c7 100644
--- a/src/pages/monitoring/js/diagramStates.js
+++ b/src/pages/monitoring/js/diagramStates.js
@@ -13,17 +13,8 @@
// diagram.del(/^line.*dot$/);
if (type == "run1") {
run1Charge(diagram);
- // run2Charge(diagram);
- // run3Charge(diagram);
}
- if (type == "run2") {
- run2Charge(diagram);
- }
-
- if (type == "run3") {
- run3Charge(diagram);
- }
}
// 杩愯鐘舵��1
@@ -81,79 +72,4 @@
points: [line5[1], line6[1]],
});
}
-
-// 杩愯鐘舵��2
-function run2Charge(diagram) {
-
- // // 绾挎潯3
- // let line3 = diagram.getOption('line3').points;
- // // 绾挎潯4
- // let line4 = diagram.getOption('line4').points;
- // diagram.moveDot({
- // id: 'line3_dot',
- // fillStyle: springGreen,
- // strokeStyle: springGreen,
- // radius: scalcRadius,
- // flush: true,
- // points: [line3[0], line4[1]],
- // });
- // // 绾挎潯5
- // let line5 = diagram.getOption('line5').points;
- // // 绾挎潯6
- // let line6 = diagram.getOption('line6').points;
- // diagram.moveDot({
- // id: 'line5_dot',
- // fillStyle: springGreen,
- // strokeStyle: springGreen,
- // radius: scalcRadius,
- // flush: true,
- // points: [line5[0], line6[1]],
- // });
-}
-
-function run3Charge(diagram) {
-
- // 绾挎潯1
- let line1 = diagram.getOption('line1').points;
- // 绾挎潯2
- let line2 = diagram.getOption('line2').points;
- diagram.moveDot({
- id: 'line1_dot',
- fillStyle: springGreen,
- strokeStyle: springGreen,
- radius: scalcRadius,
- flush: true,
- points: [line1[0], line2[1]],
- });
-
- // 绾挎潯3
- let line3 = diagram.getOption('line3').points;
- // 绾挎潯4
- let line4 = diagram.getOption('line4').points;
- diagram.moveDot({
- id: 'line3_dot',
- fillStyle: springGreen,
- strokeStyle: springGreen,
- radius: scalcRadius,
- flush: true,
- points: [line3[0], line4[1]],
- });
-
-
- // 绾挎潯5
- let line5 = diagram.getOption('line5').points;
- // 绾挎潯6
- let line6 = diagram.getOption('line6').points;
- diagram.moveDot({
- id: 'line5_dot',
- fillStyle: springGreen,
- strokeStyle: springGreen,
- radius: scalcRadius,
- flush: true,
- points: [line5[0], line6[1]],
- });
-
-}
-
-
export default diagramStates;
\ No newline at end of file
diff --git a/src/pages/switchboard/switchboard.vue b/src/pages/switchboard/switchboard.vue
index 34e944f..e7eb75c 100644
--- a/src/pages/switchboard/switchboard.vue
+++ b/src/pages/switchboard/switchboard.vue
@@ -267,7 +267,8 @@
bottom: '30'
},
tooltip: {
- show: true
+ show: true,
+ "trigger":"axis",
},
xAxis: {
type: 'category',
diff --git a/src/pages/testedMotor/testedMotor.vue b/src/pages/testedMotor/testedMotor.vue
index 2eb1a28..f2e741c 100644
--- a/src/pages/testedMotor/testedMotor.vue
+++ b/src/pages/testedMotor/testedMotor.vue
@@ -268,6 +268,7 @@
bottom: '30'
},
tooltip: {
+ "trigger":"axis",
show: true
},
xAxis: {
--
Gitblit v1.9.1