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

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

@@ -272,6 +272,12 @@ export default {
         this.$store.dispatch('map/setPictureDeviceMap', {});
     },
     methods: {
+        changeSignedStatus(info) {
+            this.$refs.cmdManage.changeSignedStatus(info);
+        },
+        signedCmdClose() {
+            this.$refs.cmdManage.doShow();
+        },
         getRunplanInStationData() {
             getRunplanInStation(this.group).then(response => {
                 // debugger;

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

@@ -45,7 +45,7 @@
     </div>
     <div class="runplanMenuButton">
       <div class="runplanLine" />
-      <div class="rpDispacherCommand runplanClickBtn">调度命令</div>
+      <div class="rpDispacherCommand runplanClickBtn" :class="{flicker: hasCommandMsg, redFlick: hasCommandMsg}" @click="showCmdManage">调度命令</div>
       <div class="runplanBtnGroup">
         <div id="stageRunplan" class="runplanClickBtn" @click="stageRunplan">阶段计划(F8)</div>
         <div id="sendRunplan" class="runplanClickBtn" @click="sendRunplan">发送计划</div>
@@ -563,6 +563,8 @@
     <modify-trip-number ref="modifyTripNumber" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
     <train-runplan ref="trainRunplan" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+    <cmdManage ref="cmdManage" />
+    <signedCmd ref="signedCmd" @signedCmdClose="signedCmdClose" @changeSignedStatus="changeSignedStatus" />
   </div>
 </template>
 <script>
@@ -590,8 +592,10 @@ import ModifyTripNumber from './dialog/modifyTripNumber';
 import TrainRunplan from './dialog/trainRunplan';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { copyAssign } from '@/utils/index';
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
 import { transfiniteList } from '@/scripts/ConstDic';
+import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
+import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
 export default {
     name:'RunplanPane',
     components: {
@@ -601,6 +605,8 @@ export default {
         ModifyAdjacentStation,
         ModifyTripNumber,
         TrainRunplan,
+        cmdManage,
+        signedCmd,
         NoticeInfo
     },
     data() {
@@ -642,6 +648,16 @@ export default {
         ...mapGetters('map', [
             'sectionList'
         ]),
+        ...mapState('socket', [
+            'dispatchCommandMsg'
+        ]),
+        hasCommandMsg() {
+            let status = false;
+            if (this.dispatchCommandMsg.body) {
+                status = true;
+            }
+            return status;
+        },
         mapStationDirectionData() {
             return this.$store.state.map.mapStationDirectionData;
         }
@@ -676,6 +692,19 @@ export default {
         }
     },
     methods:{
+        changeSignedStatus(info) {
+            this.$refs.cmdManage.changeSignedStatus(info);
+        },
+        signedCmdClose() {
+            this.$refs.cmdManage.doShow();
+        },
+        showCmdManage() {
+            if (this.hasCommandMsg) {
+                this.$refs.signedCmd.doShow();
+            } else {
+                this.$refs.cmdManage.doShow();
+            }
+        },
         initDate(date) {
             this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
             const years = date.getFullYear() + '';
@@ -1214,6 +1243,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.redFlick {
+	background: red !important;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.2;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
+.flicker {
+	animation: fade 600ms infinite;
+}
 .runplanPane{
     width: 100%;
     height: calc(100% - 34px);

src/jmapNew/theme/datie_jd1a/menus/index.vue

@@ -308,7 +308,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .redFlick {
-	background: red;
+	background: red !important;
 }
 @keyframes fade {
 	from {

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

@@ -42,7 +42,7 @@
     </div>
     <div class="runplanMenuButton">
       <div class="runplanLine" />
-      <div class="rpDispacherCommand runplanClickBtn">调度命令</div>
+      <div class="rpDispacherCommand runplanClickBtn" :class="{flicker: hasCommandMsg, redFlick: hasCommandMsg}" @click="showCmdManage">调度命令</div>
       <div class="runplanBtnGroup">
         <div id="stageRunplan" class="runplanClickBtn" @click="stageRunplan">阶段计划(F8)</div>
         <div id="sendRunplan" class="runplanClickBtn" @click="sendRunplan">发送计划</div>
@@ -489,6 +489,8 @@
     <delete-runplan ref="deleteRunplan" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
     <modify-trip-number ref="modifyTripNumber" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+    <cmdManage ref="cmdManage" />
+    <signedCmd ref="signedCmd" @signedCmdClose="signedCmdClose" @changeSignedStatus="changeSignedStatus" />
   </div>
 </template>
 <script>
@@ -512,7 +514,9 @@ import ModifyAdjacentStation from './dialog/modifyAdjacentStation';
 import ModifyTripNumber from './dialog/modifyTripNumber';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { copyAssign } from '@/utils/index';
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
+import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
+import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
 export default {
     name:'RunplanPane',
     components: {
@@ -521,7 +525,9 @@ export default {
         DeleteRunplan,
         ModifyAdjacentStation,
         ModifyTripNumber,
-        NoticeInfo
+        NoticeInfo,
+        cmdManage,
+        signedCmd
     },
     data() {
         return {
@@ -552,7 +558,17 @@ export default {
     computed: {
         ...mapGetters('map', [
             'sectionList'
-        ])
+        ]),
+        ...mapState('socket', [
+            'dispatchCommandMsg'
+        ]),
+        hasCommandMsg() {
+            let status = false;
+            if (this.dispatchCommandMsg.body) {
+                status = true;
+            }
+            return status;
+        }
     },
     watch:{
         '$store.state.socket.railCtcRunplanChange': function (val) {
@@ -565,6 +581,19 @@ export default {
         // railwaySimulationRunplanSendChange
     },
     methods:{
+        changeSignedStatus(info) {
+            this.$refs.cmdManage.changeSignedStatus(info);
+        },
+        signedCmdClose() {
+            this.$refs.cmdManage.doShow();
+        },
+        showCmdManage() {
+            if (this.hasCommandMsg) {
+                this.$refs.signedCmd.doShow();
+            } else {
+                this.$refs.cmdManage.doShow();
+            }
+        },
         getRailwaySimulationRunplanSend() {
             const stationCode = this.$store.state.training.roleDeviceCode;
             const railwaySimulationRunplanSendMap = this.$store.state.socket.railwaySimulationRunplanSendMap;
@@ -814,6 +843,24 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.redFlick {
+	background: red !important;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.2;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
+.flicker {
+	animation: fade 600ms infinite;
+}
+
 .runplanPane{
     width: 100%;
     height: calc(100% - 34px);

src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js

@@ -567,12 +567,193 @@ export const operateEnum = {
                     function:getStationNameById
                 }
             ]
+        },
+        CTC_MODIFY_SECTION:{
+            isList:true,
+            name:'修改股道',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                }
+            ]
+            // planParamList:[],
+            // force:1
+        },
+        CTC_CANCEL_TWINKLE:{
+            isList:true,
+            name:'车站取消红闪',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+        },
+        CTC_LOG_SET_START_RUN_PLAN:{
+            isList:true,
+            name:'设置始发',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+            // status  startRunPlan
+        },
+        CTC_LOG_SET_END_RUN_PLAN:{
+            isList:true,
+            name:'设置终到',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+            // status  startRunPlan
+        },
+        CTC_LOG_SET_DELETE_LABEL:{
+            isList:true,
+            name:'设置删除标识',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+            // status:1
+        },
+        CTC_LOG_CANCEL_ARRIVE:{
+            isList:true,
+            name:'取消到达',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+        },
+        CTC_LOG_CANCEL_DEPARTURE:{
+            isList:true,
+            name:'取消出发',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+        },
+        CTC_LOG_CANCEL_BLOCK:{
+            isList:true,
+            name:'取消闭塞',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+        },
+        CTC_LOG_SET_KEY_TRAINS:{
+            isList:true,
+            name:'设置重点列车',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                }
+            ]
+            // status  keyTrains
+        },
+        CTC_LOG_SET_TRANSFINITE:{
+            isList:true,
+            name:'设置超限',
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'runPlanCode',
+                    name:'车次号',
+                    function:getTripNumberByCode
+                    // 运行计划编码
+                },
+                {
+                    code:'transfinite',
+                    name:'超限类型',
+                    result:[
+                        {code:'NO', name:'不超限'},
+                        {code:'TRANSFINITE_ONE_LEVEL', name:'一级超限'},
+                        {code:'TRANSFINITE_TWO_LEVEL', name:'二级超限'},
+                        {code:'TRANSFINITE_SUPER', name:'超级超限'}
+                    ]
+                }
+            ]
         }
-        // CTC_MODIFY_SECTION
+        // CTC_LOG_SAVE_RUN_PLAN:{value: 'CTC_LOG_SAVE_RUN_PLAN', label: '保存运行计划'},
-        // 修改股道
+        // CTC_MODIFY_TRIP_NUMBER
-        // CTC_CANCEL_TWINKLE
+        // 修改车次号(大铁CTC)
-        // 车站取消红闪
+        // CTC_LOG_SET_ENTRY_OUT_DISCORDANT:{value: 'CTC_LOG_SET_ENTRY_OUT_DISCORDANT', label: '设置允许出入口与基本路径不一致'},
-        // CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'},
+        // CTC_LOG_SET_TRACK_DISCORDANT:{value: 'CTC_LOG_SET_TRACK_DISCORDANT', label: '设置允许股道与基本路径不一致'},
+
     },
     RAIL:{
         function: getRAILDevicename,
@@ -910,7 +1091,9 @@ function getCTCDevicename(operationType) {
         'CTC_STATION_SIGN_RUN_PLAN',
         'CTC_STATION_SEND_OUT_RUN_PLAN', 'CTC_CANCEL_TWINKLE',
         'CTC_MODIFY_TRIP_NUMBER', 'CTC_AGREE_NOTICE',
-        'CTC_MODIFY_ADJACENT_STATION'];
+        'CTC_MODIFY_ADJACENT_STATION', 'CTC_MODIFY_SECTION', 'CTC_CANCEL_TWINKLE', 'CTC_LOG_SET_START_RUN_PLAN',
+        'CTC_LOG_SET_END_RUN_PLAN', 'CTC_LOG_SET_DELETE_LABEL', 'CTC_LOG_CANCEL_ARRIVE', 'CTC_LOG_CANCEL_DEPARTURE',
+        'CTC_LOG_CANCEL_BLOCK', 'CTC_LOG_SET_KEY_TRAINS', 'CTC_LOG_SET_TRANSFINITE'];
     if (operationType.includes('CTC_ZONE')) {
         deviceName = '请点击运行图';
     } else if (stationRPLogList.includes(operationType)) {