From f7c6f6ee644c69298123a171e1b2d194c10bbd78 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 12 Jun 2020 09:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/newMap/newMapdraft/mapoperate/section/index.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index c59924e25..778caeb7b 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://b29z135112.zicp.vip'; diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue index 2caa663b3..9040ccb6c 100644 --- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue @@ -223,7 +223,7 @@ export default { { prop: 'destinationCodePoint.y', firstLevel: 'destinationCodePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' } ] }, // 目的地码坐标 - { prop: 'switchSection', label: this.$t('map.isSwitchSection'), type: 'checkbox', disabled: true }, // 是否关联道岔 + { prop: 'switchSection', label: this.$t('map.isSwitchSection'), type: 'checkbox', disabled: true, isHidden: !this.isRelevanceSwitchShow }, // 是否关联道岔 { prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: !this.isRelevanceSwitchShow, disabled: true }, // 关联道岔 { prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSwitchSectionType }, // 1 @@ -393,7 +393,7 @@ export default { }, isSwitchSectionShow() { // 道岔区段 - return this.editModel.type != '03'; + return this.editModel.type != '03' && !this.editModel.logicSectionCodeList.length; }, isPointsShow() { return ( @@ -401,7 +401,7 @@ export default { ); }, isRelevanceSwitchShow() { - return this.editModel.type == '04' && this.editModel.type == '03'; + return this.editModel.type == '04' || this.editModel.type == '03'; }, hasAssociatedSection() { return this.editModel.type == '01' || this.editModel.type == '03';