行调大赛调整

src/jmapNew/theme/ningbo_03/menus/menuBar.vue

@@ -104,6 +104,7 @@
     <signal-guide ref="signalGuide" />
     <initialzed-signal-can-block ref="initializeSignalCanBlock" />
     <signal-can-block ref="signalCanBlock" />
+    <route-command ref="routeCommand" />
   </div>
 </template>
 <script>
@@ -131,6 +132,7 @@ import InitializeSignalGuide from './menuDialog/initializeSignalGuide';
 import SignalGuide from './menuDialog/signalGuide';
 import InitialzedSignalCanBlock from './menuDialog/initializeSignalCanBlock';
 import SignalCanBlock from './menuDialog/signalCanBlock';
+import RouteCommand from './menuDialog/routeCommand';
 
 export default {
     name: 'MenuBar',
@@ -152,7 +154,8 @@ export default {
         InitializeSignalGuide,
         SignalGuide,
         InitialzedSignalCanBlock,
-        SignalCanBlock
+        SignalCanBlock,
+        RouteCommand
     },
     props: {
         selected: {
@@ -358,7 +361,7 @@ export default {
                                     },
                                     {
                                         title: '进路/命令',
-                                        click: this.undeveloped
+                                        click: this.setRouteCommand
                                     },
                                     {
                                         title: '信号指示模式',
@@ -768,7 +771,7 @@ export default {
                                     },
                                     {
                                         title: '进路/命令',
-                                        click: this.undeveloped
+                                        click: this.setRouteCommand
                                     },
                                     {
                                         title: '信号指示模式',
@@ -1340,6 +1343,19 @@ export default {
                     // this.$refs.signalCanBlock.doShow();
                 }
             });
+        },
+        setRouteCommand() {
+            const operate = {
+                type: 'bar',
+                operation: ''
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.routeCommand.doShow();
+                }
+            });
         }
     }
 };

src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue

@@ -4,24 +4,24 @@
       <el-col :span="3">
         <el-row>
           <div>开始</div>
-          <el-table :data="signalList">
+          <el-table :data="signalList" height="150">
             <el-table-column prop="name" label="信号机" />
           </el-table>
         </el-row>
         <el-row>
           <div>结束</div>
-          <el-table :data="signalList">
+          <el-table :data="signalList" height="150">
             <el-table-column prop="name" label="信号机" />
           </el-table>
         </el-row>
       </el-col>
-      <el-col :span="4">
+      <el-col :span="6">
         <el-table :data="tempData">
           <el-table-column prop="path" label="路径" />
           <el-table-column prop="direction" label="运行方向" />
         </el-table>
       </el-col>
-      <el-col :span="17">
+      <el-col :span="15">
         <el-tabs v-model="activeName" type="card">
           <el-tab-pane label="设置进路" name="first">用户管理</el-tab-pane>
           <el-tab-pane label="取消进路" name="second">配置管理</el-tab-pane>

src/views/login/index.vue

@@ -17,10 +17,6 @@
       <div class="countdown_box">{{ days[1] }}</div>
       <div class="countdown_box">{{ days[2] }}</div>
       <div style="display: inline-block;">天</div>
-      <div style="width: 300px;font-size: 28px;justify-content:space-between;display: flex;margin:0 auto;margin-top: 30px">
-        <div style="display: inline-block;">备战国赛</div>
-        <div style="display: inline-block;">免费使用</div>
-      </div>
     </div>
     <div v-else-if="project === 'drts' && gameOver" style="position: absolute; top: 100px;font-size: 50px;color:#F00;">
       <div style="display: inline-block;">全国调度大赛已结束</div>
@@ -115,7 +111,13 @@
     </div>
     <float-part v-if="isProject && !versionBaseNoShow.includes(project)" />
     <div v-if="!mainBodyNoShow.includes(project)" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;"><span>主体：北京玖琏科技有限公司  备案号：京ICP备18028522号</span></div>
-    <div v-if="project === 'drts'" style="position: absolute; bottom: 200px;text-align: center; font-size: 32px;color:#F00;">郑重承诺：满足用户的一切技术需求！新地图上线三周！新需求两周完成！新BUG两天修复！</div>
+    <div v-if="project === 'drts'" style="position: absolute; bottom: 200px;text-align: center; font-size: 32px;color:#F00;">
+      <div>郑重承诺：满足用户的一切技术需求！新地图上线三周！新需求两周完成！新BUG两天修复！</div>
+      <div style="width: 300px;font-size: 28px;justify-content:space-between;display: flex;margin:0 auto;margin-top: 30px;">
+        <div style="display: inline-block;">备战国赛</div>
+        <div style="display: inline-block;">免费使用</div>
+      </div>
+    </div>
     <div v-if="project === 'drts'" style="position: absolute; bottom: 50px; font-size: 20px;right: 20px;color:#3D3D3D;width: 370px;">
       <el-row>
         <el-col :span="6">

src/views/newMap/displayNew/demonMenu.vue

@@ -19,7 +19,8 @@
         <!-- 排班计划 -->
         <el-button v-if="scheduleLoadShow" type="primary" size="small" @click="jumpScheduling">派班计划加载</el-button>
         <el-button v-if="schedulePreviewShow" type="primary" size="small" @click="schedulingView">派班计划预览</el-button>
-        <el-button v-if="isContest" size="small" type="primary" @click="viewChangeMap">切换地图</el-button>
+        <el-button v-if="isContest" size="small" @click="fieldPractice">实操练习</el-button>
+        <el-button v-if="isContest" size="small" @click="viewChangeMap">切换地图</el-button>
       </el-button-group>
     </div>
     <Jl3d-Device
@@ -201,6 +202,9 @@ export default {
         },
         changeMap(query) {
             this.$emit('changeMap', query);
+        },
+        fieldPractice() {
+            this.$emit('fieldPractice');
         }
     }
 };

src/views/newMap/displayNew/dispatherContest/index.vue

@@ -18,6 +18,7 @@
       :driver-show="isDrive"
       :all-style="'top:'+(offset+textStatusHeight)+'px'"
       @changeMap="changeMap"
+      @fieldPractice="fieldPractice"
     />
 
     <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
@@ -27,8 +28,10 @@
           <template v-if="isScriptRun">
             <el-button type="danger" size="small" @click="handleQuitQuest">退出剧本</el-button>
           </template>
-          <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
+          <template v-else>
-          <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
+            <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
+            <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
+          </template>
         </template>
       </el-button-group>
     </div>
@@ -170,9 +173,11 @@ export default {
             this.setRuning(false);
         },
         '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            const initTime = new Date(this.$store.state.training.initTime || null);
+            if (this.$route.query.noFirst) {
-            const model = {initTime:this.formatTime(initTime)};
+                const initTime = new Date(this.$store.state.training.initTime || null);
-            this.start(model);
+                const model = {initTime:this.formatTime(initTime)};
+                this.start(model);
+            }
         }
     },
     created() {
@@ -258,6 +263,7 @@ export default {
                     this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType
                     query.group = resp.data;
                     const newQuery = Object.assign({}, query);
+                    newQuery.noFirst = true;
                     this.$router.replace({query: newQuery});
                     launchFullscreen();
                 }).catch(error => {
@@ -428,6 +434,9 @@ export default {
                 }
 
             }
+        },
+        fieldPractice() {
+            this.$refs.menuSchema.viewRunQuest();
         }
     }
 };

src/views/newMap/displayNew/index.vue

@@ -209,6 +209,7 @@ export default {
                     this.textStatusHeight = textStatus.offsetHeight || 0;
                     textStatus.style.top = this.offset - 15 + 'px';
                 }
+                console.log(this.offset, '*************');
             });
         },
         // 缩放设置

src/views/newMap/displayNew/menuSchema.vue

@@ -6,7 +6,7 @@
         <el-button-group>
           <el-button v-if="isScheduling && isDepot" size="small" type="primary" @click="runPlanEditShow">运行图编辑</el-button>
           <!-- 加载剧本 -->
-          <el-button v-if="isDemon && !isScheduling" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
+          <el-button v-if="isDemon && !isScheduling && !isContest" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
           <!-- 运行图加载 -->
           <el-button v-if="notScript && running" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
           <el-button v-if="notScript && !running" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
@@ -101,6 +101,9 @@ export default {
         },
         isDepot() {
             return this.$route.query.type === 'DEPOT';
+        },
+        isContest() {
+            return this.project === 'drts';
         }
     },
     watch: {

src/views/newMap/displayNew/menuSystemTime.vue

@@ -57,7 +57,7 @@ export default {
             return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.isDisplay;
         },
         top() {
-            return this.isShowDate ? (this.$route.query.prdType == '05' ? 5 : 35) : this.offset;
+            return this.isShowDate ? (this.$route.query.prdType == '05' ? 5 : this.offset - 10) : this.offset;
         },
         newRight() {
             return this.isShowDate ? this.$store.state.config.width - 420 : this.$store.state.config.width / 2 - 55;