diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index 28c8bd61e..557291bed 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -247,8 +247,8 @@ class SkinCode extends defaultStyle { standEmergent: { // 紧急关闭 mergentR: 9, // 站台紧急关闭半径 mergentN: 8, // 站台紧急关闭边数(西安二号线特殊样式) - insideOffset: { x: 0, y: 50 }, // 内站台紧急关闭偏移量 - outsideOffset: { x: 0, y: -50}, // 外站台紧急关闭偏移量 + insideOffset: { x: 0, y: 40 }, // 内站台紧急关闭偏移量 + outsideOffset: { x: 0, y: -40}, // 外站台紧急关闭偏移量 closeColor: 'red', // 站台紧急关闭颜色 defaultColor:'#808080', // 西安二号线特殊样式(默认颜色) special:true // 西安二号线特殊样式 diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 7cedc6817..e9046878d 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ 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.3.5:9000'; // 袁琪 - BASE_API = 'http://192.168.3.6:9000'; // 旭强 + // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 diff --git a/src/views/newMap/newMapdraft/mapoperate/splitStation.vue b/src/views/newMap/newMapdraft/mapoperate/splitStation.vue index 650099076..02e237248 100644 --- a/src/views/newMap/newMapdraft/mapoperate/splitStation.vue +++ b/src/views/newMap/newMapdraft/mapoperate/splitStation.vue @@ -88,7 +88,7 @@ export default { draw: { name: this.$t('map.drawData'), item: [ - { prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.splitStationList}, + { prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'code', optionValue: 'code', options: this.splitStationList}, { prop: 'rightStationName', label: this.$t('map.rightCentralStationName'), type: 'input'}, { prop: 'leftStationName', label: this.$t('map.leftCentralStationName'), type: 'input'}, { prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '140px', children: [ @@ -141,7 +141,7 @@ export default { deviceSelect(selected) { this.$refs.dataform.resetFields(); this.$refs.make.resetFields(); - if (selected) { + if (selected && selected._type === 'SplitStation') { this.activeName = 'first'; this.editModel = deepAssign(this.editModel, selected); this.editModel.type = selected._type; diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue index 2696290f7..177b89343 100644 --- a/src/views/newMap/newMapdraft/mapoperate/station.vue +++ b/src/views/newMap/newMapdraft/mapoperate/station.vue @@ -76,6 +76,9 @@ + + + {{ $t('global.set') }} @@ -161,7 +164,8 @@ export default { }, allModel: { nameFont: '', - kmPostFont: '' + kmPostFont: '', + positionY: 0 } }; }, @@ -493,6 +497,7 @@ export default { const model = deepAssign({}, station); model.nameFont = this.allModel.nameFont; model.kmPostFont = this.allModel.kmPostFont; + model.position.y = this.allModel.positionY; models.push(model); }); this.$emit('updateMapModel', models);