大铁项目 ctc 代码调整

src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue

@@ -13,7 +13,7 @@
     <div style="text-align: center;">
       确定删除该列车的行车信息？
     </div>
-    <el-row justify="center" class="button-group">
+    <el-row justify="center" class="button-group" style="margin-top:20px">
       <el-col :span="8" :offset="2">
         <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
       </el-col>

src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue

@@ -18,6 +18,7 @@
           placeholder=""
           size="mini"
           style="width:100px"
+          popper-class="stationSelect"
         >
           <el-option
             v-for="item in stationList"
@@ -35,6 +36,7 @@
           placeholder=""
           size="mini"
           style="width:100px"
+          popper-class="stationSelect"
         >
           <el-option
             v-for="item in stationList"
@@ -46,7 +48,7 @@
         <div style="display:inline-block">站</div>
       </div>
     </div>
-    <el-row justify="center" class="button-group">
+    <el-row justify="center" class="button-group" style="margin-top:20px">
       <el-col :span="8" :offset="4">
         <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
       </el-col>
@@ -57,7 +59,7 @@
   </el-dialog>
 </template>
 <script>
-import { mapGetters } from 'vuex';
+// import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
@@ -67,6 +69,7 @@ export default {
             dialogShow: false,
             loading: false,
             tripNumber:'',
+            stationList:[],
             model:{
                 stationCode:'', // 车站编码
                 runPlanCode:'', // 运行编码
@@ -76,9 +79,6 @@ export default {
         };
     },
     computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ]),
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
@@ -92,6 +92,9 @@ export default {
             return '修改相关车站';
         }
     },
+    mounted() {
+        this.stationList = this.$store.state.map.map.stationList;
+    },
     methods: {
         doShow(row) {
             this.model.stationCode = row.stationCode;
@@ -144,3 +147,8 @@ export default {
 .adjacentStationStart{margin-top: 10px;}
 .adjacentStationEnd{margin-top: 10px;}
 </style>
+<style lang="scss">
+.stationSelect{
+  z-index:2014 !important;
+}
+</style>

src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue

@@ -19,6 +19,7 @@
           placeholder=""
           size="mini"
           style="width:100px"
+          popper-class="stationSelect"
         >
           <el-option
             v-for="item in stationList"
@@ -80,6 +81,7 @@ export default {
             oldArriveTripNumber:'',
             oldDepartTripNumber:'',
             trainTypeList:[],
+            stationList:[],
             model:{
                 stationCode:'', // 车站编码
                 runPlanCode:'', // 运行编码
@@ -89,9 +91,6 @@ export default {
         };
     },
     computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ]),
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
@@ -105,6 +104,9 @@ export default {
             return '设置车次';
         }
     },
+    mounted() {
+        this.stationList = this.$store.state.map.map.stationList;
+    },
     methods: {
         doShow(row) {
             this.model.stationCode = row.stationCode;
@@ -181,4 +183,7 @@ export default {
 <style lang="scss">
 .chengdou-03__systerm .el-dialog .modifyTripNumber .el-checkbox-group .el-checkbox .el-checkbox__label{font-size: 15px !important;line-height: 16px;}
 .chengdou-03__systerm .el-dialog .modifyTripNumber .el-checkbox-group .el-checkbox .el-checkbox__input{vertical-align: top;line-height: 16px;}
+.stationSelect{
+  z-index:2014 !important;
+}
 </style>

src/jmapNew/theme/datie_02/menus/runplanPane.vue

@@ -289,6 +289,7 @@
                   v-model="tableData[scope.$index].departRunPlan.sectionCode"
                   placeholder=""
                   size="mini"
+                  popper-class="stationSelect"
                   @focus="focusDepartRunPlan($event,scope.row)"
                   @change="changeDepartRunPlan($event,scope.row,scope.$index)"
                 >
@@ -604,15 +605,23 @@ export default {
             window.removeEventListener('keydown', this.handleKeyDown);
         },
         handleKeyDown(event) {
-            event.stopPropagation();
-            event.preventDefault();
-            switch (event.code) {
-            case 'F1':
-                this.sendNotcie();
-                break;
-            case 'F2':
-                this.agreeNotcie();
-                break;
+            if (!(this.$refs.modifyTripNumber.dialogShow ||
+                this.$refs.modifyAdjacentStation.dialogShow ||
+                this.$refs.deleteRunplan.dialogShow
+            )) {
+                event.stopPropagation();
+                switch (event.code) {
+                case 'F1': {
+                    event.preventDefault();
+                    this.sendNotcie();
+                    break;
+                }
+                case 'F2': {
+                    event.preventDefault();
+                    this.agreeNotcie();
+                    break;
+                }
+                }
             }
         },
         sendRunplan() {
@@ -1022,6 +1031,9 @@ export default {
 .eachRpSep{width:100%;height:0px;border-top:1px #80a6a9 solid}
 </style>
 <style lang="scss">
+.stationSelect{
+  z-index:2014 !important;
+}
 #runplanContentTable.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell{
     padding-left:0;
     padding-right:0;