时刻表列车总览详览迁移

src/views/newMap/displayBaSiDi/baSiDi.vue

@@ -37,13 +37,13 @@
                   <div class="div-simulate-button" style="width: 40px;" @click="handleCarPark">车场</div>
                   <div class="div-simulate-button" style="width: 40px;" @click="troClick">轨道</div>
                   <div class="div-simulate-button" style="width: 40px;">系统</div>
-                  <div class="div-simulate-button" style="width: 40px;">列车</div>
+                  <div class="div-simulate-button" style="width: 40px;" @click="traClick">列车</div>
                 </div>
                 <div>
                   <div class="div-simulate-button" style="width: 40px;">联锁</div>
                   <div class="div-simulate-button" style="width: 40px;">列监</div>
                   <div class="div-simulate-button" style="width: 40px;">运图</div>
-                  <div class="div-simulate-button" style="width: 55px;">时刻表</div>
+                  <div class="div-simulate-button" style="width: 55px;" @click="ttlClick">时刻表</div>
                   <div class="div-simulate-button" style="width: 40px;">编表</div>
                   <div class="div-simulate-button" style="width: 40px;">调度</div>
                   <div class="div-simulate-button" style="width: 40px;">站控</div>
@@ -287,6 +287,12 @@ export default {
         troClick() {
             this.$emit('troClick');
         },
+        traClick() {
+            this.$emit('traClick');
+        },
+        ttlClick() {
+            this.$emit('ttlClick');
+        },
         // 车场
         handleCarPark() {
             this.$emit('handleCarPark');

src/views/newMap/displayBaSiDi/index.vue

@@ -6,6 +6,8 @@
       :data-error="dataError"
       @rpsClick="rpsClick"
       @troClick="troClick"
+      @traClick="traClick"
+      @ttlClick="ttlClick"
       @handleCarPark="handleCarPark"
       @end="end"
       @back="back"
@@ -15,6 +17,8 @@
     <tro-dialog ref="troDialog" :train-list="trainList" :station-list="stationList" />
     <car-pack ref="carPack" />
     <tro-detail ref="troDetail" :train-list="trainList" :station-list="stationList" @goTroDialog="troClick" />
+    <tra-dialog ref="traDialog" />
+    <ttl-dialog ref="ttlDialog" />
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
   </div>
 </template>
@@ -36,18 +40,21 @@ import RpsDialog from './rps';
 import TroDialog from './tro';
 import CarPack from './carPack';
 import TroDetail from './troDetail';
+import TraDialog from './tra';
+import TtlDialog from './ttl';
 import parseStatus from '@/utils/parseStatus';
 
 export default {
     name: 'DisplayDraft',
     components: {
-        // MapSystemDraft
         BaSiDi,
         SetTime,
         RpsDialog,
         CarPack,
         TroDialog,
-        TroDetail
+        TroDetail,
+        TraDialog,
+        TtlDialog
     },
     data() {
         return {
@@ -179,24 +186,12 @@ export default {
         },
         // 仿真错误时，被动退出时调用
         async back() {
-            // if (this.isExam) {
-            //     await this.$refs.menuExam.back();
-            // } else if (this.isLesson) {
-            //     await this.$refs.lessonMenu.back();
-            // } else if (this.isDemon) {
-            //     await this.$refs.menuDemon.back();
-            // } else if (this.isScript) {
-            //     await this.$refs.menuScript.back();
-            // } else if (this.isContest) {
-            //     await this.$refs.menuDispatherContest.back();
-            // }
             this.$router.go(-1);
         },
         async statusMessage(list) {
             if (this.$jlmap) {
                 await this.$store.dispatch('training/updateMapState', list);
             } else {
-                // await this.$store.dispatch('map/updateMapDevices', list);
                 this.$store.commit('map/updateMapDevice', list);
             }
             await this.$store.dispatch('socket/setEquipmentStatus');
@@ -320,34 +315,6 @@ export default {
                 this.dataError = resp.data.dataError;
             }
         },
-        // 通过showMode切换显示效果
-        switchModeInner(swch) {
-            let showMode = '03';
-            if (swch == '01') {
-                showMode = '03';
-            } else if (swch == '02') {
-                showMode = '02';
-            }
-
-            const nameList = Object.keys(this.$store.state.map.map || {});
-            let list = [];
-            nameList.forEach(item => {
-                if (item !== 'skinVO') {
-                    const data = this.$store.state.map.map[item];
-                    if (data && data.constructor === Array) {
-                        list = [...list, ...data];
-                    }
-                }
-            });
-
-            if (swch == '01') {
-                this.$jlmap.updateShowStation(list, this.$store.state.training.centerStationCode); // 显示全部元素
-            } else {
-                this.$jlmap.updateShowStation(list, ''); // 显示全部元素
-            }
-
-            this.$jlmap.updateShowMode(list, showMode); // 二次过滤
-        },
         selectBeginTime() {
             this.$refs.setTime.doShow();
         },
@@ -429,6 +396,12 @@ export default {
         troClick() {
             this.$refs.troDialog.doShow();
         },
+        ttlClick() {
+            this.$refs.ttlDialog.doShow();
+        },
+        traClick() {
+            this.$refs.traDialog.doShow();
+        },
         handleCarPark() {
             this.$refs.carPack.doShow();
         }
@@ -438,7 +411,7 @@ export default {
 <style>
 .nanjing-02__systerm .el-dialog {
     background: #d8d8d8;
-    border: 2px solid rgb(144, 144, 144, 0.8);
+    border: 2px solid rgba(144, 144, 144, 0.8);
     border-radius: 6px;
     color: #000;
     font-size: 14px;

src/views/newMap/displayBaSiDi/tra.vue

@@ -27,7 +27,7 @@
 </template>
 <script>
 import trainTrunkDown from '@/assets/baSiDi/up.png';
-import TrainTrunkDetail from './trainTrunkDetail.vue';
+import TrainTrunkDetail from '../../../jmapNew/theme/nanjing_02/menus/dialog/trainTrunkDetail.vue';
 export default {
     name:'Tra',
     components:{
@@ -63,7 +63,6 @@ export default {
             });
         },
         doClose() {
-            // this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -77,7 +76,7 @@ export default {
 	/deep/ .el-dialog {
 		background: rgba(100, 100, 100, 1) !important;
 		position: relative;
-		border: 2px solid rgb(144, 144, 144, 0.8);
+		border: 2px solid rgba(144, 144, 144, 0.8);
 		border-radius: 6px;
 		font-size: 14px;
         display: flex;