字典管理

This commit is contained in:
haozq 2024-02-28 10:46:41 +08:00
parent 1552186f80
commit b8164fedb4
7 changed files with 213 additions and 286 deletions

View File

@ -0,0 +1,65 @@
import request from '@/utils/request'
/**
* 字典管理js
*/
/**
* 获取集合
* @param data
* @returns {AxiosPromise}
*/
export function getList(keyWord) {
return request({
url: '/system/sys/dict/getDictList',
method: 'get',
params:{keyWord}
})
}
/**
* 新增
* @param data
* @returns {AxiosPromise}
*/
export function addDict(data){
return request({
url: '/system/sys/dict/addDict',
method: 'post',
data
})
}
/**
* 新增
* @param data
* @returns {AxiosPromise}
*/
export function updateDict(data){
return request({
url: '/system/sys/dict/updateDict',
method: 'post',
data
})
}
/**
* 新增
* @param data
* @returns {AxiosPromise}
*/
export function delDict(data){
return request({
url: '/system/sys/dict/delDict',
method: 'post',
data
})
}
/**
* 新增
* @param data
* @returns {AxiosPromise}
*/
export function getDetails(id){
return request({
url: '/system/sys/dict/getDetails/'+id,
method: 'post',
})
}

View File

@ -45,7 +45,7 @@ export function updateOrg(data){
*/
export function delOrg(data){
return request({
url: '/system/sys/org/delOrg/',
url: '/system/sys/org/delOrg',
method: 'post',
data
})

View File

@ -15,6 +15,23 @@ export function fetchRoleList() {
})
}
/**
* 查询下拉选集合
* int 类型 code
* code null 查询全部
* code->pid
* @returns {AxiosPromise}
*/
export function fetchDictList(code) {
if(code==null){
code='';
}
return request({
url: '/system/sys/select/getDictList?code='+code,
method: 'post',
})
}
/** 菜单查询 */
export function fetchMenuList(query) {
return request({
@ -22,4 +39,4 @@ export function fetchMenuList(query) {
method: 'post',
params: query
})
}
}

View File

@ -13,7 +13,6 @@ const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist
router.beforeEach(async(to, from, next) => {
// start progress bar
NProgress.start()
// set page title
document.title = getPageTitle(to.meta.title)

View File

@ -1,6 +1,6 @@
import defaultSettings from '@/settings'
const title = defaultSettings.title || 'Vue Element Admin'
const title = defaultSettings.title || '智慧工地'
export default function getPageTitle(pageTitle) {
if (pageTitle) {

View File

@ -1,179 +1,97 @@
<template>
<div class="app-container">
<div class="filter-container">
<el-input v-model="listQuery.name" placeholder="用户名" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.nickName" placeholder="用户昵称" style="width: 200px;" class="filter-item ml-20" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.phone" placeholder="用户手机" style="width: 200px;" class="filter-item ml-20" @keyup.enter.native="handleFilter" />
<el-button v-waves style="margin-left: 40px;" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
查询222222222222
</el-button>
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
新增
</el-button>
<el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">
导出222222
</el-button>
<!-- <el-checkbox v-model="showReviewer" class="filter-item" style="margin-left:15px;" @change="tableKey=tableKey+1">
reviewer
</el-checkbox> -->
<el-input v-model="listQuery.keyWord" :maxlength="50" placeholder="请输入字典名称" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
<el-button v-waves style="margin-left: 40px;" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
</div>
<div>
<el-table
:data="tableData"
style="width: 100%;margin-bottom: 20px;"
row-key="dictId"
border
:default-expand-all="false"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column prop="dictCode" :maxlength="50" label="字典编码" sortable width="180" />
<el-table-column prop="dictName" :maxlength="50" label="字典名称" sortable width="180" />
<el-table-column prop="dictValue" :maxlength="50" label="排序" />
<el-table-column prop="remarks" :maxlength="50" label="备注" />
<el-table-column prop="createTime" :maxlength="50" label="创建时间" />
<el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
<template slot-scope="{row,$index}">
<el-button type="primary" icon="el-icon-edit" title="编辑" size="mini" @click="handleUpdate(row)" />
<el-button v-if="row.status!='deleted'" size="mini" icon="el-icon-delete" title="删除" type="danger" @click="handleDelete(row,$index)" />
</template>
</el-table-column>
</el-table>
</div>
<el-table
:key="tableKey"
v-loading="listLoading"
:data="list"
border
fit
highlight-current-row
style="width: 100%;"
@sort-change="sortChange"
>
<el-table-column label="用户ID" prop="id" sortable="custom" align="center" width="80" :class-name="getSortClass('id')">
<template slot-scope="{row}">
<span>{{ row.id }}</span>
</template>
</el-table-column>
<el-table-column label="用户名" min-width="40px">
<template slot-scope="{row}">
<span class="link-type" @click="handleUpdate(row)">{{ row.name }}</span>
</template>
</el-table-column>
<el-table-column key="nickName" label="呢称" prop="nickName" min-width="40px" align="center" />
<el-table-column key="phone" label="手机号码" align="center" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="日期" width="150px" align="center" :show-overflow-tooltip="true">
<template slot-scope="{row}">
<span>{{ row.date | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
<template slot-scope="{row,$index}">
<el-button type="primary" size="mini" @click="handleUpdate(row)">
编辑
</el-button>
<el-button v-if="row.status!='deleted'" size="mini" type="danger" @click="handleDelete(row,$index)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="600px">
<el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="80px" style="width: 400px; margin-left:50px;">
<el-form-item label="用户名" prop="name">
<el-input v-model="temp.name" placeholder="用户名" />
<el-form-item label="上级节点" prop="type">
<treeselect v-model="temp.pidCode" :options="DictList" :show-count="true" placeholder="请选择上级节点" noOptionsText="暂无数据" />
</el-form-item>
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="temp.nickName" placeholder="用户昵称" />
<el-form-item label="字典编码" prop="dictCode">
<el-input-number v-model="temp.dictCode" :min="1" :max="999999999" placeholder="请输入字典编码(大于0的正整数)" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="temp.phone" placeholder="用户手机号" />
<el-form-item label="字典名称" prop="dictName">
<el-input v-model="temp.dictName" placeholder="请输入字典名称" />
</el-form-item>
<el-form-item label="日期" prop="timestamp">
<el-date-picker v-model="temp.timestamp" type="datetime" placeholder="选择日期" style="width: 100%;" />
<el-form-item label="字典排序" prop="dictValue">
<el-input-number :min="1" :max="999999999" v-model="temp.dictValue" placeholder="请输入字典值" />
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="temp.type" class="filter-item" placeholder="请选择类型" style="width: 100%;">
<el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
</el-select>
<el-form-item label="备注" prop="remarks">
<el-input :maxlength="100" v-model="temp.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="状态">
<el-select v-model="temp.status" class="filter-item" placeholder="请选择状态" style="width: 100%;">
<el-option v-for="item in statusOptions" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="temp.remark" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">
关闭
</el-button>
<el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
<el-button type="primary" @click="dialogStatus==='create'?addDict():updateDict()">
提交
</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogPvVisible" title="Reading statistics">
<el-table :data="pvData" border fit highlight-current-row style="width: 100%">
<el-table-column prop="key" label="Channel" />
<el-table-column prop="pv" label="Pv" />
</el-table>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogPvVisible = false">Confirm</el-button>
</span>
</el-dialog>
</div>
</template>
<style scoped>
.el-input-number--medium {
width: 320px;
line-height: 34px;
}
</style>
<script>
import { fetchList, fetchPv, createArticle, updateArticle } from '@/api/article'
import { getList,addDict,updateDict,delDict,getDetails } from '@/api/dict'
import {fetchDictList} from '@/api/select'
import waves from '@/directive/waves' // waves directive
import { parseTime } from '@/utils'
import Pagination from '@/components/Pagination' // secondary package based on el-pagination
const calendarTypeOptions = [
{ key: 'CN', display_name: 'China' },
{ key: 'US', display_name: 'USA' },
{ key: 'JP', display_name: 'Japan' },
{ key: 'EU', display_name: 'Eurozone' }
]
// arr to obj, such as { CN : "China", US : "USA" }
const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
acc[cur.key] = cur.display_name
return acc
}, {})
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {delUser} from "@/api/user";
export default {
name: 'ComplexTable',
components: { Pagination },
components: { Pagination,Treeselect },
directives: { waves },
filters: {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]
},
typeFilter(type) {
return calendarTypeKeyValue[type]
}
},
data() {
return {
tableKey: 0,
list: null,
total: 0,
tableData: null,
listLoading: true,
listQuery: {
page: 1,
limit: 10,
importance: undefined,
title: undefined,
type: undefined,
sort: '+id'
keyWord: '',
},
importanceOptions: [1, 2, 3],
calendarTypeOptions,
sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
statusOptions: ['published', 'draft', 'deleted'],
DictList: [],
showReviewer: false,
temp: {
id: undefined,
importance: 1,
remark: '',
timestamp: new Date(),
title: '',
type: '',
status: 'published'
dictCode: null,
dictValue: '',
dictName: '',
dictId: '',
remarks: '',
pidCode: null,
},
dialogFormVisible: false,
dialogStatus: '',
@ -182,90 +100,74 @@ export default {
create: '新增'
},
dialogPvVisible: false,
pvData: [],
rules: {
name: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
phone: [{ required: true, message: '用户名手机号不能为空', trigger: 'blur' }]
// type: [{ required: true, message: 'type is required', trigger: 'change' }],
// timestamp: [{ type: 'date', required: true, message: 'timestamp is required', trigger: 'change' }],
dictName: [{ required: true, message: '字典名称不能为空', trigger: 'blur' }],
dictCode: [{ required: true, message: '字典编码不能为空', trigger: 'blur' }],
orgName: [{ required: true, message: '组织机构名称不能为空', trigger: 'blur' }]
},
downloadLoading: false
}
},
created() {
this.getList()
this.getList();
this.fetchDictList();
},
methods: {
getList() {
getList() {//
this.listLoading = true
this.list = [{ id: 1, name: 'admin1', nickName: '管理员1', phone: '18000000001', date: '2024-02-21' }, { id: 2, name: 'admin2', nickName: '管理员2', phone: '18000000002', date: '2024-02-22' }, { id: 3, name: 'admin3', nickName: '管理员3', phone: '18000000003', date: '2024-02-23' }]
this.total = 3
// fetchList(this.listQuery).then(response => {
// this.list = response.data.items
// this.total = response.data.total
// // Just to simulate the time of the request
// setTimeout(() => {
this.listLoading = false
// }, 1.5 * 1000)
// })
getList(this.listQuery.keyWord).then(response => {
this.tableData = response.data;
setTimeout(() => {
this.listLoading = false
}, 1.5 * 1000)
})
},
fetchDictList(){//
fetchDictList(null).then(response => {
console.log(123)
console.log(response)
this.DictList= response.data;
})
},
handleFilter() {
this.listQuery.page = 1
this.getList()
},
handleModifyStatus(row, status) {
this.$message({
message: '操作Success',
message: '操作成功',
type: 'success'
})
row.status = status
},
sortChange(data) {
const { prop, order } = data
if (prop === 'id') {
this.sortByID(order)
}
},
sortByID(order) {
if (order === 'ascending') {
this.listQuery.sort = '+id'
} else {
this.listQuery.sort = '-id'
}
this.handleFilter()
},
resetTemp() {
this.temp = {
id: undefined,
importance: 1,
remark: '',
timestamp: new Date(),
title: '',
status: 'published',
type: ''
dictCode: null,
dictValue: '',
dictName: '',
dictId: '',
remarks: '',
pidCode: null,
}
},
handleCreate() {
this.resetTemp()
this.dialogStatus = 'create'
this.dialogFormVisible = true
this.resetTemp();
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
},
createData() {
addDict() {//
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
this.temp.author = 'vue-element-admin'
createArticle(this.temp).then(() => {
this.list.unshift(this.temp)
addDict(this.temp).then((response) => {
this.dialogFormVisible = false
this.getList();
this.fetchDictList();
this.$notify({
title: 'Success',
message: 'Created Successfully',
title: '成功',
message: response.msg,
type: 'success',
duration: 2000
})
@ -273,27 +175,27 @@ export default {
}
})
},
handleUpdate(row) {
this.temp = Object.assign({}, row) // copy obj
this.temp.timestamp = new Date(this.temp.timestamp)
handleUpdate(row) {//
this.dialogStatus = 'update'
this.dialogFormVisible = true
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
console.log(row)
getDetails(row.dictId).then((response)=>{
if(response.data.pidCode=='0'){
response.data.pidCode=null;
}
this.temp=response.data;
})
},
updateData() {
updateDict() {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
const tempData = Object.assign({}, this.temp)
tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
updateArticle(tempData).then(() => {
const index = this.list.findIndex(v => v.id === this.temp.id)
this.list.splice(index, 1, this.temp)
updateDict(this.temp).then((response) => {
this.dialogFormVisible = false
this.getList();
this.$notify({
title: 'Success',
message: 'Update Successfully',
title: '成功',
message: response.msg,
type: 'success',
duration: 2000
})
@ -302,47 +204,30 @@ export default {
})
},
handleDelete(row, index) {
this.$notify({
title: 'Success',
message: 'Delete Successfully',
type: 'success',
duration: 2000
})
this.list.splice(index, 1)
},
handleFetchPv(pv) {
fetchPv(pv).then(response => {
this.pvData = response.data.pvData
this.dialogPvVisible = true
})
},
handleDownload() {
this.downloadLoading = true
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
const data = this.formatJson(filterVal)
excel.export_json_to_excel({
header: tHeader,
data,
filename: 'table-list'
})
this.downloadLoading = false
this.$confirm(`确定要删除该数据吗?`, {
type: 'warning',
title: '操作提示',
beforeClose: async (action, instance, done) => {
if (action === 'confirm') {
delDict({ dictId: row.dictId }).then((response) => {
this.$notify({
title: '成功',
message: response.msg,
type: 'success',
duration: 2000
})
this.getList()
done()
})
} else {
done()
}
}
})
},
formatJson(filterVal) {
return this.list.map(v => filterVal.map(j => {
if (j === 'timestamp') {
return parseTime(v[j])
} else {
return v[j]
}
}))
},
getSortClass: function(key) {
const sort = this.listQuery.sort
return sort === `+${key}` ? 'ascending' : 'descending'
}
}
}
</script>

View File

@ -26,7 +26,7 @@
</div>
<pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="600px">
<el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="80px" style="width: 400px; margin-left:50px;">
<el-form-item label="上级节点" prop="type">
@ -52,15 +52,6 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogPvVisible" title="Reading statistics">
<el-table :data="pvData" border fit highlight-current-row style="width: 100%">
<el-table-column prop="key" label="Channel" />
<el-table-column prop="pv" label="Pv" />
</el-table>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogPvVisible = false">Confirm</el-button>
</span>
</el-dialog>
</div>
</template>
@ -76,29 +67,14 @@ export default {
name: 'ComplexTable',
components: { Pagination,Treeselect },
directives: { waves },
filters: {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]
}
},
data() {
return {
tableKey: 0,
tableData: null,
total: 0,
listLoading: true,
listQuery: {
keyWord: '',
},
orgList: [],
importanceOptions: [1, 2, 3],
sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
statusOptions: ['published', 'draft', 'deleted'],
showReviewer: false,
temp: {
orgId: null,
@ -115,7 +91,6 @@ export default {
create: '新增'
},
dialogPvVisible: false,
pvData: [],
rules: {
orgName: [{ required: true, message: '组织机构名称不能为空', trigger: 'blur' }]
},
@ -192,10 +167,10 @@ export default {
this.dialogStatus = 'update'
this.dialogFormVisible = true
getDetails(row.orgId).then((response)=>{
if(response.data.pId=='0'){
response.data.pId=null;
}
this.temp=response.data;
if(response.data.pId=='0'){
response.data.pId=null;
}
this.temp=response.data;
})
},
@ -237,20 +212,6 @@ export default {
}
})
},
handleDownload() {
this.downloadLoading = true
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
const data = this.formatJson(filterVal)
excel.export_json_to_excel({
header: tHeader,
data,
filename: 'table-list'
})
this.downloadLoading = false
})
},
formatJson(filterVal) {
},