From 799100b674e56fc0a87b6a00258f7e2778a4b37f Mon Sep 17 00:00:00 2001 From: pan <380711010@qq.com> Date: Wed, 18 Sep 2024 14:06:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=202.?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/tool.css | 29 +++++++++--------- src/views/message/index.vue | 19 ++++++------ src/views/system/bizdict/index.vue | 6 ++-- src/views/system/dept/index.vue | 4 +-- src/views/system/role/index.vue | 4 +-- src/views/workstuff/apply/index.vue | 12 ++++---- src/views/workstuff/dispose/index.vue | 42 +++++++++++++-------------- 7 files changed, 57 insertions(+), 59 deletions(-) diff --git a/public/css/tool.css b/public/css/tool.css index b9cf588..4eb218c 100644 --- a/public/css/tool.css +++ b/public/css/tool.css @@ -7,7 +7,7 @@ body { } a,a:visited,a:active{ color: #004098; - text-decoration: underline; + text-decoration: none; cursor: pointer; } 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 .el-sub-menu .el-menu-item { - min-width: 180px!important; + min-width: 220px!important; } body #app .sidebar-container .scrollbar-wrapper { 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 .nest-menu .el-submenu>.el-submenu__title { - min-width: 180px!important; + min-width: 220px!important; } /*main-container 右侧内容*/ @@ -395,7 +395,7 @@ body #app .app-wrapper .main-container .navbar .hamburger-container{ z-index: 1001; left: 0; bottom: 0; - width: 180px; + width: 220px; height: 50px; line-height: 50px; 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{ color: #141414; - font-size: 26px; + font-size: 18px; line-height: 40px; margin: 0 0 0 15px; } @@ -1524,10 +1524,8 @@ body .el-button+.el-upload{ body .el-upload, body .registerbox .avatar-uploader .el-upload{ background:#fff; - border:1px solid #004098; - color:#004098 !important; border-radius: 2px; - height: 34px; + border: 0; } body .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:hover{ - height: 32px; - line-height: 30px; - border: none !important; + display: block; + border-radius: 2px; + height: 34px; + line-height: 32px; + border: 1px solid #004098 !important; background: transparent !important; } body .el-upload .el-button{ @@ -1559,10 +1559,6 @@ body .el-upload .el-button{ body .el-upload:hover .el-button{ color:#fff !important; } -body .el-upload .el-button{ - border-radius: 0 !important; - display: block; -} body .el-upload .el-button.el-button--primary{ background: #004098 !important; border: 1px solid #004098 !important; @@ -2162,7 +2158,7 @@ body .el-card.lrtt>.el-card__body{ .lrtt .lt{ display: block; padding: 16px; - width: 250px; + width: 310px; height: 700px; overflow: auto; } @@ -2584,6 +2580,7 @@ body .login-page .loright .locont .el-form--label-top .el-form-item .el-form-ite .fbox1 .fr{ display: block; padding: 16px 32px; + width: 420px; } body .el-drawer .el-drawer__body .fbox1 .fl, body .el-drawer .el-drawer__body .fbox1 .fr{ diff --git a/src/views/message/index.vue b/src/views/message/index.vue index 593ee3d..736b884 100644 --- a/src/views/message/index.vue +++ b/src/views/message/index.vue @@ -249,19 +249,20 @@ export default { */ markRead(row) { 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: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - 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)}); + + }).catch((err) => {console.error(err)}); */ }, /** diff --git a/src/views/system/bizdict/index.vue b/src/views/system/bizdict/index.vue index 85c9c8d..492a4c3 100644 --- a/src/views/system/bizdict/index.vue +++ b/src/views/system/bizdict/index.vue @@ -107,8 +107,8 @@ - - + + - + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 8061e9e..3f216ea 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -58,8 +58,8 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" > - - + + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index fcba135..ce026d6 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -95,10 +95,10 @@ - + - +