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

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-12-29 11:31:52 +08:00
commit 058838c39f
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
View File

@ -2,7 +2,7 @@
<div class="chengdou-01__system request_box">
<div :id="domIdRequestBar" class="title-box">
<div class="title-name">操作请求堆栈</div>
<div class="icon" :class="{'is-active': unfold}" @click="unflodDiv">
<div :id="unfold ? domIdConfirm : ''" class="icon" :class="{'is-active': unfold}" @click="unflodDiv">
<i class="el-icon-arrow-down" />
</div>
</div>
@ -21,7 +21,7 @@
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="8" class="button-bottom-left">
<el-button :id="domIdConfirm" size="mini" style="float: left;" :loading="loading" :disabled="commitDisabled" @click="commit">发送请求</el-button>
<el-button :id="unfold ? '' : domIdConfirm" size="mini" style="float: left;" :loading="loading" :disabled="commitDisabled" @click="commit">发送请求</el-button>
</el-col>
<el-col :span="8" :offset="8" class="button-bottom-right">
<el-button :id="domIdCancel" size="mini" style="float: right;" @click="cancel">取消请求</el-button>
@ -90,10 +90,9 @@ export default {
methods: {
unflodDiv() {
this.unfold = !this.unfold;
const operate = {
operation: OperationEvent.Command.commandChengDu1.requestBar.operation
};
this.$store.dispatch('trainingNew/next', operate);
setTimeout(() => {
this.$store.dispatch('training/emitTipFresh');
}, 300);
},
clickEvent(row, event, column) {
this.row = row;

24
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -215,9 +215,27 @@ export default {
watch: {
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
this.doShow(this.$store.state.menuOperation.menuPosition);
const operate = {
code: `${this.selected.code}`,
userOperationType: 'rightClick',
operation: OperationEvent.Command.commandRight.right.operation
};
this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
if (valid) {
this.doShow(this.$store.state.menuOperation.menuPosition);
}
});
} else if (this.selected && this.selected._type === 'Signal' && this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Enabled) && !this.buttonOperation) {
this.doEnabledShow(this.$store.state.menuOperation.menuPosition);
const operate = {
code: `${this.selected.code}`,
userOperationType: 'rightClick',
operation: OperationEvent.Command.commandRight.right.operation
};
this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
if (valid) {
this.doEnabledShow(this.$store.state.menuOperation.menuPosition);
}
});
} else {
this.doClose();
}
@ -346,8 +364,6 @@ export default {
param: step.param
});
}
} else {
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.$refs.noticeInfo.doShow();