1.样式调整
2.宽度调整
This commit is contained in:
parent
efc8fc7a37
commit
799100b674
@ -7,7 +7,7 @@ body {
|
|||||||
}
|
}
|
||||||
a,a:visited,a:active{
|
a,a:visited,a:active{
|
||||||
color: #004098;
|
color: #004098;
|
||||||
text-decoration: underline;
|
text-decoration: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
a:hover{
|
a:hover{
|
||||||
@ -79,7 +79,7 @@ body #app .openSidebar .sidebar-container {
|
|||||||
}
|
}
|
||||||
body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
|
body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
|
||||||
body #app .sidebar-container .el-sub-menu .el-menu-item {
|
body #app .sidebar-container .el-sub-menu .el-menu-item {
|
||||||
min-width: 180px!important;
|
min-width: 220px!important;
|
||||||
}
|
}
|
||||||
body #app .sidebar-container .scrollbar-wrapper {
|
body #app .sidebar-container .scrollbar-wrapper {
|
||||||
padding-bottom: 95px;
|
padding-bottom: 95px;
|
||||||
@ -336,7 +336,7 @@ body .hideSidebar .el-submenu__title i.icon-zhiliang-xianxing{
|
|||||||
}
|
}
|
||||||
body #app .sidebar-container .el-submenu .el-menu-item,
|
body #app .sidebar-container .el-submenu .el-menu-item,
|
||||||
body #app .sidebar-container .nest-menu .el-submenu>.el-submenu__title {
|
body #app .sidebar-container .nest-menu .el-submenu>.el-submenu__title {
|
||||||
min-width: 180px!important;
|
min-width: 220px!important;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*main-container 右侧内容*/
|
/*main-container 右侧内容*/
|
||||||
@ -395,7 +395,7 @@ body #app .app-wrapper .main-container .navbar .hamburger-container{
|
|||||||
z-index: 1001;
|
z-index: 1001;
|
||||||
left: 0;
|
left: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 180px;
|
width: 220px;
|
||||||
height: 50px;
|
height: 50px;
|
||||||
line-height: 50px;
|
line-height: 50px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
@ -539,7 +539,7 @@ body #app .main-container .navbar .right-menu .el-dropdown .el-dropdown-selfdefi
|
|||||||
}
|
}
|
||||||
body #app .main-container .navbar .right-menu .el-icon-bell{
|
body #app .main-container .navbar .right-menu .el-icon-bell{
|
||||||
color: #141414;
|
color: #141414;
|
||||||
font-size: 26px;
|
font-size: 18px;
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
margin: 0 0 0 15px;
|
margin: 0 0 0 15px;
|
||||||
}
|
}
|
||||||
@ -1524,10 +1524,8 @@ body .el-button+.el-upload{
|
|||||||
body .el-upload,
|
body .el-upload,
|
||||||
body .registerbox .avatar-uploader .el-upload{
|
body .registerbox .avatar-uploader .el-upload{
|
||||||
background:#fff;
|
background:#fff;
|
||||||
border:1px solid #004098;
|
|
||||||
color:#004098 !important;
|
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
height: 34px;
|
border: 0;
|
||||||
}
|
}
|
||||||
body .el-upload:hover,
|
body .el-upload:hover,
|
||||||
body .registerbox .avatar-uploader .el-upload:hover{
|
body .registerbox .avatar-uploader .el-upload:hover{
|
||||||
@ -1548,9 +1546,11 @@ body .el-upload:hover .el-upload-dragger i{
|
|||||||
}
|
}
|
||||||
body .el-upload .el-button,
|
body .el-upload .el-button,
|
||||||
body .el-upload .el-button:hover{
|
body .el-upload .el-button:hover{
|
||||||
height: 32px;
|
display: block;
|
||||||
line-height: 30px;
|
border-radius: 2px;
|
||||||
border: none !important;
|
height: 34px;
|
||||||
|
line-height: 32px;
|
||||||
|
border: 1px solid #004098 !important;
|
||||||
background: transparent !important;
|
background: transparent !important;
|
||||||
}
|
}
|
||||||
body .el-upload .el-button{
|
body .el-upload .el-button{
|
||||||
@ -1559,10 +1559,6 @@ body .el-upload .el-button{
|
|||||||
body .el-upload:hover .el-button{
|
body .el-upload:hover .el-button{
|
||||||
color:#fff !important;
|
color:#fff !important;
|
||||||
}
|
}
|
||||||
body .el-upload .el-button{
|
|
||||||
border-radius: 0 !important;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
body .el-upload .el-button.el-button--primary{
|
body .el-upload .el-button.el-button--primary{
|
||||||
background: #004098 !important;
|
background: #004098 !important;
|
||||||
border: 1px solid #004098 !important;
|
border: 1px solid #004098 !important;
|
||||||
@ -2162,7 +2158,7 @@ body .el-card.lrtt>.el-card__body{
|
|||||||
.lrtt .lt{
|
.lrtt .lt{
|
||||||
display: block;
|
display: block;
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
width: 250px;
|
width: 310px;
|
||||||
height: 700px;
|
height: 700px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
@ -2584,6 +2580,7 @@ body .login-page .loright .locont .el-form--label-top .el-form-item .el-form-ite
|
|||||||
.fbox1 .fr{
|
.fbox1 .fr{
|
||||||
display: block;
|
display: block;
|
||||||
padding: 16px 32px;
|
padding: 16px 32px;
|
||||||
|
width: 420px;
|
||||||
}
|
}
|
||||||
body .el-drawer .el-drawer__body .fbox1 .fl,
|
body .el-drawer .el-drawer__body .fbox1 .fl,
|
||||||
body .el-drawer .el-drawer__body .fbox1 .fr{
|
body .el-drawer .el-drawer__body .fbox1 .fr{
|
||||||
|
@ -249,19 +249,20 @@ export default {
|
|||||||
*/
|
*/
|
||||||
markRead(row) {
|
markRead(row) {
|
||||||
let self = this
|
let self = this
|
||||||
self.$confirm('确认标记已读吗?', '提示', {
|
let formData = JSON.parse(JSON.stringify(row))
|
||||||
|
self.$set(formData, "states", 2)
|
||||||
|
updateMessage(formData).then(response => {
|
||||||
|
self.$modal.msgSuccess(response?.msg || '操作成功')
|
||||||
|
store.dispatch('GetUserMsgCount').then(() => { })
|
||||||
|
self.getList();
|
||||||
|
}).catch((err) => {console.error(err)});
|
||||||
|
/* self.$confirm('确认标记已读吗?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
let formData = JSON.parse(JSON.stringify(row))
|
|
||||||
self.$set(formData, "states", 2)
|
}).catch((err) => {console.error(err)}); */
|
||||||
updateMessage(formData).then(response => {
|
|
||||||
self.$modal.msgSuccess(response?.msg || '操作成功')
|
|
||||||
store.dispatch('GetUserMsgCount').then(() => { })
|
|
||||||
self.getList();
|
|
||||||
})
|
|
||||||
}).catch((err) => {console.error(err)});
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -107,8 +107,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<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" width="100px" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
|
<el-table-column label="字典名称" align="center" prop="dictName" width="200px" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
|
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
|
<router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
|
||||||
@ -116,7 +116,7 @@
|
|||||||
</router-link>
|
</router-link>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="状态" align="center" prop="status">
|
<el-table-column label="状态" align="center" prop="status" width="70px" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||||
</template>
|
</template>
|
||||||
|
@ -58,8 +58,8 @@
|
|||||||
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
||||||
>
|
>
|
||||||
<el-table-column prop="deptName" label="部门名称"></el-table-column>
|
<el-table-column prop="deptName" label="部门名称"></el-table-column>
|
||||||
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
|
<el-table-column prop="orderNum" label="排序" width="70px"></el-table-column>
|
||||||
<el-table-column prop="status" label="状态" width="100">
|
<el-table-column prop="status" label="状态" width="70px" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||||
</template>
|
</template>
|
||||||
|
@ -95,10 +95,10 @@
|
|||||||
|
|
||||||
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column label="角色编号" prop="roleId" />
|
<el-table-column label="角色编号" prop="roleId" width="90px" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
|
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" />
|
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="显示顺序" prop="roleSort" width="100" />
|
<el-table-column label="显示顺序" prop="roleSort" width="80px" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="状态" align="center" width="100">
|
<el-table-column label="状态" align="center" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-switch
|
<el-switch
|
||||||
|
@ -45,23 +45,23 @@
|
|||||||
<el-card>
|
<el-card>
|
||||||
<el-table :data="tableData1" style="width: 100%" height="529" v-loading="loading">
|
<el-table :data="tableData1" style="width: 100%" height="529" v-loading="loading">
|
||||||
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
||||||
<el-table-column label="申请类型">
|
<el-table-column label="申请类型" width="110px" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.applyType === 'publish'">发布申请</span>
|
<span v-if="scope.row.applyType === 'publish'">发布申请</span>
|
||||||
<span v-if="scope.row.applyType === 'use'">使用申请</span>
|
<span v-if="scope.row.applyType === 'use'">使用申请</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="procTitle" label="流程标题"></el-table-column>
|
<el-table-column prop="procTitle" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column label="流程状态" width="150">
|
<el-table-column label="流程状态" width="80px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag v-if="scope.row.recordStatus === 'doing'">审核中</el-tag>
|
<el-tag v-if="scope.row.recordStatus === 'doing'">审核中</el-tag>
|
||||||
<el-tag type="success" v-if="scope.row.recordStatus === 'done'">已审核</el-tag>
|
<el-tag type="success" v-if="scope.row.recordStatus === 'done'">已审核</el-tag>
|
||||||
<el-tag type="info" v-if="scope.row.recordStatus === 'draft'">拟稿</el-tag>
|
<el-tag type="info" v-if="scope.row.recordStatus === 'draft'">拟稿</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="createTime" label="发起时间"></el-table-column>
|
<el-table-column prop="createTime" label="发起时间" width="156px" ></el-table-column>
|
||||||
<el-table-column prop="endTime" label="结束时间"></el-table-column>
|
<el-table-column prop="endTime" label="结束时间" width="156px"></el-table-column>
|
||||||
<el-table-column label="操作" width="100" >
|
<el-table-column label="操作" width="80px" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
|
<el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
@ -25,23 +25,23 @@
|
|||||||
<el-tab-pane :label="'待办('+ statustotal+')'" name="taskToDo">
|
<el-tab-pane :label="'待办('+ statustotal+')'" name="taskToDo">
|
||||||
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
|
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
|
||||||
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
||||||
<el-table-column prop="procDefName" label="流程类型"></el-table-column>
|
<el-table-column prop="procDefName" label="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="title" label="流程标题"></el-table-column>
|
<el-table-column prop="title" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="curActDefName" label="当前环节"></el-table-column>
|
<el-table-column prop="curActDefName" label="当前环节" width="95px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="prevActDefName" label="上一环节">
|
<el-table-column prop="prevActDefName" label="上一环节" width="100px" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="!scope.row.prevActDefName">/</span>
|
<span v-if="!scope.row.prevActDefName">/</span>
|
||||||
<span v-else>{{ scope.row.prevActDefName }}</span>
|
<span v-else>{{ scope.row.prevActDefName }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
|
<el-table-column prop="sendUserName" label="上一环节处理人" width="115px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="startUserName" label="发起人"></el-table-column>
|
<el-table-column prop="startUserName" label="发起人" width="70px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="sendTime" label="接收时间">
|
<el-table-column prop="sendTime" label="接收时间" width="95px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
|
<span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="100" >
|
<el-table-column label="操作" width="80px" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
|
<el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
|
||||||
</template>
|
</template>
|
||||||
@ -58,18 +58,18 @@
|
|||||||
<el-tab-pane :label="'已办('+doneTotal+')'" name="taskDealed">
|
<el-tab-pane :label="'已办('+doneTotal+')'" name="taskDealed">
|
||||||
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
|
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
|
||||||
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
||||||
<el-table-column prop="procDefName" label="流程类型"></el-table-column>
|
<el-table-column prop="procDefName" label="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="title" label="流程标题"></el-table-column>
|
<el-table-column prop="title" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="curActDefName" label="处理环节"></el-table-column>
|
<el-table-column prop="curActDefName" width="100px" label="处理环节"></el-table-column>
|
||||||
<el-table-column label="上一环节">
|
<el-table-column label="上一环节" width="100px" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="!scope.row.prevActDefName">/</span>
|
<span v-if="!scope.row.prevActDefName">/</span>
|
||||||
<span v-else>{{ scope.row.prevActDefName }}</span>
|
<span v-else>{{ scope.row.prevActDefName }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
|
<el-table-column prop="sendUserName" label="上一环节处理人" width="115px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="startUserName" label="发起人"></el-table-column>
|
<el-table-column prop="startUserName" label="发起人" width="70px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="sendTime" label="接收时间">
|
<el-table-column prop="sendTime" label="接收时间" width="95px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
|
<span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
|
||||||
</template>
|
</template>
|
||||||
@ -91,20 +91,20 @@
|
|||||||
<el-tab-pane :label="'办结('+finishedTotal+')'" name="taskFinish">
|
<el-tab-pane :label="'办结('+finishedTotal+')'" name="taskFinish">
|
||||||
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
|
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
|
||||||
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
|
||||||
<el-table-column prop="procDefName" label="流程类型"></el-table-column>
|
<el-table-column prop="procDefName" label="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="title" label="流程标题"></el-table-column>
|
<el-table-column prop="title" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="startUserName" label="发起人"></el-table-column>
|
<el-table-column prop="startUserName" label="发起人" width="95px" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column prop="startTime" label="发起时间">
|
<el-table-column prop="startTime" label="发起时间" width="95px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.startTime,'{y}-{m}-{d}')}}</span>
|
<span>{{ parseTime(scope.row.startTime,'{y}-{m}-{d}')}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="sendTime" label="接收时间">
|
<el-table-column prop="sendTime" label="接收时间" width="95px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
|
<span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="100" >
|
<el-table-column label="操作" width="80px" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
|
<el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user