From a52c2d21263070c0bb66211f8f47ca60ad88dc47 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 1 Jun 2021 14:22:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=8E=A5?= =?UTF-8?q?=E8=BF=91=E5=8C=BA=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/ningbo_01.js | 13 +++++++------ src/jmapNew/shape/graph/Signal/index.js | 8 +++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index bf6046322..48bee6fef 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -137,8 +137,9 @@ class SkinCode extends defaultStyle { standardLength: 6, // 高柱长度 standardHeight: 6, // 灯柱高度 standardColor: '#C0C0C0', // 灯柱颜色 - standardVerticalWidth: 2, // 灯柱竖杆宽度 - standardRailWidth: 2 // 灯柱横杆宽度 + standardVerticalWidth: 2, // 灯柱竖杆宽度 + standardRailWidth: 2, // 灯柱横杆宽度 + approachLockColor: '#FFFF00' // 接近锁闭灯柱颜色 }, text: { show: true, // 信号机名称显示 @@ -256,7 +257,7 @@ class SkinCode extends defaultStyle { yellowColor: 'yellow', // 控制模式黄色 stroke: '#FFFFFF', // 框的颜色 fill: 'rgba(0,0,0,0)', // 填充色 - textColorNoChange: true + textColorNoChange: true }, emergencyControl: { // 紧急站控 show: true, @@ -353,8 +354,8 @@ class SkinCode extends defaultStyle { borderBackgroundColor: '#22DFDF', // 边框背景色 borderColor: '#fff', // 边框颜色 textShadowColor: '#22DFDF', // 字体阴影颜色 - coreBackgroundColor: '#00BFFF', // 岔芯颜色 浅蓝色 - coreBackgroundColorOver: '#001AFC', // 岔芯颜色 深蓝色 + coreBackgroundColor: '#00BFFF', // 岔芯颜色 浅蓝色 + coreBackgroundColorOver: '#001AFC' // 岔芯颜色 深蓝色 } }; @@ -858,7 +859,7 @@ class SkinCode extends defaultStyle { }; this[deviceType.FloodGate] = {}; this[deviceType.DirectionRod] = {}; - this[deviceType.IndicatorLight] = {}; + this[deviceType.IndicatorLight] = {}; } } diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index df26d1d61..7f3bcdfc0 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/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) { From 6b90da452b1ea15bc3a7673a05d30d235611a5e5 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 1 Jun 2021 14:57:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=9B=BE=E5=8A=A0=E8=BD=BD=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ConstConfig.js | 5 +++++ src/views/publish/runPlanCommon/draft.vue | 16 ++++++++++++++-- src/views/publish/runPlanCommon/index.vue | 8 ++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 28968b8c1..6ea082b2c 100644 --- a/src/scripts/ConstConfig.js +++ b/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' } ] } }; diff --git a/src/views/publish/runPlanCommon/draft.vue b/src/views/publish/runPlanCommon/draft.vue index 845e700ef..4fe1a25e3 100644 --- a/src/views/publish/runPlanCommon/draft.vue +++ b/src/views/publish/runPlanCommon/draft.vue @@ -22,6 +22,11 @@ + + + + + @@ -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() { diff --git a/src/views/publish/runPlanCommon/index.vue b/src/views/publish/runPlanCommon/index.vue index dc0a651f6..0daba7ba9 100644 --- a/src/views/publish/runPlanCommon/index.vue +++ b/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'), From 35db44cd422ae502830aa954e6e133cb59c0d1b3 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 1 Jun 2021 15:36:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=A9=BE=E9=A9=B6=E8=87=B3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menus/dialog/setFault.vue | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index 184f4dc93..63d450a50 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -17,7 +17,7 @@ - + - 激活 + + + + + @@ -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 = []; - if (this.sectionList && this.sectionList.length) { - sectionList = this.sectionList.filter(elem => { return (elem.standTrack || elem.reentryTrack || elem.transferTrack); }); - } - list = [...sectionList, ...this.trainList]; + // let sectionList = []; + // if (this.sectionList && this.sectionList.length) { + // sectionList = this.sectionList.filter(elem => { return (elem.standTrack || elem.reentryTrack || elem.transferTrack); }); + // } + 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) { - this.field = field == this.field ? '' : field; - }, + // hover(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 = ''; } } }