#335 projects/mesxc-zjl

Merged
juzi merged 2 commits from projects/mesxc-zjl into projects/mesxc-test 5 months ago
  1. +1
    -1
      src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
  2. +4
    -1
      src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
  3. +1
    -1
      src/views/order/base/orderGroup/index.vue

+ 1
- 1
src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue View File

@@ -116,7 +116,7 @@ export default {
}, },
selectObj(val) { selectObj(val) {
this.form.bindObjectId = val[val.length - 1]; this.form.bindObjectId = val[val.length - 1];
this.form.bindObjectType = val.length - 1;
this.form.bindObjectType = val.length;
}, },
submitForm() { submitForm() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {


+ 4
- 1
src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue View File

@@ -216,10 +216,10 @@ export default {
getEnergyLimit(id).then((res) => { getEnergyLimit(id).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.form = res.data; this.form = res.data;
this.form.plcParamId = res.data.plcParamId || '';
this.form.tableName = this.form.tableName this.form.tableName = 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.method = this.form.method ? this.form.method + '' : '';
this.form.limitType = this.form.limitType this.form.limitType = this.form.limitType
? this.form.limitType + '' ? this.form.limitType + ''
@@ -231,6 +231,9 @@ export default {
if (this.form.type === 2) { if (this.form.type === 2) {
this.getDetailList(); this.getDetailList();
} }
if (this.form.energyTypeId) {
this.getTableNameList(this.form.energyTypeId);
}
} }
}); });
} else { } else {


+ 1
- 1
src/views/order/base/orderGroup/index.vue View File

@@ -280,7 +280,7 @@ export default {
}, },
} }
: undefined, : undefined,
this.$auth.hasPermi('base:order-group:update')
this.$auth.hasPermi('base:order-group:query')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情', btnName: '详情',


Loading…
Cancel
Save