From 3f398494f7a399fdd9f9b9973e566069045e804b Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 5 May 2023 17:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/icon/arrow.png | Bin 0 -> 217 bytes src/assets/styles/archives-manage.scss | 14 -- src/assets/styles/mixin.scss | 12 ++ src/assets/styles/yxk-admin.scss | 23 +++ src/views/system/processManage/index.vue | 5 +- .../processManage/modelDesign/index.vue | 11 +- .../processManage/processDeployment/index.vue | 190 ++++++++++++++---- .../processDeployment/module/form.vue | 139 +++++++++++++ .../processManage/runningProcess/index.vue | 93 ++++++++- .../module/approvalList/index.vue | 52 +++++ .../module/businessDetails/index.vue | 52 +++++ .../runningProcess/module/detail.vue | 172 ++++++++++++++++ .../module/processImg/index.vue | 17 ++ .../runningProcess/module/taskList/index.vue | 52 +++++ 14 files changed, 778 insertions(+), 54 deletions(-) create mode 100644 src/assets/images/icon/arrow.png create mode 100644 src/views/system/processManage/processDeployment/module/form.vue create mode 100644 src/views/system/processManage/runningProcess/module/approvalList/index.vue create mode 100644 src/views/system/processManage/runningProcess/module/businessDetails/index.vue create mode 100644 src/views/system/processManage/runningProcess/module/detail.vue create mode 100644 src/views/system/processManage/runningProcess/module/processImg/index.vue create mode 100644 src/views/system/processManage/runningProcess/module/taskList/index.vue diff --git a/src/assets/images/icon/arrow.png b/src/assets/images/icon/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..b6fbf2bba475cf9aa38ad9684bcad72ea55d7873 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRV!3HF!2OrA@QjEnx?oJHr&dIz4awdDaIEF}s zC#Mwr&N}m9{>0`)^Xq|ZIt^Ff&bCx;ex6>vtp30GpX7usi8oGGi@MIeoi3|(?0>tY zW78SA_(%VZ|K$HX{^9tv#P$cw8=U&TbNTS-wEs8!vz}3#iBavl|5KhG9?Ac8f3~GQ zNJ&Web-rrGL;1&Z>UUQ}KkPcdWou_{{O7;?!2<_=v^P#nJiA|Z&sK#(2BsQ)NAs7T R_5+>A;OXk;vd$@?2>_B!TY&%o literal 0 HcmV?d00001 diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 29c8bfe..4f740d7 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -687,20 +687,6 @@ background-color: #011E4F !important; } -.el-tag.el-tag--info { - margin: 0 0 0 8px; - height: 20px; - line-height: 20px; - font-size: 12px; - background-color: #E8F2FF; - border: none; - color: #0348F3; -} - -.el-tag.el-tag--info .el-tag__close { - background-color: #0348F3; -} - //出入库 .dpflex { display: flex; diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 25b3bcd..184752e 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -868,6 +868,7 @@ padding: 20px 0; } } + @mixin elTag-style{ [data-theme="dark"] & { border: 1px solid $mainColor; @@ -880,6 +881,17 @@ } } +@mixin select-elTag-style{ + [data-theme="dark"] & { + color: #fff; + background-color: #02255f; + } + [data-theme="light"] & { + color: #0348F3; + background-color: #EEF5FE; + } +} + @mixin prepend-input{ [data-theme="dark"] & { border: 1px solid $mainColor; diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 72ff41f..6c4915c 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -138,6 +138,15 @@ } } } + .el-select{ + margin-right: 10px; + .el-input__inner{ + height: 30px !important; + line-height: 30px !important; + background-color: transparent; + @include pagination-input; + } + } } .el-tabs{ @@ -1503,6 +1512,20 @@ input[type ='number'] { color: #f65163; } + +.el-tag.el-tag--info { + margin: 0 0 0 8px; + height: 20px; + line-height: 20px; + font-size: 12px; + border: none; + @include select-elTag-style; +} + +.el-tag.el-tag--info .el-tag__close { + @include select-elTag-style; +} + // table 选中状态 .el-table__body .rowStyle>td { color: #fff !important; diff --git a/src/views/system/processManage/index.vue b/src/views/system/processManage/index.vue index 8e37042..c9efe16 100644 --- a/src/views/system/processManage/index.vue +++ b/src/views/system/processManage/index.vue @@ -59,7 +59,10 @@ export default { diff --git a/src/views/system/processManage/modelDesign/index.vue b/src/views/system/processManage/modelDesign/index.vue index b64ba60..4f9f803 100644 --- a/src/views/system/processManage/modelDesign/index.vue +++ b/src/views/system/processManage/modelDesign/index.vue @@ -1,5 +1,14 @@