From a4ebf22baba3dc37e9d308928a4ff707339f2b3c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 9 Jan 2020 17:48:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=80=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chengdu_01/menus/dialog/platformDwell.vue | 6 +- .../menus/dialog/speedLimitControl.vue | 16 +- .../chengdu_01/menus/menuDialog/playBack.vue | 120 +++++++++++++++ .../menus/menuDialog/systemLogin.vue | 54 +++++-- .../menus/menuDialog/systemLogout.vue | 82 ++++++++++ .../theme/chengdu_01/menus/menuSection.vue | 93 ++++------- .../theme/chengdu_01/menus/menuSignal.vue | 135 ++++------------ .../chengdu_01/menus/menuStationStand.vue | 145 +----------------- .../theme/chengdu_01/menus/menuSwitch.vue | 106 +++---------- src/store/modules/menuoperation.js | 16 +- 10 files changed, 365 insertions(+), 408 deletions(-) create mode 100644 src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue create mode 100644 src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue index ee2ebfdbb..f86772a27 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue @@ -128,14 +128,18 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); }, - doShow() { + doShow(step, selected) { this.dialogShow = true; + this.selected = selected; }, cancel() { this.doClose(); }, commit() { this.$refs['form'].validate((valid) => { + if (valid) { + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.StationStand.setStopTime.menu.operation}); + } // if (valid) { // const operate = { // send: true, diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue index e28caf70e..0e04bdc45 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue @@ -155,7 +155,8 @@ export default { {key: 'ATP', label: 'ATP'}, {key: 'iATO', label: 'iATO'}, {key: 'NRM', label: 'NRM'} - ] + ], + selected: null }; }, computed: { @@ -185,10 +186,10 @@ export default { }); }, methods: { - doShow(operate) { - this.operate = operate || {}; + doShow(step, selected) { + // this.operate = operate || {}; // this.operation = operate.operation; - + this.selected = selected; // 非断电激活时设置初始值 if (!this.dialogShow) { this.loading = false; @@ -205,12 +206,17 @@ export default { this.$store.dispatch('training/emitTipFresh'); }, commit() { + this.$refs['form'].validate((valid) => { + if (valid) { + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, Operation: OperationEvent.Section.setSpeed.menu.operation}); + } + }); // this.$refs['form'].validate((valid) => { // if (valid) { // const operate = { // send: true, // - // operation: OperationEvent.Command.planTrain.addPlanTrain.operation + // operation: OperationEvent.Section.setSpeed.menu.operation // }; // // this.loading = true; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue new file mode 100644 index 000000000..a7770a187 --- /dev/null +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue index 22b78db65..ce8040782 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue @@ -4,7 +4,7 @@ class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" - width="500px" + width="400px" :before-close="doClose" :z-index="2000" :modal="false" @@ -12,22 +12,22 @@ > - +
用户名
 - +
密码
 - + - + - + @@ -37,18 +37,25 @@ -
+
+ +
+ {{ item.label }}
+
+ +
- +
+ - + - + 确定 取消 帮助 @@ -69,7 +76,20 @@ export default { note: '' }, rules: {}, - dialogShow: false + dialogShow: false, + roleList: [ + { label: '调度1', value:'dispatcher1'}, + { label: '调度2', value:'dispatcher2'}, + { label: '调度3', value:'dispatcher3'}, + { label: '调度4', value:'dispatcher4'}, + { label: '调度5', value:'dispatcher5'}, + { label: '调度6', value:'dispatcher6'}, + { label: '调度7', value:'dispatcher7'}, + { label: '调度8', value:'dispatcher8'}, + { label: '调度9', value:'dispatcher9'}, + { label: '调度10', value:'dispatcher10'}, + { label: '调度11', value:'dispatcher11'} + ] }; }, computed: { @@ -95,11 +115,21 @@ export default { commit() { this.$refs['form'].validate((valid) => { }); + }, + clickEvent(val) { + console.log(val, '--------', this.addModel.role, '========', document.getElementById(val)); + this.addModel.role && document.getElementById(this.addModel.role).setAttribute('style', 'background: #5F9EA0;color: #000; width:100%'); + this.addModel.role = val; + document.getElementById(val).setAttribute('style', 'background: #000;color: #5F9EA0; width:100%'); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue new file mode 100644 index 000000000..e76ff97da --- /dev/null +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index 572278961..74bf1069a 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -45,22 +45,16 @@ export default { menu: [], menuNormal: { Local: [ - // { - // label: '区故解', - // handler: this.fault, - // disabledCallback: MenuDisabledState.Section.fault, - // auth: { station: true, center: false } - // } ], Center: [ { label: '轨道封锁', - handler: '', + handler: this.lock, cmdType: CMD.Section.CMD_SECTION_UNBLOCK }, { label: '轨道封锁解除', - handler: '', + handler: this.unlock, cmdType: CMD.Section.CMD_SECTION_BLOCK }, { @@ -68,24 +62,6 @@ export default { handler: this.setSpeed, cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED } - // { - // label: '区故解', - // handler: this.fault, - // auth: { station: true, center: false }, - // cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK - // }, - // { - // label: '设置临时限速', - // handler: this.setSpeed, - // auth: { station: false, center: true }, - // cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED - // }, - // { - // label: '属性', - // handler: this.detail, - // auth: { station: false, center: true }, - // cmdType:'' - // } ] }, menuForce: [ @@ -174,40 +150,7 @@ export default { this.$refs.noticeInfo.doShow(step); }); }, - // 故障解锁 - fault() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.fault.menu.operation, - param: { - Section_Code: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.sectionControl.doShow(step, this.selected); - } - }); - }, - detail() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.detail.menu.operation, - param: { - Section_Code: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.sectionDetail.doShow(step, this.selected); - } - }); - }, // 设置故障 setStoppage() { const step = { @@ -267,6 +210,38 @@ export default { } }); }, + lock() { + const step = { + start: true, + code: `${this.selected.code}`, + operation: OperationEvent.Section.lock.menu.operation, + param: { + Section_Code: `${this.selected.code}` + } + }; + this.$store.dispatch('training/nextNew', step).then(({valid}) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.Section.lock.menu.operation}); + } + }); + }, + unlock() { + const step = { + start: true, + code: `${this.selected.code}`, + operation: OperationEvent.Section.unlock.menu.operation, + param: { + Section_Code: `${this.selected.code}` + } + }; + this.$store.dispatch('training/nextNew', step).then(({valid}) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.Section.unlock.menu.operation}); + } + }); + }, undeveloped() { this.doClose(); this.$alert('实现中......', '提示', { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 4e8382e87..46bb82141 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -1,11 +1,8 @@