From ae28541ae1322a1b1e7b5c83aabb301c71ccc9c1 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 20 Jul 2021 18:06:22 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=89=20=E8=BF=9B?=
 =?UTF-8?q?=E8=B7=AF=E4=BA=A4Ats=E6=8E=A7=20=E5=86=B2=E7=AA=81=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=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

---
 .../menus/dialog/routeHandControl.vue         | 78 ++++++++++++++++---
 1 file changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
index 6eae3f4aa..66dd27716 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
@@ -5,7 +5,7 @@
       :class="systemName+' route-hand-control'"
       :title="title"
       :visible.sync="show"
-      width="300px"
+      :width="systemName == 'xian-01__systerm'?'400px':'300px'"
       :before-close="doClose"
       :z-index="2000"
       :modal="false"
@@ -48,6 +48,22 @@
               <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.name }}</span>
             </template>
           </el-table-column>
+          <el-table-column v-if="systemName == 'xian-01__systerm'" prop="atsControl" label="控制状态" style="margin-left:30px">
+            <template slot-scope="scope">
+              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.atsControl==0?'人工':'自动' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="systemName == 'xian-01__systerm'" prop="conflict" label="冲突检测" style="margin-left:30px">
+            <template slot-scope="scope">
+              <el-checkbox
+                v-if="scope.row.atsControl==0"
+                v-model="checkConflictList[scope.$index].value"
+                style="text-align: center; display: block;"
+              />
+              <!-- @change="changeCheckConflit(checkConflictMap[scope.row.code],scope.row.code)" -->
+              <!-- :disabled="scope.row.disabled" -->
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <el-row>
@@ -83,6 +99,7 @@ import NingBoConfirmTip from '../../../ningbo_01/menus/dialog/childDialog/confir
 // import { mouseCancelState } from '../utils/menuItemStatus';
 import NoticeInfo from '../childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '../../utils/menuOperate';
+import { delimiter } from 'path';
 
 export default {
     name: 'RouteHandControl',
@@ -108,6 +125,8 @@ export default {
             signalName: '',
             allSelect: false,
             changeList:[],
+            checkConflictList:[],
+            selectedCheckConflict:[],
             commitDisabled: true,
             disabledLength: 0
         };
@@ -143,7 +162,12 @@ export default {
             if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
                 return '进路交人工控';
             } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                return '进路交自动控';
+                if (this.systemName == 'xian-01__systerm') {
+                    return '进路交ATS自动控';
+                } else {
+                    return '进路交自动控';
+                }
+
             } else {
                 return '';
             }
@@ -162,6 +186,7 @@ export default {
             this.selected = selected;
             this.allSelect = false;
             this.changeList = [];
+            this.checkConflictList.splice(0, this.checkConflictList.length - 1);
             this.commitDisabled = true;
             this.selection = [];
             this.disabledLength = 0;
@@ -178,18 +203,28 @@ export default {
                 }
 
                 if (tempData && tempData.length > 0) {
+                    const that = this;
                     tempData.forEach(elem => {
-                        this.changeList.push(false);
+                        that.changeList.push(false);
+
                         elem.disabled = false;
                         // 设置禁用状态
                         if (operate.operation === OperationEvent.Signal.humanControl.menu.operation &&
                                 (elem.atsControl == '0')) {
                             elem.disabled = true;
-                            this.disabledLength++;
-                        } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation &&
-                                (elem.atsControl == '1')) {
-                            elem.disabled = true;
-                            this.disabledLength++;
+                            that.disabledLength++;
+                        } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                            if (elem.atsControl == '1') {
+                                elem.disabled = true;
+                                that.disabledLength++;
+                            } else {
+                                if (that.systemName == 'xian-01__systerm') {
+                                    this.checkConflictList.push({code:elem.code, value:false});
+                                    // that.$set('checkConflictMap', elem.code, );
+                                    // that.checkConflictMap[elem.code] = false;
+                                }
+                            }
+
                         }
                     });
                 }
@@ -215,6 +250,16 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
             // mouseCancelState(this.selected);
         },
+        changeCheckConflit(check, code) {
+            // debugger;
+            // this.checkConflictMap;
+            // this.$set('checkConflictMap', code, check);
+            // if (check) {
+            //     this.checkConflictMap[code] = false;
+            // } else {
+            //     this.checkConflictMap[code] = true;
+            // }
+        },
         changeCheck(check, code) {
             if (check) {
                 this.selection.push(code);
@@ -324,7 +369,7 @@ export default {
                         operate.message = `命令：进路交人工控<br/>始端信号机：${this.stationName} ${this.signalName}` + msg;
                         this.$refs.ningBoConfirmTip.doShow(operate);
                     }
-                }).catch((error) => {
+                }).catch(() => {
                     this.loading = false;
                     this.doClose();
                     this.$refs.noticeInfo.doShow();
@@ -335,7 +380,7 @@ export default {
                     if (valid) {
                         this.doClose();
                     }
-                }).catch((error) => {
+                }).catch(() => {
                     this.loading = false;
                     this.doClose();
                     this.$refs.noticeInfo.doShow();
@@ -359,13 +404,22 @@ export default {
                         operate.message = `命令：进路交自动控<br/>始端信号机：${this.stationName} ${this.signalName}` + msg;
                         this.$refs.ningBoConfirmTip.doShow(operate);
                     }
-                }).catch((error) => {
+                }).catch(() => {
                     this.loading = false;
                     this.doClose();
                     this.$refs.noticeInfo.doShow();
                 });
             } else {
-                commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2, {val}).then(({valid})=>{
+                const params = {routeCodeList:this.selection};
+                if (this.systemName === 'xian-01__systerm') {
+                    const checkConflictList = [];
+                    this.selection.forEach(each=>{
+                        const checkConflict = this.checkConflictList.find(check=>{ return check.code == each; });
+                        if (checkConflict) { checkConflictList.push(checkConflict.value); }
+                    });
+                    params.checkConflictList = checkConflictList;
+                }
+                commitOperate(menuOperate.Signal.atsAutoControl, params, 2, {val}).then(({valid})=>{
                     this.loading = false;
                     if (valid) {
                         this.doClose();

From dfab1da1c67a9d2a10b471d251f85d81278e5a2b Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 21 Jul 2021 17:53:14 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=A3=80=E6=B5=8B=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=20=20=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=8A=9E=E7=90=86=E7=A1=AE=E8=AE=A4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/menus/dialog/routeDetail.vue   |  13 +-
 .../menus/dialog/routeHandControl.vue         |  11 +-
 .../theme/components/utils/menuOperate.js     |   5 +
 .../xian_01/menus/dialog/conflictRoute.vue    | 186 ++++++++++++++++++
 .../theme/xian_01/menus/menuSignal.vue        |  21 ++
 src/scripts/cmdPlugin/CommandEnum.js          |   4 +-
 src/scripts/cmdPlugin/Handler.js              |   1 +
 src/scripts/cmdPlugin/OperationHandler.js     |   7 +
 8 files changed, 237 insertions(+), 11 deletions(-)
 create mode 100644 src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue

diff --git a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
index 34eb60f43..fab1c9311 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
@@ -39,9 +39,14 @@
               <span>{{ scope.row.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="status" label="控制状态" width="100">
+          <el-table-column prop="status" label="控制状态" width="150">
             <template slot-scope="scope">
-              {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+              <div v-if="systemName=='xian-01__systerm'">
+                {{ scope.row.atsControl == '0' ? '人工' : scope.row.checkConflict?'自动 (进行冲突检查)':'自动 (不进行冲突检查)' }}
+              </div>
+              <div v-else>
+                {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -112,7 +117,7 @@ export default {
     },
     methods: {
         doShow(operate, selected, tempData) {
-			this.$root.$emit('dialogOpen', selected);
+            this.$root.$emit('dialogOpen', selected);
             this.selected = selected;
             // 如果不是因为断点激活则需要，初始化菜单初始值
             if (!this.dialogShow) {
@@ -142,7 +147,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.$root.$emit('dialogClose', this.selected);
+            this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             // mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
index 66dd27716..91b619eec 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
@@ -54,9 +54,8 @@
             </template>
           </el-table-column>
           <el-table-column v-if="systemName == 'xian-01__systerm'" prop="conflict" label="冲突检测" style="margin-left:30px">
-            <template slot-scope="scope">
+            <template v-if="title == '进路交ATS自动控'&& scope.row.atsControl==0" slot-scope="scope">
               <el-checkbox
-                v-if="scope.row.atsControl==0"
                 v-model="checkConflictList[scope.$index].value"
                 style="text-align: center; display: block;"
               />
@@ -99,7 +98,6 @@ import NingBoConfirmTip from '../../../ningbo_01/menus/dialog/childDialog/confir
 // import { mouseCancelState } from '../utils/menuItemStatus';
 import NoticeInfo from '../childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '../../utils/menuOperate';
-import { delimiter } from 'path';
 
 export default {
     name: 'RouteHandControl',
@@ -186,7 +184,8 @@ export default {
             this.selected = selected;
             this.allSelect = false;
             this.changeList = [];
-            this.checkConflictList.splice(0, this.checkConflictList.length - 1);
+            this.checkConflictList = [];
+            // .splice(0, this.checkConflictList.length - 1);
             this.commitDisabled = true;
             this.selection = [];
             this.disabledLength = 0;
@@ -217,14 +216,14 @@ export default {
                             if (elem.atsControl == '1') {
                                 elem.disabled = true;
                                 that.disabledLength++;
+                                that.checkConflictList.push({code:elem.code, value:null});
                             } else {
                                 if (that.systemName == 'xian-01__systerm') {
-                                    this.checkConflictList.push({code:elem.code, value:false});
+                                    that.checkConflictList.push({code:elem.code, value:false});
                                     // that.$set('checkConflictMap', elem.code, );
                                     // that.checkConflictMap[elem.code] = false;
                                 }
                             }
-
                         }
                     });
                 }
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index bc377bdf3..ee3bdd589 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -149,7 +149,12 @@ export const menuOperate = {
         signalTotalCancle:{ // 信号机总取消
             operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
             cmdType: CMD.Signal.CMD_SIGNAL_TOTAL_CANCLE
+        },
+        signalConflictRoute:{ // 冲突进路办理
+            operation: OperationEvent.Signal.signalConflictRoute.menu.operation,
+            cmdType:CMD.Signal.CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM
         }
+        // Signal_Conflict_Route_Set_Confirm
     },
     Switch:{
         lock:{
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue b/src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue
new file mode 100644
index 000000000..c4ef497b0
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue
@@ -0,0 +1,186 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="conflictRoute"
+      :class="systemName+' route-hand-control'"
+      title="冲突进路办理确认"
+      :visible.sync="show"
+      width="435px"
+      :before-close="closeDialog"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <div>
+        <div>
+          <div class="conflictRoute">
+            <span class="conflictRouteTitle">冲突进路：</span>
+            <span class="conflictRouteName">{{ routeName }}</span>
+          </div>
+        </div>
+        <div class="conflictDescription">冲突描述：</div>
+        <div class="context">
+          {{ message }}
+        </div>
+        <div class="conflictTips">距离对话框关闭还有：{{ minutes }}分{{ seconds }}秒，请确认是否办理冲突进路。</div>
+        <el-row justify="center" class="button-group">
+          <el-col :span="7" :offset="3">
+            <el-button
+              style="width: 115px;"
+              :loading="loading"
+              @click="selectConflict"
+            >选排冲突进路</el-button>
+          </el-col>
+          <!-- :id="domIdConfirm" -->
+          <!-- :disabled="commitDisabled" -->
+          <!-- :id="domIdCancel"  -->
+          <el-col :span="7" :offset="3">
+            <el-button style="width: 115px;" :loading="loading" @click="routeRunplan">按计划执行</el-button>
+          </el-col>
+        </el-row>
+      </div>
+    </el-dialog>
+    <notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
+  </div>
+</template>
+<script>
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+export default {
+    name:'ConflictRoute',
+    components: {
+        NoticeInfo
+    },
+    props:{
+        systemName:{
+            type:String,
+            required:true
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            message:'',
+            routeCode:'',
+            routeName:'',
+            allMinutes:10 * 60,
+            minutes:10,
+            seconds:0,
+            inter:null,
+            loading:false
+        };
+    },
+    computed:{
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        }
+    },
+    methods:{
+        doShow({route, description}) {
+            if (route) {
+                this.routeCode = route.code;
+                const station = this.$store.getters['map/getDeviceByCode'](route.stationCode);
+                if (station) {
+                    this.routeName = station.name + ' ' + route.name;
+                } else {
+                    this.routeName = route.name;
+                }
+            }
+            this.message = description;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.inter = setInterval(()=>{
+                    if (this.allMinutes <= 0) {
+                        clearInterval(this.inter);
+                        this.routeRunplan();
+                    }
+                    this.allMinutes--;
+                    this.minutes = (this.allMinutes - this.allMinutes % 60) / 60;
+                    this.seconds = this.allMinutes % 60;
+                }, 1000);
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        closeDialog() {
+            const that = this;
+            clearInterval(this.inter);
+            commitOperate(menuOperate.Signal.signalConflictRoute, {routeCode:this.routeCode, way:1}, 3).then(({valid, operate})=>{
+                if (valid) {
+                    that.doClose();
+                }
+            }).catch(error=>{
+                this.dialogShow = false;
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+
+        selectConflict() {
+            this.commit(2);
+        },
+        routeRunplan() {
+            this.commit(1);
+        },
+        commit(way) {
+            this.loading = true;
+            // int way, 处理方式：1-按计划执行，2-执行冲突进路
+            commitOperate(menuOperate.Signal.signalConflictRoute, {routeCode:this.routeCode, way:way}, 3).then(({valid, operate})=>{
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    // this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            }).catch(error=>{
+                this.loading = false;
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        }
+    }
+};
+</script>
+<style>
+    .conflictRoute .context {
+        margin:5px 13px 13px 13px;
+        padding-bottom: 10px !important;
+        border: 1px solid lightgray;
+        line-height: 138%;
+        font-size: 15px;
+        height:115px;
+    }
+    .conflictDescription{
+        margin-left:13px;
+        font-size: 15px;
+        margin-top: 5px;
+    }
+    .conflictRoute{
+        padding-left: 13px;
+        font-size: 15px;
+        width: 100%;
+        padding-right: 13px;
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-content: center;
+        justify-content: flex-start;
+        align-items: flex-start;
+    }
+    .conflictRouteName{
+        font-size: 15px;
+        height: 23px;
+        border: 2px inset #E2E2E2;
+        padding-left: 5px;
+        flex-grow: 1;
+    }
+    .conflictRouteTitle{
+
+    }
+    .conflictTips{
+        margin-left: 13px;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index 1d03576ea..895a03460 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -9,6 +9,7 @@
     <route-hand-control ref="routeHandControl" system-name="xian-01__systerm" />
     <route-detail ref="routeDetail" system-name="xian-01__systerm" />
     <set-fault ref="setFault" pop-class="xian-01__systerm" />
+    <conflict-route ref="conflictRoute" system-name="xian-01__systerm" />
   </div>
 </template>
 
@@ -27,6 +28,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import ConflictRoute from './dialog/conflictRoute';
 
 export default {
     name: 'SignalMenu',
@@ -39,6 +41,7 @@ export default {
         RouteHandControl,
         RouteDetail,
         NoticeInfo,
+        ConflictRoute,
         SetFault
     },
     props: {
@@ -239,6 +242,21 @@ export default {
             } else {
                 this.doClose();
             }
+        },
+        '$store.state.socket.simulationAlarmInfo': function(val) {
+            (val || []).forEach(item => {
+                if (!item.confirmed) {
+                    if (item.level === '0') {
+                        if (item.type == 'Conflict_Route_Set') {
+                            const route = this.routeList.find(each=>{ return each.code == item.deviceCode; });
+                            this.$refs.conflictRoute.doShow({route:route, description:item.description});
+                            // doShow();
+                            // "":"Route205",
+                            // "description":"计划车(111046(322)触发的进路[X2112-X2102]与计划(311045)从节点(务庄站（22）_G2202)到节点(香湖湾站（21）_G2102)的计划冲突，无法选排"
+                        }
+                    }
+                }
+            });
         }
     },
     methods: {
@@ -291,6 +309,9 @@ export default {
             commitOperate(menuOperate.Signal.arrangementRoute, { signalCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.routeSelection.doShow(operate, this.selected, this.getRouteList(this.selected));
+                    // const route = this.routeList.find(each=>{ return each.code == 'Route205'; });
+                    // this.$refs.conflictRoute.doShow({route:route, description:'计划车(111046(322)触发的进路[X2112-X2102]与计划(311045)从节点(务庄站（22）_G2202)到节点(香湖湾站（21）_G2102)的计划冲突，无法选排'});
+                    // this.$refs.conflictRoute.doShow({deviceCode:'Route205', });
                 }
             });
         },
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index adcc00007..c6694c329 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -126,7 +126,9 @@ export default {
         /** 信号机总取消 */
         CMD_SIGNAL_TOTAL_CANCLE:{value:'Signal_Total_Cancel', label: '信号机总取消'},
         /** 设置保护 */
-        CMD_SIGNAL_SET_OVERLAP : {value: 'Signal_Set_Overlap', label: '设置保护'}
+        CMD_SIGNAL_SET_OVERLAP : {value: 'Signal_Set_Overlap', label: '设置保护'},
+        /** 冲突进路办理 */
+        CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM:{value: 'Signal_Conflict_Route_Set_Confirm', label: '冲突进路办理'}
     },
 
     // 物理区段操作
diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js
index 23bd42953..01f18db97 100644
--- a/src/scripts/cmdPlugin/Handler.js
+++ b/src/scripts/cmdPlugin/Handler.js
@@ -109,6 +109,7 @@ class Handler {
             this.afterValid(operation, valid).then(()=>{
                 rtn.valid = valid;
                 if (operation.cmdType && valid) {
+                    debugger;
                     const command = this.getCommand(operation);
                     if (command) {
                         CommandHandler.execute(command.id, command.get()).then(response => {
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 90756f12f..6acb2a8a0 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1703,6 +1703,13 @@ export const OperationEvent = {
                 operation: '3211',
                 domId: '_Tips-Signal-setOverlap-Menu{BOTTOM}'
             }
+        },
+        // 冲突进路办理
+        signalConflictRoute:{
+            menu: {
+                operation: '322',
+                domId: '_Tips-Signal-conflictRoute-Menu{TOP}'
+            }
         }
     },
 

From a6e37fc667114fd89a984459f3674bfd9c560a7d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 21 Jul 2021 18:02:13 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=AD=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/cmdPlugin/Handler.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js
index 01f18db97..23bd42953 100644
--- a/src/scripts/cmdPlugin/Handler.js
+++ b/src/scripts/cmdPlugin/Handler.js
@@ -109,7 +109,6 @@ class Handler {
             this.afterValid(operation, valid).then(()=>{
                 rtn.valid = valid;
                 if (operation.cmdType && valid) {
-                    debugger;
                     const command = this.getCommand(operation);
                     if (command) {
                         CommandHandler.execute(command.id, command.get()).then(response => {

From 6e45e2c1685f160246c0bdaf6134b15e8e873dbe Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 22 Jul 2021 14:56:27 +0800
Subject: [PATCH 4/8] =?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

---
 .../xian_01/menus/dialog/conflictRoute.vue    | 30 +++++++++----------
 .../theme/xian_01/menus/menuSignal.vue        |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue b/src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue
index c4ef497b0..f6911e9c9 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/conflictRoute.vue
@@ -23,7 +23,7 @@
         <div class="context">
           {{ message }}
         </div>
-        <div class="conflictTips">距离对话框关闭还有：{{ minutes }}分{{ seconds }}秒，请确认是否办理冲突进路。</div>
+        <!-- <div class="conflictTips">距离对话框关闭还有：{{ minutes }}分{{ seconds }}秒，请确认是否办理冲突进路。</div> -->
         <el-row justify="center" class="button-group">
           <el-col :span="7" :offset="3">
             <el-button
@@ -64,10 +64,10 @@ export default {
             message:'',
             routeCode:'',
             routeName:'',
-            allMinutes:10 * 60,
-            minutes:10,
-            seconds:0,
-            inter:null,
+            // allMinutes:10 * 60,
+            // minutes:10,
+            // seconds:0,
+            // inter:null,
             loading:false
         };
     },
@@ -90,21 +90,21 @@ export default {
             this.message = description;
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.inter = setInterval(()=>{
-                    if (this.allMinutes <= 0) {
-                        clearInterval(this.inter);
-                        this.routeRunplan();
-                    }
-                    this.allMinutes--;
-                    this.minutes = (this.allMinutes - this.allMinutes % 60) / 60;
-                    this.seconds = this.allMinutes % 60;
-                }, 1000);
+                // this.inter = setInterval(()=>{
+                //     if (this.allMinutes <= 0) {
+                //         clearInterval(this.inter);
+                //         this.routeRunplan();
+                //     }
+                //     this.allMinutes--;
+                //     this.minutes = (this.allMinutes - this.allMinutes % 60) / 60;
+                //     this.seconds = this.allMinutes % 60;
+                // }, 1000);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         closeDialog() {
             const that = this;
-            clearInterval(this.inter);
+            // clearInterval(this.inter);
             commitOperate(menuOperate.Signal.signalConflictRoute, {routeCode:this.routeCode, way:1}, 3).then(({valid, operate})=>{
                 if (valid) {
                     that.doClose();
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index 895a03460..6fe8e89b5 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -245,7 +245,7 @@ export default {
         },
         '$store.state.socket.simulationAlarmInfo': function(val) {
             (val || []).forEach(item => {
-                if (!item.confirmed) {
+                if (!item.confirmed && !item.recovered) {
                     if (item.level === '0') {
                         if (item.type == 'Conflict_Route_Set') {
                             const route = this.routeList.find(each=>{ return each.code == item.deviceCode; });

From ede14de20bd4de05a0958c46dfb815567375f0ba Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 22 Jul 2021 16:36:18 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=8A=B6=E6=80=81=20=E5=9B=BE=E5=BD=A2?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/xian_01.js  | 1 +
 src/jmapNew/map.js                      | 2 ++
 src/jmapNew/shape/graph/Signal/index.js | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index b80dda468..b6979a9af 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -145,6 +145,7 @@ class SkinCode extends defaultStyle {
                 defaultColor: '#FFFFFF',						// 信号灯字体默认色
                 blockColor: '#FFFFFF',							// 信号灯字体锁定颜色
                 checkColor: '#00FF00',							// 信号字体
+                conflictColor:'#FF0000', // 冲突进路始端信号机颜色
                 nameBorderShow: true							// 信号机名字边框显示
             },
             lamp: {
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index ea4e966bb..7184e2d03 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -568,11 +568,13 @@ class Jlmap {
                 routeStartSignalData[item.code].forEach((elem, index)=> {
                     if (index) {
                         status.atsControl = status.atsControl && elem.atsControl;
+                        status.checkConflict = status.checkConflict || elem.checkConflict;
                         status.fleetMode = status.fleetMode || elem.fleetMode;
                         status.ciControl = status.ciControl || elem.ciControl;
                         status.lock = status.lock || elem.lock;
                     } else {
                         status.atsControl = elem.atsControl;
+                        status.checkConflict = elem.checkConflict;
                         status.fleetMode = elem.fleetMode;
                         status.ciControl = elem.ciControl;
                         status.lock = elem.lock;
diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index cac40d689..6e0767154 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -986,6 +986,11 @@ class Signal extends Group {
                     !model.atsControl && this.setArtificialRouteClose(); /** 进路交人工控或自动控 */
                 }
             }
+            // 冲突检查状态
+            if (this.style.Signal.text.conflictColor && model.checkConflict) {
+                this.sigName.setColor(this.style.Signal.text.conflictColor);
+            }
+
             // 设置点灯类型 必须在最后设置不能放前面 logicLight  0 物理点灯 1 逻辑点灯
             if (model.logicLight) {
                 this.logicalLight(); // 设置逻辑点灯

From 234b09863c36e7fe13158149b94812ee06b13ba1 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 22 Jul 2021 17:28:17 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=A3=80=E6=B5=8B=20?=
 =?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/constant/deviceState.js     | 2 +-
 src/jmapNew/shape/graph/Signal/index.js | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js
index 307e035e1..2eb4c0930 100644
--- a/src/jmapNew/constant/deviceState.js
+++ b/src/jmapNew/constant/deviceState.js
@@ -254,5 +254,5 @@ deviceState[deviceType.Train] = {
 deviceState[deviceType.Responder] = {
 };
 deviceState[deviceType.IndicatorLight] = {
-}
+};
 export default deviceState;
diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index 6e0767154..85671ead4 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -986,10 +986,6 @@ class Signal extends Group {
                     !model.atsControl && this.setArtificialRouteClose(); /** 进路交人工控或自动控 */
                 }
             }
-            // 冲突检查状态
-            if (this.style.Signal.text.conflictColor && model.checkConflict) {
-                this.sigName.setColor(this.style.Signal.text.conflictColor);
-            }
 
             // 设置点灯类型 必须在最后设置不能放前面 logicLight  0 物理点灯 1 逻辑点灯
             if (model.logicLight) {
@@ -1058,6 +1054,11 @@ class Signal extends Group {
             if (model.noStatus || model.level === 0) {
                 this.setAshShow();
             }
+
+            // 冲突检查状态
+            if (this.style.Signal.text.conflictColor && model.checkConflict) {
+                this.sigName.setColor(this.style.Signal.text.conflictColor);
+            }
         }
     }
 

From 45e121179bea7c5c2d8f9bfe5d1ef19b418ecb14 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 22 Jul 2021 18:16:05 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=A3=80=E6=B5=8B=20?=
 =?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/constant/deviceState.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js
index 2eb4c0930..28ebacf48 100644
--- a/src/jmapNew/constant/deviceState.js
+++ b/src/jmapNew/constant/deviceState.js
@@ -77,6 +77,7 @@ deviceState[deviceType.Signal] = {
     redOpen: 1, // 红灯开放(默认状态)
     delayTime: 0, // 信号机延迟解锁倒计时
     atsControl: 1, // 0是人工，1是自动
+    checkConflict:0, // 0是不检查冲突，1是检测冲突（检测冲突进路）
     fault: 0, // 是否故障
     isStartSignal: 0,		// 是否进路排列选中始端信号机
     isTerminalSignal: 0,	// 是否进路排列待选终端信号机

From 4cf49ccd5d805ac7651ce033b79b5b350852f531 Mon Sep 17 00:00:00 2001
From: walker-sheng <shengxuqiang@joylink.club>
Date: Tue, 3 Aug 2021 14:41:57 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=96=B0=E6=B5=8B=E8=AF=95=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.staging | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.staging b/.env.staging
index 35048ea21..0bf49b3f8 100644
--- a/.env.staging
+++ b/.env.staging
@@ -2,7 +2,7 @@
 NODE_ENV = 'test'
 
 # base api
-VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
+VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud1'
 VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
 VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
-VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'
+VUE_APP_BASE_SITE='https://test.joylink.club/cbtc1'