From 63824fb35f2bef074e41d655a581692fa2635eef Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 12 Oct 2020 18:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E4=B8=80=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=20iscs=20=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/shape/stateTable.js | 2 +- .../stationConfig/electricSystem/index.vue | 57 -------- .../stationConfig/environment/index.vue | 125 ++++++++++++++++++ .../iscs/iscsSystem/stationConfig/index.vue | 18 ++- .../stationConfig/powerMonitor/substation.vue | 11 +- src/views/iscs/iscsSystem/stationNav.vue | 82 +++++++++++- 6 files changed, 228 insertions(+), 67 deletions(-) delete mode 100644 src/views/iscs/iscsSystem/stationConfig/electricSystem/index.vue create mode 100644 src/views/iscs/iscsSystem/stationConfig/environment/index.vue diff --git a/src/iscs/shape/stateTable.js b/src/iscs/shape/stateTable.js index 463f89742..f92724c84 100644 --- a/src/iscs/shape/stateTable.js +++ b/src/iscs/shape/stateTable.js @@ -276,7 +276,7 @@ export default class StateTable extends Group { model.tableData.forEach((item, i)=> { const index = model.headerType === 'none'? i: i+1; - const rects = this.rectsArr[index]; + const rects = this.rectsArr[index] || []; const contexts = []; model.columnWidthList.forEach((elem, j) => { const rect = rects[j]; diff --git a/src/views/iscs/iscsSystem/stationConfig/electricSystem/index.vue b/src/views/iscs/iscsSystem/stationConfig/electricSystem/index.vue deleted file mode 100644 index e2cf13444..000000000 --- a/src/views/iscs/iscsSystem/stationConfig/electricSystem/index.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - diff --git a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue new file mode 100644 index 000000000..9a7e50659 --- /dev/null +++ b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue @@ -0,0 +1,125 @@ + + + diff --git a/src/views/iscs/iscsSystem/stationConfig/index.vue b/src/views/iscs/iscsSystem/stationConfig/index.vue index fe4dc8f42..47debbe6a 100644 --- a/src/views/iscs/iscsSystem/stationConfig/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/index.vue @@ -1,19 +1,29 @@