From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 17 五月 2024 11:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/sysPictureBase/SysPictureBase.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase.vue b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
index 69e8daf..668f854 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
@@ -22,9 +22,9 @@
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="鍥剧墖鍚嶇О"/>
<zt-table-column-dict prop="isDefault" label="鏄惁榛樿" dict="is_or_not"/>
- <el-table-column label="鍥剧墖" align="center">
+ <el-table-column label="鍥剧墖" align="center" prop="svgContent">
<template v-slot="{ row }">
- <el-image v-if="row.id" :src="url+row.id" style="height: 50px;width: 50px"></el-image>
+ <el-input v-if="row.id" v-html = row.svgContent></el-input>
</template>
</el-table-column>
<el-table-column prop="contentType" label="妫�绱㈠叧閿瓧"/>
@@ -33,7 +33,7 @@
delete-perm="sysPictureBase::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="table.query"/>
+ <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
</zt-table-wraper>
</div>
</template>
--
Gitblit v1.9.1