From 00f0fd84a383c5fde344f65741a9a405df3b7ee4 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Mon, 19 Aug 2019 09:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E7=AB=99=E5=85=AC?= =?UTF-8?q?=E9=87=8C=E8=A1=A8=E9=9A=90=E8=97=8F=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/jmap/shape/Section/index.js | 3 +- .../chengdu_03/menus/menuDialog/viewName.vue | 464 +++++++++--------- src/scripts/ConstDic.js | 16 + src/utils/baseUrl.js | 4 +- src/views/demonstration/detail/index.vue | 9 +- 5 files changed, 257 insertions(+), 239 deletions(-) diff --git a/src/jmap/shape/Section/index.js b/src/jmap/shape/Section/index.js index 2c33386ed..032cd17ae 100644 --- a/src/jmap/shape/Section/index.js +++ b/src/jmap/shape/Section/index.js @@ -46,7 +46,6 @@ export default class Section extends Group { createMouseEvent() { // 鼠标事件 if (this.style.Section.mouseOverStyle) { - // console.log(this.model.relSwitchCode); this.mouseEvent = new EMouse(this, this.model.relSwitchCode); this.add(this.mouseEvent); this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); }); @@ -133,6 +132,8 @@ export default class Section extends Group { }); this.add(this.turnBack); this.add(this.turnBackriangle); + this.turnBack.hide(); + this.turnBackriangle.hide(); } } diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue index aa1ccd4f0..8fdfe991f 100644 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue +++ b/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue @@ -1,248 +1,256 @@ \ No newline at end of file + this.$store.dispatch('map/updateMapDevices', deviceList); + } + } +}; + diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js index a7d86cc2a..90f7a35d0 100644 --- a/src/scripts/ConstDic.js +++ b/src/scripts/ConstDic.js @@ -2009,6 +2009,22 @@ export const OperationEvent = { operation: '70b2', domId: '_Tips-Train-deletePlanTrainId-TrainSource' } + }, + // 设目的地车 + destinationTrainId: { + event: 'c', + menu: { + operation: '70c', + domId: '_Tips-Train-destinationTrainId-Menu' + } + }, + // 设人工车 + artificialTrainId: { + event: 'd', + menu: { + operation: '70d', + domId: '_Tips-Train-artificialTrainId-Menu' + } } }, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 2e575c51e..72be3b2f1 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,8 +3,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 = 'http://192.168.3.5:9000'; // 袁琪 + // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.4:9000' // 琰培 } else { diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index 786346961..4e2916510 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -262,17 +262,10 @@ export default { } } } else { - this.loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); if (this.courseModel.pmsList.length) { this.jump(); } else { if (this.tryTime <= 1) { - this.loading.close(); this.$confirm('您没有权限，请前往购买产品', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -294,7 +287,7 @@ export default { this.$router.push({ path: `${UrlConfig.display}/demon`, query: query }); launchFullscreen(); }).catch(error => { - this.loading.close(); + this.loading.close(); this.$messageBox(`创建仿真失败: ${error.message}`); }); },