clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、系统字典新增字典分组功能 

2、前端积分管理页面细微调整
3、前端过渡动画调整
This commit is contained in:
xjs 2022-03-02 10:58:44 +08:00
parent 721c07f06d
commit d5913e0ad9
6 changed files with 481 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
View File

@ -1,12 +1,13 @@
package com.ruoyi.system.api.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* 字典类型表 sys_dict_type
@ -29,10 +30,24 @@ public class SysDictType extends BaseEntity
@Excel(name = "字典类型")
private String dictType;
/**
* 字典分组
*/
@Excel(name = "字典分组")
private String dictGroup;
/** 状态（0正常 1停用） */
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
public String getDictGroup() {
return dictGroup;
}
public void setDictGroup(String dictGroup) {
this.dictGroup = dictGroup;
}
public Long getDictId()
{
return dictId;

11
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
View File

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<id property="dictId" column="dict_id" />
<result property="dictName" column="dict_name" />
<result property="dictType" column="dict_type" />
<result property="dictGroup" column="dict_group" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDictTypeVo">
select dict_id, dict_name, dict_type, status, create_by, create_time, remark
select dict_id, dict_name, dict_type, dict_group, status, create_by, create_time, remark
from sys_dict_type
</sql>
@ -32,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dictType != null and dictType != ''">
AND dict_type like concat('%', #{dictType}, '%')
</if>
<if test="dictGroup != null and dictGroup != ''">
AND dict_group like concat('%', #{dictGroup}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
@ -39,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by update_time desc ,dict_id desc
order by dict_group desc, update_time desc ,dict_id desc
</select>
<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
@ -77,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<set>
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
<if test="dictGroup != null and dictGroup != ''">dict_group = #{dictGroup},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@ -89,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
<if test="dictGroup != null and dictGroup != ''">dict_group,</if>
<if test="status != null">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@ -96,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)values(
<if test="dictName != null and dictName != ''">#{dictName},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if>
<if test="dictGroup != null and dictGroup != ''">#{dictGroup},</if>
<if test="status != null">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>

2
ruoyi-ui/src/layout/components/AppMain.vue
View File

@ -1,6 +1,6 @@
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
<transition name="el-fade-in-linear" mode="out-in">
<keep-alive :include="cachedViews">
<router-view :key="key" />
</keep-alive>

13
ruoyi-ui/src/views/srb/integral/form.vue
View File

@ -11,7 +11,9 @@
<el-input-number v-model="formData.integralEnd" placeholder="积分区间结束" :min="0"></el-input-number>
</el-form-item>
<el-form-item size="large">
<el-button type="primary" @click="submitForm">提交</el-button>
<el-button type="primary"
v-hasPermi="['srb:integralGrade:save']"
@click="submitForm">提交</el-button>
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
@ -79,14 +81,9 @@ export default {
//根据id获取
getById(id) {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: "#666666"
});
this.$modal.loading("请稍候...");
getById(id).then(res => {
loading.close();
this.$modal.closeLoading()
this.formData = res.data
})
},

9
ruoyi-ui/src/views/srb/integral/index.vue
View File

@ -81,16 +81,11 @@ export default {
methods: {
//获取数据
fetchData() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: "#666666"
});
this.$modal.loading("请稍候...");
getList().then(res => {
loading.close();
this.list = res.data
this.$modal.closeLoading()
}).catch(err => {
})
loading.close();

51
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -7,7 +7,7 @@
placeholder="请输入字典名称"
clearable
size="small"
style="width: 240px"
style="width: 180px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -17,7 +17,7 @@
placeholder="请输入字典类型"
clearable
size="small"
style="width: 240px"
style="width: 180px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -27,7 +27,7 @@
placeholder="字典状态"
clearable
size="small"
style="width: 240px"
style="width: 120px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
@ -37,11 +37,27 @@
/>
</el-select>
</el-form-item>
<el-form-item label="字典分组" prop="dictGroup">
<el-select
v-model="queryParams.dictGroup"
placeholder="字典分组"
clearable
size="small"
style="width: 120px"
>
<el-option
v-for="dict in dict.type.sys_dict_group"
: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"
style="width: 200px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@ -127,6 +143,11 @@
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="字典分组" align="center" prop="dictGroup" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_dict_group" :value="scope.row.dictGroup"/>
</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,6 +191,23 @@
<el-form-item label="字典类型" prop="dictType">
<el-input v-model="form.dictType" placeholder="请输入字典类型" />
</el-form-item>
<el-form-item label="字典分组" prop="dictGroup">
<el-select
v-model="form.dictGroup"
placeholder="字典分组"
clearable
size="small"
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_dict_group"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
@ -196,7 +234,7 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
dicts: ['sys_normal_disable','sys_dict_group'],
data() {
return {
// 遮罩层
@ -225,7 +263,8 @@ export default {
pageSize: 10,
dictName: undefined,
dictType: undefined,
status: undefined
status: undefined,
dictGroup:undefined
},
// 表单参数
form: {},