Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

2021-01-18 13:40:29 +08:00 · 2021-01-18 13:40:29 +08:00 · 74b9c8cc7e
commit 74b9c8cc7e
parent 5687ffc5a8 f60054ccad
9 changed files with 29 additions and 12 deletions
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@ -80,6 +80,7 @@ class SkinCode extends defaultStyle {
            line: {
                z: 0,
                width: 5, 										// 区段宽度
+                routeBlockFlashing: true, 						// 进路锁闭区段封锁闪烁
                beyondWidth: 0, 								// 区段宽超出宽度
                invadeColor: '#EF0C08', 						// 区段侵入颜色
                spareColor: '#ffff00', 							// 区段空闲颜色 (黄色)
@ -390,7 +391,7 @@ class SkinCode extends defaultStyle {
                borderColor:'', // 字体边框颜色
                textBorderWidth:1 // 字体边框宽度
            },
-
+            syncCentralizeStation: true, // 集中站和下辖车站控制权状态同步
            kmPostShow: true,								// 公里标显示
            kilometerPosition: 'up',						// 公里标朝向
            text: {
--- a/src/jmapNew/config/skinCode/nanjing_02.js
+++ b/src/jmapNew/config/skinCode/nanjing_02.js
@ -437,7 +437,7 @@ class SkinCode extends defaultStyle {
                borderColor:'', // 字体边框颜色
                textBorderWidth:1 // 字体边框宽度
            },
-
+            syncCentralizeStation: true, // 集中站和下辖车站控制权状态同步
            kmPostShow: true,								// 公里标显示
            kilometerPosition: 'up',						// 公里标朝向
            text: {
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@ -89,6 +89,7 @@ export default class Section extends Group {
            this.line.setCrossUnBlock();
            this.line.stopAnimation(true);
            this.sectionBlock && this.sectionBlock.hide(); // 因此特殊区段
+            this.sectionBlock && this.sectionBlock.stopAnimation();
            this.line.setStyle({
                stroke: this.style.Section.line.spareColor,
                lineWidth: this.style.Section.line.width
@ -173,9 +174,13 @@ export default class Section extends Group {
    }

    /** 封锁 06*/
-    block() {
+    block(routeLock) {
        if (this.sectionBlock) {
            this.model.type !== '03' && this.sectionBlock.show();
+            routeLock && this.style.Section.line.routeBlockFlashing && this.sectionBlock.animateStyle(true, [
+                { time: 500, styles: { stroke: this.style.backgroundColor } },
+                { time: 1000, styles: { stroke: this.style.Section.line.blockColor } }
+            ]);
        } else {
            this.line && this.line.setStyle({
                stroke: this.style.Section.line.blockColor,
@ -318,7 +323,7 @@ export default class Section extends Group {
        /** 计轴故障 */
        model.invalid && this.invalid();
        /** 轨道封锁 */
-        model.blockade && this.block();
+        model.blockade && this.block(model.routeLock);
        /** 非通信车占用状态 */
        model.nctOccupied && this.unCommunicationOccupied();
        /** 通信车占用状态 */
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@ -433,6 +433,12 @@ export default class Station extends Group {
        if (!this.isShowShape) return;
        this.recover();
        model.controlMode && this['handle' + model.controlMode]();
+        if (this.style.Station.syncCentralizeStation && model.controlMode) {
+            model.chargeStationCodeList.forEach(item => {
+                const device = store.getters['map/getDeviceByCode'](item);
+                device && device.instance && device.instance['handle' + model.controlMode]();
+            });
+        }
        if (model.tbStrategyId) {
            store.state.map.map.tbStrategyList.forEach(item => {
                if (item.stationCode == model.code) {
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@ -268,8 +268,8 @@ export default {
                '01': 'Local',		// 中心调度工作站
                '02': 'Center'		// 现地工作站
            };
-            this.modeMatch = true;
            if (this.selected._type) {
+                this.modeMatch = true;
                const control = this.getStationControl(this.selected);
                const type = State2SimulationMap[this.$store.state.training.prdType];
                if (control.controlMode != type) {
@ -925,14 +925,14 @@ export default {
                { name: '' },
                { name: '' },
                { name: '' },
-                { name: '强行站控', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu },
+                { name: '强行站控', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu, securityCommand: true, mode: 'None' },
                { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
                { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
                { name: '' },
                { name: '' },
                { name: '' },
                { name: '' },
-                { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu }
+                { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu, mode: 'None' }

                // { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }
            ] : [
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@ -21,7 +21,7 @@ export default {
        /** 故障解锁 */
        CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
        /** 强解道岔*/
-        CMD_SWITCH_FORCE_UNLOCK: {value:'', label: '强解道岔'},
+        CMD_SWITCH_FORCE_UNLOCK: {value:'Switch_Force_Unlock', label: '强解道岔'},
        /** 转动 */
        CMD_SWITCH_TURN: {value:'Switch_Turn', label: '转动'},
        /** 强扳 */
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@ -369,6 +369,9 @@ const socket = {
        },
        setIsFirst:(state, isFirst)=>{
            state.isFirst = isFirst;
+        },
+        clearSimulationRoleList: (state)=>{
+            state.simulationRoleList = [];
        }
    },

@ -440,6 +443,9 @@ const socket = {
        },
        setIsFirst:({ commit }, isFirst) => {
            commit('setIsFirst', isFirst);
+        },
+        clearSimulationRoleList:({ commit }) => {
+            commit('clearSimulationRoleList');
        }
    }
 };
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@ -2,9 +2,9 @@ export function getBaseUrl() {
    let BASE_API;
    if (process.env.NODE_ENV === 'development') {
        // BASE_API = 'https://api.joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
        // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
-        BASE_API = 'http://192.168.8.129:9000'; // 旭强
+        // BASE_API = 'http://192.168.8.129:9000'; // 旭强
        // BASE_API = 'http://192.168.8.119:9000'; // 张赛
        // BASE_API = 'http://192.168.8.140:9000'; // 杜康
        // BASE_API = 'http://b29z135112.zicp.vip';
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@ -219,6 +219,7 @@ export default {
        EventBus.$off('refresh');
        EventBus.$off('viewLoading');
        EventBus.$off('viewProgressAt');
+        this.$store.dispatch('socket/clearSimulationRoleList');
        this.$store.dispatch('map/mapClear');
        if (this.$jlmap) {
            this.$jlmap.dispose();
@ -393,7 +394,6 @@ export default {
            if (path.includes('/practiceDisplay')) {
                if (em.deviceType == 'StationStand') {
                    runPassenger(this.$route.query.group, em.deviceCode).then(netdata => {
-                        console.log(netdata);
                        if (netdata.data) {
                            const routeData = this.$router.resolve({
                                path:'/jlmap3d/trafficplan',
@ -413,7 +413,6 @@ export default {
                if (em.deviceType == 'Train') {

                    runPassenger(this.$route.query.group, em.deviceCode).then(netdata => {
-                        console.log(netdata);
                        if (netdata.data) {
                            const routeData = this.$router.resolve({
                                path:'/jlmap3d/traffictrain',