From ce79c12b7da690bca6456d4d2ebc1a8af5a45d59 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 26 Mar 2021 16:08:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=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 --- src/views/iscs/iscsSystem/stationConfig/fas/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue index 5fa5b240f..679ab60de 100644 --- a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue @@ -65,7 +65,7 @@ export default { if (this.mode == 'gas') { this.title = this.stationName + ' 气体灭火系统'; this.scaleRate = window.innerWidth / 1920; - this.height = 970; + this.height = 930; } else if (this.mode == 'sensing') { this.title = ''; this.scaleRate = window.innerWidth / 1920; From 6f0eca250335c6b3abf3e12bec606d9934361847 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Fri, 26 Mar 2021 16:08:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20iscs=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/iscs/iscsSystem/stationConfig/environment/index.vue | 4 +++- src/views/iscs/iscsSystem/stationConfig/fas/index.vue | 4 +++- .../iscs/iscsSystem/stationConfig/powerMonitor/substation.vue | 4 +++- src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue | 4 +++- .../iscs/iscsSystem/stationConfig/signalSystem/index.vue | 4 +++- .../iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue | 4 +++- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 2d2373cdb..2b32afcf1 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.129:9000'; // 旭强 // BASE_API = 'http://192.168.8.119:9000'; // 张赛 diff --git a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue index 2be0ca4b6..e40a262a8 100644 --- a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue @@ -158,7 +158,9 @@ export default { const data = JSON.parse(resp.data.graphData); this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate); document.querySelector('.Substation').scrollTop = 0; - } + } else { + this.loading = false; + } }); } } diff --git a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue index 5fa5b240f..b45f39e3e 100644 --- a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue @@ -98,7 +98,9 @@ export default { const data = JSON.parse(resp.data.graphData); this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate); document.querySelector('.fasIndex').scrollTop = 0; - } + } else { + this.loading = false; + } }); } } diff --git a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue index 2019493a8..70331e5b1 100644 --- a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue +++ b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue @@ -114,7 +114,9 @@ export default { const data = JSON.parse(resp.data.graphData); this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate); document.querySelector('.Substation').scrollTop = 0; - } + } else { + this.loading = false; + } }); } } diff --git a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue index 1a4116a19..4d41e4387 100644 --- a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue @@ -48,7 +48,9 @@ export default { if (resp.data) { const data = JSON.parse(resp.data.graphData); this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate); - } + } else { + this.loading = false; + } }); } }; diff --git a/src/views/iscs/iscsSystem/stationConfig/signalSystem/index.vue b/src/views/iscs/iscsSystem/stationConfig/signalSystem/index.vue index 0b8cb2495..f9edb09e6 100644 --- a/src/views/iscs/iscsSystem/stationConfig/signalSystem/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/signalSystem/index.vue @@ -75,7 +75,9 @@ export default { const data = JSON.parse(resp.data.graphData); this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate); document.querySelector('.fasIndex').scrollTop = 0; - } + } else { + this.loading = false; + } }); } } diff --git a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue index 2d36eead1..0f350512e 100644 --- a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue @@ -71,7 +71,9 @@ export default { const data = JSON.parse(resp.data.graphData); this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate); document.querySelector('.fasIndex').scrollTop = 0; - } + } else { + this.loading = false; + } }); } } From 0a796d421853ef9457ea66c99c78424e3d92e6ae Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 29 Mar 2021 10:03:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BC=96?= =?UTF-8?q?=E5=88=B6=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 --- src/views/planMonitor/detail.vue | 11 ++++++----- .../planMonitor/editTool/menus/createEmptyPlan.vue | 9 +++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue index 94a3c2a95..2a8b1789b 100644 --- a/src/views/planMonitor/detail.vue +++ b/src/views/planMonitor/detail.vue @@ -15,17 +15,17 @@ border > - + +