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

src/router/index_Common.js

@@ -19,13 +19,13 @@ const Jlmap3dTrain = () => import('@/views/jlmap3d/devicetrain/jl3ddevicetrain')
 const Jlmap3dMaintainerVr = () => import('@/views/jlmap3d/maintainer/jl3dmaintainervr');
 // const Jl3dMaintainer = () => import('@/views/jlmap3d/maintainer/jl3dmaintainer');
 
-const Display = () => import('@/views/display/index');
+const Display = () => import('@/views/oldMap/display/index');
 const DisplayNew = () => import('@/views/newMap/displayNew/index');
-const DesignDisplay = () => import('@/views/display/designIndex');
+const DesignDisplay = () => import('@/views/oldMap/display/designIndex');
 const DesignDisplayNew = () => import('@/views/newMap/displayNew/designIndex');
 
 const TrainRoom = () => import('@/views/trainRoom/index');
-const JointTraining = () => import('@/views/jointTraining/index');
+const JointTraining = () => import('@/views/oldMap/jointTraining/index');
 const JointTrainingNew = () => import('@/views/newMap/jointTrainingNew/index');
 
 const Errpr404 = () => import('@/views/error-page/404');
@@ -232,9 +232,9 @@ export const constantRoutes = [
         hidden: true
     },
     {
-      path: '/jlmap3d/maintainervr', // 贵阳 继电器
+        path: '/jlmap3d/maintainervr', // 贵阳 继电器
-      component: Jlmap3dMaintainerVr,
+        component: Jlmap3dMaintainerVr,
-      hidden: true
+        hidden: true
 
     },
     { // 竞赛系统报名

src/router/index_HEB.js

@@ -15,12 +15,12 @@ const Jlmap3dSandbox = () => import('@/views/jlmap3d/simulation/jl3dsimulation')
 const Jlmap3dModel = () => import('@/views/jlmap3d/device/jl3ddevice');
 const Jlmap3dPassFlow = () => import('@/views/jlmap3d/passflow/jl3dpassflow');
 const Jlmap3dTrain = () => import('@/views/jlmap3d/devicetrain/jl3ddevicetrain');
-const Display = () => import('@/views/display/index');
+const Display = () => import('@/views/oldMap/display/index');
 const DisplayNew = () => import('@/views/newMap/displayNew/index');
-const DesignDisplay = () => import('@/views/display/designIndex');
+const DesignDisplay = () => import('@/views/oldMap/display/designIndex');
 
 const TrainRoom = () => import('@/views/trainRoom/index');
-const JointTraining = () => import('@/views/jointTraining/index');
+const JointTraining = () => import('@/views/oldMap/jointTraining/index');
 const JointTrainingNew = () => import('@/views/newMap/jointTrainingNew/index');
 
 const Errpr404 = () => import('@/views/error-page/404');

src/store/modules/map.js

@@ -225,7 +225,7 @@ const map = {
         activeTrainListUpdate:0, // 当前按计划行车的列车列表更新标识
         activeTrainListChange:0, // 当前按计划行车的列车列表变化标识（只对列车的groupNumber进行了检测）
         activeTrainList:[], // 当前按计划行车的列车列表
-        runPlanStatus:false, // 是否正处于按计划行车
+        runPlanStatus: false, // 是否正处于按计划行车
         showCentralizedStationCode: '',	// 现地分集中站显示(集中站code)
         showCentralizedStationNum: 0, 	// 现地分集中站显示判断
         overlapList: [], // 延续保护list

src/views/designPlatform/mapPreview.vue

@@ -4,7 +4,7 @@
   </div>
 </template>
 <script>
-import JlmapVisual from '@/views/jlmap/index';
+import JlmapVisual from '@/views/oldMap/jlmap/index';
 import { loadMapDataById } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 

src/views/jlmap3d/edit/jlmap3dedit.vue

@@ -28,7 +28,7 @@
   import Vue from 'vue';
   import localStore from 'storejs';
   import { mapGetters } from 'vuex';
-  import SetTime from '@/views/display/demon/setTime';
+  import SetTime from '@/views/oldMap/display/demon/setTime';
   import { getTrainingCbtcDemon, setTrainingCbtcInitTime } from '@/api/simulation';
 
   import { UrlConfig } from '@/scripts/ConstDic';

src/views/newMap/jointTrainingNew/menuDemon.vue

@@ -3,14 +3,15 @@
     <chat-box :group="group" :user-role="userRole" />
     <!-- <div class="btn_hover" @mouseenter="btnHover"><i class="el-icon-s-promotion" /></div> -->
     <!--  @mouseenter="btnBoxEnter" @mouseleave.stop="btnBoxLeave"  -->
-    <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
+    <div class="display-draft" :class="{'display-type-hb': lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group class="button-group-box">
         <el-button v-if="project==='refereeJsxt'" type="success" size="small" @click="refeeEndCompetition">退出</el-button> <!-- 竞赛退出 -->
         <el-button v-if="project!=='jsxt' && project!=='refereeJsxt'" type="primary" :loading="backLoading" size="small" @click="back">退出</el-button>
         <template v-if="!dataError"> <!-- 地图错误判断 -->
           <template v-if="isAdmin && project != 'refereeJsxt'">
             <el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
-            <el-button type="success" :disabled="isDisable || dataError" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
+            <!-- 按计划行车 -->
+            <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           </template>
           <template v-if="project == 'jsxt'">
             <div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div>
@@ -140,14 +141,16 @@ export default {
             }
         },
         '$store.state.socket.simulationStart': async function (val) {
+            console.log(val, '仿真开始标记');
             if (val) {
                 this.$store.dispatch('training/setInitTime', +new Date(val));
                 this.$store.dispatch('training/simulationStart', { start: true});
             }
         },
-        '$store.state.map.runPlanStatus': function (val) {
+        // '$store.state.map.runPlanStatus': function (val) { // 是否正处于按计划行车
-            this.isDisable = val;
+        //     console.log(val);
-        },
+        //     this.isDisable = val;
+        // },
         '$store.state.socket.simulationOver':function(val) {
             if (val && this.project == 'refereeJsxt') {
                 this.$router.go(-1);
@@ -238,7 +241,7 @@ export default {
                     if (this.project == 'jsxt') {
                         this.jsStart = false;
                     }
-                    this.$store.dispatch('map/setRunPlanStatus', true);
+                    this.$store.dispatch('map/', true);
                     this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                 });
             }).catch((error) => {
@@ -268,9 +271,8 @@ export default {
         },
         end() {
             this.isDisable = false;
-            // EventBus.$emit('trainView');
             exitRunPlan(this.group).then(()=>{
-                this.$store.dispatch('map/setRunPlanStatus', false);
+                this.$store.dispatch('map/', false);
                 this.$store.dispatch('map/setTrainWindowShow', false);
                 this.$store.dispatch('map/resetActiveTrainList');
             }).catch(() => {

src/views/oldMap/display/designIndex.vue

@@ -54,14 +54,14 @@
 import RunPlanLoad from './demon/runPlanLoad';
 import RunPlanView from './demon/runPlanView';
 import FaultChoose from './demon/faultChoose';
-import MapSystemDraft from '@/views/mapsystem/index';
+import MapSystemDraft from '@/views/oldMap/mapsystem/index';
-import MenuLesson from '@/views/display/menuLesson';
+import MenuLesson from '@/views/oldMap/display/menuLesson';
-import MenuDemon from '@/views/display/menuDemon';
+import MenuDemon from '@/views/oldMap/display/menuDemon';
-import MenuScreen from '@/views/display/menuScreen';
+import MenuScreen from '@/views/oldMap/display/menuScreen';
-import MenuSchema from '@/views/display/menuSchema';
+import MenuSchema from '@/views/oldMap/display/menuSchema';
-import MenuSystemTime from '@/views/display/menuSystemTime';
+import MenuSystemTime from '@/views/oldMap/display/menuSystemTime';
-import MenuPlan from '@/views/display/menuPlan';
+import MenuPlan from '@/views/oldMap/display/menuPlan';
-import MenuScript from '@/views/display/menuScript';
+import MenuScript from '@/views/oldMap/display/menuScript';
 import AddQuest from './demon/addQuest';
 import Scheduling from './demon/scheduling';
 import { mapGetters } from 'vuex';

src/views/oldMap/display/index.vue

@@ -51,15 +51,15 @@
 </template>
 
 <script>
-import MapSystemDraft from '@/views/mapsystem/index';
+import MapSystemDraft from '@/views/oldMap/mapsystem/index';
-import MenuExam from '@/views/display/menuExam';
+import MenuExam from '@/views/oldMap/display/menuExam';
-import MenuLesson from '@/views/display/menuLesson';
+import MenuLesson from '@/views/oldMap/display/menuLesson';
-import MenuDemon from '@/views/display/menuDemon';
+import MenuDemon from '@/views/oldMap/display/menuDemon';
-import MenuScreen from '@/views/display/menuScreen';
+import MenuScreen from '@/views/oldMap/display/menuScreen';
-import MenuSchema from '@/views/display/menuSchema';
+import MenuSchema from '@/views/oldMap/display/menuSchema';
-import MenuSystemTime from '@/views/display/menuSystemTime';
+import MenuSystemTime from '@/views/oldMap/display/menuSystemTime';
-import MenuPlan from '@/views/display/menuPlan';
+import MenuPlan from '@/views/oldMap/display/menuPlan';
-import MenuScript from '@/views/display/menuScript';
+import MenuScript from '@/views/oldMap/display/menuScript';
 import Scheduling from './demon/scheduling';
 import { mapGetters } from 'vuex';
 import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training';

src/views/oldMap/jointTraining/index.vue

@@ -28,13 +28,13 @@
 <script>
 import { getToken } from '@/utils/auth';
 import { creatSubscribe, clearSubscribe, roomTopic} from '@/utils/stomp';
-import MapSystemDraft from '@/views/mapsystem/index';
+import MapSystemDraft from '@/views/oldMap/mapsystem/index';
 import MenuDemonJoint from './menuDemon';
 import MenuDemonSchema from './menuSchema';
-import JoinFaultChoose from '@/views/display/demon/faultChoose';
+import JoinFaultChoose from '@/views/oldMap/display/demon/faultChoose';
-import JoinRunPlanLoad from '@/views/display/demon/runPlanLoad';
+import JoinRunPlanLoad from '@/views/oldMap/display/demon/runPlanLoad';
-import JoinRunPlanView from '@/views/display/demon/runPlanView';
+import JoinRunPlanView from '@/views/oldMap/display/demon/runPlanView';
-import menuSystemTime from '@/views/display/menuSystemTime';
+import menuSystemTime from '@/views/oldMap/display/menuSystemTime';
 import IbpPlate from '@/views/ibp/ibpsystem/index';
 import { mapGetters } from 'vuex';
 import { OperateMode, TrainingMode } from '@/scripts/ConstDic';

src/views/oldMap/jointTraining/menuDemon.vue

@@ -19,7 +19,7 @@
 
 <script>
 import QrCode from '@/components/QrCode';
-import SetTime from '@/views/display/demon/setTime';
+import SetTime from '@/views/oldMap/display/demon/setTime';
 import { runDiagramIsStart, runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
 import { exitFullscreen } from '@/utils/screen';
 import { putJointTrainingSimulationUser } from '@/api/chat';

src/views/oldMap/mapsystem/common/index.vue

@@ -11,8 +11,8 @@ import { mapGetters } from 'vuex';
 import { getDeviceMenuByDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import { letfMouseSelectDevice } from '@/api/simulation';
 import deviceType from '@/jmap/constant/deviceType';
-import JlmapVisual from '@/views/jlmap/index';
+import JlmapVisual from '@/views/oldMap/jlmap/index';
-import TrainingTips from '@/views/mapsystem/plugin/trainingtip';
+import TrainingTips from '@/views/oldMap/mapsystem/plugin/trainingtip';
 
 export default {
     name: 'LessonCanvas',

src/views/oldMap/mapsystem/plugin/trainingtip.vue

@@ -6,7 +6,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import PopTip from '@/views/mapsystem/plugin/src/poptip';
+import PopTip from '@/views/oldMap/mapsystem/plugin/src/poptip';
 import { getDeviceTypeByDic, getDomIdByOperation } from '@/scripts/ConstDic';
 import { getDomOffset } from '@/utils/index';
 

src/views/scriptManage/display/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import Display from '@/views/display/index';
+import Display from '@/views/oldMap/display/index';
 import TipScriptRecord from './tipScriptRecord';
 import drapLeft from '@/views/components/drapLeft/index';