From 475ec35ec5cb92e6e6f12a6f52d50232ed783e4c Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 12 Apr 2024 16:59:34 +0800
Subject: [PATCH] 1

---
 .../base/energyPlcConnect/components/energyPlcConnectAdd.vue | 4 ++--
 .../monitoring/energyLimit/components/energyLimitAdd.vue     | 5 ++++-
 src/views/order/base/orderGroup/index.vue                    | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

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 {
 		},
 	},
 };
-</script>
\ No newline at end of file
+</script>
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 {
 		},
 	},
 };
-</script>
\ No newline at end of file
+</script>
-- 
2.24.3