diff --git a/src/App.vue b/src/App.vue index 37e4c4697..5fe6d98af 100644 --- a/src/App.vue +++ b/src/App.vue @@ -47,7 +47,7 @@ export default { created() { const project = getSessionStorage('project'); if (project) { - document.querySelector("link[rel*='icon']").href = ProjectIcon[this.project]; + document.querySelector("link[rel*='icon']").href = loginInfo[project].linkIcon || ProjectIcon[project]; } }, mounted() { diff --git a/src/assets/icon/bottom_jyd.png b/src/assets/icon/bottom_jyd.png new file mode 100644 index 000000000..57932c78a Binary files /dev/null and b/src/assets/icon/bottom_jyd.png differ diff --git a/src/assets/icon/favicon_jyd.png b/src/assets/icon/favicon_jyd.png new file mode 100644 index 000000000..a468108d6 Binary files /dev/null and b/src/assets/icon/favicon_jyd.png differ diff --git a/src/assets/icon/link_jyd.png b/src/assets/icon/link_jyd.png new file mode 100644 index 000000000..3d56e6019 Binary files /dev/null and b/src/assets/icon/link_jyd.png differ diff --git a/src/i18n/langs/en/display.js b/src/i18n/langs/en/display.js index 9b1b5ccbf..aaf218f8a 100644 --- a/src/i18n/langs/en/display.js +++ b/src/i18n/langs/en/display.js @@ -50,6 +50,7 @@ export default { exitScript: 'Exit Script', drivingByPlan: 'Driving By Plan', exitPlan: 'Exit Plan', + initialize: 'initialize', back: 'Back', threeDimensionalView: 'Three-Dimensional View', threeDimensionalStation: 'Three-Dimensional Station', diff --git a/src/i18n/langs/en/joinTraining.js b/src/i18n/langs/en/joinTraining.js index 137a6da4c..3576f9804 100644 --- a/src/i18n/langs/en/joinTraining.js +++ b/src/i18n/langs/en/joinTraining.js @@ -15,6 +15,7 @@ export default { driverPerspective: 'Driver perspective', drivingByPlan: 'Driving by plan', exitPlan: 'Exit plan', + initialize: 'initialize', runGraphPreview: 'Run graph preview', runGraphLoading: 'Run graph loading', faultSetting: 'Fault setting', diff --git a/src/i18n/langs/zh/display.js b/src/i18n/langs/zh/display.js index 2e43ca30a..ce7c63035 100644 --- a/src/i18n/langs/zh/display.js +++ b/src/i18n/langs/zh/display.js @@ -50,6 +50,7 @@ export default { exitScript: '退出剧本', drivingByPlan: '按计划行车', exitPlan: '退出计划', + initialize: '初始化', back: '返回', threeDimensionalView: '三维视图', threeDimensionalStation: '三维车站', diff --git a/src/i18n/langs/zh/joinTraining.js b/src/i18n/langs/zh/joinTraining.js index dcd8e44c8..b9101d6fd 100644 --- a/src/i18n/langs/zh/joinTraining.js +++ b/src/i18n/langs/zh/joinTraining.js @@ -15,6 +15,7 @@ export default { driverPerspective: '司机视角', drivingByPlan: '按计划行车', exitPlan: '退出计划', + initialize: '初始化', runGraphPreview: '运行图预览', runGraphLoading: '运行图加载', faultSetting: '故障设置', diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js index 5429f4303..977322517 100644 --- a/src/jmapNew/config/skinCode/xian_01.js +++ b/src/jmapNew/config/skinCode/xian_01.js @@ -657,7 +657,7 @@ class SkinCode extends defaultStyle { trainHeadFillColor: '#EF0C08', // 列车车头矩形填充颜色 directionStopType:'normal', // special 西安二号线 停车 列车方向图标不消失 normal 正常 trainHeadHeight: 'text', // 列车车头高度取决于trainBox高度 - trainHeadArrowWidth: 4, // 列车车头三角宽度 + trainHeadArrowWidth: 8, // 列车车头三角宽度 trainHeadArrowOffsetX: 2 // 列车车头三角偏移 }, common: { diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue index db0298ce5..00f07fa50 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue @@ -162,7 +162,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -182,7 +182,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -202,7 +202,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -222,7 +222,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -242,7 +242,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -262,7 +262,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -283,7 +283,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -304,7 +304,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -325,7 +325,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -341,7 +341,7 @@ export default { operation: OperationEvent.Command.cancel.menu.operation }; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.doClose(); } diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue index c4fe8cf20..0e99e8126 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue @@ -86,7 +86,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); if (valid) { @@ -104,7 +104,7 @@ export default { operation: OperationEvent.Command.cancel.menu.operation }; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); if (valid) { this.$emit('setOperate', { step: 0, success: false }); diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue index 258096dfb..cf1c92f0e 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue @@ -279,7 +279,7 @@ export default { this.setMessage(this.$t('tip.firstConfirmTip')); this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' }); - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); if (this.operation == OperationEvent.Signal.unlock.menu.operation) { @@ -299,7 +299,7 @@ export default { this.setMessage(this.$t('tip.firstConfirmTip')); this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' }); - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.setButtonEnable({ step: 1 }); @@ -325,7 +325,7 @@ export default { this.setMessage(this.$t('tip.secondConfirmTip')); this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' }); - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.timeCountCommand = -1; @@ -355,7 +355,7 @@ export default { } this.setMessage(''); this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' }); - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.timeCountCommand = -1; this.timeCountConfirm = -1; this.setButtonEnable({ step: -1 }); @@ -385,7 +385,7 @@ export default { } this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' }); - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.setButtonEnable({ step: 0 }); @@ -402,7 +402,7 @@ export default { operation: OperationEvent.Command.close.menu.operation }; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.doClose(); } diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue index 9b6715176..e1904156d 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue @@ -36,14 +36,14 @@ > @@ -83,7 +83,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'; import ConfirmControl from './childDialog/confirmControl'; import NoticeInfo from './childDialog/childDialog/noticeInfo'; -import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import {menuOperate, commitOperate} from '../utils/menuOperate'; export default { name: 'RouteHandControl', @@ -99,7 +99,9 @@ export default { operation: null, selection: [], stationName: '', - signalName: '' + signalName: '', + changeList: [], + commitDisabled: true }; }, computed: { @@ -132,24 +134,9 @@ export default { return this.$t('menu.menuSignal.atsAutoControl'); } return ''; - }, - commitDisabled() { - let disabled = true; - if (this.selection && this.selection.length) { - disabled = false; - } - - return disabled; } }, watch: { - // 深度数据状态 - tempData: { - handler(val, oldVal) { - this.checkTableDataSelction(val); - }, - deep: true - } }, mounted() { this.$nextTick(() => { @@ -161,7 +148,10 @@ export default { // 如果不是断点激活，而是第一次显示则初始化 if (!this.dialogShow) { this.signalName = ''; + this.changeList = []; + this.commitDisabled = true; this.stationName = ''; + this.selection = []; if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) { this.signalName = selected.name; const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode); @@ -172,15 +162,18 @@ export default { if (tempData && tempData.length > 0) { tempData.forEach(elem => { - elem.check = false; + // 设置禁用状态 + this.changeList.push(false); elem.disabled = false; // 设置禁用状态 - if (operate.operation === OperationEvent.Signal.humanControl.menu.operation && - elem.controlType != '01') { + if (operate.operation == OperationEvent.Signal.humanControl.menu.operation && + (elem.atsControl == 0)) { elem.disabled = true; - } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation && - elem.controlType == '01') { + this.disabledLength++; + } if (operate.operation == OperationEvent.Signal.atsAutoControl.menu.operation && + (elem.atsControl != 0)) { elem.disabled = true; + this.disabledLength++; } }); } @@ -199,29 +192,40 @@ export default { this.$refs.tempTable.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); }, - checkTableDataSelction(data) { - const selection = []; - if (data && data.length > 0) { - data.forEach(row => { - if (row.check && !row.disabled) { - selection.push(row); - } - }); + changeCheck(check, code) { + if (check) { + this.selection.push(code); + } else { + this.selection.splice(this.selection.indexOf(code), 1); + } + if (this.selection.length > 0) { + this.commitDisabled = false; + } else { + this.commitDisabled = true; } - if (JSON.stringify(selection) !== JSON.stringify(this.selection)) { - this.handleChooseChange(selection); - this.selection = selection; + const operate = {val:code}; + if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { + /** 进路交人工控*/ + operate.operation = OperationEvent.Signal.humanControl.choose.operation; + } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { + /** 进路交自动控*/ + operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation; } + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + }); + }, handleChooseChange(selection) { this.selection = selection; - const codeList = selection.map(elem => { return elem.code; }); - if (codeList && codeList.length) { + if (selection && selection.length) { const operate = { repeat: true, operation: '', - val: codeList.join('::') + selection: selection }; if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { @@ -232,7 +236,7 @@ export default { operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation; } - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } @@ -250,20 +254,10 @@ export default { this.atsAutoControl(); } }, - // 自排关 + // 进路交人工控 humanControl() { - const codeList = this.selection.map(elem => { return elem.code; }); - const operate = { - over: true, - operation: OperationEvent.Signal.humanControl.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, - param: { - Route_Code_List: codeList - } - }; - this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2).then(({valid})=>{ this.loading = false; if (valid) { this.doClose(); @@ -271,23 +265,13 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, - // 自排开 + // 进路交自动控 atsAutoControl() { - const codeList = this.selection.map(elem => { return elem.code; }); - const operate = { - over: true, - operation: OperationEvent.Signal.atsAutoControl.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, - param: { - Route_Code_List: codeList - } - }; - this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2).then(({valid})=>{ this.loading = false; if (valid) { this.doClose(); @@ -295,7 +279,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { @@ -303,7 +287,7 @@ export default { operation: OperationEvent.Command.cancel.menu.operation }; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.doClose(); } diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue index eaa3d6027..27dbcb368 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue @@ -109,9 +109,10 @@ export default { } } - /** status 04:封锁*/ - const signal = (selected || {}).status; - this.tempData = [{ code: selected.code, name: selected.name, status: signal.status != '04' ? this.$t('menu.unblocked') : this.$t('menu.blocked') }]; + this.tempData = [{ + code: selected.code, + name: selected.name, + status: selected.blockade ? this.$t('menu.unblocked') : this.$t('menu.blocked') }]; const timer = setInterval(() => { if (this.$refs.table) { this.$refs.table.setCurrentRow(this.tempData[0]); @@ -138,7 +139,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); @@ -154,7 +155,7 @@ export default { operation: OperationEvent.Command.cancel.menu.operation }; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.doClose(); } diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue index f205504b2..c9c74bd1b 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue @@ -271,7 +271,7 @@ export default { operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation; } - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } diff --git a/src/layout/components/Title.vue b/src/layout/components/Title.vue index 96a65c072..8dba4fd3b 100644 --- a/src/layout/components/Title.vue +++ b/src/layout/components/Title.vue @@ -1,7 +1,7 @@