From 7142b4f322c72bd5f5de6a35ca364d2651357bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 15 Oct 2021 15:00:48 +0800
Subject: [PATCH 01/31] commit

---
 src/App.vue                                   |  32 +++--
 src/components/personalCenter/index.vue       | 113 ++++++++++--------
 .../searchCenter/pages/standardSearch.vue     |  13 +-
 3 files changed, 97 insertions(+), 61 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9f68cb375..680c12bfb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,6 +42,7 @@
 
 <script>
   import {mapGetters, mapState} from 'vuex'
+  import { webLoginType } from '@/sysConfig'
   export default {
     name: 'App',
     data () {
@@ -61,17 +62,31 @@
             confirmButtonClass: 'common-button-primary',
             roundButton: false
           }).then(() => {
+            if(webLoginType != null && webLoginType === 'idm' ) {
+              window.location.href= 'http://testsso1.foton.com.cn/logout?service='
+              // this.$http.post('logout', {}, res => {
+              //   window.location.href= 'http://testsso1.foton.com.cn/logout?service='
+              // })
+            }else if(webLoginType != null && webLoginType === 'dev'){
+              this.$store.commit('setTypeFlag', 'loginOut')
+              this.$http.get('logout', {}, {
+                _this: this
+              }, res => {
+                this.$store.dispatch('logout')
+                this.$router.push('/login')
+              }, e => {})
+            }
             // this.$http.post('/logout', {}, res => {
             //   window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
             // })
             // return
-            this.$store.commit('setTypeFlag', 'loginOut')
-            this.$http.get('logout', {}, {
-              _this: this
-            }, res => {
-              this.$store.dispatch('logout')
-              this.$router.push('/login')
-            }, e => {})
+            // this.$store.commit('setTypeFlag', 'loginOut')
+            // this.$http.get('logout', {}, {
+            //   _this: this
+            // }, res => {
+            //   this.$store.dispatch('logout')
+            //   this.$router.push('/login')
+            // }, e => {})
           }).catch(() => {
           })
         }
@@ -271,7 +286,8 @@
     width: 100%;
     height: 100%;
     overflow-y: auto;
-    background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
+    background-color: #F0F2F5;
+    //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
     background-size: 100% 100%;
     font-family: MicrosoftYaHei,微软雅黑;
     & > div{
diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index 44ab56f26..a22948f90 100644
--- a/src/components/personalCenter/index.vue
+++ b/src/components/personalCenter/index.vue
@@ -3,8 +3,13 @@
     <div class="header-left">
       <span class="logo" @click="toHome" title="回到首页"></span>
     </div>
+    <div class="header-center">
+        <span style="color: #fff; line-height: 65px; font-size: 20px;">
+            标准法规管理系统  standard and regulations management system
+          </span>
+    </div>
     <div class="header-right">
-      <span class="date">{{currentTime}}</span>
+      <span class="date">{{ currentTime }}</span>
       <span class="divide-line"> | </span>
       <span class="user-img"></span>
       <span class="user">{{ $store.getters.userInfo.uName }}</span>
@@ -16,7 +21,7 @@
         >
           <div class="iconfont" style="color: #fff;"><i class="el-icon-arrow-down"></i></div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item name="logout" command="logout">{{$t('m.exit')}}</el-dropdown-item>
+            <el-dropdown-item name="logout" command="logout">{{ $t("m.exit") }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -25,78 +30,84 @@
 </template>
 
 <script>
-import {mapGetters, mapMutations} from 'vuex'
+import { mapGetters, mapMutations } from "vuex";
+
 export default {
-  name: 'useImg',
-  data () {
+  name: "useImg",
+  data() {
     return {
       // 当前系统时间
-      currentTime: '',
+      currentTime: "",
       userInfoVisible: false
-    }
+    };
   },
   methods: {
-    toHome () {
-      this.$router.push('/home2')
+    toHome() {
+      this.$router.push("/home2");
     },
     // 获取当前时间
-    getTime () {
-      this.currentTime = this.$dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss')
+    getTime() {
+      this.currentTime = this.$dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss");
     },
     // 用户菜单栏点击
-    userInfoOpen (name) {
+    userInfoOpen(name) {
       switch (name) {
-        case 'personal':
-          this.$router.push('/personal')
-          break
-        case 'logout':
-          this.$confirm('您确认要退出吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-            confirmButtonClass: 'common-button-primary',
+        case "personal":
+          this.$router.push("/personal");
+          break;
+        case "logout":
+          this.$confirm("您确认要退出吗？", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+            confirmButtonClass: "common-button-primary",
             roundButton: true
           }).then(() => {
-            this.userLoginOut()
-          }).catch(() => {})
-          break
+            this.userLoginOut();
+          }).catch(() => {
+          });
+          break;
       }
     },
     // 用户退出登录
-    userLoginOut () {
-      this.$http.get('logout', {}, {
+    userLoginOut() {
+      this.$http.get("logout", {}, {
         _this: this
       }, res => {
-        this.$store.dispatch('logout')
-        this.$router.push('/sign_in')
-      }, e => {})
+        this.$store.dispatch("logout");
+        this.$router.push("/sign_in");
+      }, e => {
+      });
     },
-    ...mapMutations(['setProcess', 'setDynamicTotal'])
+    ...mapMutations(["setProcess", "setDynamicTotal"])
   },
-  mounted () {
-    this.getTime()
+  mounted() {
+    this.getTime();
   },
   computed: {
     // 用户头像
-    userAvator () {
-      return this.$store.getters.userInfo.avator || require('@/assets/images/avator_default.png')
+    userAvator() {
+      return this.$store.getters.userInfo.avator || require("@/assets/images/avator_default.png");
     },
-    uName () {
-      return this.$store.getters.userInfo.uName
+    uName() {
+      return this.$store.getters.userInfo.uName;
     },
-    ...mapGetters(['getDynamicTotal', 'getMenuList'])
+    ...mapGetters(["getDynamicTotal", "getMenuList"])
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
-.header{
+.header {
   display: flex;
   justify-content: space-between;
+  background-color: #171E4A;
   color: #fff;
-  .header-left{
+
+  .header-left {
     text-align: left;
-    width: 50%;
+    //width: 50%;
+
     .logo {
       display: inline-block;
       width: 160px;
@@ -106,19 +117,25 @@ export default {
       cursor: pointer;
     }
   }
-  .header-right{
-    width: 49%;
+  .header-center{
+    width: 70%;
+  }
+  .header-right {
+    //width: 49%;
     text-align: right;
     line-height: 61px;
     height: 61px;
     display: flex;
+    margin-right: 20px;
     justify-content: flex-end;
     align-items: center;
-    .date{
+
+    .date {
       display: inline-block;
       margin-right: 20px;
     }
-    .user-img{
+
+    .user-img {
       display: inline-block;
       width: 20px;
       height: 21px;
@@ -126,11 +143,13 @@ export default {
       background-size: 100% 100%;
       margin-right: 15px;
     }
-    .divide-line{
+
+    .divide-line {
       display: inline-block;
       margin-right: 20px;
     }
-    .user{
+
+    .user {
       display: inline-block;
     }
   }
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 79708a549..e23f60f14 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -5,7 +5,7 @@
         <div class="standard-search-content">
             <div style="position: absolute;left: 0;right: 0;top: 0;bottom: 0;">
                 <div class="content-left">
-                    <div class="search">
+                    <div class="search" style="padding: 40px;">
                         <div class="search-box">
                             <div class="home-input">
                                 <el-input
@@ -2565,7 +2565,7 @@
         border-bottom-left-radius: 20px;
     }
     .standard-search {
-        padding: 6px 26px;
+        //padding: 6px 26px;
         @borderColor: #BFBFBF;
         height: 100%;
         font-size: 14px;
@@ -2641,7 +2641,7 @@
         }
         @media screen and (min-width: 1920px) {
             .header{
-                height: 75px;
+                height: 65px;
             }
         }
         .standard-search-content{
@@ -3065,7 +3065,7 @@
             }
             .router-link{
                 position: relative;
-                color: #fff;
+                color: #333;
                 top: 17px;
                 left: 44px;
                 font-family: PingFang-SC-Medium;
@@ -3074,7 +3074,7 @@
             }
             .router-link1{
                 position: relative;
-                color: #fff;
+                color: #333;
                 top: 17px;
                 left: 54px;
                 font-family: PingFang-SC-Medium;
@@ -3107,7 +3107,8 @@
         border-radius: 20px;
         flex: 1;
         overflow: hidden;
-        margin-top: 20px;
+        //margin-top: 20px;
+        margin: 20px 26px 0 26px;
         display: flex;
         flex-direction: column;
         .all-box__wrap {

From 9229392fcf4db1475330cf3402f91706143cdebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 16 Oct 2021 09:33:58 +0800
Subject: [PATCH 02/31] commit

---
 src/pages/login/index.vue       | 4 +++-
 src/pages/loginVerify/index.vue | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 7ae16a224..a878c6ba2 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -134,7 +134,9 @@
              */
             getMenu () {
                 return new Promise((resolve, reject) => {
-                    this.$http.get('sarUser/user/menu', {}, {
+                    this.$http.get('sarUser/user/menu', {
+                      userId: this.$store.getters.userInfo.userId,
+                    }, {
                         _this: this,
                     }, res => {
                         if (res.ok) {
diff --git a/src/pages/loginVerify/index.vue b/src/pages/loginVerify/index.vue
index b76887178..d93995f79 100644
--- a/src/pages/loginVerify/index.vue
+++ b/src/pages/loginVerify/index.vue
@@ -29,7 +29,9 @@
              */
             getMenu () {
                 return new Promise((resolve, reject) => {
-                    this.$http.get('sarUser/user/menu', {}, {
+                    this.$http.get('sarUser/user/menu', {
+                      userId: this.$store.getters.userInfo.userId,
+                    }, {
                         _this: this,
                     }, res => {
                         if (res.ok) {

From cbd6b630dc737ea4a451824f6a53390a381eb505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 16 Oct 2021 10:33:14 +0800
Subject: [PATCH 03/31] commit

---
 src/pages/details/otherBussStandardDetails/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 6657f427d..e3656326e 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -124,8 +124,8 @@
                   :key="fileIndex"
                 >
                   <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'AdUThFonYX'"/>
-                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'HDLSNLFDWHF'"/>
+                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'0a0d0d1956ab6ca62a8efd6a1ff536ad'"/>
+                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'bfed56ba55181d154bfb4cd1cfbca806'"/>
                   <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                 </p>
 <!--                <el-button-->

From b49381845406580d5fdfb55d69179bea5a4613e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 16 Oct 2021 10:41:21 +0800
Subject: [PATCH 04/31] commit

---
 src/App.vue            | 2 +-
 src/sysConfig/index.js | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 680c12bfb..f744aa507 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -63,7 +63,7 @@
             roundButton: false
           }).then(() => {
             if(webLoginType != null && webLoginType === 'idm' ) {
-              window.location.href= 'http://testsso1.foton.com.cn/logout?service='
+              window.location.href= 'http://sso.foton.com.cn/logout?service='
               // this.$http.post('logout', {}, res => {
               //   window.location.href= 'http://testsso1.foton.com.cn/logout?service='
               // })
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 23dbde637..e9ecb4e04 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -10,9 +10,9 @@
 const devIp = '62.234.136.153'
 const devInterfacePORT = '8033'
 // 配置 idm 认证
-const ssoLogin = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
+const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
-const devWebUrl = 'http://127.0.0.1:10088/#/'
+const devWebUrl = 'https://slrs.foton.com.cn/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 // 云端端口号
@@ -37,9 +37,8 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8033'
-
+const prodIp = '10.100.5.117'
+const prodInterfacePORT = '4202'
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp

From 079db318a59b96e0e120ae5d8064d5718a8ee6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 16 Oct 2021 14:04:57 +0800
Subject: [PATCH 05/31] commit

---
 src/pages/config/pages/mechanismManage/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 244d8450e..60231784e 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -11,7 +11,6 @@
         <el-tree
           :data="treeData"
           :props="defaultProps"
-          default-expand-all
           :current-node-key="nodeKeyId"
           node-key="id"
           :filter-node-method="filterNode"

From 3b7075f14f54c90f1df5912e62abe284de21fa4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 17 Oct 2021 11:32:14 +0800
Subject: [PATCH 06/31] commit

---
 src/components/personalCenter/index.vue         | 3 ++-
 src/pages/searchCenter/pages/standardSearch.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index a22948f90..b6863919f 100644
--- a/src/components/personalCenter/index.vue
+++ b/src/components/personalCenter/index.vue
@@ -119,9 +119,10 @@ export default {
   }
   .header-center{
     width: 70%;
+    margin-left: 20px;
   }
   .header-right {
-    //width: 49%;
+    width: 49%;
     text-align: right;
     line-height: 61px;
     height: 61px;
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index e23f60f14..8560988e7 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -2634,7 +2634,7 @@
             text-align: center;
         }
         .header{
-            height: 50px;
+            //height: 50px;
             .home-header{
                 height: 100%;
             }

From d2fe41b41baec14262c658821a55b9c06ab1b8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 17 Oct 2021 14:38:37 +0800
Subject: [PATCH 07/31] commit

---
 src/components/navMenu/index.vue        | 9 ++++++---
 src/components/personalCenter/index.vue | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 37812b30c..97bc155cc 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -465,7 +465,9 @@
     },
     computed: {
       logo () {
-        return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
+        // background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
+        // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
+        return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/home/logo2.png')
       },
       ...mapGetters(['getDynamicTotal', 'isCollapse'])
     },
@@ -510,8 +512,9 @@
         padding: 10px;
         text-align: left;
         img {
-          width: 115px;
-          height: 40px;
+          width: 160px;
+          height: 61px;
+          margin-top: -7px;
         }
       }
     }
diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index b6863919f..636543c87 100644
--- a/src/components/personalCenter/index.vue
+++ b/src/components/personalCenter/index.vue
@@ -107,7 +107,6 @@ export default {
   .header-left {
     text-align: left;
     //width: 50%;
-
     .logo {
       display: inline-block;
       width: 160px;
@@ -119,7 +118,7 @@ export default {
   }
   .header-center{
     width: 70%;
-    margin-left: 20px;
+    margin-left: 60px;
   }
   .header-right {
     width: 49%;

From 08b4de67d83766b0a82a93c5e111d4b8354a8c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 17 Oct 2021 19:57:52 +0800
Subject: [PATCH 08/31] commit

---
 src/components/navMenu/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 97bc155cc..eeedc53f1 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -175,10 +175,10 @@
                 path: '/nonConfomity',
                 menuId: '0119abd677e0204e061eb0f0b8cafda0'
               },
-              {
-                title: '工作组',
-                path: '/workingGroup',
-              },
+              // {
+              //   title: '工作组',
+              //   path: '/workingGroup',
+              // },
               // {
               //   title: '备案产品标准库',
               //   path: '/enterpriseStandardFiling',

From 12941aa7ac2ccccda6d1d7f009bc650c722ae7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 18 Oct 2021 13:28:15 +0800
Subject: [PATCH 09/31] commit

---
 .../accessStandardsAndRegulations/index.vue          |  2 +-
 .../localProductsOrProjectLibrary/index.vue          | 12 ++++++------
 .../localProductsOrProjectLibrary/pages/details.vue  |  2 +-
 .../standardForComments/index.vue                    |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index c24f4f472..33de0f22d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -49,7 +49,7 @@ export default {
     var list = [];
     const menuList = this.$store.getters.getMenuList;
     let menuData = [];
-    let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865", "418123d180abf67bd2c46d5a694baaa5", "5a75523729b04102a565167004d640e9"];
+    let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865", "a1170d77f4332e5f45ce520e63b00e15", "5a75523729b04102a565167004d640e9"];
     this.menuName.forEach(item => {
       for (let i = 0; i < menuList.length; i++) {
         let entity = menuList[i];
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 7bc6df506..72276a5e1 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -50,7 +50,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
-              v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'"
+              v-btn-permission="'b1ac4fb12eeb08c525b018ef839dbd40'"
               @click="getLocalProductTableBtn">查询
             </el-button>
           </el-form-item>
@@ -58,7 +58,7 @@
             <el-button
               class="common-button-default"
               size="small"
-              v-btn-permission="'10e3fdd2d816d64022f2928cd65b9bb1'"
+              v-btn-permission="'7238d3ca40d709ba6b089c9aaa560760'"
               @click="clearAllSearch">清空
             </el-button>
           </el-form-item>
@@ -67,7 +67,7 @@
               type="primary"
               class="common-button-primary"
               size="mini"
-              v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
+              v-btn-permission="'11a6fc355f457eff8ad70278224a2f3b'"
               @click="selectMoreBtn"
             ><i class="iconfont">&#xe7a5;</i>高级查询
             </el-button>
@@ -195,11 +195,11 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'881cfa2f3c898e0954d90ee7d521ed70'">
                     查看
                   </el-dropdown-item>
-                  <!-- // 权限id  91ed4c216c019e869aad04baf7bc7db4-->
-                  <el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="''">
+                  <!-- // 权限id -->
+                  <el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="'dd87f572b6c807b6982fa071fcbe0d41'">
                     发起确认流程
                   </el-dropdown-item>
                 </el-dropdown-menu>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 6fb4a4ee4..6a1a49764 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -54,7 +54,7 @@
               type="primary"
               class="common-button-default export-button"
               size="mini" @click="exportStandard"
-              v-btn-permission="''"
+              v-btn-permission="'b46217ac825d49933b0f7349ba924ea7'"
               title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
               icon="export"
             >导出
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 4cff101d9..3d2404d61 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -41,12 +41,13 @@
                 type="primary"
                 size="mini"
                 class="common-button-primary"
-
+                v-btn-permission="'0514cd2c6b0e6311a7632f8bef87aecb'"
                 @click="sarStandCompareHisInfo">查询
               </el-button>
               <el-button
                 class="common-button-default"
                 size="mini"
+                v-btn-permission="'bb7386429dabf20b8006e03efacc0673'"
                 @click="clearSearchStand">清空
               </el-button>
             </el-formItem>

From ecd1b4c1dcccdf8fd5893d758329164b249eaf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 18 Oct 2021 14:08:52 +0800
Subject: [PATCH 10/31] commit

---
 .../accessStandardsAndRegulations/index.vue                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index 33de0f22d..5920e1055 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -32,7 +32,7 @@ export default {
     return {
       list: [],
       tabValue: "listProject",
-      menuName: ["国家/地区清单", "项目类清单", "其他清单", "重点标准跟踪清单"]
+      menuName: ["国家/地区清单", "车型类别清单", "其他清单", "项目清单"]
     };
   },
   methods: {},
@@ -74,7 +74,7 @@ export default {
               name: "listOther"
             });
             continue;
-          } else {
+          } else if (entity.id === "a1170d77f4332e5f45ce520e63b00e15") {
             list.push({
               label: "项目清单",
               name: "localProductsOrProjectLibrary"

From 73cb52770ee3d155b8bc08b2521076386d7d87f1 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Mon, 18 Oct 2021 15:45:48 +0800
Subject: [PATCH 11/31] =?UTF-8?q?=E9=A6=96=E9=A1=B5log=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index f744aa507..f4d57b343 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -308,7 +308,7 @@
         flex-direction: column;
         .container-box {
           position: relative;
-          height: calc(~'100% - 50px');
+          height: calc(~'100% - 65px');
           //flex: 1;
           background: #F4F4F4;
           overflow-y: auto;

From 9fa4cce190a59a6fd87d0c8bc18b566e15aba93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 18 Oct 2021 19:56:13 +0800
Subject: [PATCH 12/31] commit

---
 src/App.vue                                   | 12 ++---
 .../config/pages/mechanismManage/index.vue    | 53 ++++++++++++++++++-
 .../otherBussStandardDetails/index.vue        |  4 +-
 src/pages/home1/components/release/index.vue  |  2 +-
 src/pages/home2/components/release/index.vue  |  2 +-
 5 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f4d57b343..31060e64e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -191,7 +191,7 @@
             return
           }
 
-          if (userInfoModifyTimeInLocalStorage === null) {
+          if (userInfoModifyTimeInLocalStorage === null && webLoginType === 'idm') {
             this.$store.dispatch('syncStorageData')
 
             const currentPage = this.$route.name
@@ -206,7 +206,7 @@
             });
             this.messageForLogin && this.messageForLogin.close()
             this.messageForLogin = this.$message({
-              message: `用户已退出，${this.currentMinute}秒后将跳转到登录页面`,
+              message: `用户已退出，${this.currentMinute}秒后将跳转到登录1页面`,
               type: 'warning'
             })
 
@@ -216,14 +216,14 @@
                 clearInterval(this.intervalForLogin)
                 this.loading.close()
 
-                this.$router.push('/login')
-                console.log('切换到登录页面', currentPage)
+                  this.$router.push('/login')
+                  console.log('切换到登录页面', currentPage)
               }
               this.currentMinute--
               this.messageForLogin.message = `用户已退出，${this.currentMinute}秒后将跳转到登录页面`
-            }, 1000)
+            }, 0)
 
-          } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage) {
+          } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage && webLoginType === 'idm') {
             this.$store.dispatch('syncStorageData')
 
             console.log('用户信息已更改，同步数据')
diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 60231784e..cf1d1930e 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -3,11 +3,26 @@
   <div id="mechanism-manage" :class="{ 'tree-close': sideClose }" class="v-class">
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
+<!--        @keyup.enter.native="searchPeople"-->
         <el-input
           class="filter-tree-input"
           placeholder="输入关键字进行过滤"
           v-model="filterText">
         </el-input>
+<!--        <el-tree-->
+<!--          node-key="id"-->
+<!--          :data="treeData"-->
+<!--          :props="defaultProps"-->
+<!--          :default-checked-keys="nodeList"-->
+<!--          :current-node-key="nodeKeyId"-->
+<!--          highlight-current-->
+<!--          check-strictly-->
+<!--          :expand-on-click-node="false"-->
+<!--          ref="tree"-->
+<!--          :load="loadNode"-->
+<!--          @node-click="handleNodeClick"-->
+<!--          lazy>-->
+<!--        </el-tree>-->
         <el-tree
           :data="treeData"
           :props="defaultProps"
@@ -15,6 +30,7 @@
           node-key="id"
           :filter-node-method="filterNode"
           highlight-current
+          default-expand-all
           ref="tree"
           :expand-on-click-node="false"
           @node-click="handleNodeClick">
@@ -274,7 +290,6 @@ export default {
       }, {}, res => {
         if (res.ok) {
           this.$message.success('配置岗位成功')
-
           this.modalPost = false
           this.getData()
         }
@@ -350,6 +365,41 @@ export default {
       this.id = data.id
       this.getData()
     },
+    // searchPeople(){
+    //   console.log(this.filterText);
+    // },
+    // loadNode(node, resolve) {
+    //   if (node.level === 0) {
+    //     return resolve(this.treeData);
+    //   }
+    //   this.getChildren(node, resolve)
+    // },
+    // getChildren (node, resolve) {
+    //   this.id = node.key
+    //   this.getData()
+    //   this.$http.get('SarInstitution/institution/getNext', {
+    //     institutionId: node.key
+    //   }, {}, res => {
+    //     let people = [];
+    //     res.forEach(item => {
+    //       if(item.disabled === true){
+    //         people.push(item)
+    //       }
+    //     })
+    //     resolve(people)
+    //   })
+    // },
+    // getTree() {
+    //   this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {
+    //     _this: this,
+    //     loading: 'treeLoading'
+    //   }, res => {
+    //     this.treeData = res
+    //     this.nodeKeyId = this.treeData[0].id
+    //     this.treeLoading = false
+    //   }, e => {
+    //   })
+    // },
     getTree() {
       this.$http.get('SarInstitution/institution', {}, {
         _this: this,
@@ -378,7 +428,6 @@ export default {
         _this: this,
         loading: 'Loading'
       }, res => {
-        console.log(res.data)
         res.data.records.forEach((item) => {
           let NameList = ''
           item.positions.forEach((items) => {
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index e3656326e..3bbd4c9cf 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -124,8 +124,8 @@
                   :key="fileIndex"
                 >
                   <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'0a0d0d1956ab6ca62a8efd6a1ff536ad'"/>
-                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'bfed56ba55181d154bfb4cd1cfbca806'"/>
+                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
+                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
                   <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                 </p>
 <!--                <el-button-->
diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 3fe4a1059..543adaa4a 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -28,7 +28,7 @@ export default {
   mounted() {
     this.getDate()
     this.getAdvice()
-    this.addDate()
+    // this.addDate()
   },
   methods: {
     // 点击查看
diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index b3b3d089f..62081407a 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -56,7 +56,7 @@ export default {
   mounted() {
     this.getDate()
     this.getAdvice()
-    this.addDate()
+    // this.addDate()
   },
   methods: {
     // 点击查看

From e36c3f092b065819d492cf25296e5f306d021407 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 19 Oct 2021 09:02:22 +0800
Subject: [PATCH 13/31] feat: There is no way the ie 8-11

---
 src/common/axios/index.js   | 8 ++++++++
 src/common/axiosV2/index.js | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index b8f6b49de..3a7d94f40 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -58,6 +58,14 @@ _axios.interceptors.request.use(
  */
 _axios.interceptors.response.use(
     res => {
+      // IE 8-9
+      if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
+        try {
+          res.data = JSON.parse(response.request.responseText);
+        } catch (e) {
+          // ignored
+        }
+      }
       if(res.data && res.data.respCode && res.data.respCode === 'LE505'){
         window.sessionStorage.clear()
         messageOnce.warning({
diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js
index b01174d05..00473653f 100644
--- a/src/common/axiosV2/index.js
+++ b/src/common/axiosV2/index.js
@@ -53,6 +53,14 @@ service.interceptors.request.use(
  */
 service.interceptors.response.use(
     res => {
+        // IE 8-9
+        if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
+            try {
+                res.data = JSON.parse(response.request.responseText);
+            } catch (e) {
+                // ignored
+            }
+        }
         if(res.data && res.data.respCode != undefined && res.data.respCode === 'LE505'){
             window.sessionStorage.clear()
             messageOnce.warning({

From a98a01b91e6442401283db1765f86507cb629e45 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 19 Oct 2021 09:08:12 +0800
Subject: [PATCH 14/31] feat: There is no way the

---
 src/common/axios/index.js   | 2 +-
 src/common/axiosV2/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index 3a7d94f40..9ae28b5be 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -61,7 +61,7 @@ _axios.interceptors.response.use(
       // IE 8-9
       if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
         try {
-          res.data = JSON.parse(response.request.responseText);
+          res.data = JSON.parse(res.request.responseText);
         } catch (e) {
           // ignored
         }
diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js
index 00473653f..8e4f0790a 100644
--- a/src/common/axiosV2/index.js
+++ b/src/common/axiosV2/index.js
@@ -56,7 +56,7 @@ service.interceptors.response.use(
         // IE 8-9
         if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
             try {
-                res.data = JSON.parse(response.request.responseText);
+                res.data = JSON.parse(res.request.responseText);
             } catch (e) {
                 // ignored
             }

From d0b7851c436a26f7527798ea9e4a7a380f2b0498 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 19 Oct 2021 13:53:21 +0800
Subject: [PATCH 15/31] commit

---
 src/App.vue                      | 6 +++---
 src/components/navMenu/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 31060e64e..a1a8916e3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,9 +27,9 @@
               </el-dropdown>
             </div>
           </div>
-          <div class="logo">
-            <img :src="logo" />
-          </div>
+<!--          <div class="logo">-->
+<!--            <img :src="logo" />-->
+<!--          </div>-->
         </div>
 <!--        <com-header></com-header>-->
         <div class="container-box">
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index eeedc53f1..069747414 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -467,7 +467,7 @@
       logo () {
         // background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
         // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
-        return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/home/logo2.png')
+        return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
       },
       ...mapGetters(['getDynamicTotal', 'isCollapse'])
     },

From 4d5c43d75b3c699979892dad541494dd43ee2b2e Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 19 Oct 2021 16:05:44 +0800
Subject: [PATCH 16/31] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A2=84=E8=A7=88=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 20ea16852..dc6093673 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -2261,6 +2261,7 @@
         // 缺少文件
         if (this.$route.params.pageType === 'INLAND_STAND') {
           if (this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
+
             this.$http.get('lawss/sarStandFile/queryConvertAtt', {
               attId: attId
             }, {
@@ -2306,7 +2307,9 @@
           }
         } else {
           // 国外在线预览权限
-          if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98  ')) {
+          if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) {
+          // if (this.$hasPermission('02fd6eff0537c283dd071683de10689f')) {
+
             this.$http.get('lawss/sarStandFile/queryConvertAtt', {
               attId: attId
             }, {

From 4b05158c7022a3e821b63cd9b4a095d6efd425da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 19 Oct 2021 18:07:15 +0800
Subject: [PATCH 17/31] commit

---
 .../config/pages/mechanismManage/index.vue    | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index cf1d1930e..6f613fbf6 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -59,7 +59,7 @@
             </el-form-item>
             <el-form-item>
               <el-button type="primary" size="mini"
-                         class="common-button-primary" @click="getData">
+                         class="common-button-primary" @click="getDatas">
                 查询
               </el-button>
             </el-form-item>
@@ -238,6 +238,7 @@ export default {
   name: 'MechanismManage',
   data() {
     return {
+      peopleType: '', //1为树结构 2 为全机构
       nodeKeyId: '',
       searchForm: {
         uname: "",
@@ -417,7 +418,33 @@ export default {
         console.log(e);
       })
     },
+    getDatas() {
+      this.peopleType = 2;
+      this.$http.post('SarInstitution/institution/user', {
+        current: this.page,
+        size: this.pageSize,
+        uname: this.searchForm.uname,
+        email: this.searchForm.email
+      }, {
+        _this: this,
+        loading: 'Loading'
+      }, res => {
+        res.data.records.forEach((item) => {
+          let NameList = ''
+          item.positions.forEach((items) => {
+            if (NameList.length > 0) {
+              NameList += ','
+            }
+            NameList += items.name
+          })
+          item.NameList = NameList
+        })
+        this.data = res.data.records
+        this.total = res.data.total
+      })
+    },
     getData() {
+      this.peopleType = 1;
       this.$http.post('SarInstitution/institution/user', {
         current: this.page,
         size: this.pageSize,
@@ -444,11 +471,19 @@ export default {
     },
     pageChange(page) {
       this.page = page
-      this.getData()
+      if(this.peopleType === 1){
+        this.getData()
+      }else{
+        this.getDatas()
+      }
     },
     pageSizeChange(pageSize) {
       this.pageSize = pageSize
-      this.getData()
+      if(this.peopleType === 1){
+        this.getData()
+      }else{
+        this.getDatas()
+      }
     },
     pageChange2(page) {
       this.page = page

From 2adcd4029728908ff321e14462d82cfe2bdddc9e 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, 20 Oct 2021 14:10:31 +0800
Subject: [PATCH 18/31] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    |  4 ++--
 src/pages/localTool/standAutoSplit/index.vue  | 12 +++++-----
 src/pages/localTool/standContrast/index.vue   |  2 ++
 .../domesticStandardsAndRegulations/index.vue | 22 +++++++++----------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index dc6093673..bf8b7a4f4 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -182,13 +182,13 @@
                             title="下载"
                             @click="downloadFile(file.id)"
                             class="icon-download"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                             title="下载带水印"
                             @click="downloadFileByWater(file.id, file.fileSuffix)"
                             class="icon-download2"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 3d807ae23..66793347b 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -14,12 +14,12 @@
                  size="mini"
                   type="primary"
                   class="common-button-primary"
-                 v-btn-permission="''"
+                 v-btn-permission="'bcf0d05723689ced8f49fae7794ff0db'"
                   @click="searchStandList">查询</el-button>
               <el-button
                  size="mini"
                   class="common-button-default"
-                 v-btn-permission="''"
+                 v-btn-permission="'0af780936b77df9905c988db9e90bee8'"
                   @click="clearSearchStand">清空</el-button>
             </el-form-item>
           </el-form>
@@ -28,8 +28,8 @@
     </table-tools-bar>
     <div class="content">
       <div class="action-bar">
-        <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="''">拆分</el-button>
-        <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="''">删除</el-button>
+        <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'">拆分</el-button>
+        <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-button>
       </div>
       <div class="table-wrap">
         <div style="position: absolute;height: 100%;width: 100%;">
@@ -113,8 +113,8 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">查看</el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'17ba4598eb411d6feed468a2e446a301'">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </template>
diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue
index e94a86b17..f2de06d94 100644
--- a/src/pages/localTool/standContrast/index.vue
+++ b/src/pages/localTool/standContrast/index.vue
@@ -19,10 +19,12 @@
                   type="primary"
                   size="mini"
                   class="common-button-primary"
+                  v-btn-permission="'158298eaaf15a57a221c53f69e9ae563'"
                   @click="sarStandCompareHisInfo">搜索</el-button>
                 <el-button
                   class="common-button-default"
                   size="mini"
+                  v-btn-permission="'9001dda4a41c698209a4c7d05c1f76bc'"
                   @click="clearSearchStand">清空</el-button>
               </el-formItem>
             </el-form>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 4445e07b3..9e603fc38 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -97,18 +97,18 @@
                     type="primary"
                     size="mini"
                     class="common-button-primary"
-                    v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
+                    v-btn-permission="'f65b5bdd64ab1c6b03f2aff0ecedeefc'"
                     @click="searchBtnClick(standCommonlySearch)">
                     查询
                   </el-button>
                   <el-button
                     size="mini"
                     class="common-button-default"
-                    v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'"
+                    v-btn-permission="'0177eb3b11ccbab403808461a4ed6977'"
                     @click="clearAllSearch('standCommonlySearch')">清空
                   </el-button>
                   <el-button size="mini" type="primary" class="common-button-primary"
-                             v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn"><i
+                             v-btn-permission="'23040dc9eea2b1b75ab70a981c3abcd5'" @click="selectMoreBtn"><i
                     class="iconfont">&#xe7a5;</i>高级检索
                   </el-button>
                 </el-form-item>
@@ -130,12 +130,12 @@
                    :loading="searching"
                    size="mini"
                    @click="addImportModal(1)"
-                   v-btn-permission="'417c6562dd08f1c98c681a40fbf94e31'"><i class="iconfont">&#xe6de;</i>导入
+                   v-btn-permission="'8a8d52ab7788a3685ffa877c2844459e'"><i class="iconfont">&#xe6de;</i>导入
         </el-button>
         <el-button class="common-button-default export-button"
                    @click="exportStandard()"
                    size="mini"
-                   v-btn-permission="'b17f1d035219c47344032e261342d87d'"
+                   v-btn-permission="'088d8fc00c581bfcb7fb999b24c5414f'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出
         </el-button>
 <!--        <el-button class="common-button-default delete-button"
@@ -147,12 +147,12 @@
         <el-button class="common-button-default"
                    size="mini"
                    @click="configurationStandard"
-                   v-btn-permission="'8158aefd62cda676a6baf179532328c6'"><i class="iconfont">&#xe669;</i>配置标准
+                   v-btn-permission="'885d2674d9a0248fbfe681068dee6540'"><i class="iconfont">&#xe669;</i>配置标准
         </el-button>
         <el-button class="common-button-default"
                    size="mini"
                    @click="deleteStandFromKind(2)"
-                   v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
+                   v-btn-permission="'b9544b3a05240a6bd2032cebccb54754'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
         <!--        <el-button class="common-button-default"-->
         <!--                   size="mini"-->
@@ -272,24 +272,24 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
+                      <el-dropdown-item v-btn-permission="'130c099bbd01e717b0751e96025b0719'"
                                         v-if="scope.row.collectBtn"
                                         :command="[scope.row, '收藏']"
                       >
                         收藏
                       </el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="'abcf82476e9f7bf2469896b3b0cb84fa'"
+                      <el-dropdown-item v-btn-permission="'2c71b19f8216912f88363e802e2ddc94'"
                                         v-else
                                         :command="[scope.row, '取消收藏']"
                       >
                         取消收藏
                       </el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑']"
-                                        v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
+                                        v-btn-permission="'630d36fc00f54e36ae04acc13125bb0e'">编辑
                       </el-dropdown-item>
                       <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>-->
                       <el-dropdown-item :command="[scope.row, '删除']"
-                                        v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
+                                        v-btn-permission="'345f21c54b973c35498dd01fffdd137b'">删除
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>

From 8758a6d473539f0aa5617d3b98fbc509b43520e9 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, 20 Oct 2021 14:35:09 +0800
Subject: [PATCH 19/31] commit

---
 .../standardForComments/pags/consultationDetails.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 76a676884..bc59868d9 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -25,9 +25,9 @@
 <!--                      {{ this.$route.query.item.cname || '-' }}-->
 <!--                    </span>-->
 <!--        </p>-->
-        <p class="transition-box-p">
+        <div class="transition-box-p">
           <label class="transition-box-label">附件：</label>
-          <span class="file-box" v-if="fileInfoList.length > 0">
+          <div class="file-box" v-if="fileInfoList.length > 0">
             <div style="display: flex;">
                 <div v-for="(file,item) in fileInfoList"
                       target="_blank"
@@ -35,12 +35,12 @@
                       @click="handleQueryPdf(file)"
                       :key="item">
                {{ file.name }}
-                    <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
+                    <el-button v-btn-permission="'27f94c4c792a0248824bb245971d2bd7'" type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
              </div>
             </div>
-          </span>
+          </div>
           <span class="transition-box-span" v-else>-</span>
-        </p>
+        </div>
         <p class="transition-box-p">
           <label class="transition-box-label">上传时间：</label>
           <span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
@@ -56,7 +56,7 @@
       <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">
         添加
       </el-button>
-      <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
+      <el-button type="primary" class="common-button-primary" size="mini"  v-btn-permission="'df2b403895020ea10fd9df724ca08d67'" @click="exportAll">导出</el-button>
     </div>
     <div class="container">
       <el-table

From 4d16218c1a7a7aea557b8def101b479ca15ca2dd 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, 20 Oct 2021 15:02:45 +0800
Subject: [PATCH 20/31] commit

---
 .../nonConfomity/pages/rectificationDatabase.vue              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 5d1e0cb47..80762aeef 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -55,7 +55,7 @@
               type="primary"
               class="common-button-primary"
               size="mini"
-              v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
+              v-btn-permission="'2a80a91dfb95a341d857e607a5540945'"
               @click="getTableByPage('')">
               查询
             </el-button>
@@ -79,7 +79,7 @@
         size="mini"
         @click="exportStandard()"
         title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-        v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
+        v-btn-permission="'c3c8c107fb4ca1ab089d5b4b73cfcee1'"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
       <el-button
         class="common-button-primary"

From e8d4037ac9e60c33684693f59494185a57b8e3b0 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, 20 Oct 2021 15:26:12 +0800
Subject: [PATCH 21/31] commit

---
 .../standardForComments/pags/consultationDetails.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index bc59868d9..eb756219f 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -35,7 +35,7 @@
                       @click="handleQueryPdf(file)"
                       :key="item">
                {{ file.name }}
-                    <el-button v-btn-permission="'27f94c4c792a0248824bb245971d2bd7'" type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
+                    <el-button  type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
              </div>
             </div>
           </div>
@@ -56,7 +56,7 @@
       <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">
         添加
       </el-button>
-      <el-button type="primary" class="common-button-primary" size="mini"  v-btn-permission="'df2b403895020ea10fd9df724ca08d67'" @click="exportAll">导出</el-button>
+      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll">导出</el-button>
     </div>
     <div class="container">
       <el-table

From 56cf5790eb7f97db4a7be02c40872d93cf920c88 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 20 Oct 2021 15:44:40 +0800
Subject: [PATCH 22/31] commit

---
 .../processCenter/pages/creatProcess/bzrk/step4.vue      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index bac4125da..8dc9a84ff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1329,11 +1329,10 @@
 </template>
 
 <script>
-import {saveTaskFirst, queryTaskFirst} from "api/process";
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew,saveTaskForPub,queryTaskFirst} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -2296,16 +2295,14 @@ export default {
       this.saveLoading = true
       let _formData = new FormData()
       // _formData.append('id', this.bpnId)
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
-      _formData.append('createUserName', this.$store.getters.userInfo.uName)
-      _formData.append('prcType', '1')
+      _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
         taskInfo: '申请人修订',
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         // this.bpnId = res.result

From e60082120dd70ae885e0a5f1b5d0638cfa193da6 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, 20 Oct 2021 16:09:18 +0800
Subject: [PATCH 23/31] commit

---
 .../domesticStandardsAndRegulations/index.vue | 58 +++++++++----------
 .../components/EnterpriseStandardDatabase.vue |  6 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 9e603fc38..b67b31cad 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -97,18 +97,18 @@
                     type="primary"
                     size="mini"
                     class="common-button-primary"
-                    v-btn-permission="'f65b5bdd64ab1c6b03f2aff0ecedeefc'"
+                    v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
                     @click="searchBtnClick(standCommonlySearch)">
                     查询
                   </el-button>
                   <el-button
                     size="mini"
                     class="common-button-default"
-                    v-btn-permission="'0177eb3b11ccbab403808461a4ed6977'"
+                    v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'"
                     @click="clearAllSearch('standCommonlySearch')">清空
                   </el-button>
                   <el-button size="mini" type="primary" class="common-button-primary"
-                             v-btn-permission="'23040dc9eea2b1b75ab70a981c3abcd5'" @click="selectMoreBtn"><i
+                             v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn"><i
                     class="iconfont">&#xe7a5;</i>高级检索
                   </el-button>
                 </el-form-item>
@@ -130,29 +130,29 @@
                    :loading="searching"
                    size="mini"
                    @click="addImportModal(1)"
-                   v-btn-permission="'8a8d52ab7788a3685ffa877c2844459e'"><i class="iconfont">&#xe6de;</i>导入
+                   v-btn-permission="'417c6562dd08f1c98c681a40fbf94e31'"><i class="iconfont">&#xe6de;</i>导入
         </el-button>
         <el-button class="common-button-default export-button"
                    @click="exportStandard()"
                    size="mini"
-                   v-btn-permission="'088d8fc00c581bfcb7fb999b24c5414f'"
+                   v-btn-permission="'b17f1d035219c47344032e261342d87d'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出
         </el-button>
-<!--        <el-button class="common-button-default delete-button"
-                   :loading="delLoading"
-                   size="mini"
-                   @click="deleteStand(2)"
-                   v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除
-        </el-button>-->
+        <!--        <el-button class="common-button-default delete-button"
+                           :loading="delLoading"
+                           size="mini"
+                           @click="deleteStand(2)"
+                           v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除
+                </el-button>-->
         <el-button class="common-button-default"
                    size="mini"
                    @click="configurationStandard"
-                   v-btn-permission="'885d2674d9a0248fbfe681068dee6540'"><i class="iconfont">&#xe669;</i>配置标准
+                   v-btn-permission="'8158aefd62cda676a6baf179532328c6'"><i class="iconfont">&#xe669;</i>配置标准
         </el-button>
         <el-button class="common-button-default"
                    size="mini"
                    @click="deleteStandFromKind(2)"
-                   v-btn-permission="'b9544b3a05240a6bd2032cebccb54754'"><i class="iconfont">&#xe611;</i>移除标准
+                   v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
         <!--        <el-button class="common-button-default"-->
         <!--                   size="mini"-->
@@ -272,24 +272,24 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="'130c099bbd01e717b0751e96025b0719'"
+                      <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                         v-if="scope.row.collectBtn"
                                         :command="[scope.row, '收藏']"
                       >
                         收藏
                       </el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="'2c71b19f8216912f88363e802e2ddc94'"
+                      <el-dropdown-item v-btn-permission="'abcf82476e9f7bf2469896b3b0cb84fa'"
                                         v-else
                                         :command="[scope.row, '取消收藏']"
                       >
                         取消收藏
                       </el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑']"
-                                        v-btn-permission="'630d36fc00f54e36ae04acc13125bb0e'">编辑
+                                        v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
                       </el-dropdown-item>
                       <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>-->
                       <el-dropdown-item :command="[scope.row, '删除']"
-                                        v-btn-permission="'345f21c54b973c35498dd01fffdd137b'">删除
+                                        v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
@@ -2418,14 +2418,14 @@ export default {
           this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
           this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
         }
-           this.modalShowFlag2 = false
+        this.modalShowFlag2 = false
       }
 
       this.$forceUpdate()
     },
-        popoverHideBusVsCancel(){
-              this.modalShowFlag2 = false
-            },
+    popoverHideBusVsCancel(){
+      this.modalShowFlag2 = false
+    },
     popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
@@ -2440,9 +2440,9 @@ export default {
 
       this.$forceUpdate()
     },
-          popoverHideCarVsCancel(){
-              this.modalShowFlag3 = false
-            },
+    popoverHideCarVsCancel(){
+      this.modalShowFlag3 = false
+    },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
@@ -2452,13 +2452,13 @@ export default {
           this.sarStandardsInfoEO.DYBXH = checkedData.model
           this.sarStandardsInfoEO.DYMC = checkedData.name
         }
-          this.modalShowFlag4 = false
+        this.modalShowFlag4 = false
       }
       this.$forceUpdate()
     },
-     popoverHideModelCancel(){
-              this.modalShowFlag4 = false
-            },
+    popoverHideModelCancel(){
+      this.modalShowFlag4 = false
+    },
     busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
         _this: this
@@ -5015,7 +5015,7 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
-  #domesticStandardDatabase{
+#domesticStandardDatabase{
   height: 100%;
   .content {
     height: calc(~'100% - 105px - 56px')
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d79bc933e..9e33d9011 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -190,18 +190,18 @@
                             type="primary"
                             size="mini"
                             class="common-button-primary"
-                            v-btn-permission=""
+                            v-btn-permission="'d451a3e980f0536386a09443f40af772'"
                             @click="getBussionStandTableBtn(sarBussionessSearch)">
                         查询
                     </el-button>
                     <el-button
                             size="mini"
                             class="common-button-default"
-                            v-btn-permission=""
+                            v-btn-permission="'4819e2ee2a92fdcba7643e27dba4a41b'"
                             @click="clearAllSearch('sarBussionessSearch')">清空
                     </el-button>
                     <el-button size="mini" type="primary" class="common-button-primary"
-                               v-btn-permission="" @click="selectMoreBtn"><i
+                               v-btn-permission="'62f5582b71835d1a0486d3109ff24698'" @click="selectMoreBtn"><i
                             class="iconfont">&#xe7a5;</i>高级检索
                     </el-button>
                 </el-form-item>

From 3a6ae671c2aec19dfbf4b4609fc9d660b48fc5cf 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, 20 Oct 2021 19:52:51 +0800
Subject: [PATCH 24/31] commit

---
 src/components/navMenu/index.vue                                | 2 +-
 .../nonConfomity/pages/rectificationDatabase.vue                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 069747414..d528748cb 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -154,7 +154,7 @@
               {
                 title: '企业标准库',
                 path: '/enterpriseStandardDatabase',
-                menuId: '7feeb73929c25a6f1fd67952704ec02b'
+                menuId: '01ed8f752748227777b3572d56ee9ab5'
               },
               // {
               //   title: '企标制修订计划',
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 80762aeef..478576fec 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -55,7 +55,7 @@
               type="primary"
               class="common-button-primary"
               size="mini"
-              v-btn-permission="'2a80a91dfb95a341d857e607a5540945'"
+              v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
               @click="getTableByPage('')">
               查询
             </el-button>

From 0da8c7b44d7a261362771ccf3fc2690ca91daa86 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, 20 Oct 2021 20:54:44 +0800
Subject: [PATCH 25/31] commit

---
 .../localProductsOrProjectLibrary/index.vue   | 121 ++----------------
 1 file changed, 10 insertions(+), 111 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 72276a5e1..106f245a7 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -209,7 +209,8 @@
         </el-table-column>
       </el-table>
       <pagination
-        :page="localProTableSearch.page"
+        :page="page"
+        :pageSize="pageSize"
         :total="total"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"></pagination>
@@ -483,12 +484,11 @@ export default {
         projectClassification: "",
         // 项目状态
         projectStatus: "",
-        page: ""
       },
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
       // 查询条件
       localProTableSearch: {
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         // 项目编号
         projectNumber: "",
@@ -519,8 +519,6 @@ export default {
       },
       // 查询条件
       localProTableSearchDefault: {
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         // 项目编号
         projectNumber: "",
@@ -1188,96 +1186,6 @@ export default {
       });
       return newData;
     },
-    saveOrUpdateLocalPro() {
-      this.$refs["addLocalProductForm"].validate((valid, fields) => {
-        if (valid) {
-          const formData = this.resolveTime(this.localProEO);
-          if (formData.energyKind != null && (formData.energyKind instanceof Array)) {
-            formData.energyKind = formData.energyKind.join(","); // 能源种类
-          }
-          if (formData.productTypeCode != null && (formData.productTypeCode instanceof Array)) {
-            formData.productTypeCode = formData.productTypeCode.join(","); // 项目类型
-          }
-          if (formData.producePlace != null && (formData.producePlace instanceof Array)) {
-            formData.producePlace = formData.producePlace.join(","); // 生产基地
-          }
-          formData.targetMarket = formData.targetMarket.toString();
-          // 新增
-          if (this.flag === 0) {
-            this.$http.postData("lawss/sarProductInfo/addSarProductInfo", formData, {
-              _this: this
-            }, res => {
-              if (res.ok) {
-                // this.modalProductAddShowflag = false
-                this.closeProductAddDrawer();
-                this.isSubmit = false;
-                if (this.localProEO.prodectCode === "INLAND") {
-                  this.activeName = "INLAND";
-                  this.localProTableSearch.prodectCode = this.activeName;
-                  this.$nextTick(() => {
-                    this.getLocalProductTable();
-                  });
-                } else {
-                  this.activeName = "FOREIGN";
-                  this.localProTableSearch.prodectCode = this.activeName;
-                  this.$nextTick(() => {
-                    this.getLocalProductTable();
-                  });
-                }
-              }
-            }, e => {
-            });
-          } else {
-            // 修改
-            this.$http.postData("lawss/sarProductInfo/updateSarProductInfo", formData, {
-              _this: this
-            }, res => {
-              if (res.ok) {
-                this.isSubmit = false;
-                // this.modalProductAddShowflag = false
-                this.closeProductAddDrawer();
-                if (this.localProEO.prodectCode === "INLAND") {
-                  this.activeName = "INLAND";
-                  this.localProTableSearch.prodectCode = this.activeName;
-                  if (this.localProEO.dataType === "LOCAL") {
-                    this.insideTabsActiveName = "LOCAL";
-                    this.localProTableSearch.dataType = this.insideTabsActiveName;
-                    this.$nextTick(() => {
-                      this.getLocalProductTable();
-                    });
-                  } else {
-                    this.insideTabsActiveName = "PDPM";
-                    this.localProTableSearch.dataType = this.insideTabsActiveName;
-                    this.$nextTick(() => {
-                      this.getLocalProductTable();
-                    });
-                  }
-                } else {
-                  this.activeName = "FOREIGN";
-                  this.localProTableSearch.prodectCode = this.activeName;
-                  if (this.localProEO.dataType === "LOCAL") {
-                    this.insideTabsActiveName = "LOCAL";
-                    this.localProTableSearch.dataType = this.insideTabsActiveName;
-                    this.$nextTick(() => {
-                      this.getLocalProductTable();
-                    });
-                  } else {
-                    this.insideTabsActiveName = "PDPM";
-                    this.localProTableSearch.dataType = this.insideTabsActiveName;
-                    this.$nextTick(() => {
-                      this.getLocalProductTable();
-                    });
-                  }
-                }
-              }
-            }, e => {
-            });
-          }
-        } else {
-          this.$message.error("请检查表单是否填写正确!");
-        }
-      });
-    },
     // 条件分页查询
     getLocalProductTableBtn() {
       this.projectLibrarySearch.page = 1;
@@ -1290,11 +1198,10 @@ export default {
       this.localProTableSearch.dataType = this.insideTabsActiveName;
       this.SarExportSearchEo = this.localProTableSearch;
       this.$http.get("sarStandProjectLibrary/queryProject", {
-        // projectName: this.projectLibrarySearch.projectName,
-        // projectClassification: this.projectLibrarySearch.projectSort,
-        // projectStatus: this.projectLibrarySearch.projectStatus
         ...this.localProTableSearch,
-        ...this.projectLibrarySearch
+        ...this.projectLibrarySearch,
+        page: this.page,
+        pageSize: this.pageSize,
       }, {
         _this: this, loading: "loading"
       }, res => {
@@ -1440,15 +1347,6 @@ export default {
         this.relateProductId = this.relectonSelectNum[0].id;
       }
     },
-    // 关联弹窗里的分页查询
-    reletionPageChange(page) {
-      this.relationPage = page;
-      this.getLocalProductTable();
-    },
-    reletionPageSizeChange(pageSize) {
-      this.reletionPageSize = pageSize;
-      this.getLocalProductTable();
-    },
     // 关联弹窗的保存
     saveOrUpdateReletion() {
       if (this.relectonSelectNum.length === 0) {
@@ -1487,12 +1385,13 @@ export default {
     },
     // 分页点击后方法
     pageChange(page) {
-      this.localProTableSearch.page = page;
+      console.log(page);
+      this.page = page;
       this.getLocalProductTable();
     },
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
-      this.localProTableSearch.pageSize = pageSize;
+      this.pageSize = pageSize;
       this.getLocalProductTable();
       // 此处需要调用接口，修改个人配置
     },

From bed01d4afb7e948e2ae22ce48749ec03f098f07f Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 21 Oct 2021 09:33:35 +0800
Subject: [PATCH 26/31] commit

---
 src/pages/processCenter/pages/newProcess/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 9a97333f5..ebd59fadc 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -461,7 +461,7 @@ export default {
         }
       }
       .card-top-right {
-        width: 200px;
+        width: 250px;
         .card-top-right-text {
           margin: 40px 0 5px 0;
           color: #e6e6e6;
@@ -469,7 +469,7 @@ export default {
         }
         .card-top-right-line {
           height: 3px;
-          width: 200px;
+          width: 250px;
           background: #e6e6e6;
         }
       }

From 9fbe5c0e1c7e9c902e2f8777d66c40e2e1182b0b Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 21 Oct 2021 10:39:14 +0800
Subject: [PATCH 27/31] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83/=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D=E7=9A=84=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=90=8E=20=E6=B7=BB=E5=8A=A0=E5=BC=B9=E7=AA=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9A=82=E6=97=A0=E6=95=B0=E6=8D=AE=20=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=B8=85=E7=A9=BA=20=E6=95=B0=E6=8D=AE=E5=9B=9E?=
 =?UTF-8?q?=E6=9D=A5=E4=BA=86=20=E5=BA=94=E8=AF=A5=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index c3ac08ea3..dd309b1b2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -288,6 +288,7 @@
             </div>
             <el-table
               :data="standardData"
+              v-loading="loading"
               tooltip-effect="dark"
               style="width: 100%"
               border
@@ -578,6 +579,7 @@ export default {
     },
     //标准查询按钮
     getStandDataBtn(){
+      this.loading = true
       this.pageNo = 1;
       this.getStandData();
     },
@@ -591,6 +593,7 @@ export default {
         _this: this
       }, res => {
         this.standardData = res.data.list;
+        this.loading = false
         this.standardData.forEach(item => {
           if(item.attrInfoMap === null){
             this.$set(item, "ZCCSSRQ", '');
@@ -607,6 +610,8 @@ export default {
     //点击添加事件
     addList() {
       this.standModel = true;
+      this.loading = true
+      this.getStandDataBtn()
     },
     //添加标准select的改变
     selectThree(data) {

From 142953fe50e67271cebe7a9e3f77ce479a871d3c Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 21 Oct 2021 11:30:35 +0800
Subject: [PATCH 28/31] =?UTF-8?q?=E5=B0=86=E5=9B=BD=E5=86=85=E6=B5=B7?=
 =?UTF-8?q?=E5=A4=96=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A0=91=E5=BD=A2=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/index.js                       |   2 +
 src/components/mechanismTree/index.vue        | 256 ++++++++
 .../domesticStandardsAndRegulations/index.vue | 589 ++++++++++--------
 .../foreignStandardsAndRegulations/index.vue  | 207 ++++--
 4 files changed, 769 insertions(+), 285 deletions(-)
 create mode 100644 src/components/mechanismTree/index.vue

diff --git a/src/components/index.js b/src/components/index.js
index fde9957d4..d5f444b04 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -22,6 +22,7 @@ import GenerationNumber from './generationNumber' // 生成企标编号组件
 import RoleUserTree from './roleUserTree' // 根据部门和角色查询人员
 import DeptRoleTree from './deptRoleTree' // 根据部门查询角色
 import RoleTree from './roleTree' // 查询所有机构及人员
+import MechanismTree from './mechanismTree'
 import SQTree from './SQTree'
 import OrgTable from './OrgTable'
 import MySelect from './mySelect'
@@ -49,6 +50,7 @@ const install = function (Vue) {
   Vue.component('SQTree', SQTree)
   Vue.component('OrgTable', OrgTable)
   Vue.component('RoleTree', RoleTree)
+  Vue.component('MechanismTree', MechanismTree)
   Vue.component('MySelect', MySelect)
 }
 
diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue
new file mode 100644
index 000000000..d295a0504
--- /dev/null
+++ b/src/components/mechanismTree/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="roleTree">
+    <el-drawer
+      :title="isTitle"
+      :visible.sync="isVisible2"
+      :wrapperClosable="false"
+      @close="handleTreeDrawerCancel"
+      size="400px">
+      <el-form
+        ref="attributeEO"
+        class="label-input-form"
+        :inline="true"
+      >
+        <el-form-item class="form-item-disabled" style="margin: 10px;">
+          <el-input
+            v-model="filterText"
+            placeholder="请输入部门"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-content">
+        <el-tree
+          class="filter-tree tree-line"
+          :data="treeData"
+          :props="defaultProps"
+          :current-node-key="nodeKeyId"
+          node-key="id"
+          :filter-node-method="filterNode"
+          highlight-current
+          :auto-expand-parent="true"
+          show-checkbox
+          ref="tree"
+          :load="loadNode"
+          @check="drawerCheck"
+          :expand-on-click-node="false"
+          @node-click="handleNodeClick">
+         <span class="custom-tree-node" slot-scope="{ node, data }">
+           <span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
+           <span> {{ node.label }} </span>
+         </span>
+        </el-tree>
+      </div>
+      <div id="roleFormButton" class="demo-drawer-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">
+          确定
+        </el-button>
+
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleTreeDrawerCancel">取消
+        </el-button>
+      </div>
+      <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "MechanismTree",
+  props: {
+    checkBox: { // 单选/多选
+      type: Boolean,
+      default: false,
+    },
+    isTitle: { // 标题
+      type: String
+    },
+    isVisible: { // drawer开关
+      type: Boolean,
+      default: false,
+    },
+    nodeList: { // 回显
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      roleList: [],
+      nodeKeyId: '',
+      isVisible2: false,
+      filterText: '',
+      defaultProps: {
+        children: 'children',
+        label: 'name',
+        isLeaf: (data, node) => {
+          if (!node.disabled) {
+            return true
+          }
+        }
+      },
+      treeData1: [],
+      treeData: [],
+      open1: true,
+      treeLoading: false,
+      roleRow: {}
+    }
+  },
+  methods: {
+    treeClass() {
+
+    },
+    handleTreeDrawerCancel() {
+      this.filterText = ''
+      this.isVisible2 = false
+    },
+    saveUserInfo() {
+      this.isVisible2 = false
+      this.$emit('checkedRole', this.roleList)
+    },
+    loadNode(node, resolve) {
+      if (node.level === 0) {
+        return resolve(this.treeData);
+      }
+    },
+    drawerCheck(data) {
+      if (this.checkBox) {
+        // 单选判断
+        var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+        if (getlist.length == 1) {
+          this.roleRow = getlist[0]
+        } else {
+          this.$refs.tree.setCheckedKeys([data.id]);
+          this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+        }
+        this.roleList = [this.roleRow]
+      } else {
+        this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
+      }
+    },
+    getTree() {
+      this.$http.get('SarInstitution/institution', {}, {
+        _this: this,
+        loading: 'treeLoading'
+      }, res => {
+        this.treeData = res.data
+        console.log(this.treeData);
+        this.nodeKeyId = this.treeData[0].id
+        this.id = res.data[0].id
+      }, e => {
+        console.log(e);
+      })
+    },
+    handleNodeClick(data) {
+      this.id = data.id
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+  },
+  watch: {
+    isVisible(val) {
+      this.isVisible2 = val
+    },
+    isVisible2(val) {
+      this.$emit('update:isVisible', val)
+    },
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  mounted() {
+    this.getTree()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .el-tree-node__content {
+  padding-left: 0px !important;
+}
+
+/deep/ .is-leaf {
+  background-image: none;
+  background-size: 100% 100%;
+}
+/deep/ .is-leaf-none {
+  position: relative;
+  display: inline-block;
+  width: 15px;
+  height: 15px;
+  background: url('~@/assets/images/shangqi/img/personnel.png');
+  background-size: 100% 100%;
+}
+
+/deep/ .is-show {
+  position: relative;
+  display: inline-block;
+  width: 15px;
+  height: 15px;
+  background: url('~@/assets/images/shangqi/img/mechanism.png');
+  background-size: 100% 100%;
+}
+
+/deep/ .tree-line {
+  min-height: calc(100vh - 170px);
+  .el-tree-node {
+    position: relative;
+    padding-left: 0px; // 缩进量
+    line-height: 30px;
+  }
+
+  .el-tree-node__children {
+    padding-left: 16px; // 缩进量
+  }
+
+  // 竖线
+  .el-tree-node::before {
+    content: "";
+    height: 100%;
+    width: 1px;
+    position: absolute;
+    left: -3px;
+    top: -26px;
+    border-left: 1px dashed #858990e0;
+  }
+
+  // 当前层最后一个节点的竖线高度固定
+  .el-tree-node:last-child::before {
+    height: 38px; // 可以自己调节到合适数值
+  }
+
+  // 横线
+  .el-tree-node::after {
+    content: "";
+    width: 11px;
+    height: 20px;
+    position: absolute;
+    left: -3px;
+    top: 12px;
+    border-width: 1px;
+    border-top: 1px dashed #858990e0;
+  }
+
+  // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+  & > .el-tree-node::after {
+    border-top: none;
+  }
+
+  & > .el-tree-node::before {
+    border-left: none;
+  }
+
+  // 展开关闭的icon
+  .el-tree-node__expand-icon {
+    font-size: 16px;
+    // 叶子节点（无子节点）
+    &.is-leaf {
+      color: transparent;
+      // display: none; // 也可以去掉
+    }
+  }
+}
+</style>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index b67b31cad..1ab82ad5a 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -262,7 +262,9 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
@@ -272,7 +274,7 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
+                      <el-dropdown-item v-btn-permission="''"
                                         v-if="scope.row.collectBtn"
                                         :command="[scope.row, '收藏']"
                       >
@@ -334,31 +336,31 @@
             :rules="sarStandardsInfoRules"
             class="label-input-form"
           >
-            <!--            <el-form-item-->
-            <!--                prop="isRelateAccess"-->
-            <!--                label-width="150px"-->
-            <!--                class="add-form-item"-->
-            <!--                title="A类必填项多，仅A类可纳入法规清单。"-->
-            <!--            >-->
-            <!--              <template slot="label">重要度<i class="el-icon-warning-outline"></i></template>-->
-            <!--              <el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">-->
-            <!--                <el-option value="1" label="A" key="1"></el-option>-->
-            <!--                <el-option value="0" label="B" key="0"></el-option>-->
-            <!--              </el-select>-->
-            <!--            </el-form-item>-->
-            <!--            <el-form-item label="适用区域" prop="country" label-width="150px" class="add-form-item form-item-disabled">-->
-            <!--              <el-select v-model="sarStandardsInfoEO.country" disabled >-->
-            <!--                <el-option v-for="opt in countryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}</el-option>-->
-            <!--              </el-select>-->
-            <!--            </el-form-item>-->
-            <!--            <el-form-item label="文本说明" prop="synopsis" label-width="150px" class="add-form-item">-->
-            <!--              <el-input-->
-            <!--                type="text"-->
-            <!--                v-model="sarStandardsInfoEO.synopsis"-->
-            <!--                placeholder="请输入"-->
-            <!--                clearable-->
-            <!--              ></el-input>-->
-            <!--            </el-form-item>-->
+            <!--                        <el-form-item
+                                        prop="isRelateAccess"
+                                        label-width="150px"
+                                        class="add-form-item"
+                                        title="A类必填项多，仅A类可纳入法规清单。"
+                                    >
+                                      <template slot="label">重要度<i class="el-icon-warning-outline"></i></template>
+                                      <el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">
+                                        <el-option value="1" label="A" key="1"></el-option>
+                                        <el-option value="0" label="B" key="0"></el-option>
+                                      </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="适用区域" prop="country" label-width="150px" class="add-form-item form-item-disabled">
+                                      <el-select v-model="sarStandardsInfoEO.country" disabled >
+                                        <el-option v-for="opt in countryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}</el-option>
+                                      </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="文本说明" prop="synopsis" label-width="150px" class="add-form-item">
+                                      <el-input
+                                        type="text"
+                                        v-model="sarStandardsInfoEO.synopsis"
+                                        placeholder="请输入"
+                                        clearable
+                                      ></el-input>
+                                    </el-form-item>-->
             <!--      动态数据-->
             <template v-for="(displayLocation, index) in dynamicFormField">
               <el-col :span="24" :key="index">
@@ -628,7 +630,41 @@
                   </template>
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
-                  <template>
+                  <template v-if="field.attrField === 'ZRBM'">
+                    <el-form-item
+                      prop="ZRBM"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">责任部门</template>
+                      <el-input
+                        :key="field.attrField"
+                        :config="field"
+                        clearable
+                        v-model="sarStandardsInfoEO['ZRBM']"
+                        :disabled="formdisableflag" placeholder="选择责任部门"
+                        @click.native="choiceZRBM('ZRBMId', '责任部门', sarStandardsInfoEO.ZRBMId)">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'ZRGCS'">
+                    <el-form-item
+                      prop="ZRGCSUser"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">责任工程师</template>
+                      <el-input
+                        :key="field.attrField"
+                        :config="field"
+                        clearable
+                        v-model="sarStandardsInfoEO['ZRGCS']"
+                        :disabled="formdisableflag" placeholder="选择责任工程师"
+                        @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else>
                     <custom-select-array
                       :key="field.attrField"
                       :config="field"
@@ -1083,7 +1119,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-        :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"  @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+        :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1094,7 +1130,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"   @popoverHideCancel="popoverHideCarVsCancel()" ></tree-select-new>
+        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1120,212 +1156,212 @@
           </el-button>
         </div>
       </el-dialog>
-      <!--      <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
-      <!--                       @reset="clearAllSearch('sarStandardsSearch')" >-->
-      <!--        <div slot="content">-->
-      <!--          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
-      <!--&lt;!&ndash;            标准号&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">-->
-      <!--              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
-      <!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            标准名称&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
-      <!--              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
-      <!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            标准英文名称&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">-->
-      <!--              <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"-->
-      <!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            标准类别&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">-->
-      <!--              <search-select-->
-      <!--                v-model="sarStandardsSearch.standSort"-->
-      <!--                :placeholder="$t('m.standardCategoryTips')"-->
-      <!--                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
-      <!--                :options="standSortOptions"-->
-      <!--                clearable/>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            文本状态&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            代替标准号&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">-->
-      <!--              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
-      <!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            标准年份&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">-->
-      <!--              <el-date-picker-->
-      <!--                  v-model="sarStandardsSearch.standYear"-->
-      <!--                  type="date"-->
-      <!--                  placeholder="根据标准年份查找">-->
-      <!--              </el-date-picker>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            标准发布日期&ndash;&gt;-->
-      <!--            <el-form-item label="标准发布日期"  class="serch-form-item">-->
-      <!--              <el-date-picker-->
-      <!--                  v-model="sarStandardsSearch.issueTime"-->
-      <!--                  type="date"-->
-      <!--                  placeholder="根据标准发布日期查找">-->
-      <!--              </el-date-picker>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            标准性质&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            是否纳入标准清单&ndash;&gt;-->
-      <!--            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">-->
-      <!--              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">-->
-      <!--                <el-option value="yes" label="是"></el-option>-->
-      <!--                <el-option value="no" label="否"></el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            实施日期&ndash;&gt;-->
-      <!--            <el-form-item label="实施日期">-->
-      <!--              <el-date-picker-->
-      <!--                  v-model="sarStandardsSearch.putTime"-->
-      <!--                  type="date"-->
-      <!--                  placeholder="根据实施日期查找">-->
-      <!--              </el-date-picker>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            新车型实施日期&ndash;&gt;-->
-      <!--            <el-form-item title="新车型实施日期" label="新车型实施日期">-->
-      <!--              <el-date-picker-->
-      <!--                  v-model="sarStandardsSearch.XCXTime"-->
-      <!--                  type="date"-->
-      <!--                  placeholder="根据新车型实施日期查找">-->
-      <!--              </el-date-picker>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            在产车实施日期&ndash;&gt;-->
-      <!--            <el-form-item title="在产车实施日期" label="在产车实施日期">-->
-      <!--              <el-date-picker-->
-      <!--                  v-model="sarStandardsSearch.ZCCTime"-->
-      <!--                  type="date"-->
-      <!--                  placeholder="根据在产车实施日期查找">-->
-      <!--              </el-date-picker>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            归口管理部门&ndash;&gt;-->
-      <!--            <el-form-item label="归口管理部门">-->
-      <!--              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            起草单位&ndash;&gt;-->
-      <!--            <el-form-item label="起草单位">-->
-      <!--              <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            我司参与深度&ndash;&gt;-->
-      <!--            <el-form-item label="我司参与深度">-->
-      <!--              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
+      <!--            <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
+                                   @reset="clearAllSearch('sarStandardsSearch')" >
+                    <div slot="content">
+                      <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
+            &lt;!&ndash;            标准号&ndash;&gt;
+                        <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
+                          <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
+                                    @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            标准名称&ndash;&gt;
+                        <el-form-item :label="$t('m.standName')" class="serch-form-item">
+                          <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
+                                    @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            标准英文名称&ndash;&gt;
+                        <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
+                          <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
+                                    @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            标准类别&ndash;&gt;
+                        <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
+                          <search-select
+                            v-model="sarStandardsSearch.standSort"
+                            :placeholder="$t('m.standardCategoryTips')"
+                            @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                            :options="standSortOptions"
+                            clearable/>
+                        </el-form-item>
+            &lt;!&ndash;            文本状态&ndash;&gt;
+                        <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
+                          <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            代替标准号&ndash;&gt;
+                        <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">
+                          <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
+                                    @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            标准年份&ndash;&gt;
+                        <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
+                          <el-date-picker
+                              v-model="sarStandardsSearch.standYear"
+                              type="date"
+                              placeholder="根据标准年份查找">
+                          </el-date-picker>
+                        </el-form-item>
+                        &lt;!&ndash;            标准发布日期&ndash;&gt;
+                        <el-form-item label="标准发布日期"  class="serch-form-item">
+                          <el-date-picker
+                              v-model="sarStandardsSearch.issueTime"
+                              type="date"
+                              placeholder="根据标准发布日期查找">
+                          </el-date-picker>
+                        </el-form-item>
+            &lt;!&ndash;            标准性质&ndash;&gt;
+                        <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
+                          <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            是否纳入标准清单&ndash;&gt;
+                        <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
+                          <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+                            <el-option value="yes" label="是"></el-option>
+                            <el-option value="no" label="否"></el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            实施日期&ndash;&gt;
+                        <el-form-item label="实施日期">
+                          <el-date-picker
+                              v-model="sarStandardsSearch.putTime"
+                              type="date"
+                              placeholder="根据实施日期查找">
+                          </el-date-picker>
+                        </el-form-item>
+            &lt;!&ndash;            新车型实施日期&ndash;&gt;
+                        <el-form-item title="新车型实施日期" label="新车型实施日期">
+                          <el-date-picker
+                              v-model="sarStandardsSearch.XCXTime"
+                              type="date"
+                              placeholder="根据新车型实施日期查找">
+                          </el-date-picker>
+                        </el-form-item>
+            &lt;!&ndash;            在产车实施日期&ndash;&gt;
+                        <el-form-item title="在产车实施日期" label="在产车实施日期">
+                          <el-date-picker
+                              v-model="sarStandardsSearch.ZCCTime"
+                              type="date"
+                              placeholder="根据在产车实施日期查找">
+                          </el-date-picker>
+                        </el-form-item>
+            &lt;!&ndash;            归口管理部门&ndash;&gt;
+                        <el-form-item label="归口管理部门">
+                          <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            起草单位&ndash;&gt;
+                        <el-form-item label="起草单位">
+                          <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            我司参与深度&ndash;&gt;
+                        <el-form-item label="我司参与深度">
+                          <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
 
-      <!--&lt;!&ndash;            能源类型&ndash;&gt;-->
-      <!--            <el-form-item label="能源类型">-->
-      <!--              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            适用车型&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            适用认证&ndash;&gt;-->
-      <!--            <el-form-item label="适用认证">-->
-      <!--              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            责任部门&ndash;&gt;-->
-      <!--            <el-form-item label="责任部门">-->
-      <!--              <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            责任工程师&ndash;&gt;-->
-      <!--            <el-form-item label="责任工程师">-->
-      <!--              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            关联模块-VPPS编码&ndash;&gt;-->
-      <!--            <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">-->
-      <!--              <el-input v-model="sarStandardsSearch.svpps" clearable-->
-      <!--                        placeholder="根据关联模块-VPPS编码查找"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            代替标准号&ndash;&gt;-->
-      <!--            <el-form-item label="代替标准号">-->
-      <!--              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            关联模块-中文名称&ndash;&gt;-->
-      <!--            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">-->
-      <!--              <el-input v-model="sarStandardsSearch.standNumber" clearable-->
-      <!--                        placeholder="根据关联模块-中文名称"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            采标编号&ndash;&gt;-->
-      <!--            <el-form-item label="采标编号" prop="nameShow">-->
-      <!--              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            采标程度&ndash;&gt;-->
-      <!--            <el-form-item label="采标程度" prop="standNumber">-->
-      <!--              <el-input v-model="sarStandardsSearch.standNumber" clearable-->
-      <!--                        placeholder="根据采标程度查找"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            引用标准&ndash;&gt;-->
-      <!--            <el-form-item label="引用标准">-->
-      <!--              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            被引用标准&ndash;&gt;-->
-      <!--            <el-form-item label="被引用标准">-->
-      <!--              <el-input v-model="sarStandardsSearch.citedStand" clearable-->
-      <!--                        placeholder="根据被引用标准查找"-->
-      <!--                        @keyup.enter.native="btnSearch"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--&lt;!&ndash;            关联模块（新增字段）&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
-      <!--                </el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--          </el-form>-->
-      <!--        </div>-->
-      <!--      </table-tools-bar>-->
+            &lt;!&ndash;            能源类型&ndash;&gt;
+                        <el-form-item label="能源类型">
+                          <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            适用车型&ndash;&gt;
+                        <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
+                          <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;
+                        <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
+                          <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            适用认证&ndash;&gt;
+                        <el-form-item label="适用认证">
+                          <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            责任部门&ndash;&gt;
+                        <el-form-item label="责任部门">
+                          <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            责任工程师&ndash;&gt;
+                        <el-form-item label="责任工程师">
+                          <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                          </el-select>
+                        </el-form-item>
+            &lt;!&ndash;            关联模块-VPPS编码&ndash;&gt;
+                        <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
+                          <el-input v-model="sarStandardsSearch.svpps" clearable
+                                    placeholder="根据关联模块-VPPS编码查找"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            代替标准号&ndash;&gt;
+                        <el-form-item label="代替标准号">
+                          <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            关联模块-中文名称&ndash;&gt;
+                        <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
+                          <el-input v-model="sarStandardsSearch.standNumber" clearable
+                                    placeholder="根据关联模块-中文名称"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            采标编号&ndash;&gt;
+                        <el-form-item label="采标编号" prop="nameShow">
+                          <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            采标程度&ndash;&gt;
+                        <el-form-item label="采标程度" prop="standNumber">
+                          <el-input v-model="sarStandardsSearch.standNumber" clearable
+                                    placeholder="根据采标程度查找"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            引用标准&ndash;&gt;
+                        <el-form-item label="引用标准">
+                          <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            被引用标准&ndash;&gt;
+                        <el-form-item label="被引用标准">
+                          <el-input v-model="sarStandardsSearch.citedStand" clearable
+                                    placeholder="根据被引用标准查找"
+                                    @keyup.enter.native="btnSearch"></el-input>
+                        </el-form-item>
+            &lt;!&ndash;            关联模块（新增字段）&ndash;&gt;
+                        <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
+                          <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
+                                     @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                            <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
+                            </el-option>
+                          </el-select>
+                        </el-form-item>
+                      </el-form>
+                    </div>
+                  </table-tools-bar>-->
       <!--    高级筛选-->
       <el-drawer
         title="高级搜索"
@@ -1627,6 +1663,18 @@
       @confirm="isTreeOk"
     ></org-table>
     <loading style="z-index: 2099;" :loading="importLoading">导入中...</loading>
+    <Role-tree
+      is-title="选择人员信息"
+      :is-visible.sync="modalshowflagRole"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
+    <Mechanism-tree
+      is-title="选择部门信息"
+      :is-visible.sync="modalshowflagZRBM"
+      :nodeList="nodeListZRBM"
+      @checkedRole="drawerCheckZRBM"
+    />
   </div>
 </template>
 
@@ -1646,6 +1694,7 @@ import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithT
 import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
+import MechanismTree from '@/components/mechanismTree'
 import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2'
 import {interfaceUrl} from '@/sysConfig'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
@@ -1671,10 +1720,15 @@ export default {
     CustomRoleTree,
     CustomDatePickWithText2,
     TreeSelect,
+    MechanismTree,
     TreeSelectNew
   },
   data() {
     return {
+      nodeList: [],
+      nodeListZRBM: [],
+      modalshowflagRole: false,
+      modalshowflagZRBM: false,
       filterText: '', // 国内法规过滤
       props: {
         label: 'menuName',
@@ -1960,6 +2014,8 @@ export default {
       }, // 标准新增过程中用到的对象
       standClass: [], // 标准类别
       sarStandardsInfoEO: {
+        ZRGCSUser: '',
+        ZRGCSUserId: '',
         regionShow: '亚洲',
         region: '2T8PFTSYE7',
         issueUnit: '', // 发布部门
@@ -2406,11 +2462,11 @@ export default {
       this.modalShowFlag1 = false
       this.$forceUpdate()
     },
-    popoverHideCancel(){
-      this.modalShowFlag1  = false
+    popoverHideCancel() {
+      this.modalShowFlag1 = false
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData  && checkedData.length != 0) {
+      if (checkedData && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
           this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",")
@@ -2423,11 +2479,11 @@ export default {
 
       this.$forceUpdate()
     },
-    popoverHideBusVsCancel(){
+    popoverHideBusVsCancel() {
       this.modalShowFlag2 = false
     },
     popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData  && checkedData.length != 0) {
+      if (checkedData && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",")
           this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",")
@@ -2440,11 +2496,11 @@ export default {
 
       this.$forceUpdate()
     },
-    popoverHideCarVsCancel(){
+    popoverHideCarVsCancel() {
       this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData  && checkedData.length != 0) {
+      if (checkedData && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
           this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2456,7 +2512,7 @@ export default {
       }
       this.$forceUpdate()
     },
-    popoverHideModelCancel(){
+    popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
     busVsFunc() {
@@ -3539,6 +3595,7 @@ export default {
           this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
             if (flag) {
               // 时间格式修改
+              this.ZRGCS = this.sarStandardsInfoEO.ZRGCSUserId
               let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
               if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
                 nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
@@ -4891,7 +4948,49 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
-    }
+    },
+    choiceRole(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.drawerTitle = title
+      this.modalshowflagRole = true
+    },
+    drawerCheck(data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.sarStandardsInfoEO.ZRGCSUserId = idList;
+      this.sarStandardsInfoEO['ZRGCS'] = nameList;
+    },
+    choiceZRBM(type, title, id) {
+      this.nodeListZRBM = []
+      this.nodeListZRBM.push(id)
+      this.drawerTitle = title
+      this.modalshowflagZRBM = true
+    },
+    drawerCheckZRBM(data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (item.hasChild === '0' && item.children === null) {
+          if (nameList.length > 0) {
+            nameList += ','
+            idList += ','
+          }
+          idList += item.id
+          nameList += item.name
+        }
+      })
+      this.sarStandardsInfoEO.ZRBMId = idList;
+      this.sarStandardsInfoEO['ZRBM'] = nameList;
+    },
   },
   computed: {
     // 是否拥有拖拽权限
@@ -5015,7 +5114,7 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
-#domesticStandardDatabase{
+  #domesticStandardDatabase{
   height: 100%;
   .content {
     height: calc(~'100% - 105px - 56px')
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 2596e42cc..85458fd27 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -136,12 +136,12 @@
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                    v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出
         </el-button>
-<!--        <el-button class="common-button-default delete-button"
-                   :loading="delLoading"
-                   size="mini"
-                   @click="deleteStand(2)"
-                   v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除
-        </el-button>-->
+        <!--        <el-button class="common-button-default delete-button"
+                           :loading="delLoading"
+                           size="mini"
+                           @click="deleteStand(2)"
+                           v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除
+                </el-button>-->
         <el-button class="common-button-default"
                    size="mini" @click="configurationStandard"
                    v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准
@@ -151,11 +151,11 @@
                    @click="deleteStandFromKind(2)"
                    v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
-<!--&lt;!&ndash;        <el-button class="common-button-default"
-                   size="mini" :loading="searching"
-                   @click="uploadImportModal(1)"
-                   v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载&ndash;&gt;
-        </el-button>-->
+        <!--&lt;!&ndash;        <el-button class="common-button-default"
+                           size="mini" :loading="searching"
+                           @click="uploadImportModal(1)"
+                           v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载&ndash;&gt;
+                </el-button>-->
       </div>
       <div class="content">
         <div class="table-wrap">
@@ -191,7 +191,9 @@
                 <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standSortShow
+                  }}
                   {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
@@ -201,9 +203,15 @@
               label="标准名称"
             >
               <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">{{ scope.row.standName }}</a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -213,13 +221,13 @@
               label="发布日期">
               <template slot-scope="scope">
                 <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
-                    {{ formatIssueDate(scope.row.issueTime) }}
+                  {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else style="color: #333333">
-                    {{ formatIssueDate(scope.row.issueTime) }}
+                  {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
               </template>
             </el-table-column>
@@ -230,9 +238,13 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
-                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -242,9 +254,15 @@
               width="150px"
               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>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
-                <span v-else style="color: #333333">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -253,9 +271,15 @@
               width="150px"
               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>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
-                <span v-else style="color: #333333">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -269,12 +293,16 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" >
+            <el-table-column label="操作" align="center" width="50">
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">
@@ -983,12 +1011,48 @@
                   ></custom-select>
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
-                  <custom-select-array
-                    :key="field.attrField"
-                    :config="field"
-                    v-model="sarStandardsInfoEO[field.attrField]"
-                    :disabled="formdisableflag"
-                  ></custom-select-array>
+                  <template v-if="field.attrField === 'ZRBM'">
+                    <el-form-item
+                      prop="ZRBM"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">责任部门</template>
+                      <el-input
+                        :key="field.attrField"
+                        :config="field"
+                        clearable
+                        v-model="sarStandardsInfoEO['ZRBM']"
+                        :disabled="formdisableflag" placeholder="选择责任部门"
+                        @click.native="choiceZRBM('ZRBMId', '责任部门', sarStandardsInfoEO.ZRBMId)">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'ZRGCS'">
+                    <el-form-item
+                      prop="ZRGCSUser"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">责任工程师</template>
+                      <el-input
+                        :key="field.attrField"
+                        :config="field"
+                        clearable
+                        v-model="sarStandardsInfoEO['ZRGCS']"
+                        :disabled="formdisableflag" placeholder="选择责任工程师"
+                        @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else>
+                    <custom-select-array
+                      :key="field.attrField"
+                      :config="field"
+                      v-model="sarStandardsInfoEO[field.attrField]"
+                      :disabled="formdisableflag"
+                    ></custom-select-array>
+                  </template>
                 </template>
               </template>
             </template>
@@ -1434,7 +1498,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"  @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
+        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1473,6 +1537,18 @@
       @confirm="isTreeOk"
     ></org-table>
     <loading style="z-index: 2099;" :loading="exportLoading">导入中...</loading>
+    <Role-tree
+      is-title="选择人员信息"
+      :is-visible.sync="modalshowflagRole"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
+    <Mechanism-tree
+      is-title="选择部门信息"
+      :is-visible.sync="modalshowflagZRBM"
+      :nodeList="nodeListZRBM"
+      @checkedRole="drawerCheckZRBM"
+    />
   </div>
 </template>
 
@@ -1492,6 +1568,7 @@ import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithT
 import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
+import MechanismTree from '@/components/mechanismTree'
 import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2'
 import {interfaceUrl} from "@/sysConfig";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
@@ -1515,12 +1592,19 @@ export default {
     CustomDatePickWithText,
     CustomSVPPS,
     CustomRoleTree,
+    MechanismTree,
     CustomDatePickWithText2,
     TreeSelect,
     TreeSelectNew
   },
   data() {
     return {
+      // 人员树形和部门树形参数
+      nodeList: [],
+      nodeListZRBM: [],
+      modalshowflagRole: false,
+      modalshowflagZRBM: false,
+
       textStatusMap: {}, // 文本状态id与name对应
       treeList: [],
       props: {
@@ -2235,7 +2319,7 @@ export default {
       this.modalShowFlag2 = false
       this.$forceUpdate()
     },
-    popoverHideBusVsCancel(){
+    popoverHideBusVsCancel() {
       this.modalShowFlag2 = false
     },
     popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2250,7 +2334,7 @@ export default {
       }
       this.modalShowFlag3 = false
       this.$forceUpdate()
-    },popoverHideCarVsCancel(){
+    }, popoverHideCarVsCancel() {
       this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2265,7 +2349,7 @@ export default {
       }
       this.modalShowFlag4 = false
       this.$forceUpdate()
-    },popoverHideModelCancel(){
+    }, popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
     // 将文本状态的id与name对应
@@ -4566,7 +4650,49 @@ export default {
             break
         }
       }
-    }
+    },
+    choiceRole(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.drawerTitle = title
+      this.modalshowflagRole = true
+    },
+    drawerCheck(data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.sarStandardsInfoEO.ZRGCSUserId = idList;
+      this.sarStandardsInfoEO['ZRGCS'] = nameList;
+    },
+    choiceZRBM(type, title, id) {
+      this.nodeListZRBM = []
+      this.nodeListZRBM.push(id)
+      this.drawerTitle = title
+      this.modalshowflagZRBM = true
+    },
+    drawerCheckZRBM(data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (item.hasChild === '0' && item.children === null) {
+          if (nameList.length > 0) {
+            nameList += ','
+            idList += ','
+          }
+          idList += item.id
+          nameList += item.name
+        }
+      })
+      this.sarStandardsInfoEO.ZRBMId = idList;
+      this.sarStandardsInfoEO['ZRBM'] = nameList;
+    },
   },
   computed: {
     // 是否拥有拖拽权限
@@ -4779,6 +4905,7 @@ export default {
       .el-card {
         min-width: min-content;
       }
+
       height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;

From 37b01f7229092cf2f450431a68d4f6c386563e18 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 21 Oct 2021 14:38:59 +0800
Subject: [PATCH 29/31] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=96=B0=E5=A2=9E-=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/addEdit.vue          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index d3e9581b2..33fc75d13 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1751,8 +1751,9 @@ export default {
       }
       if (exportList != null && exportList.length > 0) {
         let accIdAndrestype = []
-        for (var accessInfo in exportList) {
-          accIdAndrestype.push(exportList[accessInfo].id)
+        let accessInfo = 1
+        for (accessInfo in exportList) {
+          accIdAndrestype.push(exportList[accessInfo])
         }
         const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' + '&exportType=apart' + '&ids=' + accIdAndrestype.join(',') + '&exportName=' + this.exportName
         window.open(exportURL)

From ec3b397e65b37038c89cb87271e4e7d25176de48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 21 Oct 2021 14:57:24 +0800
Subject: [PATCH 30/31] commit

---
 .../pages/creatProcess/xmpg2/step1.vue        |   2 +-
 .../pages/details.vue                         | 351 ++++++++++--------
 .../domesticStandardsAndRegulations/index.vue |   5 +-
 .../components/EnterpriseStandardDatabase.vue |   5 +-
 .../foreignStandardsAndRegulations/index.vue  |   5 +-
 .../localProductsOrProjectLibrary/index.vue   |   2 +-
 6 files changed, 209 insertions(+), 161 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index cc1d1fc09..b192d5f89 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -337,7 +337,7 @@
                 label="项目分类"
               />
               <el-table-column
-                prop="projectManager"
+                prop="uname"
                 align="center"
                 label="项目经理"
               />
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 18d5e3626..cdb93f7ad 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -13,7 +13,7 @@
     </div>
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
-        <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
+        <p class="transition-box-p" v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
           <span class="transition-box-span">
              {{ sarAccessEO.countryAreaShow }}
@@ -71,11 +71,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
+            <el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary"
+                       type="primary" size="small" @click="selectProductBtn">查询
             </el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button  v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default" @click="resetSelect" size="small">清空</el-button>
+            <el-button v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default"
+                       @click="resetSelect" size="small">清空
+            </el-button>
           </el-form-item>
 
           <el-button class="common-button-default export-button"
@@ -110,11 +113,11 @@
             align="center">
           </el-table-column>
           <el-table-column
-              label="序号"
-              align="center"
-              width="55"
-              fixed="left"
-              type="index"
+            label="序号"
+            align="center"
+            width="55"
+            fixed="left"
+            type="index"
           >
           </el-table-column>
           <el-table-column
@@ -286,80 +289,80 @@
       :wrapperClosable="false"
       :visible.sync="isAdvancedSearch">
       <div class="demo-drawer-content">
-        <el-form  :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
-          <el-form-item label="中文名称" >
-                <el-input
-                  class="showBox"
-                  v-model="standardFormList.standName"
-                  placeholder="请输入"
-                  :maxlength="100"
-                  size="small"
-                />
-              </el-form-item>
-          <el-form-item label="适用车型" >
-                <el-select
-                  class="showBox"
-                  v-model="standardFormList.typeApplicable"
-                  placeholder="请选择"
-                  filterable
-                  size="small"
-                >
-                  <el-option
-                    v-for="item in applyArcticOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-          <el-form-item label="能源类型"  >
-                <el-select
-                  class="showBox"
-                  v-model="standardFormList.nylx"
-                  placeholder="请选择"
-                  filterable
-                  size="small"
-                >
-                  <el-option
-                    v-for="item in categoryOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-          <el-form-item label="责任部门"  >
-                <el-select
-                  class="showBox"
-                  v-model="standardFormList.zrbm"
-                  placeholder="请选择"
-                  filterable
-                  size="small"
-                >
-                  <el-option
-                    v-for="item in zrbmOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-          <el-form-item label="适用产品线"  >
-                <el-select
-                  class="showBox"
-                  v-model="standardFormList.sycpx"
-                  placeholder="请选择"
-                  filterable
-                  size="small"
-                >
-                  <el-option
-                    v-for="item in sycpxOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
+        <el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
+          <el-form-item label="中文名称">
+            <el-input
+              class="showBox"
+              v-model="standardFormList.standName"
+              placeholder="请输入"
+              :maxlength="100"
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="适用车型">
+            <el-select
+              class="showBox"
+              v-model="standardFormList.typeApplicable"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in applyArcticOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="能源类型">
+            <el-select
+              class="showBox"
+              v-model="standardFormList.nylx"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in categoryOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="责任部门">
+            <el-select
+              class="showBox"
+              v-model="standardFormList.zrbm"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in zrbmOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="适用产品线">
+            <el-select
+              class="showBox"
+              v-model="standardFormList.sycpx"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in sycpxOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
       <div class="demo-drawer-footer">
@@ -367,11 +370,13 @@
           size="small"
           icon="el-icon-check"
           type="primary"
-          @click="queryInfo">搜索</el-button>
+          @click="queryInfo">搜索
+        </el-button>
         <el-button
           size="small"
           icon="el-icon-close"
-          @click="backInfo">取消</el-button>
+          @click="backInfo">取消
+        </el-button>
       </div>
     </el-drawer>
 
@@ -381,6 +386,7 @@
 
 <script>
 import { interfaceUrl } from "@/sysConfig";
+
 export default {
   name: "AccessStandardDetails",
   data() {
@@ -410,7 +416,7 @@ export default {
       heightShow: true,
       dataLoading: false,
       standardForm: {
-        zrbm: '',
+        zrbm: "",
         standNumber: "",
         standName: "",
         responseUnit: "",
@@ -418,13 +424,13 @@ export default {
         Size: this.$store.getters.userInfo.configContent
       },
       standardFormList: {
-        zrbm: '',
-        typeApplicable: '',
-        nylx: '',
-        sycpx: '',
-        standNumber: '',
-        standName: '',
-        responseUnit: '',
+        zrbm: "",
+        typeApplicable: "",
+        nylx: "",
+        sycpx: "",
+        standNumber: "",
+        standName: "",
+        responseUnit: "",
         page: 1,
         Size: this.$store.getters.userInfo.configContent
       },
@@ -441,18 +447,18 @@ export default {
       loading: false,
       accessSarType: "",
       selectedList: [],
-      pageId: '',
+      pageId: "",
       // 导出文件模态框控制，和文件名称
       saveExportType: "",
       depNode: [], // 部门树
       sarAccessEO: {},
-      sarAccessEOInfo: '',
+      sarAccessEOInfo: "",
       fileInfoList: [],
       // 改变颜色
       dialogColor: false,
       dialogType: "",
       color: "",
-      isShow: false,
+      isShow: false
     };
   },
   methods: {
@@ -495,44 +501,73 @@ export default {
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
         ...this.standardFormList,
         ...this.standardForm,
-        id: this.pageId,
+        id: this.pageId
       }, {
         _this: this
       }, res => {
+        console.log(res.data.records);
+        res.data.records.forEach(item => {
+          if (item.nylx === "[]") {
+            item.nylx = null;
+          }
+          if (item.typeApplicable === "[]") {
+            item.typeApplicable = null;
+          }
+          if (item.sycpx === "[]") {
+            item.sycpx = null;
+          }
+          if(item.zrbm === "[]"){
+            item.zrbm = null
+          }
+        });
         this.standinfoList = res.data.records;
-        this.standardFormTotal = res.data.total
+        this.standardFormTotal = res.data.total;
         this.standinfoList.forEach(item => {
           if (item.standYear === null) {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
+            item.standNumber = item.standSortShow + " " + item.standNumber;
           } else {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
           }
-        })
+        });
       }, e => {
       });
     },
     selectInfoMore() {
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
         ...this.standardFormList,
-        id: this.pageId,
+        id: this.pageId
       }, {
         _this: this
       }, res => {
+        res.data.records.forEach(item => {
+          if (item.nylx === "[]") {
+            item.nylx = null;
+          }
+          if (item.typeApplicable === "[]") {
+            item.typeApplicable = null;
+          }
+          if (item.sycpx === "[]") {
+            item.sycpx = null;
+          }
+          if(item.zrbm === "[]"){
+            item.zrbm = null
+          }
+        });
         this.standinfoList = res.data.records;
-        this.standardFormTotal = res.data.total
+        this.standardFormTotal = res.data.total;
         this.standinfoList.forEach(item => {
           if (item.standYear === null) {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
+            item.standNumber = item.standSortShow + " " + item.standNumber;
           } else {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
           }
-        })
+        });
       }, e => {
 
       });
     },
     back() {
-      this.$router.push({name: 'AccessStandardsAndRegulations'})
+      this.$router.push({ name: "AccessStandardsAndRegulations" });
       // this.$router.push(this.$store.state.detailMap)
       // this.$store.commit('setDetailMap', '')
     },
@@ -544,11 +579,11 @@ export default {
     },
     // 重置搜索
     resetSelect() {
-      this.standardForm.zrbm = ''
-      this.standardForm.standName = ''
-      this.standardForm.responseUnit = ''
-      this.selectInfobyAccid()
-      this.selectInfoMore()
+      this.standardForm.zrbm = "";
+      this.standardForm.standName = "";
+      this.standardForm.responseUnit = "";
+      this.selectInfobyAccid();
+      this.selectInfoMore();
     },
     exportStandard() {
       if (this.selectedList.length > 0) {
@@ -565,22 +600,22 @@ export default {
     },
     // 导出确定功能
     //确认导出
-    exportTestItem () {
-      if(this.saveExportType === 'apart') {
-        if (this.selectedList != null && this.selectedList != ''){
-          const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' +
-            'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
-          window.open(exportURL)
-          this.$message.success('导出信息成功')
+    exportTestItem() {
+      if (this.saveExportType === "apart") {
+        if (this.selectedList != null && this.selectedList != "") {
+          const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
+            "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+          window.open(exportURL);
+          this.$message.success("导出信息成功");
         }
-      } else if (this.saveExportType === 'all') {
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' +
-          'exportType' + this.saveExportType + '&id=' + this.pageId + '&exportName=' + this.exportName
-        window.open(exportURL)
-        this.$message.success('导出信息成功')
+      } else if (this.saveExportType === "all") {
+        const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
+          "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
+        window.open(exportURL);
+        this.$message.success("导出信息成功");
       }
-      this.exportModelFlag = false
-      this.selectedList = []
+      this.exportModelFlag = false;
+      this.selectedList = [];
     },
     // tab页切换
     handleClick(tab, event) {
@@ -591,10 +626,10 @@ export default {
       this.selectInfobyAccid();
     },
     // 修改成表格样式后，选择项勾选改变
-    standSelectChange (data) {
-      this.selectedList = []
+    standSelectChange(data) {
+      this.selectedList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id)
+        this.selectedList.push(data[i].id);
       }
     },
     pageChange(page) {
@@ -655,7 +690,7 @@ export default {
     },
     // 附件下载事件
     fileDownLoad(attId) {
-      window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
+      window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId;
     },
     // 点击查看
     handlePreview(data) {
@@ -707,30 +742,30 @@ export default {
      * 高级检索
      */
     selectMoreBtn() {
-      this.isAdvancedSearch = true
-      this.standardFormList.standName = ''
-      this.standardFormList.typeApplicable = ''
-      this.standardFormList.nylx = ''
-      this.standardFormList.zrbm = ''
-      this.standardFormList.sycpx = ''
-      this.showTableFlag = false
-      this.page = 1
-      this.standardForm.page = 1
-      this.selectInfoMore()
+      this.isAdvancedSearch = true;
+      this.standardFormList.standName = "";
+      this.standardFormList.typeApplicable = "";
+      this.standardFormList.nylx = "";
+      this.standardFormList.zrbm = "";
+      this.standardFormList.sycpx = "";
+      this.showTableFlag = false;
+      this.page = 1;
+      this.standardForm.page = 1;
+      this.selectInfoMore();
     },
     queryInfo() {
       this.page = 1;
       this.standardForm.page = 1;
       this.selectInfoMore();
-      this.isAdvancedSearch = false
+      this.isAdvancedSearch = false;
     },
     backInfo() {
-      this.standardFormList.standName = ''
-      this.standardFormList.typeApplicable = ''
-      this.standardFormList.nylx = ''
-      this.standardFormList.zrbm = ''
-      this.standardFormList.sycpx = ''
-      this.isAdvancedSearch = false
+      this.standardFormList.standName = "";
+      this.standardFormList.typeApplicable = "";
+      this.standardFormList.nylx = "";
+      this.standardFormList.zrbm = "";
+      this.standardFormList.sycpx = "";
+      this.isAdvancedSearch = false;
     },
     // 获取工作组信息下拉框信息
     getGzzOption() {
@@ -767,16 +802,16 @@ export default {
       this.$refs.skillTable && this.$refs.skillTable.doLayout();
     },
     // 将文本状态的id与name对应
-    setMap(data){
+    setMap(data) {
       data.forEach(item => {
-        this.$set(this.textStatusMap, item.value, item.label)
-      })
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
     }
   },
   mounted() {
     this.$nextTick(() => {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
-      this.pageId = accessRow.id
+      this.pageId = accessRow.id;
       this.sarAccessEO = accessRow;
       this.selectInfobyAccid();
       this.getOrgTreeSource();
@@ -800,11 +835,11 @@ export default {
       this.ROLELIST = res.data.ROLELIST;
       this.GXHBQOptions = res.data.GXHBQXX;
       this.askNatureOptions = res.data.ACCESSTYPE;
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.textStatusOptions = res.data.WBZTCLASS
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.setMap(this.textStatusOptions)
+      this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
+      this.categoryOptions = res.data.NYLXCLASS; // 能源类型
+      this.textStatusOptions = res.data.WBZTCLASS;
+      this.sycpxOptions = res.data.SYCPXCLASS; // 适用产品线
+      this.setMap(this.textStatusOptions);
       this.getGzzOption();
     }, e => {
     });
@@ -935,9 +970,11 @@ export default {
       }
     }
   }
+
   .labelForm {
     margin-top: 20px;
   }
+
   /deep/ .relateClass {
     & > button {
       height: 30px;
@@ -969,9 +1006,10 @@ export default {
     }
   }
 
-  /deep/.showBox{
+  /deep/ .showBox {
     width: 300px;
   }
+
   .iconClass {
     width: 18px;
     height: 18px;
@@ -995,6 +1033,7 @@ export default {
     cursor: pointer
   }
 }
+
 .relateClass {
   .el-dialog__body {
     max-height: 460px;
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 1ab82ad5a..fbdf3a6e4 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -5202,7 +5202,10 @@ export default {
       }
 
       .el-card {
-        min-width: min-content;
+        width: 500px;
+        min-width: 2000px;
+        max-width: 100%;
+        //min-width: min-content;
       }
 
       height: 95%;
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 9e33d9011..97c75f62e 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -4159,7 +4159,10 @@ export default {
           padding: 0 !important;
         }
         .el-card{
-          min-width: min-content;
+          width: 500px;
+          min-width: 2000px;
+          max-width: 100%;
+          //min-width: min-content;
         }
         height: 95%;
         width: 95%;
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 85458fd27..3d30c9147 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -4903,7 +4903,10 @@ export default {
       }
 
       .el-card {
-        min-width: min-content;
+        width: 500px;
+        min-width: 2000px;
+        max-width: 100%;
+        //min-width: min-content;
       }
 
       height: 95%;
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 106f245a7..da31f68c8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -185,7 +185,7 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="projectManager"
+          prop="uname"
           align="center"
           label="项目经理">
         </el-table-column>

From 9cdc77656c20f1a9a295d89e5998ed321a86fe55 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Fri, 22 Oct 2021 14:16:21 +0800
Subject: [PATCH 31/31] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=8F=E6=94=B6=E7=BC=A9=E6=94=BE=E5=88=B0=E5=8F=B3=E4=BE=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                      |  557 +++++++--------
 src/components/navMenu/index.vue | 1134 +++++++++++++++---------------
 2 files changed, 859 insertions(+), 832 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a1a8916e3..dcb78047d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,8 +12,8 @@
           <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
             <div class="user-info">
               <el-dropdown
-                      trigger="click"
-                      @command="handleCommand"
+                  trigger="click"
+                  @command="handleCommand"
               >
                 <div class="user-box" style="margin-top: 23px;">
                   <img :src="userAvator" v-if="$store.getters.userInfo.avator">
@@ -27,11 +27,11 @@
               </el-dropdown>
             </div>
           </div>
-<!--          <div class="logo">-->
-<!--            <img :src="logo" />-->
-<!--          </div>-->
+          <!--          <div class="logo">-->
+          <!--            <img :src="logo" />-->
+          <!--          </div>-->
         </div>
-<!--        <com-header></com-header>-->
+        <!--        <com-header></com-header>-->
         <div class="container-box">
           <router-view />
         </div>
@@ -41,288 +41,289 @@
 </template>
 
 <script>
-  import {mapGetters, mapState} from 'vuex'
-  import { webLoginType } from '@/sysConfig'
-  export default {
-    name: 'App',
-    data () {
-      return {
-        isBoolean: false
-      }
-    },
-    methods: {
-      // 点击下拉选项事件
-      handleCommand (command) {
-        // 退出登录
-        if (command === 'loginOut') {
-          this.$confirm('您确认要退出吗?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-            confirmButtonClass: 'common-button-primary',
-            roundButton: false
-          }).then(() => {
-            if(webLoginType != null && webLoginType === 'idm' ) {
-              window.location.href= 'http://sso.foton.com.cn/logout?service='
-              // this.$http.post('logout', {}, res => {
-              //   window.location.href= 'http://testsso1.foton.com.cn/logout?service='
-              // })
-            }else if(webLoginType != null && webLoginType === 'dev'){
-              this.$store.commit('setTypeFlag', 'loginOut')
-              this.$http.get('logout', {}, {
-                _this: this
-              }, res => {
-                this.$store.dispatch('logout')
-                this.$router.push('/login')
-              }, e => {})
-            }
-            // this.$http.post('/logout', {}, res => {
-            //   window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
-            // })
-            // return
-            // this.$store.commit('setTypeFlag', 'loginOut')
-            // this.$http.get('logout', {}, {
-            //   _this: this
-            // }, res => {
-            //   this.$store.dispatch('logout')
-            //   this.$router.push('/login')
-            // }, e => {})
-          }).catch(() => {
-          })
-        }
-      },
-      /**
-       * @description: 主题设置
-       * @author: xx
-       * @date: 2018-08-29 14:56:39
-       */
-      setTheme (theme) {
-        document.getElementById('app').className = theme
-      },
-
-      /**
-       * @description: backSpace回退禁用
-       * @date: 2021-03-01 16:36:55
-       * @auth: chenxiaoxi
-       */
-      banBackSpace(e) {
-        var ev = e || window.event;
-        //各种浏览器下获取事件对象
-        var obj = ev.relatedTarget || ev.srcElement || ev.target ||ev.currentTarget;
-        //按下Backspace键
-        if(ev.keyCode == 8){
-          var tagName = obj.nodeName //标签名称
-          //如果标签不是input或者textarea则阻止Backspace
-          if(tagName!='INPUT' && tagName!='TEXTAREA'){
-            return this.stopIt(ev);
-          }
-          var tagType = obj.type.toUpperCase();//标签类型
-          //input标签除了下面几种类型，全部阻止Backspace
-          if(tagName=='INPUT' && (tagType!='TEXT' && tagType!='TEXTAREA' && tagType!='PASSWORD')){
-            return this.stopIt(ev);
-          }
-          //input或者textarea输入框如果不可编辑则阻止Backspace
-          if((tagName=='INPUT' || tagName=='TEXTAREA') && (obj.readOnly==true || obj.disabled ==true)){
-            return this.stopIt(ev);
-          }
-        }
-      },
-
-      stopIt(ev) {
-        if(ev.preventDefault){
-          //preventDefault()方法阻止元素发生默认的行为
-          ev.preventDefault();
-        }
-        if(ev.returnValue){
-          //IE浏览器下用window.event.returnValue = false;实现阻止元素发生默认的行为
-          ev.returnValue = false;
-        }
-        return false;
-      },
-      // 其他标签页修改用户 或者 退出登录
-      refresh() {
-        //执行刷新操作，这里我没有写this.$route.go(0),因为整个页面抖动不是很友好
-        //现将app.vue下面的 头部组件，菜单组件，内容组件隐藏再放出来，实现刷新一样的效果
-        console.log('我要刷新页面了')
-      }
-    },
-    computed: {
-      // 获取用户头像
-      userAvator () {
-        return this.$store.getters.userInfo.avator || require('@/assets/images/avator_default.png')
-      },
-      ...mapGetters([
-        'getWebSocketList', 'getTheme', 'getMenuList'
-      ]),
-      ...mapState(['userInfoModifyTime','isCollapse'])
-    },
-    watch: {
-      // 'userInfoModifyTime'() {
-      //   // console.log('watch global, userInfoModifyTime')
-      //   this.refresh()
-      // },
-      getTheme (val) {
-        // 主题修改
-        this.setTheme(val)
-      },
-      // 监听路由 控制isBoolean
-      $route () {
-        if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch') {
-          this.isBoolean = true
-        } else {
-          this.isBoolean = false
-        }
-      }
-    },
-    mounted () {
-      this.setTheme(this.getTheme)
-      //实现对字符码的截获，keypress中屏蔽了这些功能按键
-      document.onkeypress = this.banBackSpace
-      //对功能按键的获取
-      document.onkeydown = this.banBackSpace
-      this.visibilitychangeFn = (e) => { //这个方法是监测浏览器窗口发生变化的时候执行
-        // 切换到当前页面
-        if (document.hidden == false) {
-          const userInfoModifyTime = this.userInfoModifyTime
-          const userInfoModifyTimeInLocalStorage = localStorage.getItem('userInfoModifyTime')
-
-          // 用户未切换 不执行任何操作
-          if (userInfoModifyTime === userInfoModifyTimeInLocalStorage) {
-            return
-          }
-
-          if (userInfoModifyTimeInLocalStorage === null && webLoginType === 'idm') {
-            this.$store.dispatch('syncStorageData')
-
-            const currentPage = this.$route.name
-            if (currentPage === 'Login') {return}
-            this.currentMinute = 3
-            this.loading && this.loading.close()
-            this.loading = this.$loading({
-              lock: true,
-              // text: 'Loading',
-              // spinner: 'el-icon-loading',
-              // background: 'rgba(0, 0, 0, 0.7)'
-            });
-            this.messageForLogin && this.messageForLogin.close()
-            this.messageForLogin = this.$message({
-              message: `用户已退出，${this.currentMinute}秒后将跳转到登录1页面`,
-              type: 'warning'
-            })
-
-
-            this.intervalForLogin = setInterval(() => {
-              if (this.currentMinute === 0) {
-                clearInterval(this.intervalForLogin)
-                this.loading.close()
-
-                  this.$router.push('/login')
-                  console.log('切换到登录页面', currentPage)
-              }
-              this.currentMinute--
-              this.messageForLogin.message = `用户已退出，${this.currentMinute}秒后将跳转到登录页面`
-            }, 0)
-
-          } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage && webLoginType === 'idm') {
-            this.$store.dispatch('syncStorageData')
-
-            console.log('用户信息已更改，同步数据')
-
-            this.currentMinute = 3
-
-            this.loading && this.loading.close()
-            this.loading = this.$loading({
-              lock: true,
-              // text: 'Loading',
-              // spinner: 'el-icon-loading',
-              // background: 'rgba(0, 0, 0, 0.7)'
-            });
-
-            this.messageForHome && this.messageForHome.close()
-            this.messageForHome = this.$message({
-              message: `用户已切换，${this.currentMinute}秒后将跳转到用户首页`,
-              type: 'warning'
-            })
-            this.intervalForHome = setInterval(() => {
-              if (this.currentMinute === 0) {
-                clearInterval(this.intervalForHome)
-                this.loading.close()
-
-                this.$router.push({
-                  path: '/redirect',
-                  query: '/home2'
-                })
-              }
-              this.currentMinute--
-              this.messageForHome.message = `用户已切换，${this.currentMinute}秒后将跳转到用户首页`
-            }, 1000)
-
-            // const route = this.$router.resolve('/home')
-            // this.$router.push({
-            //   path: '/redirect',
-            //   query: '/home'
-            // })
-            // location.reload();
-          }
-
-        }
-      }
-      document.addEventListener('visibilitychange', this.visibilitychangeFn);
-
-    },
-    beforeDestroy() {
-      document.onkeypress = null
-      document.onkeydown = null
-      document.removeEventListener('visibilitychange', this.visibilitychangeFn)
-      clearInterval(this.intervalForLogin)
-      clearInterval(this.intervalForHome)
+import {mapGetters, mapState} from 'vuex'
+import { webLoginType } from '@/sysConfig'
+export default {
+  name: 'App',
+  data () {
+    return {
+      isBoolean: false
     }
+  },
+  methods: {
+    // 点击下拉选项事件
+    handleCommand (command) {
+      // 退出登录
+      if (command === 'loginOut') {
+        this.$confirm('您确认要退出吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: false
+        }).then(() => {
+          if(webLoginType != null && webLoginType === 'idm' ) {
+            window.location.href= 'http://sso.foton.com.cn/logout?service='
+            // this.$http.post('logout', {}, res => {
+            //   window.location.href= 'http://testsso1.foton.com.cn/logout?service='
+            // })
+          }else if(webLoginType != null && webLoginType === 'dev'){
+            this.$store.commit('setTypeFlag', 'loginOut')
+            this.$http.get('logout', {}, {
+              _this: this
+            }, res => {
+              this.$store.dispatch('logout')
+              this.$router.push('/login')
+            }, e => {})
+          }
+          // this.$http.post('/logout', {}, res => {
+          //   window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
+          // })
+          // return
+          // this.$store.commit('setTypeFlag', 'loginOut')
+          // this.$http.get('logout', {}, {
+          //   _this: this
+          // }, res => {
+          //   this.$store.dispatch('logout')
+          //   this.$router.push('/login')
+          // }, e => {})
+        }).catch(() => {
+        })
+      }
+    },
+    /**
+     * @description: 主题设置
+     * @author: xx
+     * @date: 2018-08-29 14:56:39
+     */
+    setTheme (theme) {
+      document.getElementById('app').className = theme
+    },
+
+    /**
+     * @description: backSpace回退禁用
+     * @date: 2021-03-01 16:36:55
+     * @auth: chenxiaoxi
+     */
+    banBackSpace(e) {
+      var ev = e || window.event;
+      //各种浏览器下获取事件对象
+      var obj = ev.relatedTarget || ev.srcElement || ev.target ||ev.currentTarget;
+      //按下Backspace键
+      if(ev.keyCode == 8){
+        var tagName = obj.nodeName //标签名称
+        //如果标签不是input或者textarea则阻止Backspace
+        if(tagName!='INPUT' && tagName!='TEXTAREA'){
+          return this.stopIt(ev);
+        }
+        var tagType = obj.type.toUpperCase();//标签类型
+        //input标签除了下面几种类型，全部阻止Backspace
+        if(tagName=='INPUT' && (tagType!='TEXT' && tagType!='TEXTAREA' && tagType!='PASSWORD')){
+          return this.stopIt(ev);
+        }
+        //input或者textarea输入框如果不可编辑则阻止Backspace
+        if((tagName=='INPUT' || tagName=='TEXTAREA') && (obj.readOnly==true || obj.disabled ==true)){
+          return this.stopIt(ev);
+        }
+      }
+    },
+
+    stopIt(ev) {
+      if(ev.preventDefault){
+        //preventDefault()方法阻止元素发生默认的行为
+        ev.preventDefault();
+      }
+      if(ev.returnValue){
+        //IE浏览器下用window.event.returnValue = false;实现阻止元素发生默认的行为
+        ev.returnValue = false;
+      }
+      return false;
+    },
+    // 其他标签页修改用户 或者 退出登录
+    refresh() {
+      //执行刷新操作，这里我没有写this.$route.go(0),因为整个页面抖动不是很友好
+      //现将app.vue下面的 头部组件，菜单组件，内容组件隐藏再放出来，实现刷新一样的效果
+      console.log('我要刷新页面了')
+    }
+  },
+  computed: {
+    // 获取用户头像
+    userAvator () {
+      return this.$store.getters.userInfo.avator || require('@/assets/images/avator_default.png')
+    },
+    ...mapGetters([
+      'getWebSocketList', 'getTheme', 'getMenuList'
+    ]),
+    ...mapState(['userInfoModifyTime','isCollapse'])
+  },
+  watch: {
+    // 'userInfoModifyTime'() {
+    //   // console.log('watch global, userInfoModifyTime')
+    //   this.refresh()
+    // },
+    getTheme (val) {
+      // 主题修改
+      this.setTheme(val)
+    },
+    // 监听路由 控制isBoolean
+    $route () {
+      if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch') {
+        this.isBoolean = true
+      } else {
+        this.isBoolean = false
+      }
+    }
+  },
+  mounted () {
+    this.setTheme(this.getTheme)
+    //实现对字符码的截获，keypress中屏蔽了这些功能按键
+    document.onkeypress = this.banBackSpace
+    //对功能按键的获取
+    document.onkeydown = this.banBackSpace
+    this.visibilitychangeFn = (e) => { //这个方法是监测浏览器窗口发生变化的时候执行
+      // 切换到当前页面
+      if (document.hidden == false) {
+        const userInfoModifyTime = this.userInfoModifyTime
+        const userInfoModifyTimeInLocalStorage = localStorage.getItem('userInfoModifyTime')
+
+        // 用户未切换 不执行任何操作
+        if (userInfoModifyTime === userInfoModifyTimeInLocalStorage) {
+          return
+        }
+
+        if (userInfoModifyTimeInLocalStorage === null && webLoginType === 'idm') {
+          this.$store.dispatch('syncStorageData')
+
+          const currentPage = this.$route.name
+          if (currentPage === 'Login') {return}
+          this.currentMinute = 3
+          this.loading && this.loading.close()
+          this.loading = this.$loading({
+            lock: true,
+            // text: 'Loading',
+            // spinner: 'el-icon-loading',
+            // background: 'rgba(0, 0, 0, 0.7)'
+          });
+          this.messageForLogin && this.messageForLogin.close()
+          this.messageForLogin = this.$message({
+            message: `用户已退出，${this.currentMinute}秒后将跳转到登录1页面`,
+            type: 'warning'
+          })
+
+
+          this.intervalForLogin = setInterval(() => {
+            if (this.currentMinute === 0) {
+              clearInterval(this.intervalForLogin)
+              this.loading.close()
+
+              this.$router.push('/login')
+              console.log('切换到登录页面', currentPage)
+            }
+            this.currentMinute--
+            this.messageForLogin.message = `用户已退出，${this.currentMinute}秒后将跳转到登录页面`
+          }, 0)
+
+        } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage && webLoginType === 'idm') {
+          this.$store.dispatch('syncStorageData')
+
+          console.log('用户信息已更改，同步数据')
+
+          this.currentMinute = 3
+
+          this.loading && this.loading.close()
+          this.loading = this.$loading({
+            lock: true,
+            // text: 'Loading',
+            // spinner: 'el-icon-loading',
+            // background: 'rgba(0, 0, 0, 0.7)'
+          });
+
+          this.messageForHome && this.messageForHome.close()
+          this.messageForHome = this.$message({
+            message: `用户已切换，${this.currentMinute}秒后将跳转到用户首页`,
+            type: 'warning'
+          })
+          this.intervalForHome = setInterval(() => {
+            if (this.currentMinute === 0) {
+              clearInterval(this.intervalForHome)
+              this.loading.close()
+
+              this.$router.push({
+                path: '/redirect',
+                query: '/home2'
+              })
+            }
+            this.currentMinute--
+            this.messageForHome.message = `用户已切换，${this.currentMinute}秒后将跳转到用户首页`
+          }, 1000)
+
+          // const route = this.$router.resolve('/home')
+          // this.$router.push({
+          //   path: '/redirect',
+          //   query: '/home'
+          // })
+          // location.reload();
+        }
+
+      }
+    }
+    document.addEventListener('visibilitychange', this.visibilitychangeFn);
+
+  },
+  beforeDestroy() {
+    document.onkeypress = null
+    document.onkeydown = null
+    document.removeEventListener('visibilitychange', this.visibilitychangeFn)
+    clearInterval(this.intervalForLogin)
+    clearInterval(this.intervalForHome)
   }
+}
 </script>
 
 <style lang="less">
-  #app {
-    position: relative;
+#app {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+  background-color: #F0F2F5;
+  //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
+  background-size: 100% 100%;
+  font-family: MicrosoftYaHei,微软雅黑;
+  & > div{
+    position: absolute;
+    top: 0;
+    left: 0;
     width: 100%;
+    min-height: 100%;
+  }
+  .content-box {
+    display: flex;
     height: 100%;
-    overflow-y: auto;
-    background-color: #F0F2F5;
-    //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
-    background-size: 100% 100%;
-    font-family: MicrosoftYaHei,微软雅黑;
-    & > div{
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      min-height: 100%;
-    }
-    .content-box {
-      display: flex;
+    .sub-container {
       height: 100%;
-      .sub-container {
-        height: 100%;
-        flex: 1;
-        overflow-x: auto;
-        display: flex;
-        flex-direction: column;
-        .container-box {
-          position: relative;
-          height: calc(~'100% - 65px');
-          //flex: 1;
-          background: #F4F4F4;
-          overflow-y: auto;
-          padding: 10px 10px 0;
-          .pagination {
-            border-top: 1px solid #f4f4f4;
-            width: calc(~'100% - 20px');
-            left: 10px;
-          }
+      flex: 1;
+      overflow-x: auto;
+      display: flex;
+      flex-direction: column;
+      .container-box {
+        position: relative;
+        height: calc(~'100% - 65px');
+        //flex: 1;
+        background: #F4F4F4;
+        overflow-y: auto;
+        padding: 10px 0 10px 0;
+        //padding:  10px 10px 0;
+        .pagination {
+          border-top: 1px solid #f4f4f4;
+          width: calc(~'100% - 20px');
+          left: 10px;
         }
       }
     }
-    /deep/.el-menu--vertical {
-      background: red;
-    }
   }
+  /deep/.el-menu--vertical {
+    background: red;
+  }
+}
 </style>
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index d528748cb..30630d572 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -8,26 +8,26 @@
         </div>
       </div>
     </div>
-    <div class="toggle-btn el-icon-s-fold" v-if="isCollapse === false" style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">
-      <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div><i class=""></i></div>
-    <div class="toggle-btn el-icon-s-unfold" v-else style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">
-      <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div></div>
+    <!--    <div class="toggle-btn el-icon-s-fold" v-if="isCollapse === false" style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">-->
+    <!--      <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div><i class=""></i></div>-->
+    <!--    <div class="toggle-btn el-icon-s-unfold" v-else style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">-->
+    <!--      <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div></div>-->
     <div class="left-tree">
       <el-menu
-              unique-opened
-              :default-active="defaultActive"
-              background-color="#5ea9f6"
-              text-color="#000"
-              active-text-color="#ffd04b"
-              router
-              :collapse="isCollapse"
+          unique-opened
+          :default-active="defaultActive"
+          background-color="#5ea9f6"
+          text-color="#000"
+          active-text-color="#ffd04b"
+          router
+          :collapse="isCollapse"
       >
         <template v-for="(item, index) in navMenuList">
           <el-submenu
-                  :key="index"
-                  :index="item.path"
-                  popper-class="nav-menu-popper"
-                  v-if="!item.isChildren && (!item.menuId || $hasPermission(item.menuId))"
+              :key="index"
+              :index="item.path"
+              popper-class="nav-menu-popper"
+              v-if="!item.isChildren && (!item.menuId || $hasPermission(item.menuId))"
           >
             <template slot="title">
               <i class="shangqi-icon" :class="item['icon-class']"></i>
@@ -36,10 +36,10 @@
               </el-badge>
             </template>
             <el-menu-item
-                    v-for="(children, childrenIndex) in item.children"
-                    :key="childrenIndex"
-                    :index="children.path"
-                    v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo
+                v-for="(children, childrenIndex) in item.children"
+                :key="childrenIndex"
+                :index="children.path"
+                v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo
             >
               <el-badge :value="getDynamicTotal.msgCount" class="item" v-if="children.title === '我的消息' && getDynamicTotal.msgCount !== 0">
                 {{ children.title }}
@@ -59,511 +59,571 @@
               :key="index"
               :index="item.path"
               v-if="item.isChildren && (!item.menuId || $hasPermission(item.menuId))"
-            >
-              <i class="shangqi-icon" :class="item['icon-class']"></i>
-              <span slot="title">{{ item.title }}</span>
-            </el-menu-item>
+          >
+            <i class="shangqi-icon" :class="item['icon-class']"></i>
+            <span slot="title">{{ item.title }}</span>
+          </el-menu-item>
         </template>
       </el-menu>
     </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>
+    </div>
   </div>
 </template>
 <script>
-  import { mapGetters, mapMutations } from 'vuex'
-  export default {
-    name: 'NavMenu',
-    data () {
-      return {
-        defaultActive: null, // 当前激活菜单的 index
-        navMenuList: [
-          // {
-          //   title: '首页',
-          //   path: '/home1',
-          //   isChildren: true, // 判断没有子菜单
-          //   'icon-class': 'home'
-          // },
-          {
-            title: '首页',
-            path: '/home2',
-            isChildren: true, // 判断没有子菜单
-            'icon-class': 'home'
-          },
-          {
-            title: '标准法规库',
-            path: '/regulatoryRepository',
-            'icon-class': 'fagui',
-            menuId: '2ewfwfa',
-            children: [
-              // {
-              //   title: '动态&资料',
-              //   path: '/dynamicInformation',
-              //   menuId: 'RAFQ4N4ARF'
-              // },
-              {
-                title: '国内标准法规',
-                path: '/domesticStandardsAndRegulations',
-                menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
-              },
-              // {
-              //   title: '零部件编号申请',
-              //   path: '/partCodeApply',
-              //   menuId: 'ad9db496772c075f78495382b7581fe9'
-              // },
-              // {
-              //   title: '标准法规工作组数据统计',
-              //   path: '/dataStatisComments',
-              //   menuId: ''
-              // },
-              {
-                title: '海外标准法规',
-                path: '/foreignStandardsAndRegulations',
-                menuId: '18c1e5134ea0cf865e8960b26b81fd8c'
-              },
-              {
-                title: '标准征求意见',
-                path: '/standardForComments',
-                menuId: '2b25c67f10abbbadf37d60daaaec54d3'
-              },
+import { mapGetters, mapMutations } from 'vuex'
+export default {
+  name: 'NavMenu',
+  data () {
+    return {
+      defaultActive: null, // 当前激活菜单的 index
+      navMenuList: [
+        // {
+        //   title: '首页',
+        //   path: '/home1',
+        //   isChildren: true, // 判断没有子菜单
+        //   'icon-class': 'home'
+        // },
+        {
+          title: '首页',
+          path: '/home2',
+          isChildren: true, // 判断没有子菜单
+          'icon-class': 'home'
+        },
+        {
+          title: '标准法规库',
+          path: '/regulatoryRepository',
+          'icon-class': 'fagui',
+          menuId: '2ewfwfa',
+          children: [
+            // {
+            //   title: '动态&资料',
+            //   path: '/dynamicInformation',
+            //   menuId: 'RAFQ4N4ARF'
+            // },
+            {
+              title: '国内标准法规',
+              path: '/domesticStandardsAndRegulations',
+              menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
+            },
+            // {
+            //   title: '零部件编号申请',
+            //   path: '/partCodeApply',
+            //   menuId: 'ad9db496772c075f78495382b7581fe9'
+            // },
+            // {
+            //   title: '标准法规工作组数据统计',
+            //   path: '/dataStatisComments',
+            //   menuId: ''
+            // },
+            {
+              title: '海外标准法规',
+              path: '/foreignStandardsAndRegulations',
+              menuId: '18c1e5134ea0cf865e8960b26b81fd8c'
+            },
+            {
+              title: '标准征求意见',
+              path: '/standardForComments',
+              menuId: '2b25c67f10abbbadf37d60daaaec54d3'
+            },
 
-              // {
-              //   title: '国内外政策',
-              //   path: '/foreignRegulationsDatabase',
-              //   menuId: '4DB4Y2H3NH'
-              // },
-              // // // {
-              // // //   title: '标准制修订管理',
-              // // //   path: '/demo2One'
-              // // // },
-              {
-                title: '标准法规清单',
-                path: '/accessStandardsAndRegulations',
-                menuId: '08dbd417864b08426034ca56d1fa3d02'
-              },
-              // // {
-              // //   title: '标准法规清单详情',
-              // //   path: '/details'
-              // // }
-              // // // {
-              // // //   title: '试验项目库',
-              // // //   path: '/demo2One'
-              // // // },
-              // // // {
-              // // //   title: '本地产品/项目库',
-              // // //   path: '/localProductsOrProjectLibrary'
-              // // // },
-              {
-                title: '企业标准库',
-                path: '/enterpriseStandardDatabase',
-                menuId: '01ed8f752748227777b3572d56ee9ab5'
-              },
-              // {
-              //   title: '企标制修订计划',
-              //   path: '/enterBSysRevPlanManaLib',
-              //   menuId: 'WW7YDHQ9Z679TGMDZMUS'
-              // },
-              // // {
-              // //   title: '子公司标准库',
-              // //   path: '/subsidiaryStandardLibrary'
-              // // }
-              /* {
-                 title: '车型/项目库',
-                 path: '/localProductsOrProjectLibrary',
-                 menuId: '42ce39c9f953be65a3e5643a4a2c786f'
-               },*/
-              {
-                title: '未符合项整改',
-                path: '/nonConfomity',
-                menuId: '0119abd677e0204e061eb0f0b8cafda0'
-              },
-              // {
-              //   title: '工作组',
-              //   path: '/workingGroup',
-              // },
-              // {
-              //   title: '备案产品标准库',
-              //   path: '/enterpriseStandardFiling',
-              //   menuId: 'MQBAGJQMSRZDRX3X5AVR'
-              // },
-              {
-                title: '标准合规评估结果', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
-                path: '/standInvolveProject',
-                menuId: '8a9c87fe06244fb9d55e78fb281f625b'
-              }
-              // {
-              //   title: '动态信息',
-              //   path: '/information',
-              //   menuId: 'ULUBXHYQB8M3XQ9HS9QG'
-              // }
-            ]
-          },
-          {
-            title: '我的工作',
-            path: '/processCenter',
-            'icon-class': 'liucheng',
-            menuId: '3fadf',
-            children: [
-              {
-                title: '流程中心',
-                path: '/processCenter',
-                menuId: '7455dc97eac2933341e18be659f07e89'
-              },
-              {
-                title: '新建流程',
-                path: '/createProcessNew',
-                menuId: 'b53e6722b33a37c0fa2d87a9b06cca40'
-              }
-            ]
-          },
-          {
-            title: '本地工具',
-            path: '/localTool',
-            'icon-class': 'tools',
-            menuId: 'afsd12',
-            children: [
-              // {
-              //   title: '标准预警',
-              //   path: '/standardWarning'
-              // },
-              {
-                title: '标准内容自动识别',
-                path: '/standardRecognition',
-                menuId: '3db80f62af9d96d6dfc6d429eea4b29b'
-              },
-              {
-                title: '标准拆分',
-                path: '/standAutoSplit',
-                menuId: '0062e261bc65e27e0a968dac67e16a3c'
-              },
-              {
-                title: '标准比对',
-                path: '/standContrast',
-                menuId: '1d83a6278f781419f628e9f5560f5c86'
-              },
-              // {
-              //   title: '标准比对库',
-              //   path: '/standardComparisonLibrary',
-              //   menuId: 'AH56UDHHBVF5V7WZFWJQ'
-              // }
-              // {
-              //   title: '预警管理',
-              //   path: '/warningManage'
-              // },
-              // {
-              //   title: '动态&通知管理',
-              //   path: '/dynamicInformationManage'
-              // },
-              // {
-              //   title: '标准编号申领',
-              //   path: '/applicationStandardNumber'
-              // },
-            ]
-          },
-          {
-            title: '标准预警',
-            path: '/standardWarning',
-            'icon-class': 'warning',
-            menuId: 'asfdew33',
-            isChildren: true // 判断没有子菜单
-          },
-          // {
-          //   title: '技术要求清单',
-          //   path: '/skillReq',
-          //   children: [
-          //     {
-          //       title: '技术要求清单查看',
-          //       path: '/SkillReqSee'
-          //     },
-          //     {
-          //       title: '技术要求清单管理',
-          //       path: '/SkillReqAdd'
-          //     }
-          //   ]
-          // },
-          {
-            title: '配置管理',
-            path: '/config',
-            'icon-class': 'conf',
-            menuId: 'adff323',
-            children: [
-              {
-                title: '标准法规属性管理',
-                path: '/standLawsAttrManage',
-                menuId: '72a24657972d286b8b5d80735cf4eee2'
-              },
-              //     {
-              //       title: '资料中心管理',
-              //       path: '/dynamicInformationManage',
-              //       menuId: '6V2QZ9STRZ'
-              //     },
-              {
-                title: '机构管理',
-                path: '/MechanismManage',
-                menuId: '5a09164da97760846509c5c9dd86b80c'
-              },
-              {
-                title: '角色管理',
-                path: '/roleManage',
-                menuId: 'd73d0e230eafdb2ddefe1c97daf657ea'
-              },
-              {
-                title: '岗位管理',
-                path: '/postManage',
-                menuId: 'd2954be3abaaf2de3dc79add4c8ab8cd'
-              },
-              //     {
-              //       title: '用户管理',
-              //       path: '/userManage',
-              //       menuId: 'YRJUEVJVUJ'
-              //     },
-              //     {
-              //       title: '系统配置管理',
-              //       path: '/warningTimeSetting',
-              //       menuId: 'H2KC6P3PPM'
-              //     },
-              //     {
-              //       title: '文档转换监控',
-              //       path: '/convertDocView',
-              //       menuId: '3F52K25546'
-              //     },
-              //     {
-              //       title: '菜单管理',
-              //       path: '/menuManage',
-              //       menuId: '87b8b4f5817a7829696e63185c744d52'
-              //     },
-              {
-                title: '链接管理',
-                path: '/linkManage',
-                menuId: 'd3ff92078c53a4d9d1f1a94450fee91e'
-              },
-              //     // {
-              //     //   title: '保密管理',
-              //     //   path: '/convertDocView'
-              //     // },
-              //     {
-              //       title: '动态信息管理',
-              //       path: '/DynamicInformations',
-              //       menuId: '3C87BSHJUF'
-              //     },
-              {
-                title: '标准属性自定义',
-                path: '/attributeCustom',
-                menuId: '9cdb9b40157dd967b664b9af462b960b'
-              },
-              //     // {
-              //     //   title: '流程分类管理',
-              //     //   path: '/processClassificationManage',
-              //     //   menuId: 'N323F2UB9FTUV5SD3GTD'
-              //     // },
-              //     // {
-              //     //   title: '流程管理',
-              //     //   path: '/processManage',
-              //     //   menuId: 'K5KXSS3X9CF7CS8AMFJ5'
-              //     // },
-              //     {
-              //       title: 'SVPPS',
-              //       path: '/svpps',
-              //       menuId: 'AR52RX586LQHVZSVV83K'
-              //     },
-              //     {
-              //       title: '企标编号管理体系',
-              //       path: '/enterpriseStandardNumberManagement',
-              //       menuId: '9YSFG39S3CBFUJCEU3QX'
-              //     }
-            ]
-          },
-          {
-            title: '个人中心',
-            path: '/personal',
-            'icon-class': 'ucenter',
-            menuId: '32143ffasdf',
-            children: [
-              // {
-              //   title: '我的消息',
-              //   path: '/dynamics',
-              //   menuId: 'JCEV4AEV32'
-              // },
-              // {
-              //   title: '我的企标',
-              //   path: '/MyEnterpriseStandard',
-              //   menuId: 'LKU3W23UMEHDM9VLDHGK'
-              // },
-              {
-                title: '我的收藏',
-                path: '/collection',
-                menuId: '63e999c65b1f2b1339119a00eb1d50cf'
-              },
-              // {
-              //   title: '我的浏览',
-              //   path: '/browsing',
-              //   menuId: 'HAEY2A4LMX'
-              // },
-              // {
-              //   title: '已收分享',
-              //   path: '/push',
-              //   menuId: '9F8T7DPYHE'
-              // },
-              // {
-              //   title: '已发分享',
-              //   path: '/forward',
-              //   menuId: 'K45Y9TGKZV2K4XP4CETD'
-              // },
-              // {
-              //   title: '我的问答',
-              //   path: '/questionsAndAnswers',
-              //   menuId: '8VKLZATQQG4NQHXV9UDS'
-              // },
-              {
-                title: '我的板块',
-                path: '/plate',
-                menuId: 'e4a94f03223df6f4ad70732b96f07221'
-              }
-              // {
-              //   title: '个人信息',
-              //   path: '/info',
-              //   menuId: '8K7FDHG89G'
-              // }
-            ]
-          },
-          // {
-          //   title: '搜索中心',
-          //   path: '/advancedSearch',
-          //   'icon-class': 'search',
-          //   menuId: '1332FSFAD',
-          //   isChildren: true // 判断没有子菜单
-          // },
-          // {
-          //   title: '标准比对库',
-          //   path: '/standardComparisonLibrary',
-          //   'icon-class': 'search',
-          //   menuId: 'Q32VBYVGCAE4XXN3XZ8T',
-          //   isChildren: true // 判断没有子菜单
-          // }
-          // {
-          //   title: '自定义报表',
-          //   path: '/customReport',
-          //   'icon-class': 'baobiao',
-          //   isChildren: true // 判断没有子菜单
-          // }
-        ]
-      }
+            // {
+            //   title: '国内外政策',
+            //   path: '/foreignRegulationsDatabase',
+            //   menuId: '4DB4Y2H3NH'
+            // },
+            // // // {
+            // // //   title: '标准制修订管理',
+            // // //   path: '/demo2One'
+            // // // },
+            {
+              title: '标准法规清单',
+              path: '/accessStandardsAndRegulations',
+              menuId: '08dbd417864b08426034ca56d1fa3d02'
+            },
+            // // {
+            // //   title: '标准法规清单详情',
+            // //   path: '/details'
+            // // }
+            // // // {
+            // // //   title: '试验项目库',
+            // // //   path: '/demo2One'
+            // // // },
+            // // // {
+            // // //   title: '本地产品/项目库',
+            // // //   path: '/localProductsOrProjectLibrary'
+            // // // },
+            {
+              title: '企业标准库',
+              path: '/enterpriseStandardDatabase',
+              menuId: '01ed8f752748227777b3572d56ee9ab5'
+            },
+            // {
+            //   title: '企标制修订计划',
+            //   path: '/enterBSysRevPlanManaLib',
+            //   menuId: 'WW7YDHQ9Z679TGMDZMUS'
+            // },
+            // // {
+            // //   title: '子公司标准库',
+            // //   path: '/subsidiaryStandardLibrary'
+            // // }
+            /* {
+               title: '车型/项目库',
+               path: '/localProductsOrProjectLibrary',
+               menuId: '42ce39c9f953be65a3e5643a4a2c786f'
+             },*/
+            {
+              title: '未符合项整改',
+              path: '/nonConfomity',
+              menuId: '0119abd677e0204e061eb0f0b8cafda0'
+            },
+            // {
+            //   title: '工作组',
+            //   path: '/workingGroup',
+            // },
+            // {
+            //   title: '备案产品标准库',
+            //   path: '/enterpriseStandardFiling',
+            //   menuId: 'MQBAGJQMSRZDRX3X5AVR'
+            // },
+            {
+              title: '标准合规评估结果', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
+              path: '/standInvolveProject',
+              menuId: '8a9c87fe06244fb9d55e78fb281f625b'
+            }
+            // {
+            //   title: '动态信息',
+            //   path: '/information',
+            //   menuId: 'ULUBXHYQB8M3XQ9HS9QG'
+            // }
+          ]
+        },
+        {
+          title: '我的工作',
+          path: '/processCenter',
+          'icon-class': 'liucheng',
+          menuId: '3fadf',
+          children: [
+            {
+              title: '流程中心',
+              path: '/processCenter',
+              menuId: '7455dc97eac2933341e18be659f07e89'
+            },
+            {
+              title: '新建流程',
+              path: '/createProcessNew',
+              menuId: 'b53e6722b33a37c0fa2d87a9b06cca40'
+            }
+          ]
+        },
+        {
+          title: '本地工具',
+          path: '/localTool',
+          'icon-class': 'tools',
+          menuId: 'afsd12',
+          children: [
+            // {
+            //   title: '标准预警',
+            //   path: '/standardWarning'
+            // },
+            {
+              title: '标准内容自动识别',
+              path: '/standardRecognition',
+              menuId: '3db80f62af9d96d6dfc6d429eea4b29b'
+            },
+            {
+              title: '标准拆分',
+              path: '/standAutoSplit',
+              menuId: '0062e261bc65e27e0a968dac67e16a3c'
+            },
+            {
+              title: '标准比对',
+              path: '/standContrast',
+              menuId: '1d83a6278f781419f628e9f5560f5c86'
+            },
+            // {
+            //   title: '标准比对库',
+            //   path: '/standardComparisonLibrary',
+            //   menuId: 'AH56UDHHBVF5V7WZFWJQ'
+            // }
+            // {
+            //   title: '预警管理',
+            //   path: '/warningManage'
+            // },
+            // {
+            //   title: '动态&通知管理',
+            //   path: '/dynamicInformationManage'
+            // },
+            // {
+            //   title: '标准编号申领',
+            //   path: '/applicationStandardNumber'
+            // },
+          ]
+        },
+        {
+          title: '标准预警',
+          path: '/standardWarning',
+          'icon-class': 'warning',
+          menuId: 'asfdew33',
+          isChildren: true // 判断没有子菜单
+        },
+        // {
+        //   title: '技术要求清单',
+        //   path: '/skillReq',
+        //   children: [
+        //     {
+        //       title: '技术要求清单查看',
+        //       path: '/SkillReqSee'
+        //     },
+        //     {
+        //       title: '技术要求清单管理',
+        //       path: '/SkillReqAdd'
+        //     }
+        //   ]
+        // },
+        {
+          title: '配置管理',
+          path: '/config',
+          'icon-class': 'conf',
+          menuId: 'adff323',
+          children: [
+            {
+              title: '标准法规属性管理',
+              path: '/standLawsAttrManage',
+              menuId: '72a24657972d286b8b5d80735cf4eee2'
+            },
+            //     {
+            //       title: '资料中心管理',
+            //       path: '/dynamicInformationManage',
+            //       menuId: '6V2QZ9STRZ'
+            //     },
+            {
+              title: '机构管理',
+              path: '/MechanismManage',
+              menuId: '5a09164da97760846509c5c9dd86b80c'
+            },
+            {
+              title: '角色管理',
+              path: '/roleManage',
+              menuId: 'd73d0e230eafdb2ddefe1c97daf657ea'
+            },
+            {
+              title: '岗位管理',
+              path: '/postManage',
+              menuId: 'd2954be3abaaf2de3dc79add4c8ab8cd'
+            },
+            //     {
+            //       title: '用户管理',
+            //       path: '/userManage',
+            //       menuId: 'YRJUEVJVUJ'
+            //     },
+            //     {
+            //       title: '系统配置管理',
+            //       path: '/warningTimeSetting',
+            //       menuId: 'H2KC6P3PPM'
+            //     },
+            //     {
+            //       title: '文档转换监控',
+            //       path: '/convertDocView',
+            //       menuId: '3F52K25546'
+            //     },
+            //     {
+            //       title: '菜单管理',
+            //       path: '/menuManage',
+            //       menuId: '87b8b4f5817a7829696e63185c744d52'
+            //     },
+            {
+              title: '链接管理',
+              path: '/linkManage',
+              menuId: 'd3ff92078c53a4d9d1f1a94450fee91e'
+            },
+            //     // {
+            //     //   title: '保密管理',
+            //     //   path: '/convertDocView'
+            //     // },
+            //     {
+            //       title: '动态信息管理',
+            //       path: '/DynamicInformations',
+            //       menuId: '3C87BSHJUF'
+            //     },
+            {
+              title: '标准属性自定义',
+              path: '/attributeCustom',
+              menuId: '9cdb9b40157dd967b664b9af462b960b'
+            },
+            //     // {
+            //     //   title: '流程分类管理',
+            //     //   path: '/processClassificationManage',
+            //     //   menuId: 'N323F2UB9FTUV5SD3GTD'
+            //     // },
+            //     // {
+            //     //   title: '流程管理',
+            //     //   path: '/processManage',
+            //     //   menuId: 'K5KXSS3X9CF7CS8AMFJ5'
+            //     // },
+            //     {
+            //       title: 'SVPPS',
+            //       path: '/svpps',
+            //       menuId: 'AR52RX586LQHVZSVV83K'
+            //     },
+            //     {
+            //       title: '企标编号管理体系',
+            //       path: '/enterpriseStandardNumberManagement',
+            //       menuId: '9YSFG39S3CBFUJCEU3QX'
+            //     }
+          ]
+        },
+        {
+          title: '个人中心',
+          path: '/personal',
+          'icon-class': 'ucenter',
+          menuId: '32143ffasdf',
+          children: [
+            // {
+            //   title: '我的消息',
+            //   path: '/dynamics',
+            //   menuId: 'JCEV4AEV32'
+            // },
+            // {
+            //   title: '我的企标',
+            //   path: '/MyEnterpriseStandard',
+            //   menuId: 'LKU3W23UMEHDM9VLDHGK'
+            // },
+            {
+              title: '我的收藏',
+              path: '/collection',
+              menuId: '63e999c65b1f2b1339119a00eb1d50cf'
+            },
+            // {
+            //   title: '我的浏览',
+            //   path: '/browsing',
+            //   menuId: 'HAEY2A4LMX'
+            // },
+            // {
+            //   title: '已收分享',
+            //   path: '/push',
+            //   menuId: '9F8T7DPYHE'
+            // },
+            // {
+            //   title: '已发分享',
+            //   path: '/forward',
+            //   menuId: 'K45Y9TGKZV2K4XP4CETD'
+            // },
+            // {
+            //   title: '我的问答',
+            //   path: '/questionsAndAnswers',
+            //   menuId: '8VKLZATQQG4NQHXV9UDS'
+            // },
+            {
+              title: '我的板块',
+              path: '/plate',
+              menuId: 'e4a94f03223df6f4ad70732b96f07221'
+            }
+            // {
+            //   title: '个人信息',
+            //   path: '/info',
+            //   menuId: '8K7FDHG89G'
+            // }
+          ]
+        },
+        // {
+        //   title: '搜索中心',
+        //   path: '/advancedSearch',
+        //   'icon-class': 'search',
+        //   menuId: '1332FSFAD',
+        //   isChildren: true // 判断没有子菜单
+        // },
+        // {
+        //   title: '标准比对库',
+        //   path: '/standardComparisonLibrary',
+        //   'icon-class': 'search',
+        //   menuId: 'Q32VBYVGCAE4XXN3XZ8T',
+        //   isChildren: true // 判断没有子菜单
+        // }
+        // {
+        //   title: '自定义报表',
+        //   path: '/customReport',
+        //   'icon-class': 'baobiao',
+        //   isChildren: true // 判断没有子菜单
+        // }
+      ]
+    }
+  },
+  created () {
+    // 获取当前页的path，赋值没左侧菜单，并展开
+    if (this.$route.meta.parentPath) {
+      this.defaultActive = this.$route.meta.parentPath
+    } else {
+      this.defaultActive = this.$route.path
+    }
+  },
+  mounted () {
+  },
+  methods: {
+    handleToggleSideBar () {
+      this.toggleSideBar(!this.isCollapse)
     },
-    created () {
+    // 收展按钮
+    collapseIcon() {
+      return this.sideClose ? 'el-icon-arrow-left' : 'el-icon-arrow-right'
+      // return 'el-icon-arrow-left'
+    },
+    ...mapMutations(['toggleSideBar'])
+  },
+  computed: {
+    logo () {
+      // background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
+      // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
+      return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
+    },
+    ...mapGetters(['getDynamicTotal', 'isCollapse'])
+  },
+  watch: {
+    // 监听路由 重新渲染面包屑
+    $route () {
       // 获取当前页的path，赋值没左侧菜单，并展开
       if (this.$route.meta.parentPath) {
         this.defaultActive = this.$route.meta.parentPath
       } else {
         this.defaultActive = this.$route.path
       }
-    },
-    mounted () {
-    },
-    methods: {
-      handleToggleSideBar () {
-        this.toggleSideBar(!this.isCollapse)
-      },
-      ...mapMutations(['toggleSideBar'])
-    },
-    computed: {
-      logo () {
-        // background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
-        // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
-        return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
-      },
-      ...mapGetters(['getDynamicTotal', 'isCollapse'])
-    },
-    watch: {
-      // 监听路由 重新渲染面包屑
-      $route () {
-        // 获取当前页的path，赋值没左侧菜单，并展开
-        if (this.$route.meta.parentPath) {
-          this.defaultActive = this.$route.meta.parentPath
-        } else {
-          this.defaultActive = this.$route.path
-        }
-      }
     }
   }
+}
 </script>
 <style lang="less" scoped>
-  @import '~@/assets/styles/mixins';
-  .nav-menu {
-    width: 58px;
-    height: 100%;
+@import '~@/assets/styles/mixins';
+.nav-menu {
+  width: 58px;
+  height: 100%;
+  overflow-y: auto;
+  user-select: none;
+  box-sizing: border-box;
+  position: relative;
+  background: rgb(255, 255, 255);
+  background-size: 100% 100%;
+  /deep/.el-tooltip {
+    padding: 0px 16px !important;
+  }
+  .left-tree {
+    height: calc(~'100% - 115px');
     overflow-y: auto;
-    user-select: none;
-    box-sizing: border-box;
+  }
+  .left-tree::-webkit-scrollbar {
+    display: none;
+  }
+  &:not(.is-collapse) {
+    width: 212px;
     background: rgb(255, 255, 255);
     background-size: 100% 100%;
-    /deep/.el-tooltip {
-      padding: 0px 16px !important;
-    }
-    .left-tree {
-      height: calc(~'100% - 115px');
-      overflow-y: auto;
-    }
-    .left-tree::-webkit-scrollbar {
-      display: none;
-    }
-    &:not(.is-collapse) {
-      width: 212px;
-      background: rgb(255, 255, 255);
-      background-size: 100% 100%;
-      .logo {
-        padding: 10px;
-        text-align: left;
-        img {
-          width: 160px;
-          height: 61px;
-          margin-top: -7px;
-        }
-      }
-    }
-    .logo{
-      text-align: center;
-      padding: 15px 0;
+    .logo {
+      padding: 10px;
+      text-align: left;
       img {
-        width: 36px;
-        height: 35px;
+        width: 160px;
+        height: 61px;
+        margin-top: -7px;
       }
     }
-    .nav-menu-header{
-      /*background:url("../../assets/images/shangqi/home/logo3.png");*/
-    }
-    /deep/:not(.is-collapse) .el-menu-item.is-active{
-      background: #f0f7ff !important;
-      color: #4091FF !important;
+  }
+  .tree-collapse{
+    position: absolute;
+    right: 0;
+    top: 65px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 15px;
+    height: calc(100% - 69px);
+    background: #EEE;
+    cursor: pointer;
+    &:hover{
+      background-color: #3391CE;
     }
   }
-  .has-no-read{
-    position: relative;
-    top:-15px;
-    left:10px
+  .logo{
+    text-align: center;
+    padding: 15px 0;
+    img {
+      width: 36px;
+      height: 35px;
+    }
   }
-  .nav-menu /deep/.el-submenu__title i {
-    color: #000;
+  .nav-menu-header{
+    /*background:url("../../assets/images/shangqi/home/logo3.png");*/
   }
-  .nav-menu{
-    scrollbar-width: none;
-    -ms-overflow-style: none; /* IE 10+ */
-  }
-  .nav-menu::-webkit-scrollbar {
-    display: none; /* Chrome Safari */
-  }
-  .nav-menu-popper .el-menu .el-menu-item {
-    color: #fff !important;
-  }
-  .nav-menu-popper .el-menu .el-menu-item.is-active {
-    background-color: #fff !important;
-    color: #5ea9f6 !important;
-    font-weight: bold;
-  }
-  .nav-menu-popper .el-menu .el-menu-item:hover {
-    background-color: #fff !important;
-    color: #5ea9f6 !important;
-    font-weight: bold;
+  /deep/:not(.is-collapse) .el-menu-item.is-active{
+    background: #f0f7ff !important;
+    color: #4091FF !important;
   }
+}
+.has-no-read{
+  position: relative;
+  top:-15px;
+  left:10px
+}
+.nav-menu /deep/.el-submenu__title i {
+  color: #000;
+}
+.nav-menu{
+  scrollbar-width: none;
+  -ms-overflow-style: none; /* IE 10+ */
+}
+.nav-menu::-webkit-scrollbar {
+  display: none; /* Chrome Safari */
+}
+.nav-menu-popper .el-menu .el-menu-item {
+  color: #fff !important;
+}
+.nav-menu-popper .el-menu .el-menu-item.is-active {
+  background-color: #fff !important;
+  color: #5ea9f6 !important;
+  font-weight: bold;
+}
+.nav-menu-popper .el-menu .el-menu-item:hover {
+  background-color: #fff !important;
+  color: #5ea9f6 !important;
+  font-weight: bold;
+}
 
-  .el-menu-item {
+.el-menu-item {
+  padding: 0 16px !important;
+  span {
+    font-weight: normal;
+    margin-left: 5px;
+  }
+  .shangqi-icon {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    background-repeat: no-repeat;
+    background-size: 85% 85%;
+    background-position: center center;
+    &.home {
+      background-image: url("~assets/images/shangqi/sideBar/home.png");
+    }
+    &.baobiao {
+      background-image: url("~assets/images/shangqi/sideBar/baobiao.png");
+    }
+    &.ucenter {
+      background-image: url("~assets/images/shangqi/sideBar/ucenter.png");
+    }
+    &.search {
+      background-image: url("~assets/images/shangqi/sideBar/search.png");
+    }
+    &.warning {
+      background-image: url("~assets/images/shangqi/sideBar/warning.png");
+    }
+    &.liucheng {
+      background-image: url("~assets/images/shangqi/sideBar/liucheng.png");
+    }
+  }
+}
+.el-submenu {
+  /deep/.el-submenu__title {
     padding: 0 16px !important;
     span {
       font-weight: normal;
@@ -576,11 +636,11 @@
       background-repeat: no-repeat;
       background-size: 85% 85%;
       background-position: center center;
-      &.home {
-        background-image: url("~assets/images/shangqi/sideBar/home.png");
+      &.fagui {
+        background-image: url("~assets/images/shangqi/sideBar/fagui.png");
       }
-      &.baobiao {
-        background-image: url("~assets/images/shangqi/sideBar/baobiao.png");
+      &.tools {
+        background-image: url("~assets/images/shangqi/sideBar/tools.png");
       }
       &.ucenter {
         background-image: url("~assets/images/shangqi/sideBar/ucenter.png");
@@ -588,71 +648,37 @@
       &.search {
         background-image: url("~assets/images/shangqi/sideBar/search.png");
       }
-      &.warning {
-        background-image: url("~assets/images/shangqi/sideBar/warning.png");
+      &.conf {
+        background-image: url("~assets/images/shangqi/sideBar/conf.png");
       }
       &.liucheng {
         background-image: url("~assets/images/shangqi/sideBar/liucheng.png");
       }
     }
   }
-  .el-submenu {
-    /deep/.el-submenu__title {
-      padding: 0 16px !important;
-      span {
-        font-weight: normal;
-        margin-left: 5px;
-      }
-      .shangqi-icon {
-        display: inline-block;
-        width: 18px;
-        height: 18px;
-        background-repeat: no-repeat;
-        background-size: 85% 85%;
-        background-position: center center;
-        &.fagui {
-          background-image: url("~assets/images/shangqi/sideBar/fagui.png");
-        }
-        &.tools {
-          background-image: url("~assets/images/shangqi/sideBar/tools.png");
-        }
-        &.ucenter {
-          background-image: url("~assets/images/shangqi/sideBar/ucenter.png");
-        }
-        &.search {
-          background-image: url("~assets/images/shangqi/sideBar/search.png");
-        }
-        &.conf {
-          background-image: url("~assets/images/shangqi/sideBar/conf.png");
-        }
-        &.liucheng {
-          background-image: url("~assets/images/shangqi/sideBar/liucheng.png");
-        }
-      }
-    }
-    .el-menu-item {
-      padding-left: 29px !important;
-      div {
-        font-weight: normal;
-      }
-    }
-    /deep/.el-menu {
-      padding-left: 18px;
+  .el-menu-item {
+    padding-left: 29px !important;
+    div {
+      font-weight: normal;
     }
   }
-  .el-menu--collapse{
-    width: 100%;
-    .shangqi-icon{
-      width: 24px;
-      height: 24px;
-    }
-    .el-submenu{
-      /deep/.el-submenu__title{
-        .shangqi-icon{
-          width: 24px;
-          height: 24px;
-        }
+  /deep/.el-menu {
+    padding-left: 18px;
+  }
+}
+.el-menu--collapse{
+  width: 100%;
+  .shangqi-icon{
+    width: 24px;
+    height: 24px;
+  }
+  .el-submenu{
+    /deep/.el-submenu__title{
+      .shangqi-icon{
+        width: 24px;
+        height: 24px;
       }
     }
   }
+}
 </style>