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

src/jmapNew/constant/deviceState.js

@@ -13,6 +13,7 @@ deviceState[deviceType.Section] = {
     invalid: 0, // 是否失效
     speedUpLimit: 0, // 最高限速
     fault: 0, /** 非故障*/
+    faultLock:0, /** 故障锁闭 */
     lockRight: 0 // 区段进路锁闭方向
 };
 // 进路后端状态

src/jmapNew/constant/stateTransition.js

@@ -35,7 +35,8 @@ class Status {
             overlapLock: device.overlapLock, // 进路延续保护锁闭
             ctOccupied: device.ctOccupied, // 通信车占用
             nctOccupied: device.nctOccupied, // 非通信车占用
-            fault: device.fault /** 非故障*/
+            fault: device.fault, /** 非故障*/
+            faultLock: device.faultLock /** 故障锁闭 */
         };
     }
     handleSwitch(device) {

src/jmapNew/shape/Section/index.js

@@ -274,8 +274,8 @@ export default class Section extends Group {
         /** 是否限速*/
         model.speedUpLimit > 0 && this.setSpeedUpperLimit(model.speedUpLimit);
         // 区段计轴预复位状态 (未处理)
-        // 区段故障锁闭
-        model.fault && this.faultLock();
+        // 区段故障锁闭  之前是fault 暂时设置为faultLock
+        model.faultLock && this.faultLock();
 
         /** 道岔区段更新岔心颜色 */
         if (model.type === '03' && model.switch) {

src/scripts/cmdPlugin/OperationHandler.js

@@ -507,7 +507,7 @@ export const OperationEvent = {
             },
             confirm: {
                 operation: '1132',
-                domId: '_Tips-Switch-SetSpeed-Confirm'
+                domId: '_Tips-Switch-SetSpeed-Confirm{BOTTOM}'
             },
             confirm1: {
                 operation: '1133',
@@ -542,7 +542,7 @@ export const OperationEvent = {
             },
             confirm: {
                 operation: '1142',
-                domId: '_Tips-Switch-CancelSpeed-Confirm'
+                domId: '_Tips-Switch-CancelSpeed-Confirm{BOTTOM}'
             },
             confirm1: {
                 operation: '1143',
@@ -1272,7 +1272,7 @@ export const OperationEvent = {
             },
             confirm: {
                 operation: '4072',
-                domId: '_Tips-Section-SetSpeed-Confirm{TOP}'
+                domId: '_Tips-Section-SetSpeed-Confirm{BOTTOM}'
             },
             confirm1: {
                 operation: '4073',
@@ -1307,7 +1307,7 @@ export const OperationEvent = {
             },
             confirm: {
                 operation: '4082',
-                domId: '_Tips-Section-CancelSpeed-Confirm'
+                domId: '_Tips-Section-CancelSpeed-Confirm{BOTTOM}'
             },
             confirm1: {
                 operation: '4083',

src/views/orderauthor/rules/index.vue

@@ -126,7 +126,8 @@ export default {
                         prop: 'remains'
                     },
                     {
-                        title: this.$t('permission.startTime'),
+                        // this.$t('permission.startTime')
+                        title:'开始时间',
                         prop: 'startTime',
                         type: 'formatter',
                         formatter: this.formatterDate