diff --git a/src/views/storeManage/warehouse3DConfig/index.vue b/src/views/storeManage/warehouse3DConfig/index.vue index 1713d47..3225d84 100644 --- a/src/views/storeManage/warehouse3DConfig/index.vue +++ b/src/views/storeManage/warehouse3DConfig/index.vue @@ -25,8 +25,8 @@ @@ -58,9 +58,9 @@ - - - + + + {{ item.label }} - {{ item.info }} @@ -158,6 +158,11 @@ export default { if (!isCAM && this.form.deviceInfo.id) { this.getParamsOptionsList() } + if (this.form.deviceSpecParams && this.form.deviceSpecParams.length > 0) { + const deviceSpecParams = this.form.deviceSpecParams.map((item) => { return item.id }) + this.$set(this.form, 'deviceSpecParams', deviceSpecParams) + // this.form.deviceSpecParams.splice(0, this.form.deviceSpecParams.length, ...deviceSpecParams) + } this.dialogVisible = true } else { this.$message({ @@ -172,17 +177,16 @@ export default { }, handleConfirm() { this.form.deviceInfo = this.devOptions.find((option) => { return option.value === this.form.deviceInfo.id }).self - if (Array.isArray(this.form.displayParams)) { - const paramValues = this.paramsOptions.filter((option) => { return this.form.displayParams.includes(option.value) }) - this.form.displayParams = paramValues.map((paramValue) => { return { paramName: paramValue.self.paramName, paramValue: paramValue.self.paramId, unit: paramValue.self.unit } }) - } else if (this.form.displayParams !== null) { - const paramValue = this.paramsOptions.find((option) => { return option.value === this.form.displayParams }) + if (Array.isArray(this.form.deviceSpecParams)) { + const paramValues = this.paramsOptions.filter((option) => { return this.form.deviceSpecParams.includes(option.value) }) + this.form.deviceSpecParams = paramValues.map((paramValue) => { return paramValue.self }) + } else if (this.form.deviceSpecParams !== null) { + const paramValue = this.paramsOptions.find((option) => { return option.value === this.form.deviceSpecParams }) if (paramValue) { - this.form.displayParams = [] - this.form.displayParams.push({ paramName: paramValue.self.paramName, paramValue: paramValue.self.paramId, unit: paramValue.self.paramId }) + this.form.deviceSpecParams = [] + this.form.deviceSpecParams.push(paramValue.self) } } - this.form.id = null displayConfigApi.bind(this.form).then(() => { this.$message.success('绑定成功 ') this.dialogVisible = false