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/index.vue | 88 ++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 55 deletions(-)
diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue
index a6b8ba3..0cf5c2b 100644
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@@ -1,12 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="瀛楀吀鍚嶇О" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="璇疯緭鍏ュ瓧鍏稿悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.dictType"
placeholder="璇疯緭鍏ュ瓧鍏哥被鍨�"
clearable
- size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
@@ -26,27 +24,26 @@
v-model="queryParams.status"
placeholder="瀛楀吀鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿">
<el-date-picker
v-model="dateRange"
- size="small"
style="width: 240px"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item>
@@ -94,7 +91,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>瀵煎嚭</el-button>
@@ -114,16 +110,20 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="瀛楀吀缂栧彿" align="center" prop="dictId" />
+ <el-table-column label="瀛楀吀缂栧彿" align="center" prop="dictId" v-if="false" />
<el-table-column label="瀛楀吀鍚嶇О" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="瀛楀吀绫诲瀷" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <router-link :to="'/dict/type/data/' + scope.row.dictId" class="link-type">
+ <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
<span>{{ scope.row.dictType }}</span>
</router-link>
</template>
</el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status" :formatter="statusFormat" />
+ <el-table-column label="鐘舵��" align="center" prop="status">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
@@ -170,10 +170,10 @@
<el-form-item label="鐘舵��" prop="status">
<el-radio-group v-model="form.status">
<el-radio
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -189,16 +189,15 @@
</template>
<script>
-import { listType, getType, delType, addType, updateType, exportType, refreshCache } from "@/api/system/dict/type";
+import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
export default {
name: "Dict",
+ dicts: ['sys_normal_disable'],
data() {
return {
// 閬僵灞�
loading: true,
- // 瀵煎嚭閬僵灞�
- exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -215,8 +214,6 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- // 鐘舵�佹暟鎹瓧鍏�
- statusOptions: [],
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏌ヨ鍙傛暟
@@ -242,9 +239,6 @@
},
created() {
this.getList();
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
/** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
@@ -256,10 +250,6 @@
this.loading = false;
}
);
- },
- // 瀛楀吀鐘舵�佸瓧鍏哥炕璇�
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -316,13 +306,13 @@
if (valid) {
if (this.form.dictId != undefined) {
updateType(this.form).then(response => {
- this.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
addType(this.form).then(response => {
- this.msgSuccess("鏂板鎴愬姛");
+ this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
});
@@ -333,36 +323,24 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const dictIds = row.dictId || this.ids;
- this.$confirm('鏄惁纭鍒犻櫎瀛楀吀缂栧彿涓�"' + dictIds + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(function() {
- return delType(dictIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栧彿涓�"' + dictIds + '"鐨勬暟鎹」锛�').then(function() {
+ return delType(dictIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- const queryParams = this.queryParams;
- this.$confirm('鏄惁纭瀵煎嚭鎵�鏈夌被鍨嬫暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.exportLoading = true;
- return exportType(queryParams);
- }).then(response => {
- this.download(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.download('system/dict/type/export', {
+ ...this.queryParams
+ }, `type_${new Date().getTime()}.xlsx`)
},
/** 鍒锋柊缂撳瓨鎸夐挳鎿嶄綔 */
handleRefreshCache() {
refreshCache().then(() => {
- this.msgSuccess("鍒锋柊鎴愬姛");
+ this.$modal.msgSuccess("鍒锋柊鎴愬姛");
+ this.$store.dispatch('dict/cleanDict');
});
}
}
--
Gitblit v1.9.3