From 0c9e6566ac342748632e146fbe78872267c53bb8 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 25 十一月 2022 15:24:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/images/index.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index 408e124..75f17e9 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -43,12 +43,12 @@
<el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="8">
- <template slot-scope="scope">
+ <template v-if="scope.row.category" slot-scope="scope">
<span>{{ getCategory(scope.row.category).label }}</span>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="浜嬩欢鏉ユ簮" min-width="8">
- <template slot-scope="scope">
+ <template v-if="scope.row.eventSource" slot-scope="scope">
<span>{{ getEventSource(scope.row.eventSource).label }}</span>
</template>
</el-table-column>
@@ -77,7 +77,7 @@
width="40%"
:title="getDialogTitle"
>
- <updateUser @closeDialog="closeDialog" :dialogType="dialogType" :originalData="originalData" />
+ <updateUser v-if="isShowUploadDialog" @closeDialog="closeDialog" :dialogType="dialogType" :originalData="originalData" />
</el-dialog>
<div class="tools">
<div class="funs">
@@ -261,7 +261,7 @@
dateParams.startTime = dateParams[0];
dateParams.endTime = dateParams[1]
}
- imageManagement.getImageResources({ current: this.currentPage, size: this.size, type: this.type, ...dateParams })
+ imageManagement.getImageResources({ current: this.currentPage, size: this.pageSize, type: this.type, ...dateParams })
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
@@ -298,6 +298,7 @@
closeDialog() {
this.isShowUploadDialog = false;
+ this.getImageResourceList();
},
getCategory(value) {
--
Gitblit v1.8.0