From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/views/equipmentManagement/equipmentDetail/components/UnbindBox.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/equipmentManagement/equipmentDetail/components/UnbindBox.vue b/src/views/equipmentManagement/equipmentDetail/components/UnbindBox.vue
index ea90873..2a2f7cc 100644
--- a/src/views/equipmentManagement/equipmentDetail/components/UnbindBox.vue
+++ b/src/views/equipmentManagement/equipmentDetail/components/UnbindBox.vue
@@ -33,9 +33,10 @@
let res = {};
try {
res = await unbind({
- ids: [this.id],
+ id: this.id,
password: this.password,
username: JSON.parse(sessionStorage.getItem("userInfo")).username,
+ userId: JSON.parse(sessionStorage.getItem("userInfo")).id,
});
} catch (err) {
this.$notify({
@@ -52,7 +53,7 @@
duration: 2500,
offset: 57,
});
- this.$emit("close");
+ this.$emit("reflash");
} else {
this.$notify({
type: "error",
@@ -117,7 +118,7 @@
.btns {
display: flex;
- justify-content: end;
+ justify-content: flex-end;
text-align: center;
line-height: 40px;
--
Gitblit v1.8.0