diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 7cc370268..f84210e59 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -27,7 +27,7 @@ export function handlerUrl() { // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; - BASE_API = 'http://192.168.3.90:9000'; // 周寅 + // BASE_API = 'http://192.168.3.90:9000'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 1b200776b..421695b27 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -229,6 +229,7 @@ export default { this.picture = val; if (this.picture === 'dispatchWork' && this.lineCode === '14') { this.picture = 'basidi'; + this.$store.dispatch('app/animationsClose'); } this.$store.dispatch('map/setPicture', this.picture); if (val === 'ibp') { @@ -268,11 +269,7 @@ export default { // 设置地图加载状态 mapViewLoaded(loading) { this.loading = loading; - if (loading) { - this.$store.dispatch('app/animationsClose'); - } else { - this.$store.dispatch('app/animationsClose'); - } + this.$store.dispatch('app/animationsClose'); } } }; diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index 24ca09c47..c41a236b6 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -195,14 +195,12 @@ export default { }, watch: { '$store.state.training.roles': function (val) { - console.log('watch', val); this.initTerminalList(); const trainingDetail = this.$store.state.trainingNew.trainingDetail; if (this.isFirst && this.$route.query.client) { this.isFirst = false; } else { if (trainingDetail && trainingDetail.client) { - console.log(trainingDetail.client, '-----------ee-'); this.changePictureShow(trainingDetail.client); } else { this.initPictureShow(); @@ -230,18 +228,14 @@ export default { }); }, noEvent(code) { - console.log(code, 'noEvent'); this.$emit('pictureChange', code); }, initPictureShow() { - console.log(this.roles, '-----------'); const localWorkRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER']; if (localWorkRoleList.includes(this.roles)) { - console.log('00000000000000'); this.changePictureShow('localWork'); } else if (this.roles === 'DISPATCHER') { - console.log('00000001111'); this.changePictureShow('dispatchWork'); } else if (this.roles === 'MAINTAINER') { // 通号 @@ -251,7 +245,6 @@ export default { } }, changePictureShow(code) { - console.log(code, '111111'); this.$emit('loadingChange'); setTimeout(() => { this.$emit('pictureChange', code); diff --git a/src/views/newMap/display/trainingDesign/createDraftTraining.vue b/src/views/newMap/display/trainingDesign/createDraftTraining.vue index eeb5138c9..cd61005cf 100644 --- a/src/views/newMap/display/trainingDesign/createDraftTraining.vue +++ b/src/views/newMap/display/trainingDesign/createDraftTraining.vue @@ -7,7 +7,13 @@ 返回 - + + + + + + + { const cpData = Object.assign({}, this.formModel); + cpData.client = this.tagForm.client; cpData.labelJson = JSON.stringify(this.tagForm.dynamicTags); + console.log(cpData, '----------'); let api = updateTraining; let mes = '编辑'; if (this.isCreate) { diff --git a/src/views/newMap/display/trainingDesign/designPane.vue b/src/views/newMap/display/trainingDesign/designPane.vue index 5e25a7a94..df16efa22 100644 --- a/src/views/newMap/display/trainingDesign/designPane.vue +++ b/src/views/newMap/display/trainingDesign/designPane.vue @@ -84,6 +84,7 @@ @@ -112,7 +113,7 @@