From ea15c3675164cc2fbd1941752fe5220adb535b23 Mon Sep 17 00:00:00 2001 From: walker-sheng Date: Mon, 2 Nov 2020 19:28:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E9=80=89?= =?UTF-8?q?=E6=8E=92->=E5=85=81=E8=AE=B8=E9=80=89=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/zh/menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 49eedd6b7..d59f4d91f 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -424,7 +424,7 @@ export default { blocked: '封锁', protectionSection: '保护区段', allowSelection: '允许选排', - notAllowSelection: '不允许选排', + notAllowSelection: '允许选排', sectionName: '区段名称', section: '区段', speedLimitValue: '限速值', From b59b3459ee1fc11311b9c489eba25204ed0fead6 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 3 Nov 2020 18:48:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=95=85=E9=9A=9C=E6=B5=81=E7=A8=8B=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscs/iscsDraw/icscComponents/line.vue | 18 +++++-- .../stationConfig/canvas/iscsCanvas.vue | 8 +-- .../stationConfig/dialog/malfunction.vue | 54 +++++++++++++++---- .../iscsSystem/stationConfig/dialog/valve.vue | 8 +-- 4 files changed, 69 insertions(+), 19 deletions(-) diff --git a/src/views/iscs/iscsDraw/icscComponents/line.vue b/src/views/iscs/iscsDraw/icscComponents/line.vue index 3b362403e..a904dbc47 100644 --- a/src/views/iscs/iscsDraw/icscComponents/line.vue +++ b/src/views/iscs/iscsDraw/icscComponents/line.vue @@ -135,6 +135,7 @@ export default { buttonText: '立即创建', showDeleteButton: false, field: '', + groupMode: null, form: { classify:'solid', code: '', @@ -230,12 +231,15 @@ export default { if (this.form.isGradual) { if (this.form.modelList.length) { this.$emit('createDataModel', lineModel); + this.groupMode && this.$emit('createDataModel', this.groupMode); this.initPage(); } else { this.$message.error('渐变列表不能为空'); } } else { this.$emit('createDataModel', lineModel); + console.log(this.groupMode, '===='); + this.groupMode && this.$emit('createDataModel', this.groupMode); this.initPage(); } } else { @@ -285,9 +289,17 @@ export default { }, addChildElement(model) { this.form.controlCode = model.code; - const groupMode = this.$iscs.iscsDevice[model.code].model; - groupMode['lineCode'] = this.form.code; - this.$emit('createDataModel', groupMode); + this.groupMode = JSON.parse(JSON.stringify(this.$iscs.iscsDevice[model.code].model)); + if (typeof this.groupMode['lineCode'] == 'string') { + this.groupMode['lineCode'] = []; + } + if (!this.groupMode['lineCode']) { + this.groupMode['lineCode'] = [this.form.code]; + } else { + if (!this.groupMode['lineCode'].includes(this.form.code)) { + this.groupMode['lineCode'].push(this.form.code); + } + } }, addModelList() { const param = { diff --git a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue index e840d4c04..61465ea86 100644 --- a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue +++ b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue @@ -152,9 +152,11 @@ export default { })); if (model.lineCode) { // 关联接触网 颜色处理 - arr.push({ - code: model.lineCode, - strokeColor: model.valve ? '#00FF1E' : '#FF0000' + model.lineCode.forEach(item => { + arr.push({ + code: item, + strokeColor: model.valve ? '#00FF1E' : '#FF0000' + }); }); } // 改变元素状态 diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue index 86731a678..a0c69d4ce 100644 --- a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue +++ b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue @@ -64,7 +64,8 @@ export default { ], list: { valve: ['控分', '控合'] - } + }, + farmed: '' }; }, computed: { @@ -87,6 +88,7 @@ export default { commit() { this.$refs['form'].validate((valid) => { if (valid) { + this.farmed = ''; if (this.formModel.value == 'frame_group') { this.setMalfunction(); } else { @@ -155,7 +157,7 @@ export default { }, time); }, // 执行操作 - handleModel(model, judge = false) { + handleModel(model, judge = true) { const arr = []; model.statusList.forEach(item => { if (item.key == 'valve' && item.value == model.valve) { @@ -177,9 +179,12 @@ export default { return device.model; })); if (model.lineCode) { - arr.push({ - code: model.lineCode, - strokeColor: model.valve ? '#00FF1E' : '#FF0000' + // 关联接触网 颜色处理 + model.lineCode.forEach(item => { + arr.push({ + code: item, + strokeColor: model.valve ? '#00FF1E' : '#FF0000' + }); }); } // 改变元素状态 @@ -199,7 +204,7 @@ export default { // 报警时间 开关 if (judge) { const params = { - name: model.name, + name: model.name + this.farmed, times: this.filterTime(), station: this.$route.query.stationName, key: 'valve', @@ -243,6 +248,7 @@ export default { this.$iscs.iscsDevice['group_43'].model['valve'] = true; this.$iscs.iscsDevice['group_47'].model['valve'] = true; this.$iscs.iscsDevice['group_48'].model['valve'] = true; + this.farmed = ''; this.handleModel(this.$iscs.iscsDevice['group_11'].model); const promise1 = new Promise((resolve) => { @@ -305,11 +311,39 @@ export default { ]); Promise.all([promise1, promise2]).then(() => { this.$message.success('105/106/201/202/211/212/213/214开关因为框架电流保护动作跳闸，分位'); - const params = { - name: '框架电流保护动作跳闸', + this.handleAlarm(); + }); + }, + handleAlarm() { + const list = [ + { + name: '211断路器', times: this.filterTime(), - station: this.$route.query.stationName, - key: 'frame' + station: '象峰站' + }, + { + name: '212断路器', + times: this.filterTime(), + station: '象峰站' + }, + { + name: '211断路器', + times: this.filterTime(), + station: '树兜站' + }, + { + name: '212断路器', + times: this.filterTime(), + station: '树兜站' + } + ]; + list.forEach(item => { + const params = { + name: item.name, + times: item.times, + station: item.station, + key: 'valve', + valve: true }; this.$store.dispatch('iscs/setAddAlarmList', params); // 报警 this.$store.dispatch('iscs/setAddIncidentList', params); // 事件 diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue index bb0578aa8..808c454fd 100644 --- a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue +++ b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue @@ -238,9 +238,11 @@ export default { })); if (model.lineCode) { // 关联接触网 颜色处理 - arr.push({ - code: model.lineCode, - strokeColor: model.valve ? '#00FF1E' : '#FF0000' + model.lineCode.forEach(item => { + arr.push({ + code: item, + strokeColor: model.valve ? '#00FF1E' : '#FF0000' + }); }); } // 改变元素状态 From d4c4f488d92bd5760b61686aa0b89d09cd2f13d7 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 4 Nov 2020 10:14:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=A0=B7=E5=BC=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscsSystem/stationConfig/dialog/alarm.vue | 79 +++++++++++++++---- src/views/iscs/iscsSystem/stationNav.vue | 11 +-- 2 files changed, 70 insertions(+), 20 deletions(-) diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/alarm.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/alarm.vue index 5c2beb188..65713ca5a 100644 --- a/src/views/iscs/iscsSystem/stationConfig/dialog/alarm.vue +++ b/src/views/iscs/iscsSystem/stationConfig/dialog/alarm.vue @@ -1,6 +1,10 @@ @@ -65,5 +78,41 @@ export default { diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue index 9e6fc95f7..898f7d5be 100644 --- a/src/views/iscs/iscsSystem/stationNav.vue +++ b/src/views/iscs/iscsSystem/stationNav.vue @@ -57,9 +57,10 @@
返回
-
+ +
报警 - +
事件
故障设置
@@ -410,9 +411,9 @@ export default { }, // 获取报警信息 handleAlarmInfo() { - if (!this.alarmInfo) { - this.$refs.alarmConfig.doShow(); - } + // if (!this.alarmInfo) { + this.$refs.alarmConfig.doShow(); + // } }, // 设置故障 handleMalfunction() { From 6b5700b3947ea23e5be7cede8fb7d53f50e4370a Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 4 Nov 2020 13:20:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/shape/group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/iscs/shape/group.js b/src/iscs/shape/group.js index 984be25f6..f7413cfad 100644 --- a/src/iscs/shape/group.js +++ b/src/iscs/shape/group.js @@ -21,7 +21,7 @@ export default class rect extends Group { create() { let rect = null; for (const key in this.model.elemMap) { - if (Vue.prototype.$iscs.iscsDevice[key].instance) { + if (Vue.prototype.$iscs.iscsDevice[key] && Vue.prototype.$iscs.iscsDevice[key].instance) { if (!rect) { rect = Vue.prototype.$iscs.iscsDevice[key].instance.getBoundingRect(); } else { From 3cc700308568e7e964f65ebe16cc93df18cb3345 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 4 Nov 2020 16:32:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/shape/text.js | 2 +- src/utils/baseUrl.js | 2 +- src/views/iscs/iscsDraw/icscComponents/text.vue | 6 +++--- .../iscsSystem/stationConfig/canvas/iscsCanvas.vue | 11 +++++++++++ .../iscsSystem/stationConfig/dialog/malfunction.vue | 13 ++++++++++++- .../iscs/iscsSystem/stationConfig/dialog/valve.vue | 13 ++++++++++++- 6 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/iscs/shape/text.js b/src/iscs/shape/text.js index 7a57815d8..95ea5d8ac 100644 --- a/src/iscs/shape/text.js +++ b/src/iscs/shape/text.js @@ -66,7 +66,7 @@ export default class text extends Group { this.model.point.y += dy; } setState(model) { - this.textName.setStyle('text', model.context); + model.context && this.textName.setStyle('text', model.context); model.gbColor && this.textName.setStyle('textBackgroundColor', model.gbColor); } setSize(width, height) { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 89ce9ee58..4bb14fdb5 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -5,7 +5,7 @@ export function getBaseUrl() { BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 - // BASE_API = 'http://192.168.3.175:9000'; // 张赛 + // BASE_API = 'http://192.168.8.109:9000'; // 张赛 // BASE_API = 'http://192.168.8.110:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 diff --git a/src/views/iscs/iscsDraw/icscComponents/text.vue b/src/views/iscs/iscsDraw/icscComponents/text.vue index 195b3c1ea..d96a0bf8b 100644 --- a/src/views/iscs/iscsDraw/icscComponents/text.vue +++ b/src/views/iscs/iscsDraw/icscComponents/text.vue @@ -1,11 +1,11 @@