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

src/jmapNew/config/skinCode/ningbo_01.js

@@ -138,7 +138,8 @@ class SkinCode extends defaultStyle {
                 standardHeight: 6, // 灯柱高度
                 standardColor: '#C0C0C0',					// 灯柱颜色
                 standardVerticalWidth: 2,					// 灯柱竖杆宽度
-                standardRailWidth: 2						// 灯柱横杆宽度
+                standardRailWidth: 2,						// 灯柱横杆宽度
+                approachLockColor: '#FFFF00'				// 接近锁闭灯柱颜色
             },
             text: {
                 show: true,											// 信号机名称显示
@@ -354,7 +355,7 @@ class SkinCode extends defaultStyle {
                 borderColor: '#fff',						// 边框颜色
                 textShadowColor: '#22DFDF',					// 字体阴影颜色
                 coreBackgroundColor: '#00BFFF',					// 岔芯颜色 浅蓝色
-				coreBackgroundColorOver: '#001AFC',			// 岔芯颜色 深蓝色
+                coreBackgroundColorOver: '#001AFC'			// 岔芯颜色 深蓝色
             }
         };
 

src/jmapNew/shape/graph/Signal/index.js

@@ -733,7 +733,12 @@ class Signal extends Group {
     //     this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
     //     this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.blueColor);
     // }
-
+    // 信号机接近锁闭
+    handleApproachLock() {
+        if (this.style.Signal.post.approachLockColor) { // 设置底座颜色
+            this.sigPost.setColor(this.style.Signal.post.approachLockColor);
+        }
+    }
     fault() {
         if (this.style.Signal.lamp.faultType == 'flash') {
             this.lamps[0].faultShow();
@@ -1032,6 +1037,7 @@ class Signal extends Group {
             if (model.hasSelected) {
                 this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
             }
+            model.approachLock && this.handleApproachLock();
             // 信号机故障
             model.fault && this.fault();
             if (model.guideTime) {

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

@@ -17,7 +17,7 @@
             <el-form ref="form" :model="formModel" :rules="rules">
               <el-col :span="24">
                 <el-form-item prop="targetDeviceCode" label="目的地:">
-                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" size="small" style="width: 165px;height: 32px;line-height: 32px;" placeholder="请选择">
+                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
                     <el-option
                       v-for="item in selectedList"
                       :key="item.code"
@@ -25,11 +25,11 @@
                       :value="item.code"
                     />
                   </el-select>
-                  <el-button
+                  <!--<el-button-->
-                    :type="field == 'selectedCode' ? 'danger' : 'primary'"
+                  <!--:type="field == 'selectedCode' ? 'danger' : 'primary'"-->
-                    size="small"
+                  <!--size="small"-->
-                    @click="hover('selectedCode')"
+                  <!--@click="hover('selectedCode')"-->
-                  >激活</el-button>
+                  <!--&gt;激活</el-button>-->
                 </el-form-item>
               </el-col>
             </el-form>
@@ -109,7 +109,7 @@ export default {
                 targetDeviceCode: ''
             },
             groupNumber: '',
-            field: '',
+            field: 'selectedCode',
             selected: null,
             rules: {
                 faultType: [
@@ -125,11 +125,11 @@ export default {
         ]),
         selectedList() {
             let list = [];
-            let sectionList = [];
+            // let sectionList = [];
-            if (this.sectionList && this.sectionList.length) {
+            // if (this.sectionList && this.sectionList.length) {
-                sectionList = this.sectionList.filter(elem => { return (elem.standTrack || elem.reentryTrack || elem.transferTrack); });
+            //     sectionList = this.sectionList.filter(elem => { return (elem.standTrack || elem.reentryTrack || elem.transferTrack); });
-            }
+            // }
-            list = [...sectionList, ...this.trainList];
+            list = [...this.sectionList, ...this.trainList];
             return list;
         },
         show() {
@@ -147,7 +147,7 @@ export default {
             } else if (this.operation == OperationEvent.MixinCommand.cancelStoppage.menu.operation) {
                 return '取消故障';
             } else if (this.operation == OperationEvent.MixinCommand.collocation.menu.operation) {
-                return '设置托管';
+                return '驾驶至';
             }
             return '';
         }
@@ -160,7 +160,7 @@ export default {
         },
         '$store.state.menuOperation.selectedCount':function(em) {
             const device = this.$store.state.menuOperation.selected;
-            if (device && device.code && this.judge && this.field) {
+            if (device && device.code && this.judge && this.field && this.show) {
                 if (device._type == 'Section' || device._type == 'Train') {
                     this.deviceSelect(device);
                 }
@@ -168,9 +168,9 @@ export default {
         }
     },
     methods: {
-        hover(field) {
+        // hover(field) {
-            this.field = field == this.field ? '' : field;
+        //     this.field = field == this.field ? '' : field;
-        },
+        // },
         doShow(operate, selected, judge) {
             this.$root.$emit('dialogOpen', selected);
             this.selected = selected;
@@ -302,10 +302,10 @@ export default {
         deviceSelect(em) {
             if (this.field == 'selectedCode' && em._type == 'Section') {
                 this.formModel.targetDeviceCode = em.code;
-                this.field = '';
+                // this.field = '';
             } else if (this.field == 'selectedCode' && em._type == 'Train') {
                 this.formModel.targetDeviceCode = em.code;
-                this.field = '';
+                // this.field = '';
             }
         }
     }

src/scripts/ConstConfig.js

@@ -222,6 +222,11 @@ export default {
             { name: '固定应答器', value: 'FB'},
             { name: '可变应答器', value: 'VB'},
             { name: '填充应答器', value: 'IB'}
+        ],
+        loadRuleList: [
+            { label: '每日加载', value:'EVERY_DAY' },
+            { label: '周内加载', value: 'WITHIN_A_WEEK' },
+            { label: '周末加载', value: 'WEEKEND' }
         ]
     }
 };

src/views/publish/runPlanCommon/draft.vue

@@ -22,6 +22,11 @@
               </el-col>
             </el-row>
           </el-form-item>
+          <el-form-item label="加载规则" prop="loadRule">
+            <el-select v-model="model.loadRule">
+              <el-option v-for="item in loadRuleList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </div>
@@ -39,6 +44,7 @@
 import { getPublishMapListOnline } from '@/api/jmap/map';
 import { createRunPlanCommon } from '@/api/runplan';
 import ChooseTemplatePlan from './chooseTemplatePlan';
+import ConstConfig from '@/scripts/ConstConfig';
 
 export default {
     name: 'CommonPlanDraft',
@@ -50,10 +56,12 @@ export default {
             display: 1,
             loading: false,
             mapList: [],
+            loadRuleList: ConstConfig.ConstSelect.loadRuleList,
             model: {
                 mapId: '',
                 planId: '',
-                planName: ''
+                planName: '',
+                loadRule: ''
             }
         };
     },
@@ -71,6 +79,9 @@ export default {
                 ],
                 planId: [
                     { required: true, message: this.$t('rules.inputTemplateRunPlan'), trigger: 'change' }
+                ],
+                loadRule: [
+                    { required: true, message: '请选择加载规则', trigger: 'change' }
                 ]
             };
 
@@ -98,7 +109,8 @@ export default {
         buildModel() {
             return {
                 mapId: this.model.mapId,
-                templatePlanId: this.model.planId
+                templatePlanId: this.model.planId,
+                loadRule: this.model.loadRule
             };
         },
         create() {

src/views/publish/runPlanCommon/index.vue

@@ -10,6 +10,7 @@ import { superAdmin } from '@/router/index';
 import { getRunPlanLoadList, listAllTempLateRunPlan, deleteDailyRunPlanLoad, postDailyRunPlanLoadGenerate, postSchedulingCommonGenerate } from '@/api/runplan';
 import { UrlConfig } from '@/scripts/ConstDic';
 import CopyMap from './copyMap';
+import ConstConfig from '@/scripts/ConstConfig';
 import { getPublishMapListOnline } from '@/api/jmap/map';
 
 export default {
@@ -57,6 +58,13 @@ export default {
                         columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
                         tagType: (row) => { return 'success'; }
                     },
+                    {
+                        title: '加载规则',
+                        prop: 'loadRule',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.loadRule, ConstConfig.ConstSelect.loadRuleList, ['value', 'label']); },
+                        tagType: (row) => { return 'success'; }
+                    },
                     {
                         type: 'button',
                         title: this.$t('global.operate'),