From e20c00b978046bb77fc302aa0a49cda49f4f1345 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 26 六月 2024 18:03:54 +0800
Subject: [PATCH] 完善计算

---
 src/components/view/a6-device-management.vue |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index dfe4981..974a79f 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -455,7 +455,7 @@
 						largeCategory: null,
 						orderBy: {
 							field: 'id',
-							order: 'desc'
+							order: 'asc'
 						}
 					},
 					isIndex: true,
@@ -477,6 +477,7 @@
 						type: 'text',
 						method: 'handleConfig'
 					}],
+          headNoShow:['enDeviceName'],
 					tagField: {
 						deviceStatus: {
 							select: []
@@ -578,6 +579,7 @@
 				let up = false
 				let del = false
 				let add = false
+        let config = false
 				for (var i = 0; i < power.length; i++) {
 					if (power[i].menuMethod == 'upDeviceParameter') {
 						up = true
@@ -588,6 +590,12 @@
 					if (power[i].menuMethod == 'addDeviceParameter') {
 						add = true
 					}
+          if (power[i].menuMethod == 'numberCollect') {
+						config = true
+					}
+				}
+        if (!config) {
+					this.componentData.do.splice(2, 1)
 				}
 				if (!up) {
 					this.componentData.do.splice(1, 1)
@@ -709,9 +717,11 @@
 					this.formData.imageName = response.data.name;
 				}
 			},
-			handleSuccessUpImg2(response, ) {
+			handleSuccessUpImg2(response) {
 				if (response.code == 200) {
 					this.$nextTick(() => {
+            this.formData.imageUpload = response.data.url;
+            this.formData.imageName = response.data.name;
 						this.formData2.imageUpload = response.data.url;
 						this.formData2.imageName = response.data.name;
 					})

--
Gitblit v1.9.3