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 | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index cb18b53..75f17e9 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -42,11 +42,17 @@
</el-table-column>
<el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
</el-table-column>
- <el-table-column prop="category" label="闂绫诲瀷" min-width="8">
+ <el-table-column prop="category" label="闂绫诲埆" min-width="8">
+ <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">
+ <el-table-column prop="eventSource" label="浜嬩欢鏉ユ簮" min-width="8">
+ <template v-if="scope.row.eventSource" slot-scope="scope">
+ <span>{{ getEventSource(scope.row.eventSource).label }}</span>
+ </template>
</el-table-column>
- <el-table-column prop="regionName" label="灏忕被鍚嶇О" min-width="8">
+ <el-table-column prop="regionName" label="绀惧尯鍚嶇О" min-width="8">
</el-table-column>
<el-table-column prop="id" label="鍥剧墖Id" min-width="8">
</el-table-column>
@@ -66,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">
@@ -100,6 +108,7 @@
<script>
import updateUser from "./updateUser";
import imageManagement from "@/api/operate/imageManagement";
+import { CATEGOTY, EVENT_SOURCE } from "@/utils/helper";
export default {
components: { updateUser },
@@ -121,7 +130,7 @@
},
data() {
- return {
+ return {
isShowUploadDialog:false,
dialogType: 'create',
originalData: null,
@@ -177,7 +186,7 @@
caseId: '',
caseCode: null,
dialogAdd: false,
- datePicked: null
+ datePicked: null,
}
},
created() {
@@ -252,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;
@@ -289,7 +298,16 @@
closeDialog() {
this.isShowUploadDialog = false;
- }
+ this.getImageResourceList();
+ },
+
+ getCategory(value) {
+ return CATEGOTY.find(item => item.value === value);
+ },
+
+ getEventSource(value) {
+ return EVENT_SOURCE.find(item => item.value === value);
+ }
}
}
</script>
--
Gitblit v1.8.0