From 429bcea8075f10135f7894b33f21a9eeb9e574be Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 10 Nov 2021 17:20:36 +0800
Subject: [PATCH 1/2] feat: There is no way the,

---
 .../domesticStandardsAndRegulations/index.vue  | 18 +++++++++---------
 .../components/EnterpriseStandardDatabase.vue  | 16 ++++++++--------
 .../foreignRegulationsDatabase/index.vue       | 16 ++++++++--------
 .../foreignStandardsAndRegulations/index.vue   | 18 +++++++++---------
 4 files changed, 34 insertions(+), 34 deletions(-)

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 @@
             <el-table-column
                 v-if="isPermission('b17f1d035219c47344032e261342d87d,c09dc12531085e30e39bbdc6cb6116ba,5aedea192a77b14c364f19bdcee3513a')>0"
               type="selection"
-              width="55"
+              min-width="5%"
               align="center">
             </el-table-column>
             <el-table-column
               label="标准号"
-              width="130"
+              min-width="15%"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
@@ -211,7 +211,7 @@
               show-overflow-tooltip
               prop="standName"
               label="标准名称"
-              width="350"
+              min-width="45%"
             >
               <template slot-scope="scope">
                 <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -221,7 +221,7 @@
             <el-table-column
               prop="issueTime"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="发布日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
@@ -231,7 +231,7 @@
             <el-table-column
               prop="SSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
@@ -244,7 +244,7 @@
             <el-table-column
               prop="XCXSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
@@ -254,7 +254,7 @@
             <el-table-column
               prop="ZCCSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
@@ -264,7 +264,7 @@
             <el-table-column
               prop="textStatus"
               sortable="custom"
-              width="75px"
+              min-width="10%"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
               <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -278,7 +278,7 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" label="操作" align="center" width="75">
+            <el-table-column v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" label="操作" align="center" min-width="10%">
               <template slot-scope="scope">
                 <div  v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
                       @command="handleCommand"
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 7cd1abf56..5b52bc6db 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -284,7 +284,7 @@
           <el-table-column
               v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96,2d41ebdb6150ba1af52fd753086d77dc')>0"
             type="selection"
-            width="55"
+              min-width="5%"
             align="center">
           </el-table-column>
 
@@ -298,7 +298,7 @@
           <el-table-column
             show-overflow-tooltip
             label="企标编号"
-            width="130"
+            min-width="15%"
           >
             <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
@@ -311,7 +311,7 @@
             show-overflow-tooltip
             prop="standName"
             label="中文名称"
-            width="350"
+            min-width="35%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -323,7 +323,7 @@
             show-overflow-tooltip
             prop="standEnName"
             label="英文名称"
-            width="350"
+            min-width="35%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -335,7 +335,7 @@
             prop="issueTime"
             label="发布日期"
             sortable
-            width="91"
+            min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -347,7 +347,7 @@
             prop="putTime"
             label="实施日期"
             sortable
-            width="91"
+            min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -360,7 +360,7 @@
                     sortable
                     prop="standStatusShow"
                     label="文本状态"
-                    width="75"
+                    min-width="10%"
             >
 
               <template slot-scope="scope">
@@ -376,7 +376,7 @@
               </template>
           </el-table-column>
 
-            <el-table-column v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="75">
+            <el-table-column v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" min-width="10%">
               <template slot-scope="scope">
               <div  v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
                     @command="handleCommand"
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 1c706e3d9..c872a8cef 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -183,7 +183,7 @@
               v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe,fd83032ae5f41a0021b00e93c88edbbd')>0"
 
               type="selection"
-                  width="55"
+              min-width="5%"
                   align="center">
           </el-table-column>
 
@@ -197,7 +197,7 @@
           <el-table-column
                   show-overflow-tooltip
                   label="政策编号"
-                  width="130"
+                  min-width="15%"
           >
             <template slot-scope="scope">
               <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
@@ -210,7 +210,7 @@
                   show-overflow-tooltip
                   prop="lawsName"
                   label="中文名称"
-                  width="350"
+                  min-width="45%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
@@ -222,7 +222,7 @@
                   show-overflow-tooltip
                   prop="lawsEnName"
                   label="英文名称"
-                  width="350"
+                  min-width="45%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
@@ -234,7 +234,7 @@
                   prop="issueTime"
                   label="发文日期"
                   sortable
-                  width="91"
+                  min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -246,7 +246,7 @@
                   prop="XCXSSRQLAWS"
                   label="新车实施日期"
                   sortable
-                  width="91"
+                  min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -259,7 +259,7 @@
                   sortable
                   prop="standStatusShow"
                   label="文本状态"
-                  width="75"
+                  min-width="10%"
           >
 
             <template slot-scope="scope">
@@ -276,7 +276,7 @@
           </el-table-column>
 
 
-          <el-table-column v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0" label="操作" align="center" width="75">
+          <el-table-column v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0" label="操作" align="center" min-width="10%">
             <template slot-scope="scope">
 
             <div  v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk') == 1"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index cb9a420cd..bfb832b9c 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -183,12 +183,12 @@
             <el-table-column
                 v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a,29bf24bbd156c06f136cc89b1c7b2bb0')>0"
                 type="selection"
-              width="55"
+              min-width="5%"
               align="center">
             </el-table-column>
             <el-table-column
               label="标准号"
-              width="130"
+              min-width="15%"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -210,7 +210,7 @@
               show-overflow-tooltip
               prop="standName"
               label="标准名称"
-              width="350"
+              min-width="45%"
             >
               <template slot-scope="scope">
                 <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -227,7 +227,7 @@
             <el-table-column
               prop="issueTime"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="发布日期">
               <template slot-scope="scope">
                 <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
@@ -244,7 +244,7 @@
             <el-table-column
               prop="SSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
@@ -261,7 +261,7 @@
             <el-table-column
               prop="XCXSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
@@ -278,7 +278,7 @@
             <el-table-column
               prop="ZCCSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
@@ -295,7 +295,7 @@
             <el-table-column
               prop="textStatus"
               sortable="custom"
-              width="75px"
+              min-width="10%"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
               <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -312,7 +312,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="75">
+            <el-table-column v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" min-width="10%">
               <template slot-scope="scope">
 
               <div  v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"

From ee4a9f08ba355913e56faf42fdce7e7de5b4b09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 10 Nov 2021 18:00:51 +0800
Subject: [PATCH 2/2] commit

---
 src/assets/styles/navMenu.less                | 16 ++++++++--------
 src/components/navMenu/index.vue              | 19 ++++++++++++-------
 .../pages/creatProcess/xmpg2/step5.vue        |  7 +++++--
 3 files changed, 25 insertions(+), 17 deletions(-)

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 @@
     </div>
     <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-right" v-if="isCollapse === true"></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" style="font-weight: 600; font-size: 16px;" v-if="isCollapse === true"></i>
     </div>
   </div>
 </template>
@@ -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 {
     }
   }
 }
+
 </style>
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", {