FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-11-11 09:48:28 +08:00
parent a077e53f5e ee4a9f08ba
commit 38e5dcf4e4
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/navMenu.less
+8 -8
View File
@@ -73,14 +73,14 @@
&.is-active { &.is-active {
background: rgba(255, 255, 255, 0.1) !important; background: rgba(255, 255, 255, 0.1) !important;
} }
&:first-child { //&:first-child {
border-top-left-radius: 15px; // border-top-left-radius: 15px;
border-top-right-radius: 15px; // border-top-right-radius: 15px;
} //}
&:last-child { //&:last-child {
border-bottom-left-radius: 15px; // border-bottom-left-radius: 15px;
border-bottom-right-radius: 15px; // border-bottom-right-radius: 15px;
} //}
} }
} }
} }
src/components/navMenu/index.vue
+12 -7
View File
@@ -68,8 +68,8 @@
</div> </div>
<div class="tree-collapse" @click="handleToggleSideBar" :class="{ 'tree-close': isCollapse }"> <div class="tree-collapse" @click="handleToggleSideBar" :class="{ 'tree-close': isCollapse }">
<!--切换折叠样式--> <!--切换折叠样式-->
<i class="el-icon-arrow-left" v-if="isCollapse === false"></i> <i class="el-icon-arrow-left" style="font-weight: 600; font-size: 16px;" v-if="isCollapse === false"></i>
<i class="el-icon-arrow-right" v-if="isCollapse === true"></i> <i class="el-icon-arrow-right" style="font-weight: 600; font-size: 16px;" v-if="isCollapse === true"></i>
</div> </div>
</div> </div>
</template> </template>
@@ -528,14 +528,14 @@ export default {
display: none; display: none;
} }
&:not(.is-collapse) { &:not(.is-collapse) {
width: 212px; width: 180px;
background: #0068B7; background: #0068B7;
background-size: 100% 100%; background-size: 100% 100%;
.logo { .logo {
padding: 10px; padding: 10px;
text-align: left; text-align: left;
img { img {
width: 160px; width: 150px;
height: 61px; height: 61px;
margin-top: -7px; margin-top: -7px;
} }
@@ -569,7 +569,7 @@ export default {
} }
/deep/:not(.is-collapse) .el-menu-item.is-active{ /deep/:not(.is-collapse) .el-menu-item.is-active{
background: #fff !important; background: #fff !important;
color: #4091FF !important; color: #0068B7 !important;
} }
} }
.has-no-read{ .has-no-read{
@@ -592,7 +592,7 @@ export default {
/* }*/ /* }*/
/*}*/ /*}*/
.is-active /deep/.shangqi-icon { .is-active /deep/.shangqi-icon {
color: #4091FF; color: #0068B7;
} }
/deep/.el-submenu__title i { /deep/.el-submenu__title i {
color: #fff; color: #fff;
@@ -601,7 +601,7 @@ export default {
color: #fff; color: #fff;
} }
.nav-menu{ .nav-menu{
background-color: #4091FF; background-color: #0068B7;
scrollbar-width: none; scrollbar-width: none;
-ms-overflow-style: none; /* IE 10+ */ -ms-overflow-style: none; /* IE 10+ */
} }
@@ -690,6 +690,10 @@ export default {
} }
.el-menu-item { .el-menu-item {
padding-left: 29px !important; padding-left: 29px !important;
font-size: 15px;
font-weight: normal;
height: 40px;
line-height: 40px;
div { div {
} }
} }
@@ -712,4 +716,5 @@ export default {
} }
} }
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+5 -2
View File
@@ -472,10 +472,13 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
let dataListChildren = []
this.dataList.forEach(item => {
dataListChildren.push(item.children)
})
this.isSubmit = true; this.isSubmit = true;
console.log(this.dataList);
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.children = this.dataList[0].children this.listForm.children = dataListChildren
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {