From 856f0767b4ada087e9e2cb33f373e23dbcf39b85 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 17:56:59 +0800
Subject: [PATCH] update 同步 ruoyi * update element-ui 2.15.10 => 2.15.12 * update 优化 tagsView右选框，首页不应该存在关闭左侧选项 * update copyright 2023 * update 优化 监控页面图标显示 * update 优化 日志注解支持排除指定的请求参数 * update 优化 业务校验优化代码 * fix 修复 优化文件下载出现的异常 * fix 修复 修改密码日志存储明文问题 * add 新增 操作日志消耗时间属性 * update 优化 日志管理使用索引提升查询性能 * update 优化 框架时间检索使用时间默认值 00:00:00 - 23:59:59
---
ruoyi-ui/src/views/system/dict/data.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
index f22099d..2421917 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -92,7 +92,7 @@
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
+ <el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" v-if="false" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
<template slot-scope="scope">
<span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
@@ -163,7 +163,7 @@
<el-option
v-for="item in listClassOptions"
:key="item.value"
- :label="item.label"
+ :label="item.label + '(' + item.value + ')'"
:value="item.value"
></el-option>
</el-select>
@@ -191,7 +191,7 @@
<script>
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { listType, getType } from "@/api/system/dict/type";
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
export default {
name: "Data",
@@ -287,8 +287,8 @@
},
/** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
getTypeList() {
- listType().then(response => {
- this.typeOptions = response.rows;
+ getDictOptionselect().then(response => {
+ this.typeOptions = response.data;
});
},
/** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
@@ -364,12 +364,14 @@
if (valid) {
if (this.form.dictCode != undefined) {
updateData(this.form).then(response => {
+ this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
addData(this.form).then(response => {
+ this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -386,6 +388,7 @@
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3