diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index 92ce192ec..2cc288844 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -440,4 +440,7 @@ export default class SignalButton extends Group { } } getAnchorPoint() {} + getShapeTipPoint() { + return this.computedPosition; + } } diff --git a/src/store/modules/trainingNew.js b/src/store/modules/trainingNew.js index 0767dc409..83cf30a1c 100644 --- a/src/store/modules/trainingNew.js +++ b/src/store/modules/trainingNew.js @@ -130,7 +130,7 @@ const training = { flag = (trainingOperate.userOperationType === stepOperation.userOperationType) && flag; } for (const param in stepOperation.params) { - flag = (trainingOperate.params[param] === stepOperation.params[param]) && flag; + flag = (trainingOperate.param[param] === stepOperation.params[param]) && flag; } if (flag && step.operations.length === (operateIndex + 1 )) { commit('stepOverCountChange'); @@ -139,7 +139,11 @@ const training = { commit('operateOrderIncrease'); resolve(); } else { - console.error('校验失败;'); + const stepList = JSON.parse(state.trainingDetail.stepJson); + const step = stepList.find(item => item.id == state.stepOrder ); + const operateIndex = step.operations.findIndex(item => item.id == state.operateOrder); + const stepOperation = step.operations[operateIndex]; + console.error('校验失败;', trainingOperate, stepOperation); reject('校验失败'); } }); diff --git a/src/views/designPlatform/trainingPositionTip.vue b/src/views/designPlatform/trainingPositionTip.vue index fe9ab49d5..1428085de 100644 --- a/src/views/designPlatform/trainingPositionTip.vue +++ b/src/views/designPlatform/trainingPositionTip.vue @@ -60,6 +60,7 @@ export default { const trainingDetail = this.$store.state.trainingNew.trainingDetail; const stepOrder = this.$store.state.trainingNew.stepOrder; const steps = JSON.parse(trainingDetail.stepJson); + console.log(stepOrder, '-----------'); if (steps && steps.length) { const step = steps[stepOrder - 1]; const distance = 5;