From 567cb4905ed9a844476491e258c82ad77cbf43aa Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 28 Jul 2021 10:28:36 +0800 Subject: [PATCH 01/17] =?UTF-8?q?feat:=20=E5=9B=BD=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=20=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 96 ++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index c00a70b96..affcc92df 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -199,9 +199,103 @@ + - +
{{ item.showAll ? '收起' : '更多' }} From 2c5a02d2141ec3f88b73940fba45bc43dedc0a23 Mon Sep 17 00:00:00 2001 From: fanlin Date: Wed, 28 Jul 2021 14:19:01 +0800 Subject: [PATCH 06/17] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E5=9B=BD?= =?UTF-8?q?=E5=A4=96=E6=8C=87=E5=AE=9A=E5=AD=97=E6=AE=B5=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 9 ++++++--- .../foreignStandardsAndRegulations/index.vue | 13 ++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a4a42d0cf..9d429cdf4 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -995,7 +995,8 @@ diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 993e50efe..fb9f602a5 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -192,7 +192,7 @@ placeholder="请输入角色描述" clearable> - + { - console.log(newVal, oldVal); - }) this.addModel = true }, getTree3 () { diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 3ac149a2f..320976806 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -4,34 +4,165 @@

标准法规管理流程
-
标准调研流程
-
标准入库流程
-
标准征求意见流程
- - -
标准清单发布/更新流程
-
项目合规评估流程-标准
-
项目合规评估流程-项目
-
未符合项整改流程
-
标准解读流程
+ + +
+
+
+ +
+
+
标准入库流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准调研流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准征求意见流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准清单发布/更新流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
项目合规评估流程-标准
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
未符合项整改流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准解读流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
项目合规评估流程-项目
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ +

政策管理流程
-

企标管理流程
-

工作组会议管理流程
-
@@ -42,10 +173,28 @@ export default { name: 'NewProcess', data () { return { - type: '' + type: '', + size: true } }, methods: { + getImg (num) { + var url = '' + if (num == 0) { + url = require('@/assets/images/shangqi/img/process1.png') + } else if (num == 1) { + url = require('@/assets/images/shangqi/img/process2.png') + } else if (num == 2) { + url = require('@/assets/images/shangqi/img/process3.png') + } else if (num == 3) { + url = require('@/assets/images/shangqi/img/process4.png') + } else if (num == 4) { + url = require('@/assets/images/shangqi/img/process5.png') + } else if (num == 5) { + url = require('@/assets/images/shangqi/img/process6.png') + } + return url + }, // 新建流程 handleCreateProcess (prcType) { this.$store.commit('setDetailMap', this.$route.path) @@ -176,6 +325,12 @@ export default { } }, mounted () { + let width = document.body.clientWidth + if (width > 1900) { + this.size = true + } else { + this.size = false + } this.type = this.$route.params.type } } @@ -186,17 +341,81 @@ export default { //height: 100%; padding: 15px 15px 0; background: #ffffff; + /deep/.el-card__body { + padding: 0; + } + .el-card { + margin: 25px; + border-radius: 10px; + } + .card-box { + .card-top { + width: 100%; + background: #2d8cf0; + height: 120px; + display: flex; + justify-content: space-between; + .card-top-left { + img { + margin: 10px; + width: 100px; + height: 100px; + } + } + .card-top-right { + width: 200px; + .card-top-right-text { + margin: 40px 0 5px 0; + color: #e6e6e6; + font-size: 18px; + } + .card-top-right-line { + height: 3px; + width: 200px; + background: #e6e6e6; + } + } + } + .card-bottom { + width: calc(~'100% - 60px'); + color: #c1c1c1; + margin: 10px 30px; + line-height: 20px; + font-size: 14px; + height: 100px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 5; + overflow: hidden; + } + } + .card-box:hover { + .card-top { + .card-top-right { + .card-top-right-text { + color: rgb(247, 186, 42); + } + .card-top-right-line { + background: rgb(247, 186, 42); + } + } + } + .card-bottom { + color: #2d8cf0; + } + } .process-box{ margin-left: -5px; margin-right: -5px; padding-top: 20px; padding-bottom: 20px; .process-name{ - width: 260px; - padding: 10px 0; + width: 300px; + padding: 40px 0; margin-bottom: 10px; text-align: center; border: 1px dashed #ddd; + border-radius: 5px; background: #fdfdfd; font-size: 18px; font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif; @@ -205,6 +424,12 @@ export default { margin-left: 5px; margin-right: 5px; } + .process-name:hover { + transform:translateY(-5px); + border: 1px dashed #2d8cf0; + background: #c6e2ff; + color: #2d8cf0; + } } } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a4a42d0cf..5cee62642 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4768,6 +4768,7 @@ export default { .el-tree-node { position: relative; padding-left: 0px; // 缩进量 + line-height: 30px; } .el-tree-node__children { padding-left: 16px; // 缩进量 From 08a34ef8ae3129519fe1b6bdcbd8a362c1779fa8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 28 Jul 2021 17:33:06 +0800 Subject: [PATCH 13/17] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=20=E6=87=92=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectNew.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index fcd07294a..9656955c2 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -273,6 +273,10 @@