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", {
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 0fe402bef..3f3fdacb7 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -186,12 +186,12 @@
{{ scope.row.standName }}
@@ -221,7 +221,7 @@
{{ formatIssueDate(scope.row.issueTime) }}
@@ -231,7 +231,7 @@
@@ -244,7 +244,7 @@
{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
@@ -254,7 +254,7 @@
{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
@@ -264,7 +264,7 @@
@@ -278,7 +278,7 @@
{{ textStatusMap[scope.row.textStatus] }}
-
+
@@ -298,7 +298,7 @@
@@ -311,7 +311,7 @@
show-overflow-tooltip
prop="standName"
label="中文名称"
- width="350"
+ min-width="35%"
>
{{ scope.row.standName }}
@@ -323,7 +323,7 @@
show-overflow-tooltip
prop="standEnName"
label="英文名称"
- width="350"
+ min-width="35%"
>
{{ scope.row.standEnName }}
@@ -335,7 +335,7 @@
prop="issueTime"
label="发布日期"
sortable
- width="91"
+ min-width="13%"
>
{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
@@ -347,7 +347,7 @@
prop="putTime"
label="实施日期"
sortable
- width="91"
+ min-width="13%"
>
{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
@@ -360,7 +360,7 @@
sortable
prop="standStatusShow"
label="文本状态"
- width="75"
+ min-width="10%"
>
@@ -376,7 +376,7 @@
-
+
@@ -197,7 +197,7 @@
@@ -210,7 +210,7 @@
show-overflow-tooltip
prop="lawsName"
label="中文名称"
- width="350"
+ min-width="45%"
>
{{ scope.row.lawsName }}
@@ -222,7 +222,7 @@
show-overflow-tooltip
prop="lawsEnName"
label="英文名称"
- width="350"
+ min-width="45%"
>
{{ scope.row.lawsEnName }}
@@ -234,7 +234,7 @@
prop="issueTime"
label="发文日期"
sortable
- width="91"
+ min-width="13%"
>
{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
@@ -246,7 +246,7 @@
prop="XCXSSRQLAWS"
label="新车实施日期"
sortable
- width="91"
+ min-width="13%"
>
{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
@@ -259,7 +259,7 @@
sortable
prop="standStatusShow"
label="文本状态"
- width="75"
+ min-width="10%"
>
@@ -276,7 +276,7 @@
-
+
{{
@@ -210,7 +210,7 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
- width="350"
+ min-width="45%"
>
{{
@@ -227,7 +227,7 @@
@@ -244,7 +244,7 @@
@@ -261,7 +261,7 @@
{{
@@ -278,7 +278,7 @@
{{
@@ -295,7 +295,7 @@
@@ -312,7 +312,7 @@
{{ textStatusMap[scope.row.textStatus] }}
-
+