From e176823ec6416e062db4ee3f7a2ccdc48bb86842 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 18 Jul 2022 13:07:45 +0800
Subject: [PATCH 01/30] =?UTF-8?q?=E5=8D=A0=E7=BA=BF=E6=9D=BF&=E8=BF=9B?=
 =?UTF-8?q?=E8=B7=AF=E5=BA=8F=E5=88=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/bottomTable.vue      | 30 +++++++++++++++---
 .../theme/datie_02/menus/menuButtonCtc.vue    |  2 +-
 .../theme/datie_02/menus/menuSection.vue      |  1 -
 src/views/newMap/displayCity/lineBoard.vue    | 31 +++++++++++++++----
 src/views/newMap/displayNew/menuSchema.vue    |  2 +-
 src/views/newMap/displayNew/selectStation.vue | 26 ++++++++++++++++
 .../newMap/jointTrainingNew/menuSchema.vue    |  1 +
 .../newMap/mapDraftPicture/createPicture.vue  |  1 +
 .../newMap/mapsystemNew/common/index.vue      | 14 ++++++---
 9 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/bottomTable.vue b/src/jmapNew/theme/datie_02/menus/bottomTable.vue
index 951aa37af..9958410c1 100644
--- a/src/jmapNew/theme/datie_02/menus/bottomTable.vue
+++ b/src/jmapNew/theme/datie_02/menus/bottomTable.vue
@@ -48,7 +48,7 @@
           <div style="margin-right: 10px;">车站</div>
           <el-select v-model="stationCode" size="mini" @change="stationChange">
             <el-option
-              v-for="item in stationList"
+              v-for="item in showStationList"
               :key="item.code"
               :label="item.name"
               :value="item.code"
@@ -144,7 +144,8 @@ export default {
             sheetList: [{ label: '历史进路', value: 'historyRoute' }],
             sequenceList: [],
             sequenceMap: {},
-            menu: [{label: '人工触发', handler: this.artificialTrigger, disabled: false}, {label: '删除', handler: this.artificialTrigger, disabled: true}]
+            menu: [{label: '人工触发', handler: this.artificialTrigger, disabled: false}, {label: '删除', handler: this.artificialTrigger, disabled: true}],
+            showStationList: []
         };
     },
     computed: {
@@ -186,23 +187,42 @@ export default {
                     }
                 }
             }
+        },
+        '$store.state.map.showCentralizedStationCode': function (val) {
+            this.initShowStationList(val);
         }
     },
     mounted() {
         EventBus.$on('bottomTableShowOrHidden', () => {
             this.showTable = !this.showTable;
         });
-        if (this.stationList && this.stationList.length) {
-            this.stationCode = this.stationList[0].code;
-        }
+        // if (this.stationList && this.stationList.length) {
+        //     this.stationCode = this.stationList[0].code;
+        // }
     },
     methods: {
         doShow() {
+            this.initShowStationList(this.$store.state.map.showCentralizedStationCode);
             this.showTable = true;
         },
         doClose() {
             this.showTable = false;
         },
+        initShowStationList(val) {
+            if (val) {
+                const centralizedStation = this.$store.getters['map/getDeviceByCode'](val);
+                const sn = centralizedStation.sn;
+                this.showStationList = [centralizedStation];
+                this.stationCode = centralizedStation.code;
+                this.stationList.forEach(station => {
+                    if (station.sn === sn - 1) {
+                        this.showStationList.unshift(station);
+                    } else if (station.sn === sn + 1) {
+                        this.showStationList.push(station);
+                    }
+                });
+            }
+        },
         getRouteStatus(status) {
             if (status === '2') {
                 return '触发完成';
diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index d61074b9b..089e0d40a 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -397,7 +397,7 @@ export default {
         },
         buttonDown(operation, commandTypeList) {
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-            if (station.controlMode === 'Interlock') { return; }
+            if (!station || station.controlMode === 'Interlock') { return; }
             this.clearOperate();
             if (operation != this.Command.cancel.clearMbm.operation) {
                 const operate = {
diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue
index ed38c5993..3bfec1c27 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue
@@ -121,7 +121,6 @@ export default {
     },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            console.log(this.buttonOperation, '***********');
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && (!this.buttonOperation || this.$route.query.ctc)) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index 5307377fe..8cf6449db 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -12,7 +12,7 @@
     <div style="height: 500px; overflow-y: auto;background: #DFE3E6;padding: 7px;">
       <div style="width: 100%;display: flex;align-items: center;margin-bottom: 10px;">
         <div
-          v-for="item in stationList"
+          v-for="item in showStationList"
           :key="item.code"
           class="tab-box"
           :style="{background: selectCode === item.code ? '#F1F1F1': '#DBDBDB', color: selectCode === item.code ? '#000': '#ccc'}"
@@ -214,7 +214,7 @@
         </el-table>
         <div style="width: 100%;display: flex;align-items: center;margin: 5px 0;">
           <div
-            v-for="item in stationList"
+            v-for="item in showStationList"
             :key="item.code"
             class="tab-box"
             :style="{background: selectCode1 === item.code ? '#F1F1F1': '#DBDBDB', color: selectCode1 === item.code ? '#000': '#ccc'}"
@@ -335,7 +335,8 @@ export default {
             sequenceList: [],
             readOnlyMap: {},
             standTrackSectionMap: {},
-            trackList: []
+            trackList: [],
+            showStationList: []
         };
     },
     computed: {
@@ -436,6 +437,9 @@ export default {
                     this.standTrackSectionMap[item.code] = { trackName: item.name, occupied: false, belongStation:item.belongStation, lineMap: {}};
                 }
             });
+        },
+        '$store.state.map.showCentralizedStationCode': function (val) {
+            this.initShowStationList(val);
         }
     },
     mounted() {
@@ -444,11 +448,26 @@ export default {
         handleClose() {
             this.dialogVisible = false;
         },
+        initShowStationList(val) {
+            if (val) {
+                const centralizedStation = this.$store.getters['map/getDeviceByCode'](val);
+                const sn = centralizedStation.sn;
+                this.showStationList = [centralizedStation];
+                this.stationList.forEach(station => {
+                    if (station.sn === sn - 1) {
+                        this.showStationList.unshift(station);
+                    } else if (station.sn === sn + 1) {
+                        this.showStationList.push(station);
+                    }
+                });
+            }
+        },
         doShow() {
             this.dialogVisible = true;
-            if (this.stationList[0]) {
-                this.selectStandCode(this.stationList[0].code);
-                this.selectStandCode1(this.stationList[0].code);
+            this.initShowStationList(this.$store.state.map.showCentralizedStationCode);
+            if (this.showStationList[0]) {
+                this.selectStandCode(this.showStationList[0].code);
+                this.selectStandCode1(this.showStationList[0].code);
             }
         },
         selectStandCode(code) {
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 7020693bc..57b5f1610 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="schema" :style="{top: offset+'px'}">
-      <select-station v-if="isShowSelectStation && !isScript" ref="selectStation" :style-css="'width: 100px;'" />
+      <select-station v-show="!$route.query.joint" v-if="isShowSelectStation && !isScript" ref="selectStation" :style-css="'width: 100px;'" />
       <el-select v-model="speed" style="width: 100px;" size="small" @change="speedChange">
         <el-option
           v-for="item in speedList"
diff --git a/src/views/newMap/displayNew/selectStation.vue b/src/views/newMap/displayNew/selectStation.vue
index b82dc2419..fc9ea8207 100644
--- a/src/views/newMap/displayNew/selectStation.vue
+++ b/src/views/newMap/displayNew/selectStation.vue
@@ -42,7 +42,13 @@ export default {
             this.initStationListMode();
         },
         '$store.state.training.simulationUserList': function(val) {
+            console.log('----------11');
             this.initData();
+        },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length) { // 人员变化监控
+                this.checkRoleChange(list);
+            }
         }
     },
     mounted() {
@@ -128,6 +134,26 @@ export default {
             if (this.showMemberId) {
                 this.switchStationMode( this.showMemberId);
             }
+        },
+        checkRoleChange(data) {
+            data.forEach(item => {
+                if (item.messageType === 'KICK_OUT' && item.userId == this.$store.state.user.id) {
+                    this.$messageBox('您已经被请离房间！');
+                    window.close();
+                } else if (item.messageType === 'PLAY_CHANGE' && item.userId == this.$store.state.user.id && item.type === 'STATION_SUPERVISOR') {
+                    this.showMemberId = item.memberId;
+                    this.oldShowMemberId = item.memberId;
+                    this.showStation = item.deviceCode;
+                    const showStationCode = this.stationCentralizedMap[item.deviceCode];
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    const list = [];
+                    for (const key in mapDevice) {
+                        list.push(mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list, showStationCode || item.deviceCode);
+                    this.setCenter(showStationCode);
+                }
+            });
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index b9e3edd74..f29728324 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -265,6 +265,7 @@ export default {
                     mapId:this.$route.query.mapId,
                     project: this.project,
                     newApi: false,
+                    joint: true,
                     ctc: true,
                     try: this.$route.query.try || 0,
                     token:getToken(),
diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue
index 37f0f0f31..c56ba31df 100644
--- a/src/views/newMap/mapDraftPicture/createPicture.vue
+++ b/src/views/newMap/mapDraftPicture/createPicture.vue
@@ -12,6 +12,7 @@
       <el-form-item label="画面类型：" prop="type">
         <el-select v-model="ruleForm.type" placeholder="请选择画面类型">
           <el-option label="站间透明" value="lucency" />
+          <el-option label="连锁车站" value="chainStation" />
         </el-select>
       </el-form-item>
       <el-form-item label="所属车站：" prop="stationCode">
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index b57225020..8d7c87862 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -69,6 +69,10 @@ export default {
         }
     },
     methods: {
+        reloadMenuComponent(lineCode) {
+            this.menus = this.$theme.loadMenuComponent(lineCode); // 加载menu
+            this.$store.commit('training/notifyGetCommandDefinition', lineCode); // 重新加载线路指令
+        },
         // 获取设备数据
         getDeviceByEm(em) {
             var device = this.$store.getters['map/getDeviceByCode'](em.deviceCode) || null;
@@ -196,13 +200,13 @@ export default {
                         this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
                     }
                 } else if (this.$route.query.ctc) {
-					this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
-					menu = getDeviceMenuByDeviceType(device._type);
-					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-				}
+                    this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
+                    menu = getDeviceMenuByDeviceType(device._type);
+                    this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                }
             } else {
                 menu = getDeviceMenuByDeviceType('Cancel');
-				this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
             }
             this.$store.dispatch('training/emitTipFresh');
         },

From b3e3dd7898fe861bff7a9cfa8b0c111427b91803 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Jul 2022 13:22:48 +0800
Subject: [PATCH 02/30] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue
index 2cddd04cb..91d546f4d 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue
@@ -34,7 +34,8 @@ export default {
             loading: false,
             model:{
                 stationCode:'',
-                runPlanCode:''
+                runPlanCode:'',
+                status:1
             }
         };
     },

From 953b63bd1a3625483388e9050f2338663fa2f756 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Jul 2022 13:49:24 +0800
Subject: [PATCH 03/30] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/runplanPane.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index f99b66bc6..5598ee7e8 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -93,7 +93,7 @@
           >
             <template slot-scope="scope">
               <div :class="scope.row.twinkle?'flashTrip noChange':'noChange'" style="color:#000">
-                {{ scope.row.tripNumber }} {{ scope.row.status==1?'(删)':scope.row.twinkle?'(*)':scope.row.keyTrains?'(重)':'' }}
+                {{ scope.row.tripNumber }} {{ scope.row.status==-1?'(删)':scope.row.twinkle?'(*)':scope.row.keyTrains?'(重)':'' }}
               </div>
             </template>
           </el-table-column>

From 46ab43aef3c58f91301e31e5e41581ad96656967 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 18 Jul 2022 15:01:35 +0800
Subject: [PATCH 04/30] =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=BB=88=E7=AB=AF?=
 =?UTF-8?q?=E5=88=86=E6=95=A3=E8=87=AA=E5=BE=8B=E4=BA=AE=E7=81=AF&?=
 =?UTF-8?q?=E5=8D=A0=E7=BA=BF=E6=9D=BF=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_02.js       | 398 +++++++++---------
 src/jmapNew/shape/graph/Station/EThreeLamp.js |   8 +-
 src/jmapNew/shape/graph/Station/index.js      |   2 +
 src/views/newMap/displayCity/lineBoard.vue    |   6 +-
 4 files changed, 208 insertions(+), 206 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js
index b0ad9d229..027c7510f 100644
--- a/src/jmapNew/config/skinCode/datie_02.js
+++ b/src/jmapNew/config/skinCode/datie_02.js
@@ -395,8 +395,8 @@ class SkinCode extends defaultStyle {
                     redColor: '#FF0000',						// 控制模式红色
                     yellowColor: '#FFFF00',						// 控制模式黄色
                     purpleColor:'#840084', // 控制模式紫色
-					strokeColor: '#fff',
-					lineWidth: 1
+                    strokeColor: '#fff',
+                    lineWidth: 1
                 },
                 emergencyControl: {									// 紧急站控
                     show: false,
@@ -427,81 +427,81 @@ class SkinCode extends defaultStyle {
                     arrowShow: false,
                     grayColor: '#7F7F7F'
                 },
-				veryControl: {
-                	show: true,
-					offset: { x: 0, y: 0 },
-					lightColor: '#f00',
-					defaultColor: '#7F7F7F',
-					text: '非常站控'
-				},
-				selfDiscipline: {
-                	show: true,
-					offset: { x: 0, y: 0 },
-					text: '允许自律',
+                veryControl: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    lightColor: '#f00',
                     defaultColor: '#7F7F7F',
+                    text: '非常站控'
+                },
+                selfDiscipline: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '允许自律',
+                    defaultColor: '#7F7F7F',
+                    lightColor: '#ff0'
+                },
+                selfDisciplineControl: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    lightColor: '#0f0',
+                    defaultColor: '#7F7F7F',
+                    text: '自律控制'
+                },
+                veryControlButton: {
+                    offset: { x: 0, y: 0 },
+                    text: '非常站控',
                     lightColor: '#ff0',
-				},
-				selfDisciplineControl: {
-                	show: true,
-					offset: { x: 0, y: 0 },
-					lightColor: '#0f0',
-					defaultColor: '#7F7F7F',
-					text: '自律控制'
-				},
-				veryControlButton: {
-                	offset: { x: 0, y: 0 },
-					text: '非常站控',
-					lightColor: '#ff0',
-					defaultColor: '#ccc',
-				},
-				selfDisciplineThree: {
-                	offset: { x: 0, y: 0 },
-					text: '分散自律',
-					lightColor: '#0f0',
-					defaultColor: '#ccc'
-				},
-				graphRoad: {
-                	show: true,
-					offset: { x: 0, y: 0 },
-					text: '按图排路',
-					lightColor: '#0f0',
-					defaultColor: '#ccc'
-				},
-				planControl: {
-                	show: true,
-					offset: { x: 0, y: 0 },
-					text: '计划控制',
-					lightColor: '#0f0',
-					defaultColor: '#ccc'
-				},
-				centerCommunication: {
-                	show: true,
-					offset: { x: 0, y: 30 },
-					text: '中心通信',
-					lightColor: '#0f0',
-					defaultColor: '#ccc'
-				},
-				selfDisciplineCommunication: {
-                	show: true,
-					offset: { x: 0, y: 30 },
-					text: '自律机通信',
-					lightColor: '#0f0',
-					defaultColor: '#ccc'
-				},
-				allowedTurnBack: {
-                	show: true,
-					offset: { x: 0, y: 30 },
-					text: '允许转回',
-					lightColor: '#0f0',
-					defaultColor: '#ccc'
-				},
-				trainControl: {
-                	show: true,
-					offset: { x: 0, y: 30 },
-					text: '列控',
-					lightColor: '#0f0',
-					defaultColor: '#ccc'
-				}
+                    defaultColor: '#ccc'
+                },
+                selfDisciplineThree: {
+                    offset: { x: 0, y: 0 },
+                    text: '分散自律',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                graphRoad: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '按图排路',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                planControl: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '计划控制',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                centerCommunication: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '中心通信',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                selfDisciplineCommunication: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '自律机通信',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                allowedTurnBack: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '允许转回',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                trainControl: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '列控',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                }
             }
         };
 
@@ -853,8 +853,8 @@ class SkinCode extends defaultStyle {
                 lrPadding: 4, // 两边间隔
                 upPadding: 4, // 上边距离
                 trainBodyFillColor: '#88DF8E', // 列车车身填充颜色
-				trainSidelineColor: '#F00',
-				trainSidelineStopColor: '#000',
+                trainSidelineColor: '#F00',
+                trainSidelineStopColor: '#000',
                 // trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
                 trainNameFormat:'tripNumber'
             },
@@ -879,21 +879,21 @@ class SkinCode extends defaultStyle {
             trainNumber: {
                 targetCodePrefix: '000', // 目的地码前缀
                 defaultTargetCode: 'DDD', // 默认目的地码
-				fontColor: '#F00',
-				trainTargetTextAlign: 'left', // 目的地码文字显示位置
+                fontColor: '#F00',
+                trainTargetTextAlign: 'left', // 目的地码文字显示位置
                 trainNumberOffset: { x: 24, y: 4}// 目的地码偏移量
             },
             trainServer: {
                 serviceNumberPrefix: '000', // 服务号(表号)前缀
                 defaultServiceNumber: 'TTT', // 默认服务号（表号）
                 defaultServerNoColor: '#F00', //  默认服务号状态显示颜色
-				fontColor: '#F00',
+                fontColor: '#F00',
                 trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
             },
             trainTarget: {
                 tripNumberPrefix: '', // 车次号前缀
                 // defaultTripNumber: 'DDD', // 默认车次号2
-				defaultTripNumber: '    ', // 默认车次号
+                defaultTripNumber: '    ', // 默认车次号
                 trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
                 trainTargetTextAlign: 'right' // 车次号文字显示位置
             },
@@ -905,13 +905,13 @@ class SkinCode extends defaultStyle {
             trainHead: {
                 trainConntWidth: 10, // 列车竖杠的宽度
                 trainHeadFillColor: '#189B4D', // 列车车头矩形填充颜色
-				trainHeadRectNoChange: true, // 列车车头矩形填充颜色不变
+                trainHeadRectNoChange: true, // 列车车头矩形填充颜色不变
                 trainHeadRectHeight: 20, // 列车车头矩形高度
                 directionStopType:'specialAll', // special 西安二号线 停车 列车方向图标不消失  normal 正常
                 trainHeadHeight: 'trainBox', // 列车车头高度取决于trainBox高度
                 trainHeadArrowWidth: 15, // 列车车头三角宽度
                 trainHeadArrowOffsetX: 0, // 列车车头三角偏移
-				trainHeadRectOffsetX: 10
+                trainHeadRectOffsetX: 10
             },
             common: {
                 trainHeight: 20, // 列车高度
@@ -961,16 +961,16 @@ class SkinCode extends defaultStyle {
                     {
                         type: 1,
                         lineLShow: true,
-						arrowLShow: false,
+                        arrowLShow: false,
                         lineRShow: false,
-						arrowRShow: true
+                        arrowRShow: true
                     },
                     {
                         type: 0,
                         lineLShow: false,
-						arrowLShow: true,
+                        arrowLShow: true,
                         lineRShow: true,
-						arrowRShow: false
+                        arrowRShow: false
                     }
                 ], // 列车停止方向类型对应车头显示状态   1从左往右 0从右往左
                 driveModeStatus: [
@@ -1018,125 +1018,125 @@ class SkinCode extends defaultStyle {
             }
         };
         this[deviceType.DepartArrow] = {
-			triangleLength: 15,
-			lineWidth: 8,
-			length: 35,
-			distance: 15,
-			fill: '#000',
-			stroke: '#fff',
-			fontSize: 11,
-			defaultText: '发车',
-			defaultColor: '#ccc',
+            triangleLength: 15,
+            lineWidth: 8,
+            length: 35,
+            distance: 15,
+            fill: '#000',
+            stroke: '#fff',
+            fontSize: 11,
+            defaultText: '发车',
+            defaultColor: '#ccc',
             occupiedColor:'#f00',
             noOccupiedColor:'#00ff00',
             blockStatusColor:'#00ff00',
-            noBlockStatusColor:'#ffff00',
-		};
+            noBlockStatusColor:'#ffff00'
+        };
         this[deviceType.PickArrow] = {
-			triangleLength: 15,
-			lineWidth: 8,
-			length: 35,
-			distance: 15,
-			fill: '#000',
-			stroke: '#fff',
-			fontSize: 11,
-			defaultText: '接车',
-			defaultColor: '#ccc',
+            triangleLength: 15,
+            lineWidth: 8,
+            length: 35,
+            distance: 15,
+            fill: '#000',
+            stroke: '#fff',
+            fontSize: 11,
+            defaultText: '接车',
+            defaultColor: '#ccc',
             occupiedColor:'#f00',
             noOccupiedColor:'#ffff00',
             blockStatusColor:'#00ff00',
-            noBlockStatusColor:'#ffff00',
-		};
-		this[deviceType.Occlusion] = {
-			text: {
-				fontSize: 11,								// 字体大小
-				fontWeight: 'normal',						// 字体粗细
-				distance: 5 								// 灯跟文字距离
-			},
-			lamp: {
-				radiusR: 6,									// 控制灯大小
-				controlColor: '#ccc'						// 控制灯颜色
-			}
-		};
-		this[deviceType.Accident] = {
-			text: {
-				fontSize: 11,
-				fontWeight: 'normal',
-				distance: 5
-			},
-			lamp: {
-				radiusR: 6,
-				controlColor: '#ccc'
-			}
-		};
-		this[deviceType.Recovery] = {
-			text: {
-				fontSize: 11,
-				fontWeight: 'normal',
-				distance: 5
-			},
-			lamp: {
-				radiusR: 6,
-				controlColor: '#ccc'
-			}
-		};
-		this[deviceType.PickAssist] = {
-			text: {
-				fontSize: 11,
-				fontWeight: 'normal',
-				distance: 5
-			},
-			lamp: {
-				radiusR: 6,
-				controlColor: '#ccc'
-			}
-		};
-		this[deviceType.DepartAssist] = {
-			text: {
-				fontSize: 11,
-				fontWeight: 'normal',
-				distance: 5
-			},
-			lamp: {
-				radiusR: 6,
-				controlColor: '#ccc'
-			}
-		};
-		this[deviceType.TotalAssist] = {
-			text: {
-				fontSize: 11,
-				fontWeight: 'normal',
-				distance: 5
-			},
-			lamp: {
-				radiusR: 6,
-				controlColor: '#ccc'
-			}
-		};
-		this[deviceType.AssistStatus] = {
-			text: {
-				fontSize: 11,
-				fontWeight: 'normal',
-				distance: 5
-			},
-			lamp: {
-				radiusR: 6,
-				controlColor: '#ccc',
-                occupiedColor:'#ffffff',
-			}
-		};
-		this[deviceType.SectionOccupied] = {
-			text: {
-				fontSize: 11,
-				fontWeight: 'normal',
-				distance: 5
-			},
-			lamp: {
-				radiusR: 6,
-				controlColor: '#ccc',
-                occupiedColor:'#ff0000',
-			}
-		};
+            noBlockStatusColor:'#ffff00'
+        };
+        this[deviceType.Occlusion] = {
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#ccc'						// 控制灯颜色
+            }
+        };
+        this[deviceType.Accident] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.Recovery] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.PickAssist] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.DepartAssist] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.TotalAssist] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.AssistStatus] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc',
+                occupiedColor:'#ffffff'
+            }
+        };
+        this[deviceType.SectionOccupied] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc',
+                occupiedColor:'#ff0000'
+            }
+        };
     }
 }
 
diff --git a/src/jmapNew/shape/graph/Station/EThreeLamp.js b/src/jmapNew/shape/graph/Station/EThreeLamp.js
index 01bb41bbf..c3604913f 100644
--- a/src/jmapNew/shape/graph/Station/EThreeLamp.js
+++ b/src/jmapNew/shape/graph/Station/EThreeLamp.js
@@ -103,10 +103,10 @@ export default class EThreeLamp extends Group {
         this.add(this.text);
     }
 
-    setColor(color) {
-        // if (color) {
-        //     this.control.setStyle('fill', color);
-        // }
+    setColor(color, index) {
+        if (color && this['control' + index]) {
+            this['control' + index].setStyle('fill', color);
+        }
     }
 
     setTextColor(color) {
diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js
index db0d891f6..06a4f250e 100644
--- a/src/jmapNew/shape/graph/Station/index.js
+++ b/src/jmapNew/shape/graph/Station/index.js
@@ -753,6 +753,7 @@ export default class Station extends Group {
         this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
         this.stationControlCC && this.stationControlCC.setStyle({text:'LC', textFill:this.style.Station.StationControl.text.stationControlColor});
         this.selfDisciplineControl && this.selfDisciplineControl.setColor(this.style.Station.StationControl.selfDisciplineControl.lightColor);
+        this.selfDisciplineThree && this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.lightColor, 3);
         // if (this.style.Station.StationControl.disPlayNone) {
         //     this.stationText && this.stationText.setStyle('textFill', '#fff');
         //     if (this.model.subheadDisplay) { // 副标题
@@ -825,6 +826,7 @@ export default class Station extends Group {
         this.selfDiscipline && this.selfDiscipline.setColor(this.style.Station.StationControl.selfDiscipline.defaultColor);
         this.selfDisciplineControl && this.selfDisciplineControl.setColor(this.style.Station.StationControl.selfDisciplineControl.defaultColor);
         this.veryControlButton && this.veryControlButton.setStyle({ fill: this.style.Station.StationControl.veryControlButton.defaultColor });
+        this.selfDisciplineThree && this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.defaultColor, 3);
         if (this.style.Station.stationText.isSpecialType) {
             this.stationText.setColor(this.style.Station.stationText.noneModeColor);
             this.stationText.setBackground(this.style.Station.stationText.defaultBackColor);
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index 8cf6449db..4c0156915 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -465,9 +465,9 @@ export default {
         doShow() {
             this.dialogVisible = true;
             this.initShowStationList(this.$store.state.map.showCentralizedStationCode);
-            if (this.showStationList[0]) {
-                this.selectStandCode(this.showStationList[0].code);
-                this.selectStandCode1(this.showStationList[0].code);
+            if (this.showStationList && this.showStationList.length) {
+                this.selectStandCode(this.$store.state.map.showCentralizedStationCode);
+                this.selectStandCode1(this.$store.state.map.showCentralizedStationCode);
             }
         },
         selectStandCode(code) {

From 458373312734de316dca4d519deb8eac0d63f870 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Jul 2022 16:17:53 +0800
Subject: [PATCH 05/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2=20=20ctc=20=E8=A1=8C?=
 =?UTF-8?q?=E8=BD=A6=E6=97=A5=E5=BF=97=20=E6=95=B0=E6=8D=AE=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/runplanPane.vue | 5 +++++
 src/views/newMap/displayNew/selectStation.vue    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index 5598ee7e8..38993e9e9 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -652,6 +652,11 @@ export default {
             const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
             this.initDate(date);
         },
+        '$store.state.training.roleDeviceCode':function(newVal, oldVal) {
+            if (oldVal) {
+                this.loadData();
+            }
+        },
         '$store.state.socket.railCtcRunplanChange': function (val) {
             this.loadData();
         },
diff --git a/src/views/newMap/displayNew/selectStation.vue b/src/views/newMap/displayNew/selectStation.vue
index fc9ea8207..f8dbb78cf 100644
--- a/src/views/newMap/displayNew/selectStation.vue
+++ b/src/views/newMap/displayNew/selectStation.vue
@@ -150,6 +150,7 @@ export default {
                     for (const key in mapDevice) {
                         list.push(mapDevice[key]);
                     }
+                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
                     this.$jlmap.updateShowStation(list, showStationCode || item.deviceCode);
                     this.setCenter(showStationCode);
                 }

From 4b1c1aae493dfc11a3b7bb9f120e9f58a229a86a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Jul 2022 16:37:08 +0800
Subject: [PATCH 06/30] =?UTF-8?q?TYJL-III=E5=9E=8B=20=E5=8C=BA=E6=AE=B5=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=88=86=E8=B7=AF=E4=B8=8D=E8=89=AF?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_tky.js  | 283 +++++++++++++++++++++-
 src/jmapNew/shape/graph/Section/ELines.js |   7 +
 src/jmapNew/shape/graph/Section/index.js  |   6 +-
 3 files changed, 292 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_tky.js b/src/jmapNew/config/skinCode/datie_tky.js
index 28b6dea33..768ba9337 100644
--- a/src/jmapNew/config/skinCode/datie_tky.js
+++ b/src/jmapNew/config/skinCode/datie_tky.js
@@ -5,7 +5,8 @@ class SkinCode extends defaultStyle {
         super();
         this.fontFamily = '宋体';
         this[deviceType.Section] = {
-            elemnetType:['name', 'line', 'separator', 'badShunt', 'derailer'],
+            elemnetType:['name', 'line', 'separator', 'derailer'],
+            // 'badShunt'
             name: {
                 z: 10,
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
@@ -33,6 +34,7 @@ class SkinCode extends defaultStyle {
                 z: 0,
                 width: 3, 									// 区段宽度
                 beyondWidth: 0, 							// 区段宽超出宽度
+                badShuntDashLine:true, // 区段分路不良标记
                 invadeColor: '#FF0000', 					// 区段侵入颜色     （红色）
                 spareColor: '#808080', 						// 区段空闲颜色  (灰色)   ok
 
@@ -53,11 +55,95 @@ class SkinCode extends defaultStyle {
                 logicalColor: '#FFFF00', 					// 逻辑区段颜色 (未用)
                 logicalTextColor: '#C0C0C0', 				// 逻辑区段名称颜色 (未用)
                 invalidColor: '#B18E38' 					// 区段ARB故障颜色
+            },
+            separator: {
+                z: 3,										// 分割符层级
+                width: 2, 									// 物理区段分隔符宽度
+                logicWidth:2, // 逻辑区段分隔符宽度
+                endWidth: 2, 								// 尽头分隔符宽度
+                endColor: 'rgb(128,128,128)', 						// 尽头分隔符颜色
+                color: 'rgb(128,128,128)', 							// 区段边界符颜色
+                invadeSpecial:true, // 特殊侵限
+                halfHeight: 3								// 区段分隔符高度的一半
+            },
+            derailer: {
+                text: {
+                    color: 'green',
+                    offset: {
+                        x: -5,
+                        y: -15
+                    }
+                },
+                symbol: {
+                    color: 'red'
+                }
             }
         };
 
         this[deviceType.Signal] = {
-            distance: 10
+            distance: 10,
+            post: {
+                standardLength: 6, // 高柱长度
+                standardHeight: 6, // 灯柱高度
+                standardColor: '#FFFFFF',					// 灯柱颜色
+                standardVerticalWidth: 2,						// 灯柱竖杆宽度
+                standardRailWidth: 2						// 灯柱横杆宽度
+            },
+            text: {
+                show: true,									// 信号机名称显示
+                distance: 3,								// 文字和灯杆的距离
+                isAlignCenter: false,						// 信号字体对其方式
+                fontSize: 11,								// 信号机名称字体大小
+                fontWeight: 'bold',							// 信号机名称字体粗细
+                defaultColor: '#FFFFFF',					// 信号灯字体默认色
+                blockColor: '#FFFFFF',						// 信号灯字体锁定颜色
+                checkColor: '#00FF00'						// 信号保护区段检查颜色
+            },
+            lamp: {
+                bgShow: false, // 是否被选中
+                guidName: 'singleRY',						// 成都三号线引导类型
+                borderVariable: false,						// 信号灯边框可变
+                stopWidth: 2,								// 禁止线宽度
+                borderWidth: 2,								// 信号灯边框线宽度
+                borderColor: '#677DBB',						// 信号灯边框线颜色
+                radiusR: 6,									// 信号灯半径
+                grayColor: '#7F7F7F',						// 信号灯灰色
+                redColor: '#FF0000',						// 信号灯红色
+                greenColor: '#00FF00',						// 信号灯绿色
+                yellowColor: '#FFFF00',						// 信号灯黄色
+                whiteColor: '#FFFFFF',						// 信号灯白色
+                blueColor: '#0070C0',						// 信号灯蓝色
+                faultType: 'light',							// 信号机故障类型 （light闪）
+                special:true // 大铁类型信号机
+            },
+            route: {
+                direction: true,							// 自动通过方向
+                offset: { x: 4, y: 0},						// 自动通过偏移量
+                routeColor: '#00FF00',						// 自动进路
+                radiusR: 6
+            },
+            auto: {
+                signalFrontTriangle: true,					// 信号灯前三角展示
+                fleetModeTriangle: true,					// 自动进路显示三角形非箭头
+                direction: false,							// 自动通过方向
+                offset: { x: -4, y: 0},						// 自动通过偏移量
+                width: 5,									// 自动宽度
+                manualControl: '#FFFF00',					// 人工控制
+                autoRoute: '#00FF00',						// 自动进路
+                autoTrigger: '#FFFF00',						// 自动触发
+                outConflict: '#C00808'						// 出车冲突
+            },
+            delay: {
+                direction: false,							// 延时解锁方向
+                offset: { x: -5, y: 0},						// 延时解锁偏移量
+                fontSize: 11,								// 延迟解锁字体大小
+                fontColor: '#C00808',						// 延迟解锁颜色
+                fontWeight: 'bold'							// 字体粗细
+
+            },
+            lowButton:{
+                display: false // 现地 信号机按钮
+            }
 
         };
 
@@ -112,11 +198,138 @@ class SkinCode extends defaultStyle {
                 borderColor:'', // 字体边框颜色
                 textBorderWidth:0 // 字体边框宽度
             },
-
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 distance: 5 								// 灯跟文字距离
+            },
+            StationControl:{
+                text: {
+                    distance: 2,								// 灯和文字之间的距离
+                    fontSize: 11,								// 字体大小
+                    fontFormat: 'consolas',						// 字体格式
+                    fontColor: '#ffffff',						// 字体颜色
+                    fontWeight: 'normal',						// 字体粗细
+                    textAlign: 'middle',						// 字体水平对齐
+                    textVerticalAlign: 'top'					// 字体垂直对齐
+                },
+                lamp: {
+                    count: 4,									// 控制模式的个数
+                    offset: {x: 0, y: 0},						// 偏移量
+                    radiusR: 6,									// 控制模式灯的半径
+                    distance: 46,								// 控制模式之间灯之间的距离
+                    grayColor: '#7F7F7F',						// 控制模式灰色
+                    greenColor: '#00FF00',						// 控制模式绿色
+                    redColor: '#FF0000',						// 控制模式红色
+                    yellowColor: '#FFFF00',						// 控制模式黄色
+                    purpleColor:'#840084', // 控制模式紫色
+                    strokeColor: '#fff',
+                    lineWidth: 1
+                },
+                emergencyControl: {									// 紧急站控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                veryControl: {
+                	show: true,
+                    offset: { x: 0, y: 0 },
+                    lightColor: '#f00',
+                    defaultColor: '#7F7F7F',
+                    text: '非常站控'
+                },
+                selfDiscipline: {
+                	show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '允许自律',
+                    defaultColor: '#7F7F7F',
+                    lightColor: '#ff0'
+                },
+                selfDisciplineControl: {
+                	show: true,
+                    offset: { x: 0, y: 0 },
+                    lightColor: '#0f0',
+                    defaultColor: '#7F7F7F',
+                    text: '自律控制'
+                },
+                veryControlButton: {
+                	offset: { x: 0, y: 0 },
+                    text: '非常站控',
+                    lightColor: '#ff0',
+                    defaultColor: '#ccc'
+                },
+                selfDisciplineThree: {
+                	offset: { x: 0, y: 0 },
+                    text: '分散自律',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                graphRoad: {
+                	show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '按图排路',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                planControl: {
+                	show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '计划控制',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                centerCommunication: {
+                	show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '中心通信',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                selfDisciplineCommunication: {
+                	show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '自律机通信',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                allowedTurnBack: {
+                	show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '允许转回',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                trainControl: {
+                	show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '列控',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                }
             }
         };
 
@@ -137,10 +350,74 @@ class SkinCode extends defaultStyle {
                 monolockLocationColor: '#00FF00',			// 道岔单锁'定位'颜色 (绿色)
                 monolockInversionColor: '#FFFF00',			// 道岔单锁'反位'颜色 (黄色)
                 faultFlashing: false						// 故障闪烁
+            },
+            sectionAction: {
+                flag: false, // 道岔 关联区段显示
+                spareColor: '#808080' // 区段显示颜色
+            },
+            core: {
+                length: 6,									// 道岔单边长度
+                graphShow: true, 							// 图形显示
+                graphInversionColor: '#FFFF00',				// 反位颜色
+                graphLocalColor: '#00FF00'					// 定位颜色
+            },
+            rectLock: {										// 矩形封锁框图形
+                rectWidth: 18, 								// 矩形框 宽高
+                rectBorderColor: '#fff',					// 矩形边框颜色
+                block: true,								// 封锁显示
+                blockColor: 'red',							// 封锁颜色
+                followName: true							// 位置跟随名称确定
             }
         };
 
         this[deviceType.Train] = {
+            trainBody: {
+                fontFamily: 'consolas',
+                trainBodyLineWidth: 1, // 车身line宽
+                changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+                specialTrainType: [
+                    {
+                        type: '03',
+                        serviceNumber: '---',
+                        // nameFormat: 'groupNumber:serviceNumber'
+                        nameFormat:'tripNumber'
+                    },
+                    {
+                        type: '03',
+                        // nameFormat: 'serviceNumber:trainNumber'
+                        nameFormat:'tripNumber'
+                    }
+                ], // 特殊列车类型需设置显示格式
+                lrPadding: 4, // 两边间隔
+                upPadding: 4, // 上边距离
+                trainBodyFillColor: '#88DF8E', // 列车车身填充颜色
+                trainSidelineColor: '#F00',
+                trainSidelineStopColor: '#000',
+                // trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
+                trainNameFormat:'tripNumber'
+            },
+            directionArrow: {
+            },
+            common: {
+                trainHeight: 20, // 列车高度
+                trainHeadDistance: 2, // 列车和车头之间的间距
+                trainWidth: 48, // 列车长度
+                trainTextFontSize: 12, // 列车字号
+                fontFamily: 'consolas', // 默认字体 族类
+                haveTextHSDA: false, // 是否需创建textHSDA对象
+                haveArrowText: true, // 是否需创建arrowText对象
+                textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+                trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+                trainTip:true // 鼠标悬停列车状态信息框是否显示
+            }
+        };
+
+        this[deviceType.TrainWindow] = {
+            lineColor: '#4DD43F',							// 车次窗颜色
+            lineDash: null,									// 车次窗虚线间隔
+            lineWidth: 1,									// 车次窗线宽
+            trainWindowSmooth: 0,							// 车次窗矩形圆滑程度
+            show: true											// 车次窗是否显示
         };
 
     }
diff --git a/src/jmapNew/shape/graph/Section/ELines.js b/src/jmapNew/shape/graph/Section/ELines.js
index bcd07f2f1..09f330671 100644
--- a/src/jmapNew/shape/graph/Section/ELines.js
+++ b/src/jmapNew/shape/graph/Section/ELines.js
@@ -580,6 +580,10 @@ export default class ELines extends Group {
         }
     }
 
+    setDashed() {
+        this.section.setStyle('lineDash', [2, 2]);
+    }
+
     addHover(style) {
         this.__zr && this.__zr.addHover(this.section, style);
     }
@@ -590,6 +594,9 @@ export default class ELines extends Group {
 
     recover() {
         this.section && this.section.show();
+        if (this.model.style.Section.line.badShuntDashLine) {
+            this.section && this.section.setStyle('lineDash', null);
+        }
         this.centerSquare && this.centerSquare.stopAnimation(true);
         this.centerSquare && this.centerSquare.setStyle({fill: this.model.style.Section.cross.centerSquare.defaultColor});
     }
diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js
index 164cbda03..34cbb11a2 100644
--- a/src/jmapNew/shape/graph/Section/index.js
+++ b/src/jmapNew/shape/graph/Section/index.js
@@ -549,7 +549,11 @@ export default class Section extends Group {
 
     // 分路不良
     badShuntStatus() {
-        this.badShunt && this.badShunt.show();
+        if (this.style.Section.line.badShuntDashLine) {
+            this.line.setDashed();
+        } else {
+            this.badShunt && this.badShunt.show();
+        }
     }
 
     /** 计算提示位置*/

From deece104b17565ca4484f78d4d11dca09b2d0009 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Jul 2022 17:18:55 +0800
Subject: [PATCH 07/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20ct?=
 =?UTF-8?q?c=20=E8=BF=90=E8=A1=8C=E5=9B=BE=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=94=B9=E5=AE=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8B=89=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/runplan.js                            |  8 +++++
 .../theme/datie_02/menus/runplanPane.vue      | 15 +++++++++
 src/store/modules/socket.js                   | 33 +++++++++++++------
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/api/runplan.js b/src/api/runplan.js
index 91211d454..1e89dc72e 100644
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@@ -521,3 +521,11 @@ export function getRunplanInRailway(group) {
         method: 'get'
     });
 }
+
+// 大铁 获取 ctc 车站 运行日志
+export function getRunplanInStation(group) {
+    return request({
+        url: `/api/simulation/${group}/ctc/station/runPlan/list`,
+        method: 'get'
+    });
+}
diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index 38993e9e9..f199bf5ad 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -592,6 +592,7 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import { copyAssign } from '@/utils/index';
 import { mapGetters } from 'vuex';
 import { transfiniteList } from '@/scripts/ConstDic';
+import {getRunplanInStation} from '@/api/runplan';
 export default {
     name:'RunplanPane',
     components: {
@@ -670,9 +671,23 @@ export default {
         '$store.state.socket.simulationReset': function (val) {
             this.$store.dispatch('socket/resetRailCtcRunplanInitMsg');
             this.loadData();
+        },
+        // 地图加载完成
+        '$store.state.map.mapDataLoadedCount': function (val) { // 地图数据加载完成
+            this.getRunplanInStationData();
         }
     },
+    mounted() {
+        this.group = this.$route.query.group;
+    },
     methods:{
+        getRunplanInStationData() {
+            getRunplanInStation(this.group).then(response => {
+                // debugger;
+                this.$store.dispatch('socket/initRailCtcRunplanInitMsg', response.data || []);
+            }).catch(()=>{
+            });
+        },
         initDate(date) {
             this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
             const years = date.getFullYear() + '';
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 9f5a079d8..45e573def 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -203,16 +203,16 @@ function handle(state, data) {
         state.railCtcStatusMsg = msg;
         break;
         // 大铁项目 ctc 运行图初始化信息
-    case 'SIMULATION_CTC_RUN_PLAN_INIT':
-        msg.forEach(element => {
-            const tripNumberDe = element.departRunPlan && element.departRunPlan.tripNumber;
-            const tripNumberAr = element.arriveRunPlan && element.arriveRunPlan.tripNumber;
-            if (tripNumberDe) { parseInt(tripNumberDe[tripNumberDe.length - 1]) % 2 == 0 ? element.departRunPlan.up = tripNumberDe : element.departRunPlan.down = tripNumberDe; }
-            if (tripNumberAr) { parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr; }
-            const code = element.stationCode + '' + element.code;
-            state.railCtcRunplanInitMsg[code] = element;
-        });
-        break;
+    // case 'SIMULATION_CTC_RUN_PLAN_INIT':
+    //     msg.forEach(element => {
+    //         const tripNumberDe = element.departRunPlan && element.departRunPlan.tripNumber;
+    //         const tripNumberAr = element.arriveRunPlan && element.arriveRunPlan.tripNumber;
+    //         if (tripNumberDe) { parseInt(tripNumberDe[tripNumberDe.length - 1]) % 2 == 0 ? element.departRunPlan.up = tripNumberDe : element.departRunPlan.down = tripNumberDe; }
+    //         if (tripNumberAr) { parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr; }
+    //         const code = element.stationCode + '' + element.code;
+    //         state.railCtcRunplanInitMsg[code] = element;
+    //     });
+    //     break;
         // 大铁项目 ctc 运行图改变信息
     case 'SIMULATION_CTC_RUN_PLAN_CHANGE':
         msg.forEach(element => {
@@ -558,6 +558,16 @@ const socket = {
         },
         resetRailCtcRunplanInitMsg: (state) => {
             state.railCtcRunplanInitMsg = {};
+        },
+        initRailCtcRunplanInitMsg: (state, list) => {
+            list.forEach(element => {
+                const tripNumberDe = element.departRunPlan && element.departRunPlan.tripNumber;
+                const tripNumberAr = element.arriveRunPlan && element.arriveRunPlan.tripNumber;
+                if (tripNumberDe) { parseInt(tripNumberDe[tripNumberDe.length - 1]) % 2 == 0 ? element.departRunPlan.up = tripNumberDe : element.departRunPlan.down = tripNumberDe; }
+                if (tripNumberAr) { parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr; }
+                const code = element.stationCode + '' + element.code;
+                state.railCtcRunplanInitMsg[code] = element;
+            });
         }
     },
 
@@ -658,6 +668,9 @@ const socket = {
         },
         resetRailCtcRunplanInitMsg:({ commit }) => {
             commit('resetRailCtcRunplanInitMsg');
+        },
+        initRailCtcRunplanInitMsg:({ commit }, list) => {
+            commit('initRailCtcRunplanInitMsg', list);
         }
     }
 };

From efab2fb9f2ee4fb8547c03e130a377b6ef0385fd Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 Jul 2022 17:49:13 +0800
Subject: [PATCH 08/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20ct?=
 =?UTF-8?q?c=20=E8=A1=8C=E8=BD=A6=E6=97=A5=E5=BF=97=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/index.vue     | 18 ++++++++++++++++++
 .../theme/datie_02/menus/runplanPane.vue       | 15 ---------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index 7cdf1aa18..fb38ae54a 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -104,6 +104,7 @@ import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
 import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
 import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
 import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
+import {getRunplanInStation} from '@/api/runplan';
 
 export default {
     name: 'Menus',
@@ -225,11 +226,21 @@ export default {
                 this.getRailwaySimulationRunplanSend();
             }
         }
+        // // 地图加载完成
+        // '$store.state.map.mapViewLoadedCount': function (val) { // 地图数据加载完成
+        //     debugger;
+        //     this.getRunplanInStationData();
+        // }
     },
     mounted() {
+        this.group = this.$route.query.group;
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
+            if (this.isCtc) {
+                this.getRunplanInStationData();
+            }
             const _that = this;
+            // debugger;
             window.onclick = function (e) {
                 if (!_that.$store.state.training.trainingStart) {
                     _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
@@ -248,6 +259,13 @@ export default {
         this.$store.dispatch('map/setPictureDeviceMap', {});
     },
     methods: {
+        getRunplanInStationData() {
+            getRunplanInStation(this.group).then(response => {
+                // debugger;
+                this.$store.dispatch('socket/initRailCtcRunplanInitMsg', response.data || []);
+            }).catch(()=>{
+            });
+        },
         changeSignedStatus(info) {
             this.isCtc && this.$refs.cmdManage.changeSignedStatus(info);
         },
diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index f199bf5ad..38993e9e9 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -592,7 +592,6 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import { copyAssign } from '@/utils/index';
 import { mapGetters } from 'vuex';
 import { transfiniteList } from '@/scripts/ConstDic';
-import {getRunplanInStation} from '@/api/runplan';
 export default {
     name:'RunplanPane',
     components: {
@@ -671,23 +670,9 @@ export default {
         '$store.state.socket.simulationReset': function (val) {
             this.$store.dispatch('socket/resetRailCtcRunplanInitMsg');
             this.loadData();
-        },
-        // 地图加载完成
-        '$store.state.map.mapDataLoadedCount': function (val) { // 地图数据加载完成
-            this.getRunplanInStationData();
         }
     },
-    mounted() {
-        this.group = this.$route.query.group;
-    },
     methods:{
-        getRunplanInStationData() {
-            getRunplanInStation(this.group).then(response => {
-                // debugger;
-                this.$store.dispatch('socket/initRailCtcRunplanInitMsg', response.data || []);
-            }).catch(()=>{
-            });
-        },
         initDate(date) {
             this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
             const years = date.getFullYear() + '';

From 19ff4db593d45df754a2be300a4560d2c2a99100 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 19 Jul 2022 10:08:40 +0800
Subject: [PATCH 09/30] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/SignalButton/index.js | 114 +++++++++---------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js
index b6d5053cd..de38f00f1 100644
--- a/src/jmapNew/shape/graph/SignalButton/index.js
+++ b/src/jmapNew/shape/graph/SignalButton/index.js
@@ -35,85 +35,85 @@ export default class SignalButton extends Group {
             return item.includes('ctc');
         });
         const ctcArcList = ['OCCLUSION', 'RECOVERY', 'CHANGE_DIRECTION', 'ACCIDENT', 'DEPART_ASSIST', 'PICK_ASSIST', 'ASSIST'];
-        const typeList = []
-        if (queryCtc && ctcArcList.includes(model.type)){
-			this.arcShape = new Arc({
-				zlevel: this.zlevel,
-				z: this.z,
-				shape: {
-					cx: computedPosition.x + 7,
-					cy: computedPosition.y + 7,
-					r: 7
-				},
-				style: {
-					stroke: '#69666E',
-					lineWidth: 1,
-					fill: fillColor
-				}
-			});
-			this.add(this.arcShape);
-        } else if (this.style.SignalButton
-            && this.style.SignalButton.shape === 'roundWithDock'
-            && typeList.includes(model.type)) {
+        const typeList = [];
+        if (queryCtc && ctcArcList.includes(model.type)) {
+            this.arcShape = new Arc({
+                zlevel: this.zlevel,
+                z: this.z,
+                shape: {
+                    cx: computedPosition.x + 7,
+                    cy: computedPosition.y + 7,
+                    r: 7
+                },
+                style: {
+                    stroke: '#69666E',
+                    lineWidth: 1,
+                    fill: fillColor
+                }
+            });
+            this.add(this.arcShape);
+        } else if (this.style.SignalButton &&
+            this.style.SignalButton.shape === 'roundWithDock' &&
+            typeList.includes(model.type)) {
             const circle1 = new Circle({
                 zlevel: this.zlevel,
                 z: this.z + 2,
                 shape: {
-					cx: computedPosition.x + 7,
-					cy: computedPosition.y + 7,
-					r: 7
+                    cx: computedPosition.x + 7,
+                    cy: computedPosition.y + 7,
+                    r: 7
                 },
                 style: {
-					stroke: '#69666E',
-					lineWidth: 1,
-					fill: fillColor
+                    stroke: '#69666E',
+                    lineWidth: 1,
+                    fill: fillColor
                 }
-            })
+            });
             const circle2 = new Circle({
                 zlevel: this.zlevel,
                 z: this.z + 1,
                 shape: {
-					cx: computedPosition.x + 7,
-					cy: computedPosition.y + 9,
-					r: 8
+                    cx: computedPosition.x + 7,
+                    cy: computedPosition.y + 9,
+                    r: 8
                 },
                 style: {
-					fill: '#000'
+                    fill: '#000'
                 }
-            })
+            });
             const circle3 = new Circle({
                 zlevel: this.zlevel,
                 z: this.z,
                 shape: {
-					cx: computedPosition.x + 7,
-					cy: computedPosition.y + 9,
-					r: 9
+                    cx: computedPosition.x + 7,
+                    cy: computedPosition.y + 9,
+                    r: 9
                 },
                 style: {
-					fill: '#eee'
+                    fill: '#eee'
                 }
-            })
-            this.arcShape = circle1
-            this.add(circle1).add(circle2).add(circle3)
+            });
+            this.arcShape = circle1;
+            this.add(circle1).add(circle2).add(circle3);
         } else {
-			this.rectButton = new Rect({
-				zlevel: this.zlevel,
-				z: this.z,
-				shape: {
-					x: model.position.x,
-					y: model.position.y,
-					width: 14,
-					height: 14
-				},
-				style: {
-					lineDash: null,
-					stroke: '#69666E',
-					lineWidth:1,
-					fill: fillColor
-				}
-			});
-			this.add(this.rectButton);
-		}
+            this.rectButton = new Rect({
+                zlevel: this.zlevel,
+                z: this.z,
+                shape: {
+                    x: computedPosition.x,
+                    y: computedPosition.y,
+                    width: 14,
+                    height: 14
+                },
+                style: {
+                    lineDash: null,
+                    stroke: '#69666E',
+                    lineWidth:1,
+                    fill: fillColor
+                }
+            });
+            this.add(this.rectButton);
+        }
         this.leftLine = new Line({
             zlevel: this.zlevel,
             z: this.z + 1,

From 3d9419b809452d6873ab247f0d40089e255a8fd0 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 19 Jul 2022 13:41:55 +0800
Subject: [PATCH 10/30] =?UTF-8?q?=E6=8C=87=E7=A4=BA=E7=81=AF=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=BF=85=E5=A1=AB=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/selectStation.vue |   1 -
 .../indicatorAssociatedInfo/route.vue         | 551 +++++++++---------
 2 files changed, 272 insertions(+), 280 deletions(-)

diff --git a/src/views/newMap/displayNew/selectStation.vue b/src/views/newMap/displayNew/selectStation.vue
index f8dbb78cf..e81685373 100644
--- a/src/views/newMap/displayNew/selectStation.vue
+++ b/src/views/newMap/displayNew/selectStation.vue
@@ -42,7 +42,6 @@ export default {
             this.initStationListMode();
         },
         '$store.state.training.simulationUserList': function(val) {
-            console.log('----------11');
             this.initData();
         },
         '$store.state.socket.simulationRoleList':function(list) {
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
index f5a71be1f..fa9fe1645 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
@@ -1,285 +1,278 @@
 <template>
-	<div class="BigRouteInfo">
-		<el-form ref="form" :model="addModel" :rules="rules" label-width="140px" size="mini" class="bigDefinition">
-			<el-form-item v-if="isModify" label="编号:" prop="code">
-				<el-input v-model="addModel.code" style="width: 220px;" disabled />
-			</el-form-item>
-			<el-form-item label="名称:" prop="name">
-				<el-input v-model="addModel.name" style="width: 220px;" />
-			</el-form-item>
-			<el-form-item label="关联车站:" prop="stationCode">
-				<el-select v-model="addModel.stationCode" clearable filterable>
-					<el-option
-						v-for="item in stationList"
-						:key="item.code"
-						:label="`${item.name}(${item.code})`"
-						:value="item.code"
-					/>
-				</el-select>
-				<el-button
-					:type=" field === 'stationCode' ? 'danger' : 'primary'"
-					@click="hover('stationCode')"
-				>{{ $t('map.activate') }}</el-button>
-			</el-form-item>
-			<el-form-item label="运行方向" prop="labelEnum">
-				<el-select v-model="addModel.labelEnum">
-					<el-option
-						v-for="item in directionLabelList"
-						:key="item.value"
-						:label="item.label"
-						:value="item.value"
-					/>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="关联区段:" prop="sectionList">
-				<el-select v-model="addModel.sectionList" multiple :placeholder="$t('map.pleaseSelect')">
-					<el-option
-						v-for="item in sectionList"
-						:key="item.code"
-						:label="`${item.name}(${item.code})`"
-						:value="item.code"
-					/>
-				</el-select>
-				<el-button
-					:type=" field === 'sectionList' ? 'danger' : 'primary'"
-					@click="hover('sectionList')"
-				>{{ $t('map.activate') }}</el-button>
-			</el-form-item>
-			<el-form-item label="关联信号机:" prop="signalCode">
-				<el-select v-model="addModel.signalCode" :placeholder="$t('map.pleaseSelect')">
-					<el-option
-						v-for="item in signalList"
-						:key="item.code"
-						:label="`${item.name}(${item.code})`"
-						:value="item.code"
-					/>
-				</el-select>
-				<el-button :type="field === 'signalCode'? 'danger':'primary'" @click="hover('signalCode')">{{$t('map.activate')}}</el-button>
-			</el-form-item>
-			<el-form-item label="闭塞类型:" prop="runModel">
-				<el-select v-model="addModel.runModel" :placeholder="$t('map.pleaseSelect')">
-					<el-option
-						v-for="item in runModelList"
-						:key="item.value"
-						:label="item.label"
-						:value="item.value"
-					/>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="默认状态:" prop="runStatus">
-				<el-select v-model="addModel.runStatus" :placeholder="$t('map.pleaseSelect')">
-					<el-option
-						v-for="item in runStatusList"
-						:key="item.value"
-						:label="item.label"
-						:value="item.value"
-					/>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="相对运行车站:" prop="relativeStationCode">
-				<el-select v-model="addModel.relativeStationCode" clearable filterable>
-					<el-option
-						v-for="item in stationList"
-						:key="item.code"
-						:label="`${item.name}(${item.code})`"
-						:value="item.code"
-					/>
-				</el-select>
-				<el-button
-					:type=" field === 'relativeStationCode' ? 'danger' : 'primary'"
-					@click="hover('relativeStationCode')"
-				>{{ $t('map.activate') }}</el-button>
-			</el-form-item>
-			<el-form-item label="相对运行方向:" prop="relativeLabelEnum">
-				<el-select v-model="addModel.relativeLabelEnum">
-					<el-option
-						v-for="item in directionLabelList"
-						:key="item.value"
-						:label="item.label"
-						:value="item.value"
-					/>
-				</el-select>
-			</el-form-item>
-		</el-form>
-		<div class="bigDraft">
-			<el-button-group class="bigDraftBtn">
-				<el-button v-if="isModify" type="warning" size="small" :loading="loading" @click="update ">更新</el-button>
-				<el-button v-else type="primary" size="small" :loading="loading" @click="save">保存</el-button>
-			</el-button-group>
-		</div>
-	</div>
+  <div class="BigRouteInfo">
+    <el-form ref="form" :model="addModel" :rules="rules" label-width="140px" size="mini" class="bigDefinition">
+      <el-form-item v-if="isModify" label="编号:" prop="code">
+        <el-input v-model="addModel.code" style="width: 220px;" disabled />
+      </el-form-item>
+      <el-form-item label="名称:" prop="name">
+        <el-input v-model="addModel.name" style="width: 220px;" />
+      </el-form-item>
+      <el-form-item label="关联车站:" prop="stationCode">
+        <el-select v-model="addModel.stationCode" clearable filterable>
+          <el-option
+            v-for="item in stationList"
+            :key="item.code"
+            :label="`${item.name}(${item.code})`"
+            :value="item.code"
+          />
+        </el-select>
+        <el-button
+          :type=" field === 'stationCode' ? 'danger' : 'primary'"
+          @click="hover('stationCode')"
+        >{{ $t('map.activate') }}</el-button>
+      </el-form-item>
+      <el-form-item label="运行方向" prop="labelEnum">
+        <el-select v-model="addModel.labelEnum">
+          <el-option
+            v-for="item in directionLabelList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="关联区段:" prop="sectionList">
+        <el-select v-model="addModel.sectionList" multiple :placeholder="$t('map.pleaseSelect')">
+          <el-option
+            v-for="item in sectionList"
+            :key="item.code"
+            :label="`${item.name}(${item.code})`"
+            :value="item.code"
+          />
+        </el-select>
+        <el-button
+          :type=" field === 'sectionList' ? 'danger' : 'primary'"
+          @click="hover('sectionList')"
+        >{{ $t('map.activate') }}</el-button>
+      </el-form-item>
+      <el-form-item label="关联信号机:" prop="signalCode">
+        <el-select v-model="addModel.signalCode" :placeholder="$t('map.pleaseSelect')">
+          <el-option
+            v-for="item in signalList"
+            :key="item.code"
+            :label="`${item.name}(${item.code})`"
+            :value="item.code"
+          />
+        </el-select>
+        <el-button :type="field === 'signalCode'? 'danger':'primary'" @click="hover('signalCode')">{{ $t('map.activate') }}</el-button>
+      </el-form-item>
+      <el-form-item label="闭塞类型:" prop="runModel">
+        <el-select v-model="addModel.runModel" :placeholder="$t('map.pleaseSelect')">
+          <el-option
+            v-for="item in runModelList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="默认状态:" prop="runStatus">
+        <el-select v-model="addModel.runStatus" :placeholder="$t('map.pleaseSelect')">
+          <el-option
+            v-for="item in runStatusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="相对运行车站:" prop="relativeStationCode">
+        <el-select v-model="addModel.relativeStationCode" clearable filterable>
+          <el-option
+            v-for="item in stationList"
+            :key="item.code"
+            :label="`${item.name}(${item.code})`"
+            :value="item.code"
+          />
+        </el-select>
+        <el-button
+          :type=" field === 'relativeStationCode' ? 'danger' : 'primary'"
+          @click="hover('relativeStationCode')"
+        >{{ $t('map.activate') }}</el-button>
+      </el-form-item>
+      <el-form-item label="相对运行方向:" prop="relativeLabelEnum">
+        <el-select v-model="addModel.relativeLabelEnum">
+          <el-option
+            v-for="item in directionLabelList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div class="bigDraft">
+      <el-button-group class="bigDraftBtn">
+        <el-button v-if="isModify" type="warning" size="small" :loading="loading" @click="update ">更新</el-button>
+        <el-button v-else type="primary" size="small" :loading="loading" @click="save">保存</el-button>
+      </el-button-group>
+    </div>
+  </div>
 </template>
 <script>
-	import { setUID } from '@/jmapNew/utils/Uid';
-	import { deepAssign } from '@/utils/index';
-	import { saveAssist } from '@/api/assist';
-	import { mapGetters } from 'vuex';
-	import ConstConfig from '@/scripts/ConstConfig';
-	import { queryAssistListPaged } from '@/api/assist';
-	export default {
-		name:'BigRouteInfo',
-		props: {
-			selected: {
-				type: Object,
-				default() {
-					return null;
-				}
-			},
-			mapInfo: {
-				type: Object,
-				default() {
-					return null;
-				}
-			}
-		},
-		data() {
-			var checkSectionList = (rule, value, callback) => {
-				if (!value || value.length === 0){
-					callback(new Error('请选择关联区段！'));
-				} else {
-					callback();
-				}
-			};
-			return {
-				field: '',
-				loading: false,
-				isModify:false,
-				mainDeviceList: [],
-				directionLabelList: ConstConfig.ConstSelect.directionLabelList,
-				addModel:{
-					id: '',
-					name:'',
-					stationCode: '',
-					labelEnum:'',
-					sectionList: [],
-					signalCode: '',
-					runModel: '',
-					runStatus: '',
-					relativeStationCode: '',
-					relativeLabelEnum: ''
-				},
-				rules: {
-					'name':[
-						{ required: true, message: '请输入名称', trigger: 'blur' },
-					],
-					'stationCode':[
-						{ required: true, message: '请选择关联车站', trigger: 'blur' },
-						{ required: true, message: '请选择关联车站', trigger: 'change' },
-					],
-					'labelEnum': [
-						{ required: true, message: '请选择运行方向', trigger: 'change' }
-					],
-					'signalCode': [
-						{ required: true, message: '请选择关联信号机', trigger: 'change' }
-					],
-					'sectionList': [
-						{ validator: checkSectionList, trigger: 'change' },
-						{ required: true, message: '请选择关联区段', trigger: 'blur' }
-					],
-					'runModel': [
-						{ required: true, message: '请选择闭塞类型', trigger: 'change' }
-					],
-					'runStatus': [
-						{ required: true, message: '请选择默认状态', trigger: 'change' }
-					],
-					'relativeStationCode': [
-						{ required: true, message: '请选择相对运行车站', trigger: 'blur' },
-						{ required: true, message: '请选择相对运行车站', trigger: 'change' }
-					],
-					'relativeLabelEnum': [
-						{ required: true, message: '请选择相对运行方向', trigger: 'change' }
-					]
-				},
-				runModelList: [
-					{ label: '自动闭塞', value: 'A' },
-					{ label: '半自动闭塞', value: 'S' }
-				],
-				runStatusList: [
-					{ label: '接车口', value: 'R' },
-					{ label: '发车口', value: 'D' },
-					{ label: '无状态', value: 'NO' }
-				],
-				relativeList: []
-			};
-		},
-		computed: {
-			...mapGetters('map', [
-				'sectionList',
-				'stationList',
-				'signalButtonList',
-				'signalList'
-			])
-		},
-		mounted() {
-			this.initPage();
-		},
-		methods:{
-			initPage() {
-				if (this.mapInfo) {
-					queryAssistListPaged({pageNum: 1, pageSize: 999},this.mapInfo.id).then(resp => {
-						this.relativeList = resp.data.list;
-					});
-				}
-			},
-			hover(field) {
-				this.field = field === this.field ? '' : field;
-			},
-			changeRadio() {
-				this.$refs.form.clearValidate();
-			},
-			setSelected(selected) {
-				if (selected) {
-					if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'sectionList'.toUpperCase()) {
-						this.addModel.sectionList.push(selected.code);
-					} else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'stationCode'.toUpperCase()) {
-						this.addModel.stationCode = selected.code;
-						this.field = '';
-					} else if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'signalCode'.toUpperCase()){
-						this.addModel.signalCode = selected.code;
-						this.field = '';
-					} else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'relativeStationCode'.toUpperCase()) {
-						this.addModel.relativeStationCode = selected.code;
-						this.field = '';
-					}
-				}
-			},
-			save() {
-				const that = this;
-				that.$refs.form.validate((valid) => {
-					if (valid) {
-						const newModel = deepAssign({}, that.addModel);
-						// newModel.code = setUID('Route');
-						that.loading = true;
-						saveAssist(newModel, that.mapInfo.id).then(res=>{
-							that.$message.success(that.$t('tip.creatingSuccessful'));
-							that.loading = false;
-							this.initPage();
-							that.clear();
-						}).catch(() => {
-							that.$messageBox(that.$t('tip.operationAbnormal'));
-							that.loading = false;
-						});
-					}
-				});
-			},
-			clear() {
-				if (this.$refs && this.$refs.form && this.mapInfo) {
-					this.$refs.form.resetFields();
-					this.addModel = {
-						id: '',
-						name:'',
-						stationCode: '',
-						labelEnum:'',
-						sectionList: [],
-						signalCode: '',
-						runModel: '',
-						runStatus: '',
-						relativeCode: ''
-					};
-				}
-			}
-		}
-	};
+// import { setUID } from '@/jmapNew/utils/Uid';
+import { deepAssign } from '@/utils/index';
+import { saveAssist } from '@/api/assist';
+import { mapGetters } from 'vuex';
+import ConstConfig from '@/scripts/ConstConfig';
+import { queryAssistListPaged } from '@/api/assist';
+export default {
+    name:'BigRouteInfo',
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        var checkSectionList = (rule, value, callback) => {
+            if (!value || value.length === 0) {
+                callback(new Error('请选择关联区段！'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            field: '',
+            loading: false,
+            isModify:false,
+            mainDeviceList: [],
+            directionLabelList: ConstConfig.ConstSelect.directionLabelList,
+            addModel:{
+                id: '',
+                name:'',
+                stationCode: '',
+                labelEnum:'',
+                sectionList: [],
+                signalCode: '',
+                runModel: '',
+                runStatus: '',
+                relativeStationCode: '',
+                relativeLabelEnum: ''
+            },
+            rules: {
+                'name':[
+                    { required: true, message: '请输入名称', trigger: 'blur' }
+                ],
+                'stationCode':[
+                    { required: true, message: '请选择关联车站', trigger: 'blur' },
+                    { required: true, message: '请选择关联车站', trigger: 'change' }
+                ],
+                'labelEnum': [
+                    { required: true, message: '请选择运行方向', trigger: 'change' }
+                ],
+                'signalCode': [
+                    { required: true, message: '请选择关联信号机', trigger: 'change' }
+                ],
+                'sectionList': [
+                    { validator: checkSectionList, trigger: 'change' },
+                    { required: true, message: '请选择关联区段', trigger: 'blur' }
+                ],
+                'runModel': [
+                    { required: true, message: '请选择闭塞类型', trigger: 'change' }
+                ],
+                'runStatus': [
+                    { required: true, message: '请选择默认状态', trigger: 'change' }
+                ]
+            },
+            runModelList: [
+                { label: '自动闭塞', value: 'A' },
+                { label: '半自动闭塞', value: 'S' }
+            ],
+            runStatusList: [
+                { label: '接车口', value: 'R' },
+                { label: '发车口', value: 'D' },
+                { label: '无状态', value: 'NO' }
+            ],
+            relativeList: []
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'stationList',
+            'signalButtonList',
+            'signalList'
+        ])
+    },
+    mounted() {
+        this.initPage();
+    },
+    methods:{
+        initPage() {
+            if (this.mapInfo) {
+                queryAssistListPaged({pageNum: 1, pageSize: 999}, this.mapInfo.id).then(resp => {
+                    this.relativeList = resp.data.list;
+                });
+            }
+        },
+        hover(field) {
+            this.field = field === this.field ? '' : field;
+        },
+        changeRadio() {
+            this.$refs.form.clearValidate();
+        },
+        setSelected(selected) {
+            if (selected) {
+                if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'sectionList'.toUpperCase()) {
+                    this.addModel.sectionList.push(selected.code);
+                } else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'stationCode'.toUpperCase()) {
+                    this.addModel.stationCode = selected.code;
+                    this.field = '';
+                } else if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'signalCode'.toUpperCase()) {
+                    this.addModel.signalCode = selected.code;
+                    this.field = '';
+                } else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'relativeStationCode'.toUpperCase()) {
+                    this.addModel.relativeStationCode = selected.code;
+                    this.field = '';
+                }
+            }
+        },
+        save() {
+            const that = this;
+            that.$refs.form.validate((valid) => {
+                if (valid) {
+                    const newModel = deepAssign({}, that.addModel);
+                    // newModel.code = setUID('Route');
+                    that.loading = true;
+                    saveAssist(newModel, that.mapInfo.id).then(res=>{
+                        that.$message.success(that.$t('tip.creatingSuccessful'));
+                        that.loading = false;
+                        this.initPage();
+                        that.clear();
+                    }).catch(() => {
+                        that.$messageBox(that.$t('tip.operationAbnormal'));
+                        that.loading = false;
+                    });
+                }
+            });
+        },
+        clear() {
+            if (this.$refs && this.$refs.form && this.mapInfo) {
+                this.$refs.form.resetFields();
+                this.addModel = {
+                    id: '',
+                    name:'',
+                    stationCode: '',
+                    labelEnum:'',
+                    sectionList: [],
+                    signalCode: '',
+                    runModel: '',
+                    runStatus: '',
+                    relativeCode: ''
+                };
+            }
+        }
+    }
+};
 </script>
 <style lang="scss" scoped>
 	.BigRouteInfo{

From a6bed9415304239b315504e8768bea588ee7fba7 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 Jul 2022 14:03:48 +0800
Subject: [PATCH 11/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E4=BE=B5=E9=99=90=E5=88=86=E9=9A=94=E7=AC=A6=20=E7=9A=84?=
 =?UTF-8?q?=E7=BB=98=E5=88=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_tky.js      |  5 ++--
 src/jmapNew/shape/graph/Section/ESeparator.js | 25 +++++++++++++++++--
 src/jmapNew/theme/datie_02/menus/index.vue    |  1 -
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_tky.js b/src/jmapNew/config/skinCode/datie_tky.js
index 768ba9337..82c2ec0c1 100644
--- a/src/jmapNew/config/skinCode/datie_tky.js
+++ b/src/jmapNew/config/skinCode/datie_tky.js
@@ -58,13 +58,14 @@ class SkinCode extends defaultStyle {
             },
             separator: {
                 z: 3,										// 分割符层级
-                width: 2, 									// 物理区段分隔符宽度
+                width: 1, 									// 物理区段分隔符宽度
                 logicWidth:2, // 逻辑区段分隔符宽度
                 endWidth: 2, 								// 尽头分隔符宽度
                 endColor: 'rgb(128,128,128)', 						// 尽头分隔符颜色
                 color: 'rgb(128,128,128)', 							// 区段边界符颜色
+                invadeColor:'#f00', // 区段特殊侵限边界符颜色
                 invadeSpecial:true, // 特殊侵限
-                halfHeight: 3								// 区段分隔符高度的一半
+                halfHeight: 6								// 区段分隔符高度的一半
             },
             derailer: {
                 text: {
diff --git a/src/jmapNew/shape/graph/Section/ESeparator.js b/src/jmapNew/shape/graph/Section/ESeparator.js
index 1dc58543b..43266dbef 100644
--- a/src/jmapNew/shape/graph/Section/ESeparator.js
+++ b/src/jmapNew/shape/graph/Section/ESeparator.js
@@ -92,7 +92,8 @@ export default class ESeparator extends Group {
             shape: {
                 cx: modelData.point.x,
                 cy: modelData.point.y,
-                r: this.style.Section.line.width
+                r: this.style.Section.separator.halfHeight
+                // this.style.Section.line.width+
             },
             style: {
                 stroke: this.style.Section.line.invadeColor,
@@ -123,6 +124,26 @@ export default class ESeparator extends Group {
         return partition;
     }
 
+    createVertical(modelData) {
+        let partition;
+        const style = this.model.style;
+        let points = [];
+        let lineWidth = 0;
+        const tanRate = modelData.traingle.getSinRate();
+        points = [
+            [modelData.point.x, modelData.point.y - (style.Section.separator.halfHeight)],
+            [modelData.point.x, modelData.point.y + (style.Section.separator.halfHeight)]
+        ];
+        lineWidth = modelData.type == '02' ? style.Section.separator.logicWidth : style.Section.separator.width;
+        if ((modelData.type == '03' || modelData.type == '01') && tanRate != 0 && tanRate != 1) {
+            partition = this.createModel(modelData, points, lineWidth, style.Section.line.transparentColor, Math.PI);
+        } else {
+            partition = this.createModel(modelData, points, lineWidth);
+        }
+        return partition;
+    }
+    // sepical:true, // 特殊类型 道岔C区段 分隔符为横向
+
     createNormal(modelData) {
         let partition;
         const style = this.model.style;
@@ -218,7 +239,7 @@ export default class ESeparator extends Group {
                 partition = [this.createModel(modelData, points, lineWidth, stroke)];
             } else if (type === '04') { // 侵限分隔符
                 if (this.style.Section.separator.invadeSpecial) {
-                    partition = [this.createNormal(modelData), this.createCircle(modelData)];
+                    partition = [this.createVertical(modelData), this.createCircle(modelData)];
                 } else {
                     partition = [this.createCircle(modelData)];
                 }
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index fb38ae54a..f79039558 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -240,7 +240,6 @@ export default {
                 this.getRunplanInStationData();
             }
             const _that = this;
-            // debugger;
             window.onclick = function (e) {
                 if (!_that.$store.state.training.trainingStart) {
                     _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();

From e3c04e96a36007a6d904051ef911ecca40896784 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Tue, 19 Jul 2022 14:50:52 +0800
Subject: [PATCH 12/30] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dispatcherStationManage/dispatchCmd.vue   | 255 +++++++++++++++++-
 1 file changed, 241 insertions(+), 14 deletions(-)

diff --git a/src/views/dispatcherStationManage/dispatchCmd.vue b/src/views/dispatcherStationManage/dispatchCmd.vue
index 85bdd476c..1c5a4512d 100644
--- a/src/views/dispatcherStationManage/dispatchCmd.vue
+++ b/src/views/dispatcherStationManage/dispatchCmd.vue
@@ -150,7 +150,87 @@
               </el-tab-pane>
               <el-tab-pane label="查询" name="search">
                 <div class="search-box">
-                  <div>查询</div>
+                  <div class="box-title">
+                    <div class="contant-null" />
+                    <div class="contant-text">查询条件</div>
+                    <div class="contant-icon" @click="active5=!active5">
+                      <i v-if="active1" class="el-icon-arrow-down" />
+                      <i v-else class="el-icon-arrow-up" />
+                    </div>
+                  </div>
+                  <div v-show="active5" class="search-condition">
+                    <div class="condition-top">
+                      <el-radio v-model="searchObj.timeType" label="1">时间范围</el-radio>
+                      <el-radio v-model="searchObj.timeType" label="2">精确匹配发令时间</el-radio>
+                    </div>
+                    <div class="condition-border" style="padding: 5px 10px">
+                      <div v-if="searchObj.timeType==1">
+                        <div class="condition-row">
+                          <span style="margin-right: 5px">从</span>
+                          <el-date-picker v-model="searchObj.startTime" style="flex: 1" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss" />
+                        </div>
+                        <div class="condition-row">
+                          <span style="margin-right: 5px">至</span>
+                          <el-date-picker v-model="searchObj.endTime" style="flex: 1" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss" />
+                        </div>
+                      </div>
+                      <div v-else class="condition-row">
+                        <span style="margin-right: 5px">发令时间</span>
+                        <el-date-picker v-model="searchObj.sendTime" style="flex: 1" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss" />
+                      </div>
+                    </div>
+                    <div class="condition-row">
+                      <el-checkbox v-model="searchObj.hasNumber">命令号</el-checkbox>
+                      <el-input v-model="searchObj.number" />
+                    </div>
+                    <div class="condition-border">
+                      <div class="condition-row">
+                        <el-checkbox v-model="searchObj.hasCompanyOfSender">发令单位</el-checkbox>
+                        <el-input v-model="searchObj.companyOfSender" />
+                      </div>
+                      <div class="condition-row">
+                        <el-checkbox v-model="searchObj.hasCompanyOfReceiver">受令单位</el-checkbox>
+                        <el-input v-model="searchObj.companyOfReceiver" />
+                      </div>
+                      <div>
+                        <el-checkbox v-model="searchObj.hasTitleKey">命令标题或者内容 关键字</el-checkbox>
+                        <el-input v-model="searchObj.titleKey" />
+                      </div>
+                      <div>
+                        <el-select v-model="searchObj.allSigned" placeholder="请选择">
+                          <el-option
+                            v-for="item in searchSignedOption"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                          />
+                        </el-select>
+                      </div>
+                    </div>
+                    <div class="condition-btn">
+                      <el-button type="primary" @click="search">查询</el-button>
+                      <el-button type="primary" style="width: 100px" @click="clearCondition">清除</el-button>
+                    </div>
+                  </div>
+                  <el-table ref="table5" class="search-table" :data="searchTable" border style="width: 100%" height="100%" highlight-current-row @current-change="handleCurrentChange($event, 'table5')">
+                    <el-table-column prop="number" label="命令号" width="80" />
+                    <el-table-column prop="transferNumber" label="识别号" width="80" />
+                    <el-table-column prop="title" label="命令标题" show-overflow-tooltip />
+                    <el-table-column prop="sendTime" label="接收单位" show-overflow-tooltip width="160">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ JoinDeviceNameStr(scope.row.receiverInfos) || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="sendTime" label="发令时间" width="160" />
+                    <el-table-column prop="senderName" label="发令人" />
+                    <el-table-column prop="companyOfSender" label="发令单位" />
+                    <el-table-column label="命令类型" width="100">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ typeObj[scope.row.type] || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="content" label="命令正文" show-overflow-tooltip />
+                  </el-table>
                 </div>
               </el-tab-pane>
             </el-tabs>
@@ -337,8 +417,8 @@ export default {
                 author: '',
                 receiverIds: [],
                 type: 'NORMAL',
-                content: '',
-                allSigned: ''
+                content: ''
+                // allSigned: ''
             },
             rules: {
                 title: [
@@ -356,10 +436,33 @@ export default {
             active2: true,
             active3: true,
             active4: true,
+            active5: true,
+            timeTypeRadio: '1',
             numTime: 24,
             seachData: [],
             cacheTableData: [],
-            currentInfo: {}
+            currentInfo: {},
+            searchObj: {
+                timeType: '1',
+                startTime: '',
+                endTime: '',
+                sendTime: '',
+                hasNumber: false,
+                number: '',
+                hasCompanyOfSender: false,
+                companyOfSender: '',
+                hasCompanyOfReceiver: false,
+                companyOfReceiver: '',
+                hasTitleKey: false,
+                titleKey: '',
+                allSigned: ''
+            },
+            searchTable: [],
+            searchSignedOption: [
+                { value: '', label: '全部'},
+                { value: true, label: '只显示签收完成的'},
+                { value: false, label: '只显示未签收完成的'}
+            ]
         };
     },
     computed: {
@@ -462,8 +565,67 @@ export default {
     beforeDestroy() {},
     mounted() {},
     methods:{
+        search() {
+            this.searchTable = [];
+            this.searchCmd().then(res => {
+                this.getSearchTable();
+            });
+        },
+        getSearchTable() {
+            const list = this.seachData.filter(item => {
+                return this.conditionFilter(item);
+            });
+            this.searchTable = list;
+        },
+        conditionFilter(item) {
+            let status = true;
+            if (this.searchObj.timeType == '1') {
+                if (this.searchObj.startTime && new Date(this.searchObj.startTime).getTime() > new Date(item.sendTime).getTime()) {
+                    status = false;
+                }
+                if (this.searchObj.endTime && new Date(this.searchObj.endTime).getTime() < new Date(item.sendTime).getTime()) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.timeType == '2' && this.searchObj.sendTime) {
+                if (this.searchObj.sendTime != item.sendTime) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasNumber && this.searchObj.number) {
+                if (this.searchObj.number != item.number) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasCompanyOfSender && this.searchObj.companyOfSender) {
+                if (this.searchObj.companyOfSender != item.companyOfSender) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasCompanyOfReceiver && this.searchObj.companyOfReceiver) {
+                const findObj = Object.keys(item.receiverInfos).find(ii => {
+                    const device = this.$store.getters['map/getDeviceByCode'](ii);
+                    const name = device ? device.name : '';
+                    return name == this.searchObj.companyOfReceiver;
+                });
+                if (!findObj) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasTitleKey && this.searchObj.titleKey) {
+                if (!item.title.includes(this.searchObj.titleKey) && !item.content.includes(this.searchObj.titleKey)) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.allSigned != '') {
+                if (this.searchObj.allSigned != item.allSigned) {
+                    status = false;
+                }
+            }
+            return status;
+        },
         setCurrentRow(obj, refName) {
-            const tableArr = ['table1', 'table2', 'table3', 'table4'];
+            const tableArr = ['table1', 'table2', 'table3', 'table4', 'table5'];
             tableArr.forEach(key => {
                 if (key != refName) {
                     this.$refs[key] && this.$refs[key].setCurrentRow();
@@ -475,7 +637,10 @@ export default {
         handleCurrentChange(obj, refName) {
             if (!obj) { return; }
             this.currentInfo = obj;
-            this.command = {...obj};
+            // this.command = {...obj};
+            Object.keys(this.command).forEach(key => {
+                this.command[key] = obj[key] || '';
+            });
             this.setCurrentRow(obj, refName);
             const infoList = Object.keys(this.currentInfo.receiverInfos || {});
             if (infoList.length) {
@@ -525,6 +690,24 @@ export default {
             console.log('刷新');
             this.searchCmd();
         },
+        clearCondition() {
+            this.searchTable = [];
+            this.searchObj = {
+                timeType: '1',
+                startTime: '',
+                endTime: '',
+                sendTime: '',
+                hasNumber: false,
+                number: '',
+                hasCompanyOfSender: false,
+                companyOfSender: '',
+                hasCompanyOfReceiver: false,
+                companyOfReceiver: '',
+                hasTitleKey: false,
+                titleKey: '',
+                allSigned: ''
+            };
+        },
         createCmd() {
             this.$confirm('当前调度命令已经被编辑修改过了，你要放弃所有的修改吗？', '操作提示', {
                 confirmButtonText: '是',
@@ -551,8 +734,8 @@ export default {
                 author: '',
                 receiverIds: [],
                 type: 'NORMAL',
-                content: '',
-                allSigned: ''
+                content: ''
+                // allSigned: ''
             };
             this.currentInfo = {};
             this.$refs.table && this.$refs.table.clearSelection();
@@ -639,11 +822,15 @@ export default {
             });
         },
         searchCmd() {
-            sendCommandNew(this.group, 'CTC_QUERY_DISPATCH_COMMAND').then((res) => {
-                console.log(res, '---res----');
-                this.seachData = res.data;
-            }).catch(error => {
-                this.$messageBox('查询调度命令失败：' + error.message);
+            return new Promise((resolve, reject) => {
+                sendCommandNew(this.group, 'CTC_QUERY_DISPATCH_COMMAND').then((res) => {
+                    console.log(res, '---res----');
+                    this.seachData = res.data;
+                    resolve();
+                }).catch(error => {
+                    this.$messageBox('查询调度命令失败：' + error.message);
+                    reject(error.message);
+                });
             });
         }
     }
@@ -687,12 +874,49 @@ export default {
 				color: blue;
 			}
 		}
+		.search-box {
+			height: 720px;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			.search-condition {
+				padding: 5px;
+				.condition-top {
+					padding: 5px;
+				}
+				.condition-btn {
+					padding: 10px;
+					text-align: center;
+				}
+			}
+			.search-table {
+				flex: 1;
+			}
+			.condition-border {
+				margin: 10px 0;
+				padding: 5px;
+				border: 1px solid #92ACD7;
+				div {
+					margin: 5px 0;
+				}
+			}
+			.condition-row {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 32px;
+				line-height: 32px;
+			}
+			.el-checkbox {
+				margin-right: 5px;
+			}
+		}
 	}
 	/deep/ .el-tabs__item {
 		height: 30px !important;
 		line-height: 30px !important;
 	}
-	.middle {
+	.middle, .left {
 		/deep/ .el-form-item {
 			margin-bottom: 0px;
 			.el-form-item__error {
@@ -720,4 +944,7 @@ export default {
 .dispatcher-cmd .el-dialog {
 	margin-top: 8vh !important;
 }
+.dispatcher-cmd .el-tabs--border-card>.el-tabs__content {
+	padding: 5px !important;
+}
 </style>

From dd1b7b934e46c0d9a05709f05a4d6f1c5b145e66 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 Jul 2022 16:53:37 +0800
Subject: [PATCH 13/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AFIII?=
 =?UTF-8?q?=E5=9E=8B=20=E5=AE=9A=E5=8F=8D=E4=BD=8D=20=E5=AE=9E=E5=BF=83?=
 =?UTF-8?q?=E5=B0=8F=E5=9C=86=E5=9C=88=20=20=E5=A4=B1=E8=A1=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_tky.js      | 10 +++-
 .../shape/graph/Switch/ESpecialCircle.js      | 49 +++++++++++++++++++
 src/jmapNew/shape/graph/Switch/index.js       | 40 ++++++++++++++-
 3 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 src/jmapNew/shape/graph/Switch/ESpecialCircle.js

diff --git a/src/jmapNew/config/skinCode/datie_tky.js b/src/jmapNew/config/skinCode/datie_tky.js
index 82c2ec0c1..26b5bfc35 100644
--- a/src/jmapNew/config/skinCode/datie_tky.js
+++ b/src/jmapNew/config/skinCode/datie_tky.js
@@ -359,8 +359,10 @@ class SkinCode extends defaultStyle {
             core: {
                 length: 6,									// 道岔单边长度
                 graphShow: true, 							// 图形显示
+                specialCircle:true, // 大铁线路III型 定反位 实心小圆圈
                 graphInversionColor: '#FFFF00',				// 反位颜色
-                graphLocalColor: '#00FF00'					// 定位颜色
+                graphLocalColor: '#00FF00',					// 定位颜色
+                lossActionColor:'#fff' // 失表颜色
             },
             rectLock: {										// 矩形封锁框图形
                 rectWidth: 18, 								// 矩形框 宽高
@@ -368,6 +370,12 @@ class SkinCode extends defaultStyle {
                 block: true,								// 封锁显示
                 blockColor: 'red',							// 封锁颜色
                 followName: true							// 位置跟随名称确定
+            },
+            jointImg: {										// 道岔 A B C D四元素属性配置
+                trapezoidLength: 8,							// 直角梯形元素默认长度
+                faultStatus: true,							// 挤岔表示
+                fork: true,									// 挤岔专用（如有挤岔操作 变为true）
+                forKColor: 'red'							// 挤岔颜色 配合挤岔专用
             }
         };
 
diff --git a/src/jmapNew/shape/graph/Switch/ESpecialCircle.js b/src/jmapNew/shape/graph/Switch/ESpecialCircle.js
new file mode 100644
index 000000000..c066f3d21
--- /dev/null
+++ b/src/jmapNew/shape/graph/Switch/ESpecialCircle.js
@@ -0,0 +1,49 @@
+import Group from 'zrender/src/container/Group';
+import Circle from 'zrender/src/graphic/shape/Circle';
+
+class ESpecialCircle extends Group {
+    constructor(model) {
+        // drictx, dricty
+        super();
+        this.model = model;
+        this.dricty = model.dricty;
+        this.drictx = model.drictx > 0;
+        this.create();
+    }
+    create() {
+        const { model } = this;
+        this.specialCircle = new Circle({
+            zlevel: model.zlevel + 1,
+            z: model.z + 2,
+            shape: {
+                cx: model.point.x + (this.drictx ? 14 : -14),
+                cy: model.point.y,
+                r: 3
+            },
+            style: {
+                fill: '#FF0000'
+            }
+        });
+        this.add(this.specialCircle);
+    }
+
+    setColor(color) {
+        console.log(this.specialCircle);
+        console.log(color);
+        this.specialCircle.setStyle({ fill: color });
+    }
+
+    animate() {
+        this.specialCircle && this.specialCircle.animateStyle(true)
+            .when(0, { opacity: 1 })
+            .when(500, { opacity: 0 })
+            .when(1000, { opacity: 1 })
+            .start();
+    }
+
+    stopAnimation(flag) {
+        this.specialCircle.stopAnimation(flag);
+    }
+}
+
+export default ESpecialCircle;
diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js
index 1e6072d31..ddc7e7ba9 100644
--- a/src/jmapNew/shape/graph/Switch/index.js
+++ b/src/jmapNew/shape/graph/Switch/index.js
@@ -14,6 +14,7 @@ import EHighlight from '../element/EHighlight';
 import ETriangle from './ETriangle';
 import store from '@/store/index';
 import ESwDot from './ESwDot';
+import ESpecialCircle from './ESpecialCircle';
 
 export default class Switch extends Group {
     constructor(model, {style, mapDevice}) {
@@ -221,6 +222,20 @@ export default class Switch extends Group {
             this.add(this.dot);
         }
 
+        if (style.Switch.core.specialCircle) {
+            // 大铁线路III型 定反位 实心小圆圈
+            const { drictx, dricty } = this.triangle;
+            this.specialCircle = new ESpecialCircle({
+                zlevel: this.zlevel,
+                z: this.z,
+                point:sectionAPoint,
+                drictx:drictx,
+                dricty:dricty
+            });
+            this.add(this.specialCircle);
+            this.specialCircle.hide();
+        }
+
         this.add(this.shapeModelA);
         this.add(this.shapeModelB);
         this.add(this.shapeModelC);
@@ -353,6 +368,8 @@ export default class Switch extends Group {
         this.name && this.name.show();
         this.limitName && this.limitName.show();
         this.dot && this.dot.hide();
+        this.specialCircle && this.specialCircle.hide();
+        this.specialCircle && this.specialCircle.stopAnimation(false);
     }
 
     /** 定位*/
@@ -368,7 +385,13 @@ export default class Switch extends Group {
         }
         if (this.style.Switch.core.graphShow) { // 佛山线路显示
             this.shapeModelB.show();
-            this.shapeModelB.setColor(this.style.Switch.core.graphLocalColor);
+            if (this.style.Switch.core.specialCircle) { // 大铁线路III型 定反位 实心小圆圈
+                this.specialCircle.show();
+                this.specialCircle.setColor(this.style.Switch.core.graphLocalColor);
+            } else {
+                this.shapeModelB.setColor(this.style.Switch.core.graphLocalColor);
+            }
+
             this.shapeModelC.show();
             this.shapeModelC.setColor(this.style.backgroundColor);
         }
@@ -388,7 +411,13 @@ export default class Switch extends Group {
         this.shapeModelA.setColor(this.style.Section.line.spareColor);
         if (this.style.Switch.core.graphShow) { // 佛山线路显示
             this.shapeModelC.show();
-            this.shapeModelC.setColor(this.style.Switch.core.graphInversionColor);
+            if (this.style.Switch.core.specialCircle) { // 大铁线路III型 定反位 实心小圆圈
+                this.specialCircle.show();
+                this.specialCircle.setColor(this.style.Switch.core.graphInversionColor);
+                this.shapeModelC.setColor(this.style.Section.line.spareColor);
+            } else {
+                this.shapeModelC.setColor(this.style.Switch.core.graphInversionColor);
+            }
             this.shapeModelC.attr({
                 z: this.z + 6
             });
@@ -436,6 +465,13 @@ export default class Switch extends Group {
         this.setTextColor(this.style.Switch.text.lossColor);
         this.style.Switch.text.faultFlashing && this.nameTextAnimation();
 
+        if (this.style.Switch.core.specialCircle) {
+            this.specialCircle.show();
+            this.specialCircle.setColor(this.style.Switch.core.lossActionColor);
+            // 大铁线路III型 定反位 实心小圆圈
+            this.specialCircle && this.specialCircle.animate();
+        }
+
         this.lossShow && this.lossShow.show(); // 西安线路专有
         this.lossShow && this.lossShow.animateStyle(true)
             .when(0, { stroke: this.style.backgroundColor })

From b6f4fc611fa1116ee9822c7a222405e728644a5f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 Jul 2022 17:14:52 +0800
Subject: [PATCH 14/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AFIII?=
 =?UTF-8?q?=E5=9E=8B=20=20=E9=81=93=E5=B2=94=20=E6=8C=A4=E5=B2=94=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=20=E9=81=93?=
 =?UTF-8?q?=E5=B2=94=E5=90=8D=E7=A7=B0=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_tky.js | 11 ++---
 src/jmapNew/shape/graph/Switch/index.js  | 53 ++++++++++++++----------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_tky.js b/src/jmapNew/config/skinCode/datie_tky.js
index 26b5bfc35..06b368547 100644
--- a/src/jmapNew/config/skinCode/datie_tky.js
+++ b/src/jmapNew/config/skinCode/datie_tky.js
@@ -340,13 +340,13 @@ class SkinCode extends defaultStyle {
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
                 offset: {x: 5, y: -10},						// 道岔名称与区段距离
                 fontSize: 11,								// 字体大小
-                fontColor: '#fff',							// 道岔名称颜色
+                fontColor: '#FFFF00',							// 道岔名称颜色
                 fontWeight: 'normal',						// 字体粗细
                 borderColor: '#FE0000',						// 道岔边框颜色
-                lossColor: '#C00808',						// 道岔失去颜色
+                lossColor: '#FFFF00',						// 道岔失去颜色
 
-                locateColor: '#00FF00',						// 道岔定位颜色   ok
-                inversionColor: '#FFFF00',					// 道岔反位颜色     ok
+                locateColor: '#808080',						// 道岔定位颜色   ok
+                inversionColor: '#808080',					// 道岔反位颜色     ok
 
                 monolockLocationColor: '#00FF00',			// 道岔单锁'定位'颜色 (绿色)
                 monolockInversionColor: '#FFFF00',			// 道岔单锁'反位'颜色 (黄色)
@@ -362,7 +362,8 @@ class SkinCode extends defaultStyle {
                 specialCircle:true, // 大铁线路III型 定反位 实心小圆圈
                 graphInversionColor: '#FFFF00',				// 反位颜色
                 graphLocalColor: '#00FF00',					// 定位颜色
-                lossActionColor:'#fff' // 失表颜色
+                lossActionColor:'#fff', // 失表颜色
+                forkActionColor:'#f00'// 挤岔颜色
             },
             rectLock: {										// 矩形封锁框图形
                 rectWidth: 18, 								// 矩形框 宽高
diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js
index ddc7e7ba9..f266b4881 100644
--- a/src/jmapNew/shape/graph/Switch/index.js
+++ b/src/jmapNew/shape/graph/Switch/index.js
@@ -500,30 +500,37 @@ export default class Switch extends Group {
         if (this.style.Switch.jointImg.fork) {
             this.recover();
             this.shapeModelB.show();
-            this.shapeModelB.animateStyle(item => {
-                item.animateStyle(true)
-                    .when(0, { stroke: this.style.backgroundColor })
-                    .when(1000, { stroke: 'red' })
-                    .when(2000, { stroke: this.style.backgroundColor })
-                    .start();
-            });
             this.shapeModelC.show(); // 宁波线路挤叉特殊显示
-            this.shapeModelC.animateStyle(item => {
-                item.animateStyle(true)
-                    .when(0, { stroke: this.style.backgroundColor })
-                    .when(1000, { stroke: 'red' })
-                    .when(2000, { stroke: this.style.backgroundColor })
-                    .start();
-            });
             this.shapeModelA.show();
-            this.shapeModelA.animateStyle(item => {
-                item.animateStyle(true)
-                    .when(0, { stroke: this.style.backgroundColor })
-                    .when(1000, { stroke: 'red' })
-                    .when(2000, { stroke: this.style.backgroundColor })
-                    .start();
-            });
-            this.setTextColor('red');
+            if (this.style.Switch.core.specialCircle) {
+                this.specialCircle.show();
+                this.specialCircle.setColor(this.style.Switch.core.forkActionColor);
+                // 大铁线路III型 定反位 实心小圆圈
+                this.specialCircle && this.specialCircle.animate();
+            } else {
+                this.shapeModelB.animateStyle(item => {
+                    item.animateStyle(true)
+                        .when(0, { stroke: this.style.backgroundColor })
+                        .when(1000, { stroke: 'red' })
+                        .when(2000, { stroke: this.style.backgroundColor })
+                        .start();
+                });
+                this.shapeModelC.animateStyle(item => {
+                    item.animateStyle(true)
+                        .when(0, { stroke: this.style.backgroundColor })
+                        .when(1000, { stroke: 'red' })
+                        .when(2000, { stroke: this.style.backgroundColor })
+                        .start();
+                });
+                this.shapeModelA.animateStyle(item => {
+                    item.animateStyle(true)
+                        .when(0, { stroke: this.style.backgroundColor })
+                        .when(1000, { stroke: 'red' })
+                        .when(2000, { stroke: this.style.backgroundColor })
+                        .start();
+                });
+                this.setTextColor('red');
+            }
         } else {
             this.setLossAction(fault); // 若不是具有特殊的挤岔，则显示状态和失表一样
         }
@@ -757,6 +764,8 @@ export default class Switch extends Group {
             // model.pos == 'NO' || model.pos == 'EX';
             // N-定位 R-反位 NO-无(失表) EX-挤叉
 
+            // model.pos = 'EX';
+
             if (model.pos == 'N') {
                 this.switchPosition = 'normal';
                 this.setLocationAction(model); 	/** 定位*/

From 751733c4504512986e32a77d427824e79bbfb797 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 20 Jul 2022 09:34:04 +0800
Subject: [PATCH 15/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AFIII?=
 =?UTF-8?q?=E5=9E=8B=20=20=E9=81=93=E5=B2=94=20=20=E9=81=93=E5=B2=94?=
 =?UTF-8?q?=E5=B0=81=E9=94=81=20=E5=8D=95=E9=94=81=20=E4=BE=A7=E9=98=B2=20?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E6=80=BB=E9=94=81=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_tky.js  |  9 +++-
 src/jmapNew/shape/graph/Switch/ESwName.js |  2 +-
 src/jmapNew/shape/graph/Switch/index.js   | 53 ++++++++++++++++++++++-
 3 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_tky.js b/src/jmapNew/config/skinCode/datie_tky.js
index 06b368547..1ee8c187b 100644
--- a/src/jmapNew/config/skinCode/datie_tky.js
+++ b/src/jmapNew/config/skinCode/datie_tky.js
@@ -344,11 +344,16 @@ class SkinCode extends defaultStyle {
                 fontWeight: 'normal',						// 字体粗细
                 borderColor: '#FE0000',						// 道岔边框颜色
                 lossColor: '#FFFF00',						// 道岔失去颜色
+                blockText:'#fff', // 道岔封锁文字颜色
+                blockTextBack:'#f00', // 道岔封锁文字背景颜色
+                lockTextBack:'#fff', // 道岔单锁文字背景颜色
+                fpLockColor:'#f00', // 道岔侧防文字背景颜色
+                guideMasterLockColor:'#f00', // 道岔引导总锁文字背景颜色
 
                 locateColor: '#808080',						// 道岔定位颜色   ok
                 inversionColor: '#808080',					// 道岔反位颜色     ok
 
-                monolockLocationColor: '#00FF00',			// 道岔单锁'定位'颜色 (绿色)
+                monolockLocationColor: '#f00', // 道岔单锁'定位'颜色 (绿色)
                 monolockInversionColor: '#FFFF00',			// 道岔单锁'反位'颜色 (黄色)
                 faultFlashing: false						// 故障闪烁
             },
@@ -368,7 +373,7 @@ class SkinCode extends defaultStyle {
             rectLock: {										// 矩形封锁框图形
                 rectWidth: 18, 								// 矩形框 宽高
                 rectBorderColor: '#fff',					// 矩形边框颜色
-                block: true,								// 封锁显示
+                block: false,								// 封锁显示
                 blockColor: 'red',							// 封锁颜色
                 followName: true							// 位置跟随名称确定
             },
diff --git a/src/jmapNew/shape/graph/Switch/ESwName.js b/src/jmapNew/shape/graph/Switch/ESwName.js
index 460385da0..1bf8b98a6 100644
--- a/src/jmapNew/shape/graph/Switch/ESwName.js
+++ b/src/jmapNew/shape/graph/Switch/ESwName.js
@@ -16,7 +16,7 @@ class ESwName extends Group {
 
         this.nameText = new Text({
             zlevel: model.zlevel,
-            z: model.z + 6,
+            z: model.z + 11,
             style: {
                 x: model.nameTextX,
                 y: model.nameTextY,
diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js
index f266b4881..4533e1396 100644
--- a/src/jmapNew/shape/graph/Switch/index.js
+++ b/src/jmapNew/shape/graph/Switch/index.js
@@ -353,6 +353,7 @@ export default class Switch extends Group {
         this.lockCircle && this.lockCircle.hide(); // 圆形包围框
         this.lockArc && this.lockArc.hide(); // 圆形单锁框
         this.name.getNameText().stopAnimation(false);
+        this.name.getTextRect().setStyle({ fill: this.style.backgroundColor });
         this.shapeModelC && this.shapeModelC.hide(); // 形状 C
         this.shapeModelA && this.shapeModelA.hide(); // 形状 A
         this.shapeModelB && this.shapeModelB.hide(); // 形状 B
@@ -564,6 +565,45 @@ export default class Switch extends Group {
             this.dot.setColor(this.style.Switch.switchDot.monoLockColor);
         }
         this.setTextColor(this.style.Switch.text.monolockLocationColor);
+        if (this.style.Switch.core.specialCircle) {
+            this.name.getTextRect().setStyle({ fill: this.style.Switch.text.lockTextBack });
+        }
+    }
+
+    // 引导总锁
+    guideMasterLock(pos) {
+        if (this.style.Switch.rectLock &&
+			this.style.Switch.rectLock.monolock) { // 判断单锁矩形是否显示
+            this.lockRect.show();
+            if (this.style.Switch.rectLock.rectBorderFillColor) { // 西安二号线 专用显示
+                this.lockRect.setStyle({ stroke: this.style.Switch.rectLock.rectBorderColor, fill: this.style.Switch.rectLock.rectBorderFillColor });
+            }
+        }
+
+        if (this.style.Switch.text &&
+			this.style.Switch.text.monolock) { // 单锁显示名称包围框
+            this.setHasTextBorder(1);
+        }
+        if (this.style.Switch.arcBlcok &&
+			this.style.Switch.arcBlcok.show) { // 圆形单锁是否显示
+            this.lockArc.show();
+            if (pos == 'N') {
+                this.lockArc.setStyle({ stroke: this.style.Switch.arcBlcok.locationColor });
+            } else if (pos == 'R') {
+                this.lockArc.setStyle({ stroke: this.style.Switch.arcBlcok.inversionColor });
+            }
+        }
+        if (this.style.Switch.switchDot && this.style.Switch.switchDot.show) {
+            this.dot.show();
+            this.dot.setColor(this.style.Switch.switchDot.monoLockColor);
+        }
+
+        if (this.style.Switch.core.specialCircle) {
+            this.name.getTextRect().setStyle({ fill: this.style.backgroundColor });
+            this.setTextColor(this.style.Switch.text.guideMasterLockColor);
+        } else {
+            this.setTextColor(this.style.Switch.text.monolockLocationColor);
+        }
     }
 
     /** 封锁 */
@@ -597,8 +637,12 @@ export default class Switch extends Group {
         if (this.style.Switch.text.block) {
             this.setHasTextBorder(1);
         }
+        //
         if (this.style.Switch.text.blockText) {
             this.setTextColor(this.style.Switch.text.blockText);
+            if (this.style.Switch.core.specialCircle) {
+                this.name.getTextRect().setStyle({ fill: this.style.Switch.text.blockTextBack });
+            }
         }
         if (this.style.Switch.jointImg.trapezoidBlock) { // 范围且封锁时显示
             if ( pos == 'N') {
@@ -787,9 +831,9 @@ export default class Switch extends Group {
                 this.setForkAction(model.fault); // 挤岔
             }
             model.isCiConfirm && this.setCiConfirm(); // 道岔使能显示
-
             model.singleLock && this.setMonolock(model.pos); // 道岔单锁
-            model.guideMasterLock && this.setMonolock(model.pos); // 引导总锁
+            model.guideMasterLock && this.guideMasterLock(model.pos); // 引导总锁
+            // setMonolock(model.pos)
             model.blockade && this.block(model.pos); // 道岔封锁
             model.singleLock && model.blockade && this.blockMonolock(); // 单锁&锁闭状态
             const path = window.location.href;
@@ -835,10 +879,15 @@ export default class Switch extends Group {
             this.setHasTextBorder(1, this.style.Switch.text.overlapLockBorderColor);
         }
     }
+    // 道岔侧防
     handleFpLock() {
         if (this.style.Switch.text.fpLockBorderColor) {
             this.setHasTextBorder(1, this.style.Switch.text.fpLockBorderColor);
         }
+        if (this.style.Switch.core.specialCircle) {
+            this.name.getTextRect().setStyle({ fill: this.style.backgroundColor });
+            this.setTextColor(this.style.Switch.text.fpLockColor);
+        }
     }
     getShapeTipPoint(opts) {
         let rect;

From ac6f16b3600fad437e0cff4c508dc82790c7ca47 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 20 Jul 2022 10:03:33 +0800
Subject: [PATCH 16/30] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5?=
 =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/runplanPane.vue      |  10 +-
 src/store/modules/socket.js                   |  11 +-
 src/utils/baidu_tts_cors.js                   | 118 ++++++++++++++++++
 3 files changed, 132 insertions(+), 7 deletions(-)
 create mode 100644 src/utils/baidu_tts_cors.js

diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index 38993e9e9..c235792f2 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -726,6 +726,7 @@ export default {
         loadData() {
             this.tableData = [];
             const railCtcRunplanInitMsg = copyAssign({}, this.$store.state.socket.railCtcRunplanInitMsg);
+            console.log(railCtcRunplanInitMsg, 'railCtcRunplanInitMsg');
             this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{
                 if (data.departRunPlan) {
                     // data.departRunPlan.planTime = this.coverTime(data.departRunPlan.planTime);
@@ -827,8 +828,7 @@ export default {
             };
             commitOperate(menuOperate.CTC.setTransfinite, params, 3).then(({valid})=>{
                 this.loading = false;
-                if (valid) {
-                }
+                // if (valid) {}
             }).catch(() => {
                 this.loading = false;
             });
@@ -844,8 +844,7 @@ export default {
             };
             commitOperate(menuOperate.CTC.modifyTrackSection, params, 3).then(({valid})=>{
                 this.loading = false;
-                if (valid) {
-                }
+                // if (valid) {}
             }).catch(() => {
                 this.loading = false;
             });
@@ -874,8 +873,7 @@ export default {
             // element.departRunPlan.sectionCode
             commitOperate(menuOperate.CTC.modifyTrackSection, params, 3).then(({valid})=>{
                 this.loading = false;
-                if (valid) {
-                }
+                // if (valid) {}
             }).catch(() => {
                 this.loading = false;
             });
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 45e573def..174d497f2 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -215,6 +215,7 @@ function handle(state, data) {
     //     break;
         // 大铁项目 ctc 运行图改变信息
     case 'SIMULATION_CTC_RUN_PLAN_CHANGE':
+        state.voiceBroadcastMsgs = [];
         msg.forEach(element => {
             const tripNumberDe = element.departRunPlan && element.departRunPlan.tripNumber;
             const tripNumberAr = element.arriveRunPlan && element.arriveRunPlan.tripNumber;
@@ -229,8 +230,15 @@ function handle(state, data) {
                 parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr;
             }
             const code = element.stationCode + '' + element.code;
+            // console.log(element, '************element');
+            if (store.state.training.roleDeviceCode === element.stationCode && element.arriveRunPlan && element.arriveRunPlan.adjacentMessage === '1') {
+                state.voiceBroadcastMsgs.push(element.stationCode + '' + element.code);
+            }
             state.railCtcRunplanInitMsg[code] = copyAssign(state.railCtcRunplanInitMsg[code] || {}, element);
         });
+        if (state.voiceBroadcastMsgs.length) {
+
+        }
         state.railCtcRunplanChange++;
         break;
     // 大铁项目 ctc 调度发布行车计划 给车站下发消息
@@ -460,7 +468,8 @@ const socket = {
         railCtcStationManageRpMsg:{}, // 大铁项目 ctc 车务管理 端运行图信息
         railCtcStationManageRpChange:0, // 大铁项目 ctc 车务管理 运行图信息变化
         railwaySimulationRunplanSendMap:{}, // 大铁项目 调度台 发布 行车计划
-        railwaySimulationRunplanSendChange:0 // 大铁项目 调度台 发布 行车计划变化
+        railwaySimulationRunplanSendChange:0, // 大铁项目 调度台 发布 行车计划变化
+        voiceBroadcastMsgs: [] // 语音播报信息
         // railwaySimulationRpMsg:{}, // 大铁项目 调度台 调度台
         // railwaySimulationRpChange:0 // 大铁项目 调度台 运行图信息变化
     },
diff --git a/src/utils/baidu_tts_cors.js b/src/utils/baidu_tts_cors.js
new file mode 100644
index 000000000..cc99d90a0
--- /dev/null
+++ b/src/utils/baidu_tts_cors.js
@@ -0,0 +1,118 @@
+/**
+ * 浏览器调用语音合成接口
+ * @param {Object} param 百度语音合成接口参数
+ * 请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
+ * @param {Object} options 跨域调用api参数
+ *           timeout {number} 超时时间 默认不设置为60秒
+ *           volume {number} audio控件音量，范围 0-1
+ *           hidden {boolean} 是否隐藏audio控件
+ *           autoDestory {boolean} 播放音频完毕后是否自动删除控件
+ *           onInit {Function} 创建完audio控件后调用
+ *           onSuccess {Function} 远程语音合成完成，并且返回音频文件后调用
+ *           onError {Function}  远程语音合成完成，并且返回错误字符串后调用
+ *           onTimeout {Function} 超时后调用，默认超时时间为60秒
+ */
+export function btts(param, options) {
+    var url = 'http://tsn.baidu.com/text2audio';
+    var opt = options || {};
+    var p = param || {};
+
+    // 如果浏览器支持，可以设置autoplay，但是不能兼容所有浏览器
+    var audio = document.createElement('audio');
+    if (opt.autoplay) {
+        audio.setAttribute('autoplay', 'autoplay');
+    }
+
+    // 隐藏控制栏
+    if (!opt.hidden) {
+        audio.setAttribute('controls', 'controls');
+    } else {
+        audio.style.display = 'none';
+    }
+
+    // 设置音量
+    if (typeof opt.volume !== 'undefined') {
+        audio.volume = opt.volume;
+    }
+
+    // 调用onInit回调
+    isFunction(opt.onInit) && opt.onInit(audio);
+
+    // 默认超时时间60秒
+    var DEFAULT_TIMEOUT = 60000;
+    var timeout = opt.timeout || DEFAULT_TIMEOUT;
+
+    // 创建XMLHttpRequest对象
+    var xhr = new XMLHttpRequest();
+    xhr.open('POST', url);
+
+    // 创建form参数
+    var data = {};
+    for (var p in param) {
+        data[p] = param[p]
+    }
+
+    // 赋值预定义参数
+    data.cuid = data.cuid || data.tok;
+    data.ctp = 1;
+    data.lan = data.lan || 'zh';
+    data.aue = data.aue || 3;
+
+    // 序列化参数列表
+    var fd = [];
+    for(var k in data) {
+        fd.push(k + '=' + encodeURIComponent(data[k]));
+    }
+
+    // 用来处理blob数据
+    var frd = new FileReader();
+    xhr.responseType = 'blob';
+    xhr.send(fd.join('&'));
+
+    // 用timeout可以更兼容的处理兼容超时
+    var timer = setTimeout(function(){
+        xhr.abort();
+        isFunction(opt.onTimeout) && opt.onTimeout();
+    }, timeout);
+
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            clearTimeout(timer);
+            if (xhr.status == 200) {
+                if (xhr.response.type === 'audio/mp3') {
+
+                    // 在body元素下apppend音频控件
+                    document.body.appendChild(audio);
+
+                    audio.setAttribute('src', URL.createObjectURL(xhr.response));
+
+                    // autoDestory设置则播放完后移除audio的dom对象
+                    if (opt.autoDestory) {
+                        audio.onended = function() {
+                            document.body.removeChild(audio);
+                        }
+                    }
+
+                    isFunction(opt.onSuccess) && opt.onSuccess(audio);
+                }
+
+                // 用来处理错误
+                if (xhr.response.type === 'application/json') {
+                    frd.onload = function(){
+                        var text = frd.result;
+                        isFunction(opt.onError) && opt.onError(text);
+                    };
+                    frd.readAsText(xhr.response);
+                }
+            }
+        }
+    }
+
+    // 判断是否是函数
+    function isFunction(obj) {
+        if (Object.prototype.toString.call(obj) === '[object Function]') {
+            return true;
+        }
+        return false;
+    }
+}

From b9ceb3a22adfed4b7d5b2ae5138f4c01609a8dc3 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 20 Jul 2022 10:05:22 +0800
Subject: [PATCH 17/30] =?UTF-8?q?=E9=95=BF=E5=85=B4=E6=8A=80=E6=9C=AF=3D?=
 =?UTF-8?q?=E3=80=8B=E9=95=BF=E5=85=B4=E6=8A=80=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ProjectConfig.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index baa189c46..5ce733e49 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -596,7 +596,7 @@ export const loginInfo = {
         systemType: '027'
     },
     designrichorcxjs: {
-        title: '长兴技术学院城市轨道交通设计平台',
+        title: '长兴技师学院城市轨道交通设计平台',
         loginPath: '/design/login?project=richorcxjs',
         bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
         loginParam: 'RICHOR_CXJS',
@@ -608,7 +608,7 @@ export const loginInfo = {
         systemType: '011'
     },
     richorcxjs: {
-        title: '长兴技术学院城市轨道交通实训平台',
+        title: '长兴技师学院城市轨道交通实训平台',
         loginPath: '/login?project=richorcxjs',
         bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
         loginParam: 'RICHOR_CXJS',

From 68bd166d2724bb2cd72b1ae5ffd618c97f8891bc Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 20 Jul 2022 13:14:08 +0800
Subject: [PATCH 18/30] =?UTF-8?q?=E8=BD=A6=E7=AB=99=E5=8F=91=E8=BD=A6?=
 =?UTF-8?q?=E9=A2=84=E5=91=8A=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/voice.js                           |  8 +++-
 src/jmapNew/theme/datie_02/menus/index.vue | 45 +++++++++++++++++++++-
 src/store/modules/socket.js                |  6 +--
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/api/voice.js b/src/api/voice.js
index e2a5253b9..73ebfd2f1 100644
--- a/src/api/voice.js
+++ b/src/api/voice.js
@@ -8,4 +8,10 @@ export function uploadAudioFiles(file) {
         data: file
     });
 }
-
+/** 获取百度语音合成token */
+export function getBaiduToken() {
+    return request({
+        url: `/api/voice/token/baidu`,
+        method: 'get'
+    });
+}
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index f79039558..c07abe8ef 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -59,11 +59,14 @@
     <notice-info v-if="isCtc" ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <cmdManage v-if="isCtc" ref="cmdManage" />
     <signedCmd v-if="isCtc" ref="signedCmd" @signedCmdClose="signedCmdClose" @changeSignedStatus="changeSignedStatus" />
+    <div id="playBtn" />
   </div>
 </template>
 
 <script>
 import { mapGetters, mapState } from 'vuex';
+import { btts } from '@/utils/baidu_tts_cors';
+import { getBaiduToken } from '@/api/voice';
 import MenuSignal from './menuSignal';
 import MenuButton from './menuButton';
 import MenuStationStand from './menuStationStand';
@@ -180,7 +183,9 @@ export default {
             ctcBarIcon15: CtcBarIcon15,
             ctcBarIcon16: CtcBarIcon16,
             ctcBarIcon17: CtcBarIcon17,
-            ctcBarIcon18: CtcBarIcon18
+            ctcBarIcon18: CtcBarIcon18,
+            audio: null,
+            voiceBroadcastToken: ''
         };
     },
     computed: {
@@ -225,6 +230,14 @@ export default {
             if (this.isCtc) {
                 this.getRailwaySimulationRunplanSend();
             }
+        },
+        '$store.state.socket.voiceBroadcastChange': function() {
+            this.$store.state.socket.voiceBroadcastMsgs.forEach(msgCode => {
+                const msg = this.$store.state.socket.railCtcRunplanInitMsg[msgCode];
+                const station = this.$store.getters['map/getDeviceByCode'](msg.arriveRunPlan.stationCode);
+                const text = station.name + msg.arriveRunPlan.tripNumber + '次发车预告';
+                this.speechSynthesis(text);
+            });
         }
         // // 地图加载完成
         // '$store.state.map.mapViewLoadedCount': function (val) { // 地图数据加载完成
@@ -265,6 +278,36 @@ export default {
             }).catch(()=>{
             });
         },
+        async speechSynthesis(text) {
+            if (!this.voiceBroadcastToken) {
+                const resp = await getBaiduToken();
+                this.voiceBroadcastToken = resp.data;
+            }
+            const that = this;
+            // 调用语音合成接口
+            // 参数含义请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
+            this.audio = btts({
+                tex: text,
+                tok: that.voiceBroadcastToken,
+                spd: 5,
+                pit: 5,
+                vol: 15,
+                per: 4
+            }, {
+                volume: 0.3,
+                autoDestory: true,
+                timeout: 10000,
+                hidden: false,
+                onInit: function (htmlAudioElement) {},
+                onSuccess: function(htmlAudioElement) {
+                    this.audio = htmlAudioElement;
+                    this.audio.play();
+                    // playBtn.innerText = '播放';
+                },
+                onError: function(text) { that.$message.error(text); that.voiceBroadcastToken = ''; },
+                onTimeout: function () { that.$message.error('合成语音超时！'); }
+            });
+        },
         changeSignedStatus(info) {
             this.isCtc && this.$refs.cmdManage.changeSignedStatus(info);
         },
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 174d497f2..1f73bf0fe 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -230,14 +230,13 @@ function handle(state, data) {
                 parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr;
             }
             const code = element.stationCode + '' + element.code;
-            // console.log(element, '************element');
             if (store.state.training.roleDeviceCode === element.stationCode && element.arriveRunPlan && element.arriveRunPlan.adjacentMessage === '1') {
                 state.voiceBroadcastMsgs.push(element.stationCode + '' + element.code);
             }
             state.railCtcRunplanInitMsg[code] = copyAssign(state.railCtcRunplanInitMsg[code] || {}, element);
         });
         if (state.voiceBroadcastMsgs.length) {
-
+            state.voiceBroadcastChange++;
         }
         state.railCtcRunplanChange++;
         break;
@@ -469,7 +468,8 @@ const socket = {
         railCtcStationManageRpChange:0, // 大铁项目 ctc 车务管理 运行图信息变化
         railwaySimulationRunplanSendMap:{}, // 大铁项目 调度台 发布 行车计划
         railwaySimulationRunplanSendChange:0, // 大铁项目 调度台 发布 行车计划变化
-        voiceBroadcastMsgs: [] // 语音播报信息
+        voiceBroadcastMsgs: [], // 语音播报信息
+        voiceBroadcastChange: 0 // 语音播报信息变化
         // railwaySimulationRpMsg:{}, // 大铁项目 调度台 调度台
         // railwaySimulationRpChange:0 // 大铁项目 调度台 运行图信息变化
     },

From e332f91eae47e3c6915ca760a49d4000ab174578 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 20 Jul 2022 14:08:33 +0800
Subject: [PATCH 19/30] =?UTF-8?q?ctc=20=E9=9D=9E=E5=B8=B8=E7=AB=99?=
 =?UTF-8?q?=E6=8E=A7=E4=B8=8B=E9=99=90=E5=88=B6=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index 089e0d40a..943f7af0c 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -254,6 +254,8 @@ export default {
             this.updateButtonShow(val, old);
         },
         '$store.state.menuOperation.selectedCount': function (val) {
+            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            if (!station || station.controlMode === 'Interlock') { return; }
             this.selectedChange();
         },
         '$store.state.map.clearButtonCount': function(val) {

From 20cf7de4533dabcaec1fc5c7efe1d9ba15cc82bb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 20 Jul 2022 14:39:57 +0800
Subject: [PATCH 20/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AFIII?=
 =?UTF-8?q?=E5=9E=8B=20=20=E9=81=93=E5=B2=94=20=E8=AE=BE=E7=BD=AE=E5=88=86?=
 =?UTF-8?q?=E8=B7=AF=E4=B8=8D=E8=89=AF=20=E5=8F=96=E6=B6=88=E5=88=86?=
 =?UTF-8?q?=E8=B7=AF=E4=B8=8D=E8=89=AF=20=E5=8C=BA=E6=AE=B5=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C=E8=A7=A3=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/Switch/ESwName.js     |  4 +
 .../theme/components/utils/menuOperate.js     | 10 +++
 .../theme/datie_tky/menus/menuSwitch.vue      | 78 +++++++++++++++----
 src/scripts/cmdPlugin/CommandEnum.js          |  6 +-
 src/scripts/cmdPlugin/OperationHandler.js     | 14 ++++
 5 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/src/jmapNew/shape/graph/Switch/ESwName.js b/src/jmapNew/shape/graph/Switch/ESwName.js
index 1bf8b98a6..24ab0abe2 100644
--- a/src/jmapNew/shape/graph/Switch/ESwName.js
+++ b/src/jmapNew/shape/graph/Switch/ESwName.js
@@ -92,6 +92,10 @@ class ESwName extends Group {
     getTextRect() {
         return this.textRect;
     }
+
+    getBoundingRect() {
+        return this.textRect.getBoundingRect();
+    }
 }
 
 export default ESwName;
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index bccfd8a23..47b96f37a 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -240,6 +240,16 @@ export const menuOperate = {
             // 道岔钩锁
             operation: OperationEvent.Switch.hookLock.menu.operation,
             cmdType: CMD.Switch.CMD_SWITCH_HOOK_LOCK
+        },
+        defectiveShunting:{
+            // 设置分路不良
+            operation: OperationEvent.Switch.defectiveShunting.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_DEFECTIVE_SHUNTING
+        },
+        cancelDefectiveShunting:{
+            // 取消分路不良
+            operation: OperationEvent.Switch.cancelDefectiveShunting.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_CANCEL_DEFECTIVE_SHUNTING
         }
     },
     StationStand:{
diff --git a/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue b/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
index 54b30f0c8..4e7760193 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <switch-control ref="switchControl" pop-class="chengdou-03__systerm" />
+    <!-- <switch-control ref="switchControl" pop-class="chengdou-03__systerm" /> -->
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
   </div>
 </template>
@@ -12,13 +12,13 @@ import { DeviceMenu } from '@/scripts/ConstDic';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl';
+// import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl';
 
 export default {
     name: 'SwitchMenu',
     components: {
         PopMenu,
-        SwitchControl,
+        // SwitchControl,
         NoticeInfo
     },
     props: {
@@ -69,8 +69,27 @@ export default {
                         label: '解封',
                         handler: this.unblock,
                         cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
+                    },
+                    {
+                        type: 'separator'
+                    },
+                    {
+                        label: '设置分路不良标记',
+                        handler: this.defectiveShunting,
+                        cmdType: CMD.Switch.CMD_SWITCH_DEFECTIVE_SHUNTING
+                    },
+                    // 设置分路不良标记
+                    {
+                        label: '取消分路不良标记',
+                        handler: this.cancelDefectiveShunting,
+                        cmdType: CMD.Switch.CMD_SWITCH_CANCEL_DEFECTIVE_SHUNTING
+                    },
+                    // 区段故障解锁
+                    {
+                        label: '区段故障解锁',
+                        handler: this.fault,
+                        cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
                     }
-
                 ],
                 Center: [
                 ]
@@ -89,53 +108,78 @@ export default {
     methods:{
         //  道岔总定
         locate() {
-            commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 3).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    // this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
 
         },
         //  道岔总反
         reverse() {
-            commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 3).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    // this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 道岔单锁
         lock() {
-            commitOperate(menuOperate.Switch.lock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
+            commitOperate(menuOperate.Switch.lock, { switchCode: this.selected.code}, 3).then(({valid, operate}) => {
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    // this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
-        // 道岔解锁
+        // 道岔单解
         unlock() {
-            commitOperate(menuOperate.Switch.unlock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
+            commitOperate(menuOperate.Switch.unlock, { switchCode: this.selected.code}, 3).then(({valid, operate}) => {
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    // this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 道岔封锁
         block() {
-            commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
+            commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 3).then(({valid, operate}) => {
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    // this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 道岔解封
         unblock() {
-            commitOperate(menuOperate.Switch.unblock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
+            commitOperate(menuOperate.Switch.unblock, { switchCode: this.selected.code}, 3).then(({valid, operate}) => {
                 if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    // this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
+        // 道岔故障解锁/ 区故解
+        fault() {
+            commitOperate(menuOperate.Switch.fault, { switchCode: this.selected.code}, 3).then(({valid, operate}) => {
+                if (valid) {
+                    // this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置分路不良
+        defectiveShunting() {
+            commitOperate(menuOperate.Switch.defectiveShunting, { switchCode: this.selected.code}, 3).then(({valid, operate}) => {
+                if (valid) {
+                    // this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 取消分路不良
+        cancelDefectiveShunting() {
+            commitOperate(menuOperate.Switch.cancelDefectiveShunting, { switchCode: this.selected.code}, 3).then(({valid, operate}) => {
+                if (valid) {
+                    // this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+
         doShow(point) {
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 8c9dc7a8c..e0fb71cb3 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -45,7 +45,11 @@ export default {
         /** 引导总锁 */
         CMD_SWITCH_MASTER_LOCK: {value:'Switch_Master_Lock', label: '设置引导总锁' },
         /** 取消引导总锁 */
-        CMD_SWITCH_MASTER_UNBLOCK: {value: 'Switch_Master_Unblock', label: '取消引导总锁'}
+        CMD_SWITCH_MASTER_UNBLOCK: {value: 'Switch_Master_Unblock', label: '取消引导总锁'},
+        /** 道岔设置分路不良 */
+        CMD_SWITCH_DEFECTIVE_SHUNTING: {value: 'Switch_Defective_Shunting', label: '道岔设置分路不良'},
+        /** 道岔取消分路不良 */
+        CMD_SWITCH_CANCEL_DEFECTIVE_SHUNTING: {value: 'Switch_Cancel_Defective_Shunting', label: '道岔取消分路不良'}
     },
 
     // 控制模式操作
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index b1bf034b1..762bf0d50 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1162,6 +1162,20 @@ export const OperationEvent = {
                 operation: '11b1',
                 domId: '_Tips-Switch-ForceCancelSpeed-Menu{BOTTOM}'
             }
+        },
+        // 设置分路不良
+        defectiveShunting:{
+            menu: {
+                operation: '11c',
+                domId: '_Tips-Switch-DefectiveShunting-Menu{TOP}'
+            }
+        },
+        // 取消分路不良
+        cancelDefectiveShunting:{
+            menu: {
+                operation: '11d',
+                domId: '_Tips-Switch-CancelDefectiveShunting-Menu{TOP}'
+            }
         }
     },
 

From 172415dccf16025e5aeca09fc61abc38825cf1a9 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 20 Jul 2022 15:07:02 +0800
Subject: [PATCH 21/30] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/mouseController.js                             | 2 +-
 .../newMapdraft/mapoperate/displayConfig/centerConfig.vue  | 5 +++--
 .../newMapdraft/mapoperate/displayConfig/depotConfig.vue   | 5 +++--
 .../newMapdraft/mapoperate/displayConfig/localConfig.vue   | 7 ++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js
index 533de5072..3334bdf95 100644
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@@ -306,7 +306,7 @@ class MouseController extends Eventful {
                 if (this.whetherInclude(boundingRect, deviceBoundingRect )) {
                     includeDeviceList.push(item);
                 } // item.instance._type !== deviceType.TrainWindow &&
-            } else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train) {
+            } else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train && (window.location.href.indexOf('pictureDraw') > -1 && item.instance._type === deviceType.TrainWindow) ) {
                 const rect = item.instance.getBoundingRect();
                 const deviceBoundingRect = {
                     x1: rect.x,
diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig.vue
index 358cca10f..8e2065cb1 100644
--- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig.vue
@@ -149,7 +149,8 @@ export default {
             'textList',
             'totalGuideLockButtonVOList',
             'seclectDeviceList',
-            'trainWindowList'
+            'trainWindowList',
+            'signalButtonList'
         ])
     },
     watch: {
@@ -283,7 +284,7 @@ export default {
 
             [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
                 ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList].forEach(item => {
+                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
                 if (!stationCodes.includes(item.stationCode)) {
                     this.addModel.elementList.push(item.code);
                 }
diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue
index 7661fa728..c4b35dfc9 100644
--- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue
@@ -223,7 +223,8 @@ export default {
             'textList',
             'totalGuideLockButtonVOList',
             'seclectDeviceList',
-            'trainWindowList'
+            'trainWindowList',
+            'signalButtonList'
         ]),
         cardTitle() {
             if (this.cardMode === 'generate') {
@@ -407,7 +408,7 @@ export default {
 
             [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
                 ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList].forEach(item => {
+                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
                 const target = this.tableData.find(elem => elem.stationCodeList.includes(item.stationCode));
                 target && target.elementList.push(item.code);
             });
diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue
index fb01568d7..fbee5d628 100644
--- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue
@@ -204,7 +204,8 @@ export default {
             'textList',
             'totalGuideLockButtonVOList',
             'seclectDeviceList',
-            'trainWindowList'
+            'trainWindowList',
+            'signalButtonList'
         ]),
         cardTitle() {
             if (this.cardMode === 'generate') {
@@ -390,7 +391,7 @@ export default {
             });
             [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
                 ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList].forEach(item => {
+                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
                 if (!stationCodeList.includes(item.stationCode)) {
                     tempData.elementList.push(item.code);
                 }
@@ -446,7 +447,7 @@ export default {
 
             [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
                 ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList].forEach(item => {
+                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
                 const target = this.tableData.find(elem => elem.stationCodeList.includes(item.stationCode));
                 target && target.elementList.push(item.code);
             });

From 43ae2bd1fb0730bc190e8c7924a03a9f039c57f9 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 20 Jul 2022 17:20:32 +0800
Subject: [PATCH 22/30] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=90=88=E6=88=90?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baidu_tts_cors.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/utils/baidu_tts_cors.js b/src/utils/baidu_tts_cors.js
index cc99d90a0..adf268445 100644
--- a/src/utils/baidu_tts_cors.js
+++ b/src/utils/baidu_tts_cors.js
@@ -13,7 +13,7 @@
  *           onTimeout {Function} 超时后调用，默认超时时间为60秒
  */
 export function btts(param, options) {
-    var url = 'http://tsn.baidu.com/text2audio';
+    var url = process.env.NODE_ENV === 'development' ? 'http://tsn.baidu.com/text2audio' : 'https://tsn.baidu.com/text2audio';
     var opt = options || {};
     var p = param || {};
 
@@ -49,7 +49,7 @@ export function btts(param, options) {
     // 创建form参数
     var data = {};
     for (var p in param) {
-        data[p] = param[p]
+        data[p] = param[p];
     }
 
     // 赋值预定义参数
@@ -60,7 +60,7 @@ export function btts(param, options) {
 
     // 序列化参数列表
     var fd = [];
-    for(var k in data) {
+    for (var k in data) {
         fd.push(k + '=' + encodeURIComponent(data[k]));
     }
 
@@ -70,7 +70,7 @@ export function btts(param, options) {
     xhr.send(fd.join('&'));
 
     // 用timeout可以更兼容的处理兼容超时
-    var timer = setTimeout(function(){
+    var timer = setTimeout(function() {
         xhr.abort();
         isFunction(opt.onTimeout) && opt.onTimeout();
     }, timeout);
@@ -90,7 +90,7 @@ export function btts(param, options) {
                     if (opt.autoDestory) {
                         audio.onended = function() {
                             document.body.removeChild(audio);
-                        }
+                        };
                     }
 
                     isFunction(opt.onSuccess) && opt.onSuccess(audio);
@@ -98,7 +98,7 @@ export function btts(param, options) {
 
                 // 用来处理错误
                 if (xhr.response.type === 'application/json') {
-                    frd.onload = function(){
+                    frd.onload = function() {
                         var text = frd.result;
                         isFunction(opt.onError) && opt.onError(text);
                     };
@@ -106,7 +106,7 @@ export function btts(param, options) {
                 }
             }
         }
-    }
+    };
 
     // 判断是否是函数
     function isFunction(obj) {

From a63827cd624bf910984f67a9dc7d26fbd9687166 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 20 Jul 2022 18:20:26 +0800
Subject: [PATCH 23/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AFIII?=
 =?UTF-8?q?=E5=9E=8B=20=E4=BF=A1=E5=8F=B7=E6=9C=BA=20=E5=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E8=A7=A3=E9=94=81=20=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_tky.js | 10 +++++++---
 src/jmapNew/shape/graph/Signal/index.js  | 20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_tky.js b/src/jmapNew/config/skinCode/datie_tky.js
index 1ee8c187b..0f99dc942 100644
--- a/src/jmapNew/config/skinCode/datie_tky.js
+++ b/src/jmapNew/config/skinCode/datie_tky.js
@@ -96,10 +96,13 @@ class SkinCode extends defaultStyle {
                 isAlignCenter: false,						// 信号字体对其方式
                 fontSize: 11,								// 信号机名称字体大小
                 fontWeight: 'bold',							// 信号机名称字体粗细
-                defaultColor: '#FFFFFF',					// 信号灯字体默认色
+                defaultColor: 'rgb(192,192,192)',					// 信号灯字体默认色
+                // '#FFFFFF'
                 blockColor: '#FFFFFF',						// 信号灯字体锁定颜色
                 checkColor: '#00FF00'						// 信号保护区段检查颜色
             },
+            remainTimeColor: '#F00',
+            dtTextNearSignalOffset:{x:35, y:5}, //    人工解锁延时时间坐标靠近信号机名称
             lamp: {
                 bgShow: false, // 是否被选中
                 guidName: 'singleRY',						// 成都三号线引导类型
@@ -350,8 +353,9 @@ class SkinCode extends defaultStyle {
                 fpLockColor:'#f00', // 道岔侧防文字背景颜色
                 guideMasterLockColor:'#f00', // 道岔引导总锁文字背景颜色
 
-                locateColor: '#808080',						// 道岔定位颜色   ok
-                inversionColor: '#808080',					// 道岔反位颜色     ok
+                // #808080
+                locateColor: 'rgb(192,192,192)',						// 道岔定位颜色   ok
+                inversionColor: 'rgb(192,192,192)',					// 道岔反位颜色     ok
 
                 monolockLocationColor: '#f00', // 道岔单锁'定位'颜色 (绿色)
                 monolockInversionColor: '#FFFF00',			// 道岔单锁'反位'颜色 (黄色)
diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index 72b654d6b..4f72e5530 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -375,13 +375,23 @@ class Signal extends Group {
         });
 
         const timeNameY = computedPosition.y + model.positionPoint.y - posit * 15;
+
+        // 人工解锁延时时间坐标靠近信号机名称 大铁III型
+        let remainX = sigNameX;
+        let remainY = timeNameY;
+        if (style.Signal.dtTextNearSignalOffset) {
+            remainX = computedPosition.x + style.Signal.dtTextNearSignalOffset.x * drict;
+            remainY = sigNameY + style.Signal.dtTextNearSignalOffset.y * posit;
+        }
         this.remainTimeName = new ESigName({
             zlevel: this.zlevel,
             z: this.z,
             silent: false,
             style: style,
-            x: sigNameX,
-            y: timeNameY,
+            x: remainX,
+            // + offsetX,sigNameX
+            y: remainY,
+            // + offsetY,timeNameY
             text: model.remainTime || 0,
             fontWeight: style.Signal.text.fontWeight,
             fontSize: 12,
@@ -936,7 +946,9 @@ class Signal extends Group {
             }
         });
         if (this.model.type === 'SHUNTING') {
-            this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
+            if (!this.style.Signal.dtTextNearSignalOffset) {
+                this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
+            }
         }
     }
     setAshShow() {
@@ -1070,6 +1082,8 @@ class Signal extends Group {
             }
             }
 
+            // model.remainTime = 26;
+            // this.setDelayUnlock();
             if (model.remainTime) {
                 this.showRemainTime(model.remainTime);
             } else {

From 15e8006f5ad885907cb8bc2cca7663522226b28a Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 21 Jul 2022 10:14:29 +0800
Subject: [PATCH 24/30] =?UTF-8?q?ctc=3D>=E8=BD=A6=E5=8A=A1=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                         | 7 +++++++
 src/views/newMap/displayNew/menuSchema.vue | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index e6d92daaa..ea2e0aa63 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -84,8 +84,15 @@ class Jlmap {
         return selectLineCode(lineCode);
     }
     reloadStyle(lineCode) {
+        if (this.lineCode !== lineCode) {
+            this.handleModelData(this.lineCode, lineCode);
+        }
+        this.lineCode = lineCode;
         this.style = selectLineCode(lineCode);
         this.$zr.dom.style.backgroundColor = this.style.backgroundColor || '#000';
+    }
+    handleModelData() {
+
     }
     loadDefaultState() { // 加载默认状态
         const defaultStateDict = {};
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 57b5f1610..e5e0c21d2 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -12,7 +12,7 @@
       </el-select>
       <template v-if="!dataError">
         <el-button-group v-if="project !== 'bjd'">
-          <el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'" size="small" @click="goCtc">CTC</el-button>
+          <el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'" size="small" @click="goCtc">车务终端</el-button>
           <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goRpManage">管理终端</el-button> -->
           <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goDsManage">调度台</el-button> -->
           <el-button v-if="isLocalStation && $route.query.lineCode!='08' && $route.query.lineCode!='16' && project !== 'teaching'" size="small" @click="goIbp">IBP盘</el-button>

From 6794e6370f976029e312ea279037f7d8c096ecb9 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 21 Jul 2022 11:08:48 +0800
Subject: [PATCH 25/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E4=BA=8C=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E6=95=85=E9=9A=9C=E5=90=8D=E7=A7=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                            |  3 +-
 .../components/menus/dialog/setFault.vue      | 32 +++++++++----------
 .../theme/datie_02/menus/menuSection.vue      |  2 +-
 .../theme/datie_02/menus/menuSignal.vue       |  2 +-
 .../theme/datie_02/menus/menuSwitch.vue       |  2 +-
 .../theme/datie_02/menus/menuTrain.vue        |  2 +-
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index ea2e0aa63..1391c9e8d 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -91,7 +91,8 @@ class Jlmap {
         this.style = selectLineCode(lineCode);
         this.$zr.dom.style.backgroundColor = this.style.backgroundColor || '#000';
     }
-    handleModelData() {
+    // 处理私有属性
+    handleModelData(oldLineCode, lineCode) {
 
     }
     loadDefaultState() { // 加载默认状态
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index 17cd93abb..9ee3af586 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -201,12 +201,12 @@ export default {
                         {label: '计轴故障', value: 'FAULT'},
                         {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
                     ];
-                } else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm'){
-					this.faultList = [
-						{label: '计轴故障', value: 'FAULT'},
-						{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
-					];
-				} else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') {
+                } else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm') {
+                    this.faultList = [
+                        {label: '电路故障', value: 'FAULT'}
+                        // {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
+                    ];
+                } else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') {
                     this.faultList = [
                         {label: '失表', value: 'SPLIT'},
                         {label: '定位失表', value: 'NORMAL_SPLIT'},
@@ -215,16 +215,16 @@ export default {
                         {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
                         {label: '计轴故障', value: 'AXLE_FAULT'}
                     ];
-                } else if(selected._type === 'Switch' && this.popClass === 'datie-02__systerm') {
-                	this.faultList = [
-						{label: '失表', value: 'SPLIT'},
-						{label: '定位失表', value: 'NORMAL_SPLIT'},
-						{label: '反位失表', value: 'REVERSE_SPLIT'},
-						{label: '挤岔', value: 'SQUEEZE'},
-						{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
-						{label: '红光带故障', value: 'AXLE_FAULT'}
-					];
-				} else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') {
+                } else if (selected._type === 'Switch' && this.popClass === 'datie-02__systerm') {
+                    this.faultList = [
+                        {label: '失表', value: 'SPLIT'},
+                        {label: '定位失表', value: 'NORMAL_SPLIT'},
+                        {label: '反位失表', value: 'REVERSE_SPLIT'},
+                        // {label: '挤岔', value: 'SQUEEZE'},
+                        // {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
+                        {label: '电路故障', value: 'AXLE_FAULT'}
+                    ];
+                } else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') {
                     this.faultList = [
                         {label: '红光带故障', value: 'FAULT'},
                         {label: '粉光带故障', value: 'CBTC_OCCUPIED_FAULT'},
diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue
index 3bfec1c27..37db1bd04 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue
@@ -145,7 +145,7 @@ export default {
                 // this.menu = MenuContextHandler.covert(this.menuNormal);
                 this.menu = this.menuNormal.Local;
                 const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-                if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
+                if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                     this.menu.forEach(item => { item.disabled = true; });
                 } else { this.menu.forEach(item => { item.disabled = false; }); }
             } else {
diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
index f6947241c..0cf472ed0 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
@@ -210,7 +210,7 @@ export default {
             // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-            if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
+            if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                 this.menu.forEach(item => { item.disabled = true; });
             } else { this.menu.forEach(item => { item.disabled = false; }); }
             // 故障模式菜单列表
diff --git a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
index 559fd1aec..d7a35a11f 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
@@ -200,7 +200,7 @@ export default {
             // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-            if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
+            if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                 this.menu.forEach(item => { item.disabled = true; });
             } else { this.menu.forEach(item => { item.disabled = false; }); }
             // 故障模式菜单列表
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index aa543d90c..175177c97 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -239,7 +239,7 @@ export default {
             // 编辑模式菜单列表
             this.menu = MenuContextHandler.covert(this.menuNormal);
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-            if (station.controlMode === 'Interlock' && this.$route.query.ctc) {
+            if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                 this.menu.forEach(item => { item.disabled = true; });
             } else { this.menu.forEach(item => { item.disabled = false; }); }
             // 故障模式菜单列表

From 891cf8761cef82e3186e51a581162d46376660e7 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 21 Jul 2022 11:25:21 +0800
Subject: [PATCH 26/30] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/runplanPane.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index c235792f2..d232c0855 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -654,6 +654,9 @@ export default {
         },
         '$store.state.training.roleDeviceCode':function(newVal, oldVal) {
             if (oldVal) {
+                this.filterSectionList = this.sectionList.filter(section=>{
+                    return section.standTrack && section.belongStation == newVal;
+                });
                 this.loadData();
             }
         },

From 1deb1e017d05a473e907a86bc8e2478e6331704f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 21 Jul 2022 15:08:07 +0800
Subject: [PATCH 27/30] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_tky/menus/menuSignal.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
index 28a3fa9fe..881027db3 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
@@ -10,6 +10,7 @@ import PopMenu from '@/components/PopMenu';
 // OperateMode
 import { DeviceMenu } from '@/scripts/ConstDic';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
     name: 'SignalMenu',
     components: {
@@ -103,7 +104,12 @@ export default {
         },
         // 总取消
         signalTotalCancle() {
-
+            const model = this.selected; // 选择设备
+            commitOperate(menuOperate.Signal.signalTotalCancle, { signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 3).then(({valid, operate}) => {
+                if (valid) {
+                    //
+                }
+            });
         },
         // 总人解
         humanTrainRoute() {

From 5909f738f7953d951e627c5d4ad35f2edf587aab Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 21 Jul 2022 16:57:09 +0800
Subject: [PATCH 28/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20ct?=
 =?UTF-8?q?c=20=E4=BF=AE=E6=94=B9=20=E6=94=B9=E6=96=B9=E3=80=81=E9=97=AD?=
 =?UTF-8?q?=E5=A1=9E=E7=AD=89=E6=93=8D=E4=BD=9C=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/SignalButton/index.js |  51 +++---
 .../theme/datie_02/menus/menuButtonCtc.vue    | 169 ++++++++++++++++--
 2 files changed, 185 insertions(+), 35 deletions(-)

diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js
index de38f00f1..7b3d04be4 100644
--- a/src/jmapNew/shape/graph/SignalButton/index.js
+++ b/src/jmapNew/shape/graph/SignalButton/index.js
@@ -30,29 +30,33 @@ export default class SignalButton extends Group {
         const model = this.model;
         const computedPosition = this.computedPosition;
         const fillColor = this.getTypeColor();
-        const queryList = window.location.search.substring(1).split('&');
-        const queryCtc = queryList.find(item => {
-            return item.includes('ctc');
-        });
-        const ctcArcList = ['OCCLUSION', 'RECOVERY', 'CHANGE_DIRECTION', 'ACCIDENT', 'DEPART_ASSIST', 'PICK_ASSIST', 'ASSIST'];
+        // const queryList = window.location.search.substring(1).split('&');
+        // const queryCtc = queryList.find(item => {
+        //     return item.includes('ctc');
+        // });
+        // const ctcArcList = ['OCCLUSION', 'RECOVERY', 'CHANGE_DIRECTION', 'ACCIDENT', 'DEPART_ASSIST', 'PICK_ASSIST', 'ASSIST'];
         const typeList = [];
-        if (queryCtc && ctcArcList.includes(model.type)) {
-            this.arcShape = new Arc({
-                zlevel: this.zlevel,
-                z: this.z,
-                shape: {
-                    cx: computedPosition.x + 7,
-                    cy: computedPosition.y + 7,
-                    r: 7
-                },
-                style: {
-                    stroke: '#69666E',
-                    lineWidth: 1,
-                    fill: fillColor
-                }
-            });
-            this.add(this.arcShape);
-        } else if (this.style.SignalButton &&
+        // debugger;
+        // console.log(model.type);
+        // if (queryCtc && ctcArcList.includes(model.type)) {
+        //     // debugger;
+        //     this.arcShape = new Arc({
+        //         zlevel: this.zlevel,
+        //         z: this.z,
+        //         shape: {
+        //             cx: computedPosition.x + 7,
+        //             cy: computedPosition.y + 7,
+        //             r: 7
+        //         },
+        //         style: {
+        //             stroke: '#69666E',
+        //             lineWidth: 1,
+        //             fill: fillColor
+        //         }
+        //     });
+        //     this.add(this.arcShape);
+        // } else
+        if (this.style.SignalButton &&
             this.style.SignalButton.shape === 'roundWithDock' &&
             typeList.includes(model.type)) {
             const circle1 = new Circle({
@@ -314,6 +318,9 @@ export default class SignalButton extends Group {
                 }
             }
         }
+        // let
+        // { value: 'PICK', label: '接车按钮' },
+        //  { value: 'SHUNT_TERMINAL', label: '调车终端按钮' },
         if (!store.getters['map/checkDeviceShow'](this._code)) {
             this.buttonText && this.buttonText.hide();
             this.rectButton && this.rectButton.hide();
diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index 943f7af0c..ac3f88c7e 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -66,7 +66,7 @@
         <center><b>按</b><b>钮</b></center>
       </span>
     </button>
-    <button :id="MixinCommand.functionButton.button.domId" class="button_box" @click="buttonDown(MixinCommand.functionButton.button.operation, ['StationStand', 'Station'])">
+    <button :id="MixinCommand.functionButton.button.domId" class="button_box" @click="buttonDown(MixinCommand.functionButton.button.operation, ['StationStand', 'Station','SignalButton'])">
       <span :style="{color: operation === MixinCommand.functionButton.button.operation ? '#ccc':'black'}">
         <center><b>功</b><b>能</b></center>
         <center><b>按</b><b>钮</b></center>
@@ -673,6 +673,7 @@ export default {
             // this.handleGuideLock(model);
             // this.handleGuideSignal(model);
             // } else
+            debugger;
             if (buttonOperation && this.commandTypeList.includes(model._type)) {
                 if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
                     this.handelTotalCancel(model);
@@ -691,22 +692,37 @@ export default {
                     this.arrangementRouteOperation(this.deviceList);
                 } else if (buttonOperation === this.Signal.guide.button.operation ) {
                     this.handleGuideSignal(model);
+                } else if (buttonOperation === this.MixinCommand.functionButton.button.operation) {
+                    const signalButtonList = ['ASSIST', 'CHANGE_DIRECTION', 'PICK_ASSIST', 'DEPART_ASSIST', 'OCCLUSION', 'RECOVERY', 'ACCIDENT'];
+                    if (model._type === 'SignalButton' && signalButtonList.includes(model.type)) {
+                    // 改方操作 总辅助操作 接辅助操作 发辅助操作
+                        this.assistOperateOrChange(model);
+                    }
                 } else {
                     this.clearOperate();
                 }
             } else if (!buttonOperation) {
-                if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
-                    this.handleGuideSignal(model);
-                } else if (model._type === 'SignalButton' && model.type === 'CHANGE_DIRECTION') {
-                    // 改方操作
-                    // this.changeDirection(model);
-                    this.clearOperate();
-                } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
-                    this.deviceList.push(model);
-                    this.arrangementRouteOperation(this.deviceList);
-                } else {
-                    this.clearOperate();
-                }
+                // if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
+                //     this.handleGuideSignal(model);
+                // } else if (model._type === 'SignalButton' && model.type === 'CHANGE_DIRECTION') {
+                //     // 改方操作
+                //     // this.changeDirection(model);
+                //     this.clearOperate();
+                // } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
+                //     this.deviceList.push(model);
+                //     this.arrangementRouteOperation(this.deviceList);
+                // } else {
+                //     this.clearOperate();
+                // }
+                // if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
+                //     this.handleGuideSignal(model);
+                // } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
+                //     this.deviceList.push(model);
+                //     this.arrangementRouteOperation(this.deviceList);
+                // } else {
+                //     this.clearOperate();
+                // }
+
             } else { this.clearOperate(); }
             if (this.timeNode) { this.timeNode = 0; }
         },
@@ -791,6 +807,133 @@ export default {
         },
         commandClear() {
             this.clearOperate();
+        },
+        assistOperateOrChange(model) {
+            // mode.type==
+            const modelTypeMap = {
+                // 总辅助按钮
+                'ASSIST':{
+                    operation:this.CTCCommand.assistPressMainAssist.menu.operation,
+                    nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_MAIN_ASSIST,
+                    param:{
+                        labelEnum:model.labelEnum,
+                        stationCode:model.stationCode,
+                        pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
+                    }
+                },
+                // 改方
+                'CHANGE_DIRECTION':{
+                    operation:this.CTCCommand.assistPressDownTurnDirection.menu.operation,
+                    nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
+                    param:{
+                        labelEnum:model.labelEnum,
+                        stationCode:model.stationCode,
+                        pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
+                    }
+                },
+                // 接辅助按钮
+                'PICK_ASSIST':{
+                    // this.CTCCommand.assistPressDownTurnDirection.menu.operation
+                    operation:this.CTCCommand.assistPressReceiveAssist.menu.operation,
+                    nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RECEIVE_ASSIST,
+                    param:{
+                        labelEnum:model.labelEnum,
+                        stationCode:model.stationCode
+                    }
+                },
+                // 发辅助按钮
+                'DEPART_ASSIST':{
+                    operation:this.CTCCommand.assistPressDeliverAssist.menu.operation,
+                    nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DELIVER_ASSIST,
+                    param:{
+                        labelEnum:model.labelEnum,
+                        stationCode:model.stationCode
+                    }
+                },
+                // 事故按钮
+                'ACCIDENT':{
+                    operation:this.CTCCommand.assistPressAccident.menu.operation,
+                    nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_ACCIDENT,
+                    param:{
+                        labelEnum:model.labelEnum,
+                        stationCode:model.stationCode
+                    }
+                }
+
+            };
+            const noPasswordModelTypeMap = {
+                // 闭塞按钮
+                'OCCLUSION':{
+                    operation:this.CTCCommand.assistPressBlock.menu.operation,
+                    nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_BLOCK,
+                    param:{
+                        labelEnum:model.labelEnum,
+                        stationCode:model.stationCode
+                    }
+                },
+                // 复原按钮
+                'RECOVERY':{
+                    operation:this.CTCCommand.assistPressRestore.menu.operation,
+                    nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RESTORE,
+                    param:{
+                        labelEnum:model.labelEnum,
+                        stationCode:model.stationCode
+                    }
+                }
+            };
+            if (noPasswordModelTypeMap[model.type]) {
+                const operate = {
+                    over:true,
+                    operation: noPasswordModelTypeMap[model.type].operation,
+                    code: model.code,
+                    param: noPasswordModelTypeMap[model.type].param,
+                    cmdType : noPasswordModelTypeMap[model.type].nextCmdType
+                };
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.clearOperate();
+                    } else {
+                        this.$refs.noticeInfo.doShow();
+                    }
+                }).catch((error) => {
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
+                });
+
+            } else {
+                const operate = {
+                    operation: modelTypeMap[model.type].operation,
+                    code: model.code,
+                    param: modelTypeMap[model.type].param
+                };
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        operate.nextCmdType = modelTypeMap[model.type].nextCmdType;
+                        operate['operateNext'] = this.Command.close.password.operation;
+                        this.$refs.password.doShow(operate);
+                    }
+                }).catch((error) => {
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
+                });
+            }
+            // const operate = {
+            //     over: true,
+            //     code: model.code,
+            //     operation: this.CTCCommand.assistPressDownTurnDirection.menu.operation,
+            //     cmdType: CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
+            //     param: {
+            //         labelEnum:model.labelEnum,
+            //         stationCode:model.stationCode
+            //     }
+            // };
+            // this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            //     // this.clearOperate();
+            // }).catch((error) => {
+            //     // this.clearOperate();
+            //     console.error(error);
+            //     this.$refs.noticeInfo.doShow();
+            // });
         }
     }
 };

From 13df1ba98dbfff065b43a31c2d32cca95514434d Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Thu, 21 Jul 2022 17:17:31 +0800
Subject: [PATCH 29/30] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E5=8A=A0=E5=B0=81?=
 =?UTF-8?q?=E8=A7=A3=E5=B0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_tky/menus/menuSignal.vue      | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
index 881027db3..bf2dbfd33 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
@@ -11,6 +11,7 @@ import PopMenu from '@/components/PopMenu';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     name: 'SignalMenu',
     components: {
@@ -58,8 +59,13 @@ export default {
                     },
                     {
                         label: '加封',
-                        handler: this.seal
-                        // cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                        handler: this.lock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+                    },
+                    {
+                        label: '解封',
+                        handler: this.unlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
                     }
                 ]
             }
@@ -124,8 +130,22 @@ export default {
 
         },
         // 加封
-        seal() {
-
+        lock() {
+            const model = this.selected; // 选择设备
+            commitOperate(menuOperate.Signal.lock, {signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 3).then(({valid, operate}) => {
+                if (valid) {
+                    //
+                }
+            });
+        },
+        // 解封
+        unlock() {
+            const model = this.selected; // 选择设备
+            commitOperate(menuOperate.Signal.unlock, {signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 3).then(({valid, operate}) => {
+                if (valid) {
+                    //
+                }
+            });
         },
         doClose() {
             if (this.$refs && this.$refs.popMenu) {

From 8279ea9b3957cf342c696b4145c84d23e2256074 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 21 Jul 2022 17:25:40 +0800
Subject: [PATCH 30/30] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AFIII?=
 =?UTF-8?q?=E5=9E=8B=20=E4=BF=A1=E5=8F=B7=E6=9C=BA=20=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E6=80=BB=E4=BA=BA=E8=A7=A3=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/Jlmap3dSubscribeNew.js            | 12 +++++--
 .../theme/datie_tky/menus/menuSignal.vue      | 31 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
index ee92f66e4..31ef4699b 100644
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
+++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
@@ -165,10 +165,11 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 	function trainRunNew(data){
 		let code = data.code;
+		// console.log(rails.sectionrail[data.section],data.section,code,'--------')
 		if(rails.sectionrail[data.section]){
 			if(trainlisttest.list[code].right != data.right){
 				if(data.right == "0"){
-
+					console.log('right==0')
 					trainlisttest.list[code].right = "0";
 					trainlisttest.list[code].rotation.y = Math.PI;
 					let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@@ -210,6 +211,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 				}
 				if(data.right == "1"){
+					console.log('right==1')
 					trainlisttest.list[code].right = "1";
 					trainlisttest.list[code].rotation.y = 0;
 					let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@@ -250,8 +252,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 			}
 
 			// console.log(data);
-
-			if(trainlisttest.list[code].dispose == "0"){
+			console.log(trainlisttest.list[code].dispose,'88888888');
+			if(trainlisttest.list[code].dispose == "0") {
+				console.log(trainlisttest.list[code].dispose,'-----------');
 				if (data.right == '1') { // 向右
 					trainlisttest.list[code].right = '1';
 					trainlisttest.list[code].progress = data.offset;
@@ -434,7 +437,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 				}
 
 			}
+			console.log(code,trainlisttest.list[code].position.x,trainlisttest.list[code].position.y,trainlisttest.list[code].position.z, '666666')
 		}else{
+			// console.log(code,'trainlisttest.list[code].position.x = -1000000')
 			trainlisttest.list[code].position.x = -1000000;
 		}
 
@@ -564,6 +569,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 							trainlisttest.list[code].position.y = 0;
 							// trainlisttest.list[code].progress = 0;
 							trainlisttest.list[code].dispose = "0";
+							debugger
 							trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
 							trainlisttest.list[code].nextcode = null;
 							trainlisttest.list[code].curve = null;
diff --git a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
index 881027db3..9dd74dd02 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
@@ -2,12 +2,14 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+    <password-box ref="passwordBox" pop-class="chengdou-03__systerm" @checkOver="passWordCommit" />
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import PopMenu from '@/components/PopMenu';
 // OperateMode
+import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@@ -15,6 +17,7 @@ export default {
     name: 'SignalMenu',
     components: {
         PopMenu,
+        PasswordBox,
         NoticeInfo
     },
     props: {
@@ -102,6 +105,25 @@ export default {
                 this.$refs.popMenu.resetShowPosition(point);
             }
         },
+        // 输入密码正确回调
+        passWordCommit(data) {
+            let operate = {};
+            if (data.nextCmdType) {
+                operate = {
+                    over: true,
+                    operation: data.operateNext,
+                    cmdType: data.nextCmdType
+                };
+            }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         // 总取消
         signalTotalCancle() {
             const model = this.selected; // 选择设备
@@ -113,7 +135,14 @@ export default {
         },
         // 总人解
         humanTrainRoute() {
-
+            const model = this.selected; // 选择设备
+            commitOperate(menuOperate.Signal.humanTrainRoute, { signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 0).then(({valid, operate}) => {
+                if (valid) {
+                    operate['operateNext'] = this.Command.close.password.operation;
+                    operate['nextCmdType'] = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            });
         },
         // 开放引导信号
         signalRouteGuide() {