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

subType调整

Browse Source
This commit is contained in:
fan 2022-12-14 13:25:43 +08:00
parent 7e2ce3c8b0
commit 294e9d61fe
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -63,7 +63,7 @@
</el-table>
</div>
<div v-if="speedShow" class="nav-border-bottom">
<div style="height: 56px;width: 100%;background: #fff;overflow-y: scroll;text-align: left;">
<div :id="operationEvent.Section.setSpeed.choose" style="height: 56px;width: 100%;background: #fff;overflow-y: scroll;text-align: left;">
<div class="speed-value-box" :style="{background: speedLimitValue===15? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(15)">15</div>
<div class="speed-value-box" :style="{background: speedLimitValue===25? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(25)">25</div>
<div class="speed-value-box" :style="{background: speedLimitValue===45? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(45)">45</div>
@ -184,6 +184,7 @@ export default {
data() {
return {
tempData: [],
operationEvent: OperationEvent,
speedLimitValue: 15,
oldDevice: null, // 上一次点击元素
canCommand: true,

3
src/scripts/cmdPlugin/newValidateHandler.js
View File

@ -37,7 +37,7 @@ class ValidateHandler {
if (operate.code || stepOperation.deviceCode) {
valid = (operate.code === stepOperation.deviceCode) && valid;
}
if (operate.subType || stepOperation.subType) {
if (stepOperation.subType) {
valid = (operate.subType === stepOperation.subType) && valid;
}
if (operate.operation || stepOperation.domId) {
@ -59,6 +59,7 @@ class ValidateHandler {
store.dispatch('trainingNew/operateOrderIncrease');
Handler.judgeIsTextSendOperation();
} else {
console.log(operate, stepOperation, '----------');
console.error('校验失败；');
}
return valid;

5
src/views/newMap/display/trainingDesign/editOperate.vue
View File

@ -53,12 +53,15 @@ export default {
const data = {
id: Date.now(),
deviceCode: val.code || '',
subType: val.subType || '',
subType: '',
userOperationType: val.userOperationType || '',
domId: val.operation || '',
operationType: val.cmdType ? val.cmdType.value : '',
params: val.param || {}
};
if (['trainSetButton'].includes(val.subType)) {
data.subType = val.subType;
}
this.stepDetail.operations.push(data);
}
},