From 7345595fdb083a70e8c708dce246af34b2d7f69f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 23 六月 2024 23:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a6-device-management.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 00e1073..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: []
@@ -716,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