Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/utils/baseUrl.js

@@ -2,11 +2,11 @@ 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.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.8.129:9000'; // 旭强
         // BASE_API = 'http://192.168.8.119:9000'; // 张赛
-        BASE_API = 'http://192.168.8.110:9000'; // 杜康
+        // BASE_API = 'http://192.168.8.110:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

src/views/planMonitor/editTool/index.vue

@@ -3,7 +3,6 @@
     <menu-bar
       ref="menuBar"
       :plan-convert="PlanConvert"
-      :run-plan-list="runPlanList"
       :load-run-plan-id="loadRunPlanId"
       @doClose="doClose"
       @refresh="refresh"
@@ -28,8 +27,6 @@
       @dispatchOperate="dispatchOperate"
       @refresh="refresh"
     />
-    <!-- <edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" /> -->
-    <!-- <add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" /> -->
     <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
     <move-planing-train ref="movePlaningTrain" :load-run-plan-id="loadRunPlanId" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
     <modifying-routing ref="modifyingRouting" @dispatchDialog="dispatchDialog" />
@@ -45,7 +42,6 @@
     <modifying-station-interval-time ref="modifyingStationIntervalTime" />
     <modifying-station-stop-time ref="modifyingStationStopTime" />
     <populating-generic-data ref="populatingGenericData" :load-run-plan-id="loadRunPlanId" />
-    <create-empty-plan ref="createEmptyPlan" @refresh="refreshRunPlanList" />
     <edit-plan-name ref="editPlan" @renewal="refreshRunPlanName" />
     <gernarate-plan ref="gernaratePlanTrain" />
   </div>
@@ -70,15 +66,11 @@ import ModifyingBeginTime from './menus/modifyingBeginTime';
 import EditStationBetweenTime from './menus/editStationBetweenTime';
 import GernaratePlan from './menus/gernaratePlanTrain';
 import MovePlaningTrain from './menus/movePlaningTrain';
-// import AddSmoothRunTime from './menus/addSmoothRunTime';
-// import EditSmoothRunTime from './menus/editSmoothRunTime';
 import ModifyingStationIntervalTime from './menus/modifyingStationIntervalTime';
 import ModifyingStationStopTime from './menus/modifyingStationStopTime';
 import PopulatingGenericData from './menus/populatingGenericData';
-import CreateEmptyPlan from './menus/createEmptyPlan';
 import { deletePlanService } from '@/api/runplan';
 import { checkLoginLine } from '@/api/login';
-import { getRpListByMapId } from '@/api/runplan';
 import { getPublishMapDetailById } from '@/api/jmap/map';
 
 export default {
@@ -104,7 +96,6 @@ export default {
         // EditSmoothRunTime,
         ModifyingStationIntervalTime,
         ModifyingStationStopTime,
-        CreateEmptyPlan,
         EditPlanName,
         GernaratePlan,
         MovePlaningTrain
@@ -130,6 +121,8 @@ export default {
         this.timeDemon = setInterval(() => {
             checkLoginLine();
         }, 5000 * 60);
+        this.loadRunPlanId = this.$route.query.planId;
+        this.loadRunPlanName = this.$route.query.planName;
         if (this.$route.query.mapId) {
             this.refreshRunPlanList(true);
             await this.loadMap();
@@ -190,15 +183,7 @@ export default {
             this.$store.dispatch('runPlan/refresh');
         },
         refreshRunPlanList(firstLoad) {
-            getRpListByMapId(this.$route.query.mapId).then(resp => {
-                this.runPlanList = resp.data || [];
-                if (firstLoad && this.runPlanList.length) {
-                    this.loadRunPlanId = this.runPlanList[0].id;
-                    this.loadRunPlanName = this.runPlanList[0].name;
-                }
-            }).catch(() => {
-                this.$message.error('获取草稿运行图列表失败');
-            });
+
         },
         doClose() {
             this.$emit('doClose');

src/views/planMonitor/editTool/menuBar.vue

@@ -133,12 +133,6 @@ export default {
                 return { };
             }
         },
-        runPlanList: {
-            type: Array,
-            default: function() {
-                return [];
-            }
-        },
         loadRunPlanId: {
             type: String,
             default: function() {
@@ -319,9 +313,6 @@ export default {
         },
         '$route.query.planId': function () {
             this.menus = this.menuConvert(this.menuBase);
-        },
-        runPlanList() {
-            this.initMenu();
         }
     },
     created() {