diff --git a/src/assets/styles/navMenu.less b/src/assets/styles/navMenu.less index 54bbdd1f9..f5eeff979 100644 --- a/src/assets/styles/navMenu.less +++ b/src/assets/styles/navMenu.less @@ -73,14 +73,14 @@ &.is-active { background: rgba(255, 255, 255, 0.1) !important; } - &:first-child { - border-top-left-radius: 15px; - border-top-right-radius: 15px; - } - &:last-child { - border-bottom-left-radius: 15px; - border-bottom-right-radius: 15px; - } + //&:first-child { + // border-top-left-radius: 15px; + // border-top-right-radius: 15px; + //} + //&:last-child { + // border-bottom-left-radius: 15px; + // border-bottom-right-radius: 15px; + //} } } } diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 96661aa9a..1aba19d67 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -68,8 +68,8 @@
- - + +
@@ -528,14 +528,14 @@ export default { display: none; } &:not(.is-collapse) { - width: 212px; + width: 180px; background: #0068B7; background-size: 100% 100%; .logo { padding: 10px; text-align: left; img { - width: 160px; + width: 150px; height: 61px; margin-top: -7px; } @@ -569,7 +569,7 @@ export default { } /deep/:not(.is-collapse) .el-menu-item.is-active{ background: #fff !important; - color: #4091FF !important; + color: #0068B7 !important; } } .has-no-read{ @@ -592,7 +592,7 @@ export default { /* }*/ /*}*/ .is-active /deep/.shangqi-icon { - color: #4091FF; + color: #0068B7; } /deep/.el-submenu__title i { color: #fff; @@ -601,7 +601,7 @@ export default { color: #fff; } .nav-menu{ - background-color: #4091FF; + background-color: #0068B7; scrollbar-width: none; -ms-overflow-style: none; /* IE 10+ */ } @@ -690,6 +690,10 @@ export default { } .el-menu-item { padding-left: 29px !important; + font-size: 15px; + font-weight: normal; + height: 40px; + line-height: 40px; div { } } @@ -712,4 +716,5 @@ export default { } } } + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 141206bc9..608baaa01 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -472,10 +472,13 @@ export default { }, //提交事件 handleSubmit() { + let dataListChildren = [] + this.dataList.forEach(item => { + dataListChildren.push(item.children) + }) this.isSubmit = true; - console.log(this.dataList); this.listForm.commentText = this.commentText; - this.listForm.children = this.dataList[0].children + this.listForm.children = dataListChildren this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", {