Merge remote-tracking branch 'remotes/origin/test_dispaly' into test

src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue

@@ -68,19 +68,19 @@ export default {
             tempData: [],
             strategyList: [
                 {
-                    value: '01',
+                    value: 'NONE',
                     label: '无折返'
                 },
                 {
-                    value: '02',
+                    value: 'UNMANNED',
                     label: '无人折返'
                 },
                 {
-                    value: '03',
+                    value: 'AUTO',
                     label: '自动换端'
                 },
                 {
-                    value: '04',
+                    value: 'DEFAULT',
                     label: '关闭'
                 }
             ],

src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue

@@ -235,7 +235,8 @@ export default {
         commit() {
             const operate = {
                 type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.close.confirm.operation
+                operation: OperationEvent.Command.close.confirm.operation,
+                over: true
             };
 
             this.loading = true;
@@ -252,7 +253,8 @@ export default {
         cancel() {
             const operate = {
                 type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.cancel.menu.operation
+                operation: OperationEvent.Command.cancel.menu.operation,
+                cancel: true
             };
 
             this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {

src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue

@@ -193,6 +193,9 @@ export default {
         ...mapGetters('map', ['routeList']),
         group() {
             return this.$route.query.group;
+        },
+        roles() {
+            return this.$store.state.training.roles;
         }
     },
     watch: {
@@ -203,8 +206,9 @@ export default {
                 this.doClose();
             }
         },
-        '$store.state.menuOperation.selectedCount': function (val) {
+        // '$store.state.menuOperation.selectedCount': function (val) {
-            if (this.$store.state.menuOperation.selected._type == 'Signal' && this.$store.state.training.prdType == '09') {
+        '$store.state.menuOperation.leftClickCount': function (val) {
+            if (this.$store.state.menuOperation.selected._type == 'Signal' && this.work == 'localWork' && this.roles == 'DEPOT_DISPATCHER') { // 车辆段调度角色
                 if (this.buttonOperation) {
                     this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected);
                     this.$parent.$refs.menuDeplotButton.clearCountDown();
@@ -278,7 +282,7 @@ export default {
         initMenu() {
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
-                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.disabled = (!judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) && this.roles !== 'DEPOT_DISPATCHER') || menuItem.isDisabled(this.selected, this.work);
                 menuItem.show = menuItem.isShow(this.selected, this.work);
                 this.menu.push(menuItem);
             });

src/views/newMap/display/terminals/index.vue

@@ -145,7 +145,6 @@ export default {
     },
     watch: {
         '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            this.subscribe('STATE');
             this.subscribe('ATS_STATUS');
             if (this.isFirst) {
                 this.$store.dispatch('training/setMapDefaultState');
@@ -183,6 +182,7 @@ export default {
         this.group = this.$route.query.group;
         this.isFirst = true;
         this.subscribe('COMMON');
+        this.subscribe('STATE');
     },
     beforeDestroy() {
         this.clearSubscribe();

src/views/newMap/display/terminals/troWork.vue

@@ -46,25 +46,17 @@ export default {
             const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
             this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
             if (this.mapData && this.mapData.pictureList) {
-                const picture = this.mapData.pictureList.find(picture => picture.type === 'dispatchWork');
+                const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen');
                 if (picture) {
-                    this.handlerPictureShow(picture);
+                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
-
+                    const deviceList = [];
-                } else {
+                    const mapDevice = this.$store.state.map.mapDevice;
-                    this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                    for (const deviceCode in mapDevice) {
-                    const list = [];
+                        deviceList.push(deviceCode);
-                    for (const key in this.mapDevice) {
-                        list.push(this.mapDevice[key]);
                     }
-                    this.$jlmap.updateShowStation(list);
+                    this.$jlmap.updatePicture(deviceList);
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
                 }
-            } else {
-                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
-                const list = [];
-                for (const key in this.mapDevice) {
-                    list.push(this.mapDevice[key]);
-                }
-                this.$jlmap.updateShowStation(list);
             }
             this.updateJlmapMode('05');
         },