From e1cd9b58eafba52b91e7492c4aa4f3f015b541ec Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 24 十一月 2022 11:26:45 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/systemSetting/device/bayonet/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index 1a69872..e9c4a90 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -30,8 +30,8 @@
</main>
<footer>
<!-- 娣诲姞鍗″彛 -->
- <el-dialog :destroy-on-close="true" :key="dialogType" :title="getDialogTitle" :visible.sync="isShowDialog" width="60%" :before-close="handleClose">
- <MyCreate @closeDialog="closeDialog" :originalBayonet="originalBayonet" :isEdit="isEdit"></MyCreate>
+ <el-dialog :destroy-on-close="true" :title="getDialogTitle" :visible.sync="isShowDialog" width="60%" :before-close="handleClose">
+ <MyCreate v-if="isShowDialog" @closeDialog="closeDialog" :originalBayonet="originalBayonet" :isEdit="isEdit"></MyCreate>
</el-dialog>
</footer>
</div>
@@ -118,8 +118,8 @@
methods: {
getBayonetListData() {
bayonet.getBayonetList({ bayonetName: '', current: this.current, size: this.size })
- .then(data => {
- this.list = data;
+ .then(({ records }) => {
+ this.list = records;
})
.catch(err => {
this.$message({ type: 'error', message: err });
--
Gitblit v1.8.0