合并代码

src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue

@@ -84,7 +84,7 @@ export default {
                         label: '道岔单解',
                         handler: this.unlock,
                         cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
+                    }
                     // {
                     //     label: '设备标签',
                     //     handler: '',

src/jmapNew/theme/xian_02/menus/menuCancel.vue

@@ -28,15 +28,30 @@ export default {
                 },
                 {
                     label: '全部扣车',
+                    children: [
+                        {
+                            label: '正线上全部扣车',
                             handler: this.undeveloped
+                        }
+                    ]
                 },
                 {
                     label: '全部发车',
+                    children: [
+                        {
+                            label: '缓解正线所有列车',
                             handler: this.undeveloped
+                        }
+                    ]
                 },
                 {
                     label: '停止所有列车',
+                    children: [
+                        {
+                            label: '停止正线所有列车',
                             handler: this.undeveloped
+                        }
+                    ]
                 },
                 {
                     label: '车站选择',
@@ -52,8 +67,17 @@ export default {
                 },
                 {
                     label: '显示控制',
+                    children: [
+                        {
+                            label: '正线及车辆段',
                             handler: this.undeveloped
                         },
+                        {
+                            label: '列车信息',
+                            handler: this.undeveloped
+                        }
+                    ]
+                },
                 {
                     label: '下一窗口',
                     handler: this.undeveloped
@@ -64,11 +88,38 @@ export default {
                 },
                 {
                     label: '激活所有菜单',
+                    children: [
+                        {
+                            label: '确认',
                             handler: this.undeveloped
+                        }
+                    ]
                 },
                 {
                     label: '恢复激活菜单',
                     handler: this.undeveloped
+                },
+                {
+                    label: '进路模式 - 授权车站',
+                    children: [
+                        {
+                            label: '自动',
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '人工',
+                            handler: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    label: '列车报警确认',
+                    children: [
+                        {
+                            label: '列车完整性报警确认',
+                            handler: this.undeveloped
+                        }
+                    ]
                 }
             ]
         };

src/jmapNew/theme/xian_02/menus/menuRequest.vue

@@ -117,11 +117,9 @@ export default {
                     if (requestList.length) {
                         this.commitEachCommand(requestList);
                     }
-                //     this.doClose();
                 }
             }).catch(() => {
                 this.loading = false;
-                // this.doClose();
                 // this.$refs.noticeInfo.doShow(operate);
             });
         }

src/jmapNew/theme/xian_02/menus/menuSection.vue

@@ -19,7 +19,7 @@ import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from './utils/menuOperate';
 
 export default {

src/jmapNew/theme/xian_02/menus/menuSwitch.vue

@@ -264,7 +264,12 @@ export default {
         locate() {
             commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: { code: OperationEvent.Switch.locate.menu.operation, name: '道岔定位'},
+                        cmdType: CMD.Switch.CMD_SWITCH_TURN,
+                        param: operate.param
+                    });
                 }
             });
         },
@@ -272,7 +277,12 @@ export default {
         reverse() {
             commitOperate(menuOperate.Switch.rpChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: { code: OperationEvent.Switch.reverse.menu.operation, name: '道岔反位'},
+                        cmdType: CMD.Switch.CMD_SWITCH_TURN,
+                        param: operate.param
+                    });
                 }
             });
         },
@@ -280,7 +290,12 @@ export default {
         lock() {
             commitOperate(menuOperate.Switch.lock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: { code: OperationEvent.Switch.lock.menu.operation, name: '道岔单锁'},
+                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                        param: operate.param
+                    });
                 }
             });
         },
@@ -288,7 +303,12 @@ export default {
         unlock() {
             commitOperate(menuOperate.Switch.unlock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.switchUnLock.doShow(operate, this.selected);
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔解锁'},
+                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                        param: operate.param
+                    });
                 }
             });
         },

src/jmapNew/theme/xian_02/menus/menuTrain.vue

@@ -241,7 +241,12 @@ export default {
                     },
                     {
                         label: '列车报警确认',
+                        children: [
+                            {
+                                label: '完整性报警确认',
                                 handler: this.undeveloped
+                            }
+                        ]
                     },
                     {
                         label: '更新列车计划',

src/views/newMap/displayNew/index.vue

@@ -259,7 +259,6 @@ export default {
             this.setWindowSize();
         },
         '$store.state.app.windowSizeCount': function() {
-            console.log('windowSizeCount');
             this.setWindowSize();
         },
         $route() {
@@ -281,7 +280,6 @@ export default {
             this.clearCheckLogin();
         });
 
-        console.log('mounted');
         await this.setWindowSize();
         await this.initLoadData();
     },

src/views/newMap/jlmapNew/index.vue

@@ -410,7 +410,7 @@ export default {
         setShowMode(showMode) {
             if (this.showMode !== showMode) {
                 this.setShowStation('');
-                this.$refs.switchStation.inintShowStation();
+                this.localStationShow && this.$refs.switchStation.inintShowStation();
             }
             this.showMode = showMode;
             const nameList = Object.keys(this.$store.state.map.map || {});

src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue

@@ -118,8 +118,8 @@
         <el-form-item label="侧防列表:">
           <el-select v-model="addModel.flankProtectionList" clearable multiple filterable :placeholder="$t('map.pleaseSelect')">
             <el-option
-              v-for="item in flankProtectList"
+              v-for="(item,index) in flankProtectList"
-              :key="item.code"
+              :key="index"
               :label="`${item.number}-${item.name}`"
               :value="item.code"
             />

src/views/newMap/newMapdraft/index.vue

@@ -502,6 +502,8 @@ export default {
     }
 	.back_box{
 		left: 150px;
+        display: inline-block;
+        width: 57px;
 	}
 
 	.map-draft{