From 46da1d5ed1398e458213a4646ff7e9e23382dc68 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 10 十一月 2023 11:13:38 +0800
Subject: [PATCH] 修复内链iframe没有传递参数问题(I8DUOJ)
---
src/views/system/dict/data.vue | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index a8fa6ef..f6207dc 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -91,8 +91,8 @@
<el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
<template #default="scope">
- <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
- <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
+ <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+ <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
</template>
</el-table-column>
<el-table-column label="瀛楀吀閿��" align="center" prop="dictValue" />
@@ -108,20 +108,10 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button
- type="text"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:dict:edit']"
- >淇敼</el-button>
- <el-button
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:dict:remove']"
- >鍒犻櫎</el-button>
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">淇敼</el-button>
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -220,8 +210,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- dictName: undefined,
dictType: undefined,
+ dictLabel: undefined,
status: undefined
},
rules: {
@@ -289,7 +279,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
proxy.resetForm("queryRef");
- queryParams.value.dictType = defaultDictType;
+ queryParams.value.dictType = defaultDictType.value;
handleQuery();
}
/** 鏂板鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3