From 24b95e3811f4aba4142262693824d8f2ae837b47 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 16 Dec 2020 16:22:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90=E9=83=BD?= =?UTF-8?q?=E4=B8=80=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/chengdu_01/menus/index.vue | 2 +- src/utils/baseUrl.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/chengdu_01/menus/index.vue b/src/jmapNew/theme/chengdu_01/menus/index.vue index 039d7d7b6..71627db46 100644 --- a/src/jmapNew/theme/chengdu_01/menus/index.vue +++ b/src/jmapNew/theme/chengdu_01/menus/index.vue @@ -35,7 +35,7 @@ export default { components: { MenuBar, MenuRequest, - MenuCancel, + // MenuCancel, MenuSignal, MenuSwitch, MenuSection, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 798608c73..c0569ef83 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ 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://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'; // 张赛 - BASE_API = 'http://192.168.8.110:9000'; // 杜康 + // BASE_API = 'http://192.168.8.110:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 From 98603f09a8a5665751cdb83275c7b8e4497f2a6f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 16 Dec 2020 18:22:37 +0800 Subject: [PATCH 2/3] =?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 --- .../planMonitor/editTool/routingoperate/runplanConfig.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/planMonitor/editTool/routingoperate/runplanConfig.vue b/src/views/planMonitor/editTool/routingoperate/runplanConfig.vue index c395aace6..31794b50a 100644 --- a/src/views/planMonitor/editTool/routingoperate/runplanConfig.vue +++ b/src/views/planMonitor/editTool/routingoperate/runplanConfig.vue @@ -110,8 +110,7 @@ export default { deleteSection(list, index) { const data = list.splice(index, 1); if (data.length > 0) { - const section = this.$store.getters['map/getDeviceByCode'](data[0].sectionCode); - section.instance.drawBatchSelected(section, ''); + this.setSectionColor({'sectionCode':data[0].sectionCode}, ''); } }, hover(field) { @@ -142,6 +141,7 @@ export default { if (!sectionState) { this.sectionCodeList.push({'sectionCode':sectionCode, 'stationCode':stationCode}); this.setSectionColor({'sectionCode':sectionCode}, 'routingSection'); + this.sectionCode = ''; } else { this.$messageBox('一个车站只能添加一个折返区段'); } @@ -193,7 +193,7 @@ export default { this.loading = false; }); } else { - this.$messageBox('该添加折返区段'); + this.$messageBox('请添加折返区段'); } }, clear() { From fdfd54f452fc86a1542903d8311aa3679a24ec6f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 17 Dec 2020 09:59:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E5=A4=A7=E5=AE=A2?= =?UTF-8?q?=E6=B5=81=E9=A1=B9=E7=9B=AE=20=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 --- .../newMap/displayNew/practiceDisplay.vue | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue index 85e570e1e..48997fd6a 100644 --- a/src/views/newMap/displayNew/practiceDisplay.vue +++ b/src/views/newMap/displayNew/practiceDisplay.vue @@ -71,7 +71,7 @@
- + {{ $t('global.cancel') }} - {{ $t('global.confirm') }} + {{ $t('global.confirm') }}
@@ -124,7 +124,9 @@ export default { openWindow:null, flowDataList:[], currentFlowDataName:'', - currentFlowDataId:'' + currentFlowDataId:'', + isDisabled:false, + loading:false }; }, computed:{ @@ -303,13 +305,16 @@ export default { }, confirmFlowData() { if (this.currentFlowDataId) { + this.loading = true; changePassengerFlowData(this.group, this.currentFlowDataId).then(res=>{ this.$store.dispatch('socket/resetTrainPassagerNum'); // this.$store.dispatch('map/mapClear'); this.flowDataShow = false; const currentFlowData = this.flowDataList.find(each=>{ return each.id == this.currentFlowDataId; }); if (currentFlowData) { this.currentFlowDataName = currentFlowData.name; } + this.loading = false; }).catch(error=>{ + this.loading = false; this.$messageBox('切换客流数据失败'); console.log(error.message); }); @@ -372,9 +377,18 @@ export default { }, changeFlowData() { this.flowDataShow = true; + this.isDisabled = true; const currentFlowData = this.flowDataList.find(each=>{ return each.name == this.currentFlowDataName; }); if (currentFlowData) { this.currentFlowDataId = currentFlowData.id; } }, + changeData(id) { + const currentFlowData = this.flowDataList.find(each=>{ return each.id == id; }); + if (currentFlowData && currentFlowData.name == this.currentFlowDataName) { + this.isDisabled = true; + } else { + this.isDisabled = false; + } + }, end() { exitRunPlan(this.group).then(() => { this.$store.dispatch('training/over').then(() => {