From 57a02d5333106a13644bd2d68ce92495f0624038 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 9 Jul 2021 10:06:14 +0800
Subject: [PATCH] commit

---
 src/pages/config/pages/mechanismManage/index.vue            | 1 +
 src/pages/config/pages/postManage/index.vue                 | 1 +
 src/pages/config/pages/roleManage/index.vue                 | 1 +
 src/pages/login/index.vue                                   | 1 +
 src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/xmpg/step1.vue   | 2 +-
 9 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 5b17d5bd9..b6d7808e3 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -107,6 +107,7 @@
               ref="tree2"
               node-key="id"
               class="filter-tree"
+              style="height: 100%; overflow: auto;"
               v-if="modalPost"
               :props="props"
               :data="postList"
diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
index 36915c846..0f19d2965 100644
--- a/src/pages/config/pages/postManage/index.vue
+++ b/src/pages/config/pages/postManage/index.vue
@@ -102,6 +102,7 @@
                     ref="tree"
                     node-key="id"
                     class="filter-tree"
+                    style="height: 100%; overflow: auto;"
                     v-if="modalRole"
                     :props="props"
                     :data="roleList"
diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 19718aa73..fb7287909 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -206,6 +206,7 @@
                     class="filter-tree1"
                     :data="treeData"
                     :props="defaultProps"
+                    style="height: 100%; overflow: auto;"
                     default-expand-all
                     check-strictly
                     node-key="id"
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 0b4e6b7a6..214dd7983 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -90,6 +90,7 @@ export default {
             let userInfoStr = Base64.decode(res.data)
             let userInfo2 = decodeURIComponent(userInfoStr)
             let userInfoObj = JSON.parse(userInfo2)
+            userInfoObj.userId = userInfoObj.usid
             this.setToken(userInfoObj.usid) // vuex存储token
             this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => {
               if (userInfo !== '' && userInfo !== null) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index aaf834d54..cd7a15d89 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -563,7 +563,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 6007a1d32..d2787d24f 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -230,7 +230,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 2b5fcdb56..9c4edbd1c 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -149,7 +149,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 2f2b95286..5d3255c1e 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -142,7 +142,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index a69694b6d..29e5f81f3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -290,7 +290,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"