Commit e5bd749f authored by shenyanpei's avatar shenyanpei

数据字典页面调整,项目页面调整

parent acaaa8a0
...@@ -22,19 +22,17 @@ ...@@ -22,19 +22,17 @@
<template slot="title"> <template slot="title">
<span>{{ item.meta.title }}</span> <span>{{ item.meta.title }}</span>
</template> </template>
<el-menu-item-group> <template v-for="(children, childrenIndex) in item.children">
<template v-for="(children, childrenIndex) in item.children">
<el-menu-item <el-menu-item
v-if="!children.hidden" v-if="!children.hidden"
:key="childrenIndex" :key="childrenIndex"
:index="childrenIndex.toString()" :index="childrenIndex.toString()"
style="text-align: center;" style="text-align: left;"
@click="handleSelect(children.path)" @click="handleSelect(children.path)"
> >
{{ children.meta.title }} {{ children.meta.title }}
</el-menu-item> </el-menu-item>
</template> </template>
</el-menu-item-group>
</el-submenu> </el-submenu>
</template> </template>
...@@ -356,7 +354,7 @@ export default { ...@@ -356,7 +354,7 @@ export default {
component: () => import('@/views/userInfo/index') component: () => import('@/views/userInfo/index')
}, },
{ {
path: 'journal/manage/list', path: '/journalManage/index',
name: 'journalManageList'.toLocaleUpperCase(), name: 'journalManageList'.toLocaleUpperCase(),
meta: { title: '日志管理' }, meta: { title: '日志管理' },
component: () => import('@/views/journalManage/index') component: () => import('@/views/journalManage/index')
......
...@@ -245,8 +245,8 @@ export const constantRoutes = [ ...@@ -245,8 +245,8 @@ export const constantRoutes = [
component: () => import('@/layout/index'), component: () => import('@/layout/index'),
children: [ children: [
{ {
path: 'journal/manage/list', path: '/journalManage/index',
name: 'journalManageList'.toLocaleUpperCase(), name: 'AdminList'.toLocaleUpperCase(),
meta: { title: '日志管理' }, meta: { title: '日志管理' },
component: () => import('@/views/journalManage/index') component: () => import('@/views/journalManage/index')
} }
......
...@@ -6,16 +6,33 @@ ...@@ -6,16 +6,33 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-scrollbar> <el-scrollbar>
<el-menu :default-active="activeIndex"> <el-menu
:default-active="activeIndex">
<el-menu-item <el-menu-item
v-for="(item, index) in dictTypeList" v-for="(item, index) in dictTypeList"
@click="handleSelect(item)" @click="handleSelect(item)"
:key="index" :key="index"
:index="index.toString()"> :index="index.toString()">
<el-tooltip v-if="item.dictTypeName.length > 30" class="item" effect="dark" :content="item.dictTypeName" placement="top-start"> <el-tooltip v-if="item.dictTypeName.length > 30" effect="dark" :content="item.dictTypeName" placement="top-start">
<span> {{item.dictType }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.dictTypeName.slice(0,20) + '...' }} </span> <el-row>
<el-col :span="8">
{{ item.dictType }}
</el-col>
<el-col :span="15">
{{ item.dictTypeName.slice(0,15) + '...' }}
</el-col>
</el-row>
</el-tooltip> </el-tooltip>
<span v-else> {{item.dictType }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.dictTypeName }} </span> <span v-else>
<el-row>
<el-col :span="8">
{{ item.dictType }}
</el-col>
<el-col :span="15">
{{ item.dictTypeName }}
</el-col>
</el-row>
</span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
</el-scrollbar> </el-scrollbar>
...@@ -23,7 +40,7 @@ ...@@ -23,7 +40,7 @@
<el-col :span="16" style="padding: 10px"> <el-col :span="16" style="padding: 10px">
<div class="topTitle"> <div class="topTitle">
<span>字典编码: {{ dictType }}</span> <span>字典编码: {{ dictType }}</span>
<span style="padding-left: 10px">字典名称: {{ dictTypeName }}</span> <span style="margin-left: 80px">字典名称: {{ dictTypeName }}</span>
</div> </div>
<el-table :data="dictTypeData.slice((currentPage - 1) * pageSize, currentPage * pageSize )" border> <el-table :data="dictTypeData.slice((currentPage - 1) * pageSize, currentPage * pageSize )" border>
<el-table-column label="序号" align="center" type="index" width="55"/> <el-table-column label="序号" align="center" type="index" width="55"/>
...@@ -104,9 +121,6 @@ export default { ...@@ -104,9 +121,6 @@ export default {
border-bottom: 14px solid #f4f4f4; border-bottom: 14px solid #f4f4f4;
} }
.dictContent { .dictContent {
.el-menu-item {
height: 40px;
}
.el-scrollbar { .el-scrollbar {
overflow: hidden; overflow: hidden;
height: calc(90vh - 50px); height: calc(90vh - 50px);
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<el-dialog <el-dialog
title="人员情况信息" title="人员情况信息"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="70%" width="85%"
:before-close="handleClose"> :before-close="handleClose">
<div class="dialogQuery"> <div class="dialogQuery">
<el-form ref="dialogForm" :model="dialogForm" label-width="auto"> <el-form ref="dialogForm" :model="dialogForm" label-width="auto">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment