From 20b2604ff8b678e86504e91b22b712ce70927ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Sun, 8 Oct 2023 15:08:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20#D52C26=E5=85=A8=E5=B1=80=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA@primary-color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 30 ++++++++++++++----- src/components/CollapsiblePanelForm.vue | 2 +- src/components/menu/SideMenu.vue | 4 +-- src/components/selection/UserSelectModal.vue | 2 +- .../questionAnswerLibrary/page/AnswerPage.vue | 2 +- src/views/dashboard/search/GeneralSearch.vue | 6 ++-- .../internalWorkGroup/WorkingGroupList.vue | 6 ++-- src/views/workCenter/NewProcess.vue | 2 +- .../flow/PlanApprovalChangeFlow.vue | 2 +- .../StandardEntryOrChangeProcess.vue | 2 +- 10 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/assets/less/common.less b/src/assets/less/common.less index b3370301..d76d2cbb 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -1,4 +1,3 @@ -@primary-color: #D52C26; /*用户信息部分的高度*/ @user-info-height: var(--user-info-height, 59px); /*面包屑的高度，高度21，上下margin24*/ @@ -297,8 +296,8 @@ width: calc(100% - 100px); //line-height: 38px; background: #fff; - border: 1px #D52C26 solid; - color: #D52C26; + border: 1px @primary-color solid; + color: @primary-color; } // 新增编辑表单样式--完 @@ -340,7 +339,7 @@ /* 表格中需要标红的样式 */ .table-red-text { - color: #D52C26; + color: @primary-color; } /* 表格中换行链接的样式 */ @@ -376,7 +375,7 @@ } .table-operator-tab a.table-operator-tab-active { - background-color: #D52C26; + background-color: @primary-color; color: #FFFFFF; } @@ -560,7 +559,7 @@ /deep/ .anticon { margin-top: 2px; - color: #D52C26; + color: @primary-color; } i { @@ -801,7 +800,7 @@ content: ''; width: 4px; height: 20px; - background: #D52C26; + background: @primary-color; border-radius: 4px; position: absolute; left: 0; @@ -813,3 +812,20 @@ } /*流程表单样式end*/ + +.detail-page-bottom-operate-box { + height: 52px; + padding: 10px 32px; + text-align: right; + + .ant-btn { + margin-left: 15px; + } +} + +.detail-page-scroll-content { + height: calc(100% - 52px); + box-sizing: border-box; + overflow: auto; + padding: 32px; +} diff --git a/src/components/CollapsiblePanelForm.vue b/src/components/CollapsiblePanelForm.vue index 0e96504e..f8d914bf 100644 --- a/src/components/CollapsiblePanelForm.vue +++ b/src/components/CollapsiblePanelForm.vue @@ -473,7 +473,7 @@ export default { cursor: pointer; font-size: 14px; font-family: PingFang SC-Regular, PingFang SC, sans-serif; - color: #D52C26; + color: @primary-color; } .anticon { diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue index e585e37e..3cec6b44 100644 --- a/src/components/menu/SideMenu.vue +++ b/src/components/menu/SideMenu.vue @@ -147,11 +147,11 @@ export default { /deep/ .icon-style { max-width: 14px; margin-right: 10px; - color: #D52C26; + color: @primary-color; } /deep/ .anticon { - color: #D52C26; + color: @primary-color; } /* update_end author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */ diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue index 67078077..bc729d85 100644 --- a/src/components/selection/UserSelectModal.vue +++ b/src/components/selection/UserSelectModal.vue @@ -360,7 +360,7 @@ export default { background: rgba(213, 44, 38, 0.08); border-radius: 4px 4px 4px 4px; opacity: 1; - color: #D52C26; + color: @primary-color; white-space: nowrap; /deep/ .anticon { margin-left: 4px; diff --git a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue index ae65e798..2d468544 100644 --- a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue +++ b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue @@ -365,7 +365,7 @@ export default { margin-bottom: 0; } .top-p { - color: #D52C26; + color: @primary-color; } .no-top-desc { margin-top: 20px; diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index 10cb4c3a..a1940b57 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -334,7 +334,7 @@ export default { height: 44px; line-height: 44px; margin-left: 32px; - border-bottom: 1px solid #D52C26; + border-bottom: 1px solid @primary-color; } } @@ -375,7 +375,7 @@ export default { // 选中项样式 .option-curr { background: rgba(213, 44, 38, 0.08); - color: #D52C26; + color: @primary-color; border-radius: 4px 4px 4px 4px; } @@ -417,7 +417,7 @@ export default { .result-source { height: 28px; line-height: 28px; - background: #D52C26; + background: @primary-color; border-radius: 4px 4px 4px 4px; font-size: 14px; font-family: PingFang SC-Regular, PingFang SC; diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue index 413eb300..bb735a3b 100644 --- a/src/views/system/internalWorkGroup/WorkingGroupList.vue +++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue @@ -30,7 +30,7 @@ - + @@ -50,11 +50,11 @@ - + - + diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index 7591b7d7..18a56cd8 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -154,7 +154,7 @@ export default { display: inline-block; width: 4px; height: 16px; - background: #D52C26; + background: @primary-color; border-radius: 4px 4px 4px 4px; margin-right: 8px; margin-top: 3px; diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue index b3199b1a..05c8c0a7 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue @@ -781,7 +781,7 @@ export default { cursor: pointer; font-size: 14px; font-family: PingFang SC-Regular, PingFang SC, sans-serif; - color: #D52C26; + color: @primary-color; } .anticon { diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue index 1bdf3cc4..d6d0a6a6 100644 --- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue +++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue @@ -563,7 +563,7 @@ export default { cursor: pointer; font-size: 14px; font-family: PingFang SC-Regular, PingFang SC, sans-serif; - color: #D52C26; + color: @primary-color; } .anticon {