From 27e938c1022f308f9ff3903df2b9ad5984f1955f Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 23 Mar 2021 17:35:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A4=8D=E5=88=B6iscs?=
=?UTF-8?q?=E5=9B=BE=E5=BD=A2=20=E7=94=9F=E6=88=90codebug=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/iscs/utils/parser.js | 5 +++++
src/views/iscs/iscsDraw/icscComponents/line.vue | 2 +-
src/views/iscsSystem/index.vue | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/iscs/utils/parser.js b/src/iscs/utils/parser.js
index 08fc4c9aa..6dacc418f 100644
--- a/src/iscs/utils/parser.js
+++ b/src/iscs/utils/parser.js
@@ -36,6 +36,11 @@ export function deviceFactory(type, elem) {
export function parser(data) {
var iscsDevice = {};
if (data) {
+ Object.values(data).forEach(list => {
+ if (list instanceof Array) {
+ list.sort((a, b) => parseInt(a.code.split('_')[1]) - parseInt(b.code.split('_')[1]));
+ }
+ })
zrUtil.each(data.manualAlarmButtonList || [], elem => {
iscsDevice[elem.code] = deviceFactory(deviceType.ManualAlarmButton, elem);
}, this);
diff --git a/src/views/iscs/iscsDraw/icscComponents/line.vue b/src/views/iscs/iscsDraw/icscComponents/line.vue
index a904dbc47..814b23117 100644
--- a/src/views/iscs/iscsDraw/icscComponents/line.vue
+++ b/src/views/iscs/iscsDraw/icscComponents/line.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue
index ff7f5d03d..2b358bab4 100644
--- a/src/views/iscsSystem/index.vue
+++ b/src/views/iscsSystem/index.vue
@@ -180,7 +180,8 @@ export default {
} else if (this.selected._type != 'CheckBox') {
this.copyModel = this.copyModelInfo(this.selected, 10);
const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1);
- this.copyModel.code = getUID(this.selected._type, this.iscs[type1 + 'List'] || []);
+ const list = this.iscs[type1 + 'List'] || [];
+ this.copyModel.code = getUID(this.selected._type, list);
} else {
this.copyModel = {};
}
From 9c31d4963c87c0a5273ddc9154884d490776df04 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 23 Mar 2021 17:51:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?iscs=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../iscs/iscsSystem/stationConfig/fas/index.vue | 13 ++++++++++++-
src/views/iscs/iscsSystem/stationConfig/index.vue | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue
index 8846619aa..1d2fb0e49 100644
--- a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue
@@ -23,7 +23,7 @@ export default {
data() {
return {
title:'',
- bacground:'rgba(0,0,0,0)',
+ bacground:'rgba(66,90,116,1)',
loading:false,
width:window.innerWidth,
scaleRate:window.innerWidth / 2200,
@@ -78,6 +78,17 @@ export default {
this.title = this.stationName + ' 火灾报警系统 FAS联动';
this.scaleRate = window.innerWidth / 1920;
this.height = 900;
+ } else if (this.mode == 'stationHall') {
+ this.title = '';
+ params.userInterface = 'stationHallOne';
+ params.system = 'stationHall';
+ this.scaleRate = window.innerWidth / 1920;
+ this.height = 850;
+ } else if (this.mode == 'platform') {
+ params.userInterface = 'platformOne';
+ params.system = 'platform';
+ this.scaleRate = window.innerWidth / 1920;
+ this.height = 850;
}
// if (this.stationId == 'mainHouseOne' || this.stationId == 'mainHouseTwo') {
// this.bacground = 'rgba(0,0,0,0)';
diff --git a/src/views/iscs/iscsSystem/stationConfig/index.vue b/src/views/iscs/iscsSystem/stationConfig/index.vue
index ea028dd79..1001d86c6 100644
--- a/src/views/iscs/iscsSystem/stationConfig/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/index.vue
@@ -43,7 +43,7 @@ export default {
return {
mode: 'index',
deviceList: [],
- fasList:['sensing', 'gas', 'section', 'linkage']
+ fasList:['sensing', 'gas', 'section', 'linkage', 'stationHall', 'platform']
};
},
computed: {