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

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

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-03-03 18:47:44 +08:00
commit 78c3af254f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
View File

@ -133,13 +133,13 @@ export default {
}, },
commit() { commit() {
const operate = { const operate = {
send: true, over: true,
type: MapDeviceType.Signal.type, operation: OperationEvent.Signal.detail.menu.operation,
operation: OperationEvent.Signal.detail.menu.operation cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
}; };
this.loading = true; this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false; this.loading = false;
if (valid) { if (valid) {
this.doClose(); this.doClose();
@ -156,7 +156,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation operation: OperationEvent.Command.cancel.menu.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.doClose(); this.doClose();
} }

1
src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue
View File

@ -27,7 +27,6 @@
<span class="base-label" style="left: 2px;">确认</span> <span class="base-label" style="left: 2px;">确认</span>
<div style="overflow: hidden;"> <div style="overflow: hidden;">
<div>操作设备</div> <div>操作设备</div>
{{disabledConfirm2}}
<el-col :span="11"> <el-col :span="11">
<el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange"> <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
<el-option v-for="option in signalList" :key="option.code" :label="option.name" :value="option.name" /> <el-option v-for="option in signalList" :key="option.code" :label="option.name" :value="option.name" />