打铁综合演练

src/views/newMap/displayNew/index.vue

@@ -211,7 +211,11 @@ export default {
                     this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断
                     this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
                     // this.$store.dispatch('training/countTime');
-                    this.$store.dispatch('training/setPrdType', resp.data.prodType);
+                    if (resp.data.prodType === '03') {
+                        this.$store.dispatch('training/setPrdType', this.$router.query.prdType);
+                    } else {
+                        this.$store.dispatch('training/setPrdType', resp.data.prodType);
+                    }
                     this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
                     this.planRunning = resp.data.planRunning;
                     if (resp.data.planRunning) {
@@ -223,7 +227,7 @@ export default {
                 this.dataError = resp.data.dataError;
             }
         },
-        // 通过showMode切换显示效果
+        // 通过showMode切换显示效果 11
         // switchModeInner(swch) {
         //     let showMode = '03';
         //     if (swch == '01') {

src/views/newMap/displayNew/menuDemon.vue

@@ -155,12 +155,12 @@ export default {
         isDisable() {
             return this.$store.state.training.started;
         },
-		isCtc() {
-        	return !!this.$route.query.ctc
-		},
-		zIndex() {
-        	return this.$route.query.ctc ? 11:0
-		},
+        isCtc() {
+            return !!this.$route.query.ctc;
+        },
+        zIndex() {
+            return this.$route.query.ctc ? 11 : 0;
+        },
         project() {
             return getSessionStorage('project');
         },
@@ -263,8 +263,10 @@ export default {
                 permissionType: PermissionType.SIMULATION
             };
             getGoodsTryUse(data).then(res => {
-                this.remainingTime = res.data.tryTime;
-                this.timeNow = Date.parse(new Date()) / 1000 + this.remainingTime;
+                if (res.data) {
+                    this.remainingTime = res.data.tryTime;
+                    this.timeNow = Date.parse(new Date()) / 1000 + this.remainingTime;
+                }
                 if (this.try) {
                     this.time = setInterval(() => {
                         this.tryTime += 1;
@@ -274,7 +276,7 @@ export default {
                         }
                     }, 1000);
                 }
-            }).catch(() => {
+            }).catch((e) => {
                 this.$messageBox(this.$t('display.demon.getTimeFail'));
             });
         },

src/views/newMap/jointTrainingNew/menuSchema.vue

@@ -13,8 +13,8 @@
         />
       </el-select>
       <el-button-group>
-        <el-button v-if="isCtc" size="small" @click="showLineBoard">占线板</el-button>
-        <el-button size="small" @click="showTrainTicket">路票</el-button>
+        <el-button v-if="userRole=== 'STATION_SUPERVISOR'&&$route.query.lineCode ==='16'" size="small" @click="goCtc">CTC</el-button>
+        <el-button v-if="$route.query.lineCode ==='16'" size="small" @click="showTrainTicket">路票</el-button>
         <el-button v-if="userRole=== 'STATION_SUPERVISOR' && !$route.query.projectDevice && $route.query.lineCode!='08'" size="small" @click="goIbp">IBP盘</el-button>
         <el-button v-if="userRole=== 'DISPATCHER' && !$route.query.projectDevice && hasBigScreen" size="small" @click="goBigScreen">大屏</el-button>
         <el-button v-if="(userRole==='DISPATCHER' || userRole=== 'STATION_SUPERVISOR') && !$route.query.projectDevice && iscsShow" size="small" @click="goIscs">ISCS</el-button>
@@ -31,7 +31,6 @@
     <!-- running &&  -->
     <join-run-plan-view v-if="!dataError" ref="runPlanView" :group="group" />
     <select-ibp ref="selectIbp" />
-    <line-board ref="lineBoard" />
     <train-ticket ref="trainTicket" />
   </div>
 
@@ -48,14 +47,13 @@ import { loadRunPlanData } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 import { timesSpeedPlayback } from '@/api/rtSimulation';
 import { queryHasIscs } from '@/api/iscs';
-import LineBoard from '../displayCity/lineBoard';
+import { getToken } from '@/utils/auth';
 import TrainTicket from '../displayNew/trainTicket';
 export default {
     name: 'MenuDemonSchema',
     components:{
         JoinRunPlanView,
         SelectIbp,
-        LineBoard,
         TrainTicket
     },
     props: {
@@ -145,9 +143,6 @@ export default {
         datie() {
             return this.$route.query.lineCode == '16';
         },
-        isCtc() {
-            return !!this.$route.query.ctc;
-        },
         isScreen() {
             return this.$store.state.training.prdType === '07';
         },
@@ -248,6 +243,24 @@ export default {
             }
             this.$store.dispatch('training/changeOperateMode', { mode: mode });
         },
+        goCtc() {
+            const routeData = this.$router.resolve({
+                path:'/displayNew/demon',
+                query:{
+                    lineCode:this.$route.query.lineCode,
+                    group: this.$route.query.group,
+                    prdType: '01',
+                    mapId:this.$route.query.mapId,
+                    project: this.project,
+                    newApi: false,
+                    ctc: true,
+                    try: this.$route.query.try || 0,
+                    token:getToken(),
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank');
+        },
         changeDirectiveMode() { // 调整指令模式
             this.directiveMode = !this.directiveMode;
             let mode = OperateMode.NORMAL;
@@ -317,9 +330,6 @@ export default {
                 this.$message.error('设置倍速失败！');
             });
         },
-        showLineBoard() {
-            this.$refs.lineBoard.doShow();
-        },
         showTrainTicket() {
             this.$refs.trainTicket.doShow();
         },