From 333c8b2c86a695c5f9797c4742e76c6b3849092a Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 3 Nov 2020 10:30:26 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A6=8F=E5=B7=9E?=
=?UTF-8?q?=E7=BB=BC=E5=90=88=E7=9B=91=E6=8E=A7=E6=95=85=E9=9A=9C=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/iscs/iscs.js | 1 +
src/iscs/shape/button.js | 3 +
src/iscs/shape/line.js | 3 +
src/store/modules/iscs.js | 4 +
src/views/iscs/iscsDesign/demonList.vue | 22 ++-
.../iscs/iscsDraw/group/tab-template.vue | 33 +++-
.../iscs/iscsDraw/icscComponents/line.vue | 30 ++-
.../iscsDraw/iscsPowerMonitoring/index.vue | 19 +-
.../iscs/iscsSystem/config/deviceControl.vue | 2 +-
.../stationConfig/canvas/iscsCanvas.vue | 79 +++++++-
.../iscsSystem/stationConfig/dialog/alarm.vue | 2 +-
.../stationConfig/dialog/malfunction.vue | 90 ++++++++-
.../stationConfig/dialog/protectReset.vue | 180 ++++++++++++++++++
.../iscsSystem/stationConfig/dialog/valve.vue | 32 ++++
.../stationConfig/environment/index.vue | 1 +
.../stationConfig/powerMonitor/substation.vue | 12 +-
.../stationConfig/psdSystem/index.vue | 1 +
17 files changed, 495 insertions(+), 19 deletions(-)
create mode 100644 src/views/iscs/iscsSystem/stationConfig/dialog/protectReset.vue
diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js
index 35864a967..c49bb3e58 100644
--- a/src/iscs/iscs.js
+++ b/src/iscs/iscs.js
@@ -73,6 +73,7 @@ class Iscs {
}
loadData(iscsDevice) {
+ console.log(iscsDevice, '=======');
// 地图数据
this.iscsDevice = iscsDevice;
diff --git a/src/iscs/shape/button.js b/src/iscs/shape/button.js
index 000eb663a..e18fd1896 100644
--- a/src/iscs/shape/button.js
+++ b/src/iscs/shape/button.js
@@ -152,6 +152,9 @@ export default class Button extends Group {
this.on('mouseout', (e) => { this.buttonText && this.buttonText.setStyle({textFill: model.textColor || '#FFF'}); });
this.on('mouseover', (e) => { this.buttonText && this.buttonText.setStyle({textFill: model.textColorActive || '#000'}); });
}
+ setState(model) {
+ this.textButtonRect.setStyle('fill', model.backgroundColor);
+ }
setModel(dx, dy) {
this.model.point.x += dx;
this.model.point.y += dy;
diff --git a/src/iscs/shape/line.js b/src/iscs/shape/line.js
index 7a84b3b90..e4e19e6fe 100644
--- a/src/iscs/shape/line.js
+++ b/src/iscs/shape/line.js
@@ -137,6 +137,9 @@ export default class line extends Group {
this.grouper.add(this.iscsLine);
this.add(this.grouper);
}
+ setState(model) {
+ this.iscsLine.setStyle('stroke', model.strokeColor);
+ }
setModel(dx, dy) {
this.model.points.forEach(item => {
item.x += dx;
diff --git a/src/store/modules/iscs.js b/src/store/modules/iscs.js
index b26e74f82..6453e8511 100644
--- a/src/store/modules/iscs.js
+++ b/src/store/modules/iscs.js
@@ -11,6 +11,7 @@ const iscs = {
rightClickCount: 0, // 右键点击设备
selected: '', // 左键选中设备
selectedCount: 0, // 左键选中
+ faultList: [], // 故障 元素状态
incidentList: [], // 事件列表
alarmList: [] // 报警列表
},
@@ -173,6 +174,9 @@ const iscs = {
},
setAddIncidentList: (state, device) => {
state.incidentList.unshift(device);
+ },
+ setFaultList: (state, list) => {
+ state.faultList = list;
}
},
diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue
index f1344c0d6..ad7d37808 100644
--- a/src/views/iscs/iscsDesign/demonList.vue
+++ b/src/views/iscs/iscsDesign/demonList.vue
@@ -89,7 +89,27 @@ export default {
name: '牵引降压混合变电所主接线图',
mode: 'powerMonitoring02',
id: 'combined',
- type: 'interface'
+ type: 'system',
+ children: [
+ {
+ name: '象峰站牵引降压混合变电所主接线图',
+ mode: 'powerMonitoring02',
+ id: 'combined01',
+ type: 'interface'
+ },
+ {
+ name: '罗汉山牵引降压混合变电所主接线图',
+ mode: 'powerMonitoring02',
+ id: 'combined02',
+ type: 'interface'
+ },
+ {
+ name: '树兜站牵引降压混合变电所主接线图',
+ mode: 'powerMonitoring02',
+ id: 'combined03',
+ type: 'interface'
+ }
+ ]
},
{
name: '停车场接触网图',
diff --git a/src/views/iscs/iscsDraw/group/tab-template.vue b/src/views/iscs/iscsDraw/group/tab-template.vue
index 0f2527af6..0db62438e 100644
--- a/src/views/iscs/iscsDraw/group/tab-template.vue
+++ b/src/views/iscs/iscsDraw/group/tab-template.vue
@@ -32,6 +32,9 @@
p^4)xn#9ZSyUq
z{)uLZRrbP0y#6%jLp+ Z)|d{S_RKcqQj1FxYZXJH<8y
zc@E43Clgi+9`T3ca%7jQGnEgCyoge9JA4o!d+p|YEmeQS|D78XvYX@eR~oG9U$*=H
zBWMeli(Af(;~vM}RN!mhC~EQN!e@#%! -TI|scopQ@
zl+--dHRK=GcxiD_Ns*{=AAU`uqv!1|eOMhD{*RKMTde%>=&sRW2JoFeL|R@kySCa_
z-iR>M
zVvnxj0Te_Mk{nGSA91c4Yq4<#>~%jGC!Ozvj|)fvL)A9xW@Nr|ndOHm1kw$hB?fn;
z44+3Ngfk*15{KaTfc`o)!&KWi_{}wmex2q7vS^|m^~e-B$@Iwd0h|XoBcyc4a;Lc7
zp-bpB9xX7w({*)HpS^Ah`yz%y=Tk&LmF~C073m8NHVRF1L2-_Sg6F+Ygrn%zh-CU{
zf*4Y0>r%|?K{kf*KsXJ((T@$p>i;@MT;77u8r)1^Akp5>H}&UA{<+bkjp5zy1wgL(
zqU>hZ?xvMO3n3<|drXy}>l99Nkk5cub#lXFV85-H=f?DrCwlCUeG#U@mO4(ElwwJH
zMDtE5+s8TP25HpZt@Q_;bFtgw#?;7z;Gb3-hcu9&p625e*AhGx{l~u8xRT%4B5d(i
zPp8_VMZ}r5P`wIV3twXCQjyI2Ain0#(X~T!41RtUF*5^Kx%%6G=
GeU}9dy=WZmO3?Q8TAD
zxbN5Cdu=Qovm#+eq0OU|TXseH4f7D42h(EzLv@JBb^M{X0fNQbCvt6v8}ch}bZ%z0
zs8$E@mc`G}L7^3Wf1e2+qpst!oh29#l&37T_IU4HZ`r~tGfc43=4oZot&G0)vWI?{
zCHV`gF(0aT6r3C0j7%jwaNUh%pgmMIwHfVO+)xX4<=l0P?|f1QYo6YFSTxc5$)e}W
z?hykU(Z6momLWXGc1BLak#R#>L_Mx)xpTl={esQjd-_Yt%j?Nqx!hIw?s@;MfKUtD
zBtMRK`hlw4XSiL(k=@Jn9~++4J^~=77cJCL{e~MWl+{7)1tWf#Nwa)bwS@HdJ^5MM
zJlCejRk{D?{uLiuaG(oQ
z;oW??!790jnc_=xT{ngh-IMv5KO)$KO!qx5n~je<7T387(a3E7gF*Yq|A6YH*E<`!
z&7%e)+^ZWQR@+O2nsnfNjNbK=+h+K`in}fF*3l6i{#rmegO7h=`8%|nS2g$=z#~!J
zR@r}5+?LD6*2Da9|GD+!baqz+wB|)!U(E-}7yLJP$2&nrs|A<%b}DyxIO#lEF$$HZ
zsCV0|oURguu0Bp}hC^NTt%0K54xZj*hMxz