From c567ca9176f9b52abab5a71c1f6a10c116bd1cbc Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Fri, 6 Sep 2024 19:57:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=202=E3=80=81=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E8=BF=9E=E6=8E=A5=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80?=
=?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=203=E3=80=81=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=EF=BC=8C=E5=85=B3=E8=81=94=E9=99=84=E4=BB=B6=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=89=8D=E7=AB=AF=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/css/tool.css | 48 +-
src/api/message/message.js | 9 +
src/layout/components/Navbar.vue | 30 +-
src/store/getters.js | 1 +
src/store/modules/user.js | 7 +-
src/views/document/detail.vue | 575 ++++++++++++++++++
src/views/document/editDocument.vue | 90 ++-
src/views/document/index.vue | 60 +-
src/views/filestatistic/index.vue | 2 +-
src/views/message/index.vue | 129 +++-
src/views/monitor/cache/list.vue | 2 +
src/views/statistic/index.vue | 2 +-
src/views/system/role/index.vue | 7 +-
src/views/tool/index.vue | 20 +-
src/views/tool/toolDetail.vue | 34 +-
.../workflowList/addWorkflow/tool_release.vue | 63 +-
.../workflowList/addWorkflow/use_apply.vue | 5 +
src/views/workstuff/dispose/index.vue | 5 +
18 files changed, 991 insertions(+), 98 deletions(-)
create mode 100644 src/views/document/detail.vue
diff --git a/public/css/tool.css b/public/css/tool.css
index 58f1fc5..db14df0 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -75,7 +75,7 @@ body #app .hideSidebar .sidebar-container {
width: 65px !important;
}
body #app .openSidebar .sidebar-container {
- width:220px !important;
+ width:180px !important;
}
body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
body #app .sidebar-container .el-sub-menu .el-menu-item {
@@ -344,7 +344,7 @@ body #app .hideSidebar .main-container {
margin-left: 65px;
}
body #app .main-container {
- margin-left: 220px;
+ margin-left: 180px;
background:#f9fafe;
background-size:100%;
}
@@ -440,6 +440,34 @@ body #app .main-container .navbar .right-menu{
float: inherit;
top: 8px;
right: 16px;
+ display: flex;
+ align-items: center;
+}
+body #app .main-container .navbar .right-menu .el-badge{
+ margin: 0 20px 0 0;
+}
+body #app .main-container .navbar .right-menu .el-badge .el-badge__content.is-fixed{
+ top: 5px;
+ right: 14px;
+ border: 0;
+ padding: 0 4px;
+ min-width: 18px;
+ text-align: center;
+}
+body #app .main-container .navbar .right-menu .el-badge .top-msg{
+ background: rgba(0 64 152 / 6%);
+ color: #004098;
+ font-size: 14px;
+ height: 36px;
+ display: block;
+ padding: 0 12px;
+ line-height: 36px;
+ border-radius: 2px;
+ cursor: pointer;
+}
+body #app .main-container .navbar .right-menu .top-version{
+ margin: 0 10px 0 0;
+ font-size: 14px;
}
body #app .main-container .navbar .right-menu>.el-select{
margin-right: 15px;
@@ -1752,22 +1780,26 @@ body .el-card>.el-card__body .el-tabs--border-card{
body .el-card>.el-card__body .search-btn .el-tabs--border-card{
border: 0;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header{
border-bottom: 1px solid #e6e6e6;
background: transparent;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item{
margin: 0;
border: none;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
border: 0;
background: transparent;
color: #034aac;
font-weight: bold;
position: relative;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active::after{
position: absolute;
left: 0;
bottom: 0;
@@ -2080,7 +2112,7 @@ body .etable1.el-table .el-table__expanded-cell tr>td:nth-child(2){
.search .el-form-item>.el-form-item__content>.el-cascader,
.search .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
.search .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
- width: 250px;
+ width: 230px;
}
.grab .filtrate{
display: none;
@@ -2109,7 +2141,7 @@ body .etable1.el-table .el-table__expanded-cell tr>td:nth-child(2){
.filtrate .el-form-item>.el-form-item__content>.el-cascader,
.filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
.filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
- width: 250px;
+ width: 230px;
}
/*operate 操作区域*/
diff --git a/src/api/message/message.js b/src/api/message/message.js
index e6a0c2b..451ff97 100644
--- a/src/api/message/message.js
+++ b/src/api/message/message.js
@@ -52,3 +52,12 @@ export function allMarkedRead(data) {
data: data
})
}
+
+
+// 获取用户统计
+export function getUserMsgCount(id) {
+ return request({
+ url: '/system/message/user/msg/count/' + id,
+ method: 'get'
+ })
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 99cc36d..6a35b7f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,13 +5,22 @@