diff --git a/src/jmap/shape/Section/index.js b/src/jmap/shape/Section/index.js index 25de6ef79..f1ec4a72d 100644 --- a/src/jmap/shape/Section/index.js +++ b/src/jmap/shape/Section/index.js @@ -230,7 +230,7 @@ export default class Section extends Group { const y = Math.min(model.points[0].y, model.points[model.points.length - 1].y) + Math.abs(model.points[model.points.length - 1].y - model.points[0].y) / 2; const traingle = new JTriangle(model.points[0], model.points[model.points.length - 1]); const drict = model.trainPosType != '01' ? 1 : -1; - if (model.type == '01' && style.Section.text.show && model.nameShow) { // 物理区段名称 + if (model.type == '01' && style.Section.text.show && model.nameShow && !model.isSwitchSection) { // 物理区段名称 const opposite = style.Section.text.opposite ? -1 : 1; const tempx = x + traingle.getSin(style.Section.text.distance); const tempy = y + traingle.getCos(style.Section.text.distance) * (style.Section.text.position || opposite * drict); @@ -272,7 +272,7 @@ export default class Section extends Group { textVerticalAlign: style.Section.logicText.textVerticalAlign }); this.add(this.name); - } else if (model.type == '03' && model.nameShow) { // 道岔计轴区段 + } else if (model.type == '03' && model.nameShow) { // 道岔区段 (实际道岔计轴区段) this.name = new ETextName({ zlevel: this.zlevel, z: this.z + 2, 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/planMonitor/editTool/menus/modifyingStationIntervalTime.vue b/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue index 03047e592..f598be9da 100644 --- a/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue +++ b/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue @@ -82,29 +82,29 @@ >{{ scope.row.runPlanLevelVO.level5 || '' }} - +
{{ $t('planMonitor.modifying.save') }} {{ $t('planMonitor.modifying.cancelAndQuit') }}
- +