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

src/jmapNew/theme/components/menus/dialog/setFault.vue

@@ -208,6 +208,22 @@ export default {
                         {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'},
+                        {label: '橙光带故障', value: 'ARB'}
+                    ];
+                } else if (selected._type === 'Switch' && this.popClass === 'xian-01__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'},
+                        {label: '橙光带故障', value: 'ARB'}
+                    ];
                 }
                 if (this.faultList && this.faultList.length) {
                     this.form.faultType = this.faultList[0].value;

src/views/system/configLine/config.vue

@@ -112,7 +112,8 @@ export default {
                 'noARB',
                 'checkDirectionWhenSetHead',
                 'transferRouteCanOnlyFaultUnlock',
-                'setManualWhenHeadTrainArriveTarget'
+                'setManualWhenHeadTrainArriveTarget',
+                'routeDefaultCheckConflict'
             ],
             selectList: ['runMode'],
             generalConfig: [
@@ -157,7 +158,8 @@ export default {
                 'noARB',
                 'checkDirectionWhenSetHead',
                 'transferRouteCanOnlyFaultUnlock',
-                'setManualWhenHeadTrainArriveTarget'
+                'setManualWhenHeadTrainArriveTarget',
+                'routeDefaultCheckConflict'
             ],
             rangeList: ['noParkingSM', 'parkingSM'],
             speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@@ -207,7 +209,8 @@ export default {
                 noARB: '没有ARB判定',
                 checkDirectionWhenSetHead: '设置头码车时检查方向',
                 transferRouteCanOnlyFaultUnlock: '转换轨进路只能通过故障解锁来取消',
-                setManualWhenHeadTrainArriveTarget: '头码车抵达目的地后变为人工车'
+                setManualWhenHeadTrainArriveTarget: '头码车抵达目的地后变为人工车',
+                routeDefaultCheckConflict: '进路默认开启冲突检测'
             }
         };
     },