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 @@ + :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" :data="{updateSupport:upload.updateSupport,proId:this.proId}" drag>
将文件拖到此处,或点击上传
@@ -829,6 +829,7 @@ this.$refs.upload.clearFiles(); this.$alert("
" + response.msg + "
", "导入结果", { dangerouslyUseHTMLString: true }); this.getList(); + this.getListGt(); }, // 提交上传文件 submitFileForm() {