From 9af8a70242102e328185c76606e61e6ef7789135 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 11 Feb 2020 10:03:59 +0800
Subject: [PATCH 1/3] =?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/shape/Section/index.js                          | 2 +-
 .../theme/chengdu_03/menus/dialog/routeSelection.vue        | 6 +++---
 .../theme/chengdu_03/menus/menuDialog/passwordBox.vue       | 2 +-
 src/jmapNew/theme/chengdu_03/menus/menuStation.vue          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 1e15681df..90312abfe 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -818,7 +818,7 @@ export default class Section extends Group {
         // /** 区段切除*/
         if (model.cutOff) {
             this.sectionCutOff();
-        }
+        }        
         // /** 是否限速*/
         // if (model.speedUpperLimit >= 0) {
         //     this.setSpeedUpperLimit();
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
index 34331a6b4..fe7491b26 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
@@ -34,12 +34,12 @@
         @row-click="clickEvent"
       >
           <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;width: 80px">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
                   <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}" style="width: 90px">
                       {{ handleRouteName(scope.row.name) }}
                   </div>
-              </template>
-          </el-table-column>
+          </template>
+        </el-table-column>
           <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
               <template slot-scope="scope">
                   <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
index 175cc6b5f..e4d9c2abb 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+        import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
     import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
     import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
index 133b38a8a..a1226539e 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <notice-info ref="noticeInfo" />

From 91a5bb6b7a0fa68e90b3214509dbcb393ca5b1df Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 11 Feb 2020 10:04:14 +0800
Subject: [PATCH 2/3] =?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/chengdu_03/menus/menuStation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
index a1226539e..133b38a8a 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <notice-info ref="noticeInfo" />

From fff6930df8783d5badba8c7e2c5d6bef6aaf1c95 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 11 Feb 2020 10:57:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E7=BA=BF=20=E9=81=93?=
 =?UTF-8?q?=E5=B2=94=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              | 6 ++++++
 src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js
index d022b5bbf..a1985fb85 100644
--- a/src/jmapNew/constant/deviceState.js
+++ b/src/jmapNew/constant/deviceState.js
@@ -43,6 +43,12 @@ deviceState[deviceType.Section] = {
 };
 
 deviceState[deviceType.Switch] = {
+    singleLock:1,   // 是否单锁
+    blockade:0,     //是否封锁
+    routeLock:0,    //是否进路锁闭
+    overlapLock:0,  //是否进路延续保护锁闭
+    normalPosition:1, // 是否定位
+    reversePosition:0,  //是否反位
     /** 定位状态*/
     // locateType: {
     //     Default: '01',			/** 道岔位置类型 - 定位（缺省值）*/
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index 9d34d1515..e1426223e 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -147,6 +147,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
+            debugger;
             this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {