From 933885f7b91dedf0f503874d9be5d8a754ea366e Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 15 Aug 2024 17:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AF=BC=E5=85=A5=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B1=9E=E6=80=A7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/bracelet.js             | 10 ++++++++++
 src/views/base/bracelet/index.vue    | 22 ++++++++++++----------
 src/views/base/device/index.vue      |  2 +-
 src/views/base/engineering/index.vue |  3 ++-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/api/base/bracelet.js b/src/api/base/bracelet.js
index 240cc9d..17e3148 100644
--- a/src/api/base/bracelet.js
+++ b/src/api/base/bracelet.js
@@ -174,6 +174,16 @@ export function delShboxById(data) {
     })
 }
 
+// 删除设备属性
+export function delDeviceAttribute(data) {
+    return request({
+        url: '/bracelet/bracelet/delDeviceAttribute',
+       method: 'post',
+       data: data
+    })
+}
+
+
 // 详情
 export function getBoxInfo(shboxId) {
     return request({
diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index b8a105f..6dfe2ca 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -1369,6 +1369,18 @@
             });
         },
 
+        /** 删除按钮操作 */
+        handleDeleteDeviceAttribute(row) {
+          const id = row.id;
+          console.log(id)
+          this.$modal.confirm('是否确认删除级联编码为"' + row.dataCode + '"的数据项？').then(function() {
+            return delDeviceAttribute({id:id});
+          }).then(() => {
+            this.getListDeviceAttribute();
+            this.$modal.msgSuccess("删除成功");
+          }).catch(() => {});
+        },
+
         /** 手环管理页面新增设备属性提交按钮 */
         submitFormAttribute() { 
             this.$refs["formThree"].validate(valid => {
@@ -1432,16 +1444,6 @@
           this.getListDeviceAttribute();
         },
 
-      /** 删除按钮操作 */
-        handleDeleteDeviceAttribute(row) {
-          const id = row.id ;
-          this.$modal.confirm('是否确认删除级联编码为"' + row.dataCode + '"的数据项？').then(function() {
-            return delDeviceAttribute(id);
-          }).then(() => {
-            this.getList();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
-        },
 
         /** 查询设备属性列表 */
         getListDeviceAttribute() {
diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue
index 4da88cb..0143c91 100644
--- a/src/views/base/device/index.vue
+++ b/src/views/base/device/index.vue
@@ -736,7 +736,7 @@
           this.$modal.confirm('是否确认删除级联编码为"' + row.dataCode + '"的数据项？').then(function() {
             return delDeviceAttribute({id:id});
           }).then(() => {
-            this.getList();
+            this.getListDeviceAttribute();
             this.$modal.msgSuccess("删除成功");
           }).catch(() => {});
         },
diff --git a/src/views/base/engineering/index.vue b/src/views/base/engineering/index.vue
index a66ab78..e7a4ac5 100644
--- a/src/views/base/engineering/index.vue
+++ b/src/views/base/engineering/index.vue
@@ -379,7 +379,7 @@
       <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
         <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
           :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-          :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+          :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" :data="{updateSupport:upload.updateSupport,proId:this.proId}" drag>
           <i class="el-icon-upload"></i>
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
           <div class="el-upload__tip text-center" slot="tip">
@@ -829,6 +829,7 @@
           this.$refs.upload.clearFiles();
           this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
           this.getList();
+          this.getListGt();
         },
         // 提交上传文件
         submitFileForm() {