From 66b8c03fef761177c004880be42de5c6962171a0 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 16 Apr 2020 17:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=99=E9=97=B4=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmap/shape/Section/index.js                  |  4 ++--
 src/utils/baseUrl.js                             |  4 ++--
 .../menus/modifyingStationIntervalTime.vue       | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

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 || '' }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('planMonitor.modifying.operation')" width="100">
+        <!-- <el-table-column :label="$t('planMonitor.modifying.operation')" width="100">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="handleUpdate(scope.row)">{{ $t('planMonitor.modifying.edit') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
     </el-row>
     <div class="button-group" style="text-align: center; margin-top: 10px;">
       <el-button type="primary" @click="handleSave">{{ $t('planMonitor.modifying.save') }}</el-button>
       <el-button @click="doClose">{{ $t('planMonitor.modifying.cancelAndQuit') }}</el-button>
     </div>
-    <update-station-interval-time ref="updateStationIntervalTime" @handleConfirm="handleConfirm" />
+    <!-- <update-station-interval-time ref="updateStationIntervalTime" @handleConfirm="handleConfirm" /> -->
   </el-dialog>
 </template>
 <script>
 import { formatName } from '@/utils/runPlan';
 import { getStationRunning, setStationRunning } from '@/api/runplan';
-import UpdateStationIntervalTime from './updateStationIntervalTime';
+// import UpdateStationIntervalTime from './updateStationIntervalTime';
 
 export default {
     name: 'ModifyingStationIntervalTime',
     components: {
-        UpdateStationIntervalTime
+        // UpdateStationIntervalTime
     },
     data() {
         return {
@@ -167,9 +167,9 @@ export default {
             this.loading = false;
             this.dialogShow = false;
         },
-        handleUpdate(row) {
-            this.$refs.updateStationIntervalTime.doShow(row);
-        },
+        // handleUpdate(row) {
+        //     this.$refs.updateStationIntervalTime.doShow(row);
+        // },
         handleConfirm(model) {
             this.stationIntervalData.forEach(elem => {
                 if (elem.id == model.stationRunningId) {