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 @@ 全部显示 全部隐藏 + @@ -52,7 +55,8 @@ export default { }, computed: { ...mapGetters('iscs', [ - 'iscsGroupList' + 'iscsGroupList', + 'iscs' ]) }, methods: { @@ -94,14 +98,15 @@ export default { elemList: [] }; }, - doDeleteGroup() { + doDeleteGroup(data) { const Model = { - code: this.formModel.code, + code: data && data.code ? data.code : this.formModel.code, _type: 'IscsGroup' }; this.$emit('deleteDataModel', Model); const modelList = []; - for (const key in this.formModel.elemMap) { + const elemMap = data ? data.elemMap : this.formModel.elemMap; + for (const key in elemMap) { const device = this.$iscs.iscsDevice[key]; if (device && device.model) { device.model['groupId'] = ''; @@ -126,6 +131,26 @@ export default { const device = this.$iscs.iscsDevice[group.code]; device.instance.hide(); }); + }, + deleteAll() { + this.$confirm('此操作将删除所有编组, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.iscs.iscsGroupList.forEach(item => { + this.doDeleteGroup(item); + }); + this.$message({ + type: 'success', + message: '删除成功!' + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); } } }; diff --git a/src/views/iscs/iscsDraw/icscComponents/line.vue b/src/views/iscs/iscsDraw/icscComponents/line.vue index b9a736930..3b362403e 100644 --- a/src/views/iscs/iscsDraw/icscComponents/line.vue +++ b/src/views/iscs/iscsDraw/icscComponents/line.vue @@ -62,6 +62,12 @@ + + + + + 添加 +
坐标点
@@ -118,7 +124,9 @@ + + diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue index b7b079b69..bb0578aa8 100644 --- a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue +++ b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue @@ -135,6 +135,18 @@ export default { console.log('不允许点击'); } } + } else if (this.model.code == 'group_24' || this.model.code == 'group_53' || this.model.code == 'group_35' || this.model.code == 'group_43' || this.model.code == 'group_47' || this.model.code == 'group_48') { + if (this.rowData[this.rowData.key]) { + this.model[this.rowData.key] = this.rowData[this.rowData.key]; + this.handleModel(this.model); + } else { + if (!this.$iscs.iscsDevice['IscsButton_6'].model['fault']) { + this.model[this.rowData.key] = this.rowData[this.rowData.key]; + this.handleModel(this.model); + } else { + console.log('不允许点击'); + } + } } else { this.model[this.rowData.key] = this.rowData[this.rowData.key]; this.handleModel(this.model); @@ -224,6 +236,13 @@ export default { const device = deviceFactory(el._type, el); return device.model; })); + if (model.lineCode) { + // 关联接触网 颜色处理 + arr.push({ + code: model.lineCode, + strokeColor: model.valve ? '#00FF1E' : '#FF0000' + }); + } // 改变元素状态 arr.forEach(el => { const device = this.$iscs.iscsDevice[el.code]; @@ -247,6 +266,19 @@ export default { }; this.$store.dispatch('iscs/setAddAlarmList', params); this.$store.dispatch('iscs/setAddIncidentList', params); + + const arrList = []; + this.$store.state.iscs.faultList.forEach(item => { + if (item.stationName == this.$route.query.stationName) { + item.list.forEach(ele => { + if (ele.code == model.code) { + ele.valve = false; + } + }); + } + arrList.push(item); + }); + this.$store.commit('iscs/setFaultList', arrList); }, doClose() { this.dialogShow = false; diff --git a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue index 45b5e45a8..328967856 100644 --- a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue @@ -168,6 +168,7 @@ export default { text-align: center; margin-top: 15px; color: #d8e9a5; + font-size: 25px; } .Substation{ display: inline-block; diff --git a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue index 815523ab7..956b4d281 100644 --- a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue +++ b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue @@ -85,7 +85,16 @@ export default { const tractionList = ['象峰站', '罗汉山站', '树兜站', '东街口站', '达道站', '三叉街站', '葫芦阵站', '城门站', '胪雷站', '安平站', '梁厝站', '三江口站']; if (tractionList.includes(this.stationName)) { this.title = this.stationName + ' 牵引降压混合变电所主接线图'; - params.userInterface = 'combined'; + if (this.stationName == '象峰站') { + params.userInterface = 'combined01'; + } else if (this.stationName == '罗汉山站') { + params.userInterface = 'combined02'; + } else if (this.stationName == '树兜站') { + params.userInterface = 'combined03'; + } else { + params.userInterface = 'combined02'; + } + params.system = 'combined'; } else { this.title = this.stationName + ' 降压变电所主接线图'; params.userInterface = 'stepDown'; @@ -113,6 +122,7 @@ export default { text-align: center; margin-top: 15px; color: #d8e9a5; + font-size: 25px; } .Substation{ display: inline-block; diff --git a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue index 34c733e92..8a9104f85 100644 --- a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue @@ -57,6 +57,7 @@ export default { text-align: center; margin-top: 15px; color: #d8e9a5; + font-size: 25px; } .psdSystem{ From 5c6ce655d610eb75fee2c4037313287822f137db Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 3 Nov 2020 13:21:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E5=A3=B0=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/AlarmSoundUrgent.wav | Bin 0 -> 45056 bytes src/iscs/iscs.js | 1 - src/store/modules/iscs.js | 4 ++ src/utils/baseUrl.js | 4 +- .../stationConfig/canvas/iscsCanvas.vue | 21 +++++++- .../iscsSystem/stationConfig/dialog/alarm.vue | 16 ++++++- .../stationConfig/dialog/incident.vue | 2 +- .../stationConfig/dialog/malfunction.vue | 45 +++++++++++------- 8 files changed, 69 insertions(+), 24 deletions(-) create mode 100644 src/assets/AlarmSoundUrgent.wav diff --git a/src/assets/AlarmSoundUrgent.wav b/src/assets/AlarmSoundUrgent.wav new file mode 100644 index 0000000000000000000000000000000000000000..9327a8f9a0817185218ea7a3aa6b3bf72a410515 GIT binary patch literal 45056 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 todv5>v7~4Nz { state.faultList = list; + }, + setCloseMusic: (state, num) => { + state.closeMusicNum = num; } }, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index a3670f04d..408bf264a 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -1,8 +1,8 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { - BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.8.144:9000'; // 旭强 // BASE_API = 'http://192.168.3.175:9000'; // 张赛 diff --git a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue index 89a7ab495..20a1ce8e9 100644 --- a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue +++ b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue @@ -3,9 +3,12 @@
+
+ + diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index c023906b9..13e431c95 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -346,7 +346,7 @@ export default { this.$store.dispatch('training/over').then(() => { this.backLoading = true; this.$store.dispatch('map/resetActiveTrainList', true); - if (this.$route.query.projectDevice) { + if (this.$route.query.projectDevice || this.$route.query.project === 'bjd') { this.$store.dispatch('LogOut').then(() => { location.reload(); }); diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index 02db231ae..4d386a28a 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -190,7 +190,22 @@ export default { this.$emit('runPlanLoadShow'); }, viewRunPlan() { - this.$refs.runPlanView.doShow(); + if (this.$route.query.project === 'bjd') { + const routeData = this.$router.resolve({ + path:'/planSchedule/window', + query:{ + mapId:this.$route.query.mapId, + group:this.$route.query.group, + lineCode: this.$route.query.lineCode, + project: this.$route.query.project, + noPreLogout: true, + initTime: this.$store.state.training.initTime + } + }); + window.open(routeData.href, '_blank', 'noopener noreferrer'); + } else { + this.$refs.runPlanView.doShow(); + } }, // 选择车站 switchStationMode(stationCode) { From 85fee7157060b0f472155dd0e49ac8fce33b446e Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 3 Nov 2020 13:54:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue index 20a1ce8e9..e840d4c04 100644 --- a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue +++ b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue @@ -108,9 +108,7 @@ export default { if (arr.length != 0) { this.$store.state.iscs.faultList.forEach(item => { if (item.stationName == this.$route.query.stationName) { - console.log(item.list); item.list.forEach(ele => { - console.log(this.$iscs.iscsDevice); const device = this.$iscs.iscsDevice[ele.code]; device.model = Object.assign(device.model, ele); if (device.model._type == 'IscsButton') { From 4e0b6dc7e62d06c7141ff45239845e84339cf13b Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 3 Nov 2020 14:06:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E8=80=83=E8=AF=95=E9=87=8D=E7=BD=AE=E9=BB=98=E8=AE=A4=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 2 +- src/views/newMap/displayNew/exam/index.vue | 1 - src/views/newMap/displayNew/lesson/index.vue | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 408bf264a..89ce9ee58 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -4,7 +4,7 @@ export function getBaseUrl() { // BASE_API = 'https://joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 - // BASE_API = 'http://192.168.8.144:9000'; // 旭强 + // BASE_API = 'http://192.168.8.114:9000'; // 旭强 // BASE_API = 'http://192.168.3.175:9000'; // 张赛 // BASE_API = 'http://192.168.8.110:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/newMap/displayNew/exam/index.vue b/src/views/newMap/displayNew/exam/index.vue index 8035738a0..1ddd34df5 100644 --- a/src/views/newMap/displayNew/exam/index.vue +++ b/src/views/newMap/displayNew/exam/index.vue @@ -96,7 +96,6 @@ export default { this.startLoading = true; if (this.$route.query.trainingId) { this.isDisable = true; - this.$store.dispatch('training/setMapDefaultState'); startTrainingNew({ id: this.$route.query.trainingId }, this.group).then(response => { this.$store.dispatch('training/setTrainingStart', true); this.$store.dispatch('training/examModeStart'); diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue index 4947fee8d..4325a7afd 100644 --- a/src/views/newMap/displayNew/lesson/index.vue +++ b/src/views/newMap/displayNew/lesson/index.vue @@ -154,7 +154,6 @@ export default { start() { // 清空按钮操作 this.$store.dispatch('menuOperation/setButtonOperation', null); - this.$store.dispatch('training/setMapDefaultState'); this.startLoading = true; if (this.trainingObj && this.trainingObj.id) { startTrainingNew(this.trainingObj, this.group).then(response => {