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:
dong 2022-09-21 14:08:51 +08:00
parent d3a06586ba
commit 119d2b3c60
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -494,6 +494,7 @@ export default {
// 清除按钮 // 清除按钮
const operate = { const operate = {
start: true, start: true,
userOperationType: 'leftClick',
operation: operation operation: operation
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {

5
src/scripts/cmdPlugin/ValidateHandler.js
View File

@ -66,8 +66,9 @@ class ValidateHandler {
if (operate.userOperationType || stepOperation.userOperationType) { if (operate.userOperationType || stepOperation.userOperationType) {
valid = (operate.userOperationType === stepOperation.userOperationType) && valid; valid = (operate.userOperationType === stepOperation.userOperationType) && valid;
} }
if (operate.param || stepOperation.params) { const opParam = operate.param == undefined ? {} : operate.param;
valid = objectIsEqual(operate.param, stepOperation.params) && valid; if (opParam || stepOperation.params) {
valid = objectIsEqual(opParam, stepOperation.params) && valid;
} }
Handler.handleCheckNewTrainingResult(valid); Handler.handleCheckNewTrainingResult(valid);
return valid; return valid;

6
src/views/trainingManage/editOperate.vue
View File

@ -16,8 +16,8 @@
<!--<div v-for="item in stepDetail.operations" :key="item"> <!--<div v-for="item in stepDetail.operations" :key="item">
<div>{{ item }}</div> <div>{{ item }}</div>
</div>--> </div>-->
<template v-for="(item, index) in stepDetail.operations"> <template>
<div :key="index"> <div v-for="(item, index) in stepDetail.operations" :key="index">
<el-tag :type="tagIndex === index? 'success':''" closable @close="deleteOperation(index)" @click="changeTagIndex(index)"> <el-tag :type="tagIndex === index? 'success':''" closable @close="deleteOperation(index)" @click="changeTagIndex(index)">
{{ covertString(item) }} {{ covertString(item) }}
</el-tag> </el-tag>
@ -60,7 +60,7 @@ export default {
userOperationType: val.userOperationType || '', userOperationType: val.userOperationType || '',
domId: val.operation || '', domId: val.operation || '',
operationType: val.cmdType ? val.cmdType.value : '', operationType: val.cmdType ? val.cmdType.value : '',
params: val.params || {}, params: val.param || {},
t: 'C' t: 'C'
}; };
this.stepDetail.operations.push(data); this.stepDetail.operations.push(data);