diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue index 6989733a..3ed6b84d 100644 --- a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue +++ b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue @@ -116,7 +116,7 @@ export default { }, selectObj(val) { this.form.bindObjectId = val[val.length - 1]; - this.form.bindObjectType = val.length - 1; + this.form.bindObjectType = val.length; }, submitForm() { this.$refs['form'].validate((valid) => { @@ -152,4 +152,4 @@ export default { }, }, }; - \ No newline at end of file + diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue index 7ed3e7ee..ff28ca3e 100644 --- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue +++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue @@ -216,10 +216,10 @@ export default { getEnergyLimit(id).then((res) => { if (res.code === 0) { this.form = res.data; - this.form.plcParamId = res.data.plcParamId || ''; this.form.tableName = this.form.tableName ? this.form.tableName + '' : ''; + this.form.plcParamId = res.data.plcParamId || ''; this.form.method = this.form.method ? this.form.method + '' : ''; this.form.limitType = this.form.limitType ? this.form.limitType + '' @@ -231,6 +231,9 @@ export default { if (this.form.type === 2) { this.getDetailList(); } + if (this.form.energyTypeId) { + this.getTableNameList(this.form.energyTypeId); + } } }); } else { diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue index d4fad27a..4ccbc1aa 100644 --- a/src/views/order/base/orderGroup/index.vue +++ b/src/views/order/base/orderGroup/index.vue @@ -280,7 +280,7 @@ export default { }, } : undefined, - this.$auth.hasPermi('base:order-group:update') + this.$auth.hasPermi('base:order-group:query') ? { type: 'detail', btnName: '详情', @@ -483,4 +483,4 @@ export default { }, }, }; - \ No newline at end of file +