From 2925d0cae10aa2ca40747ee8636f44584995cc7f Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期一, 28 十一月 2022 16:45:21 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/images/index.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index 1e36b97..b6ef844 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -40,15 +40,15 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
+ <el-table-column prop="code" 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>
@@ -72,10 +72,12 @@
</el-table>
<el-dialog
:visible.sync="isShowUploadDialog"
+ :destroy-on-close="true"
+ :key="dialogType"
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">
@@ -259,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.size, ...dateParams })
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
@@ -296,6 +298,7 @@
closeDialog() {
this.isShowUploadDialog = false;
+ this.getImageResourceList();
},
getCategory(value) {
@@ -388,8 +391,9 @@
margin-bottom: 10px;
.type-item {
- width: 80px;
+ min-width: 80px;
text-align: center;
+ padding-right: 10px;
&:hover {
cursor: pointer;
--
Gitblit v1.8.0