From e93b1dddf4f99f83d05688baceeb59cacdd82ec8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 十月 2024 17:29:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/system/permission.vue | 4 ++--
admin/src/views/business/deviceEvent.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index f6b4a8f..911e069 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -77,7 +77,7 @@
</el-table-column>
<el-table-column label="鎶撴媿鐓х墖" min-width="100px">
<template slot-scope="{row}">
- <el-image style="width: 80px; height: 80px" :src="row.extEventPictureURL"
+ <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL"
:preview-src-list="[row.extEventPictureURL]">
</el-image>
</template>
diff --git a/admin/src/views/system/permission.vue b/admin/src/views/system/permission.vue
index 76f35b3..18935a1 100644
--- a/admin/src/views/system/permission.vue
+++ b/admin/src/views/system/permission.vue
@@ -29,8 +29,8 @@
>
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
<el-table-column prop="code" label="鏉冮檺缂栫爜" fixed="left" min-width="200px"></el-table-column>
- <el-table-column prop="name" label="鏉冮檺鍚嶇О" fixed="left" min-width="120px"></el-table-column>
- <el-table-column prop="remark" label="鏉冮檺澶囨敞" min-width="120px"></el-table-column>
+ <el-table-column prop="name" label="鏉冮檺鍚嶇О" fixed="left" min-width="200px"></el-table-column>
+ <el-table-column prop="remark" label="鏉冮檺澶囨敞" min-width="200px"></el-table-column>
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
</el-table-column>
--
Gitblit v1.9.3