合并代码

src/jmapNew/constant/deviceState.js

@@ -17,6 +17,12 @@ deviceState[deviceType.Section] = {
 };
 
 deviceState[deviceType.Switch] = {
+    singleLock:1,   // 是否单锁
+    blockade:0,     //是否封锁
+    routeLock:0,    //是否进路锁闭
+    overlapLock:0,  //是否进路延续保护锁闭
+    normalPosition:1, // 是否定位
+    reversePosition:0,  //是否反位
     /** 定位状态*/
     // locateType: {
     //     Default: '01',			/** 道岔位置类型 - 定位（缺省值）*/

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'}">

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';
 

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) {