joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

成都三调整

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-02-11 17:29:25 +08:00
parent 977fe574eb
commit e7a9c09e50
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
View File

@ -7,6 +7,7 @@
:before-close="doClose"
:z-index="2000"
:modal="false"
title="密码校验"
:close-on-click-modal="false"
append-to-body
>
@ -84,7 +85,7 @@ export default {
data() {
return {
/* 写死的初始密码*/
correctPassword: '123456',
correctPassword: '123',
dialogShow: false,
operation: null,
checkHasInput: false,

11
src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
View File

@ -4,7 +4,7 @@
class="chengdou-03__systerm route-setting"
:title="title"
:visible.sync="show"
width="460px"
width="500px"
:before-close="doClose"
:z-index="2000"
:modal="false"
@ -33,9 +33,9 @@
highlight-current-row
@row-click="clickEvent"
>
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;width: 80px">
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;">
<template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}" style="width: 90px">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}" style="width: 120px">
{{ handleRouteName(scope.row.name) }}
</div>
</template>
@ -264,9 +264,7 @@ export default {
commit() {
if (this.row && this.row.canSetting) {
const operate = {
over: true,
operation: OperationEvent.Signal.arrangementRoute.menu.operation,
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
val: this.row.code,
param: {
routeCode: this.row.code
@ -277,7 +275,8 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
// this.$refs.passwordBox.doShow(operate);
operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
this.$refs.passwordBox.doShow(operate);
this.doClose();
}
}).catch(() => {

16
src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
View File

@ -7,6 +7,7 @@
<route-guide ref="routeGuide" />
<route-hand-control ref="routeHandControl" />
<notice-info ref="noticeInfo" />
<password-box ref="passwordBox" @checkOver="passWordCommit" />
</div>
</template>
@ -23,6 +24,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import PasswordBox from './dialog/childDialog/passwordInputBox';
export default {
name: 'SignalMenu',
@ -33,7 +35,8 @@ export default {
RouteHandControl,
RouteDetail,
RouteGuide,
NoticeInfo
NoticeInfo,
PasswordBox
},
props: {
selected: {
@ -311,7 +314,7 @@ export default {
routes.push(elem);
}
});
this.$refs.routeGuide.doShow(step.operation, this.selected, routes);
this.$refs.passwordBox.doShow({operation: step.operation, selected: this.selected, routesList: routes});
}
});
},
@ -345,7 +348,8 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (valid) {
this.$refs.routeControl.doShow(step, this.selected);
this.$refs.passwordBox.doShow({operation: step.operation, selected: this.selected});
// this.$refs.routeControl.doShow(step, this.selected);
}
});
},
@ -463,6 +467,12 @@ export default {
}
});
}
},
passWordCommit(data) {
console.log(data, '============');
if (data.operation === OperationEvent.Signal.guide.menu.operation) {
this.$refs.routeGuide.doShow(data.operation, data.selected, data.routesList);
}
}
};
</script>