diff --git a/.env.development b/.env.development
index 5bd12618a..be7be3ece 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
-# VUE_APP_API_SERVER =  http://localhost:8080/api
+# VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
+VUE_APP_API_SERVER =  http://localhost:9001/api
 # VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
diff --git a/src/assets/images/home/lydxzClick.png b/src/assets/images/home/lydxzClick.png
new file mode 100644
index 000000000..7eeb24adb
Binary files /dev/null and b/src/assets/images/home/lydxzClick.png differ
diff --git a/src/assets/images/home/lydxzTree.png b/src/assets/images/home/lydxzTree.png
index bd83131c7..3c2db15ae 100644
Binary files a/src/assets/images/home/lydxzTree.png and b/src/assets/images/home/lydxzTree.png differ
diff --git a/src/assets/images/home/sh.png b/src/assets/images/home/sh.png
new file mode 100644
index 000000000..51daebd86
Binary files /dev/null and b/src/assets/images/home/sh.png differ
diff --git a/src/assets/images/home/zbbg.png b/src/assets/images/home/zbbg.png
old mode 100644
new mode 100755
index 6aa9b22ab..b3cf0d692
Binary files a/src/assets/images/home/zbbg.png and b/src/assets/images/home/zbbg.png differ
diff --git a/src/assets/images/home/zbbgClick.png b/src/assets/images/home/zbbgClick.png
new file mode 100644
index 000000000..bc1506c02
Binary files /dev/null and b/src/assets/images/home/zbbgClick.png differ
diff --git a/src/assets/images/home/zk.png b/src/assets/images/home/zk.png
new file mode 100644
index 000000000..16e5aae78
Binary files /dev/null and b/src/assets/images/home/zk.png differ
diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue
index ac36790f5..54303e526 100644
--- a/src/components/JwTree/nodeWrap.vue
+++ b/src/components/JwTree/nodeWrap.vue
@@ -17,19 +17,31 @@
               <div class="condition-node-box">
                 <div class="auto-judge">
                   <div v-if="getOnerSixLevelFlag(item)">
-                    <div class="wgdzb">
+                    <div :class="[item.children && item.children.length > 0 ? 'wgdzbHover' : 'wgdzb']">
                       <nameSplit :item="item" areaName="organizationName" peopleName="name" pageName="居委组织架构" />
                     </div>
+                    <div v-if="item._children" style="text-align: center" @click="getChildrenData(item, index, nodeConfig.children)">
+                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
+                      <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
+                    </div>
                   </div>
                   <div v-if="item.level === 'building_chief'">
-                    <div class="lydxz">
+                    <div :class="[tem.children && item.children.length > 0 ? 'lydxzHover' : 'lydxz']">
                       <nameSplit :item="item" areaName="organizationName" peopleName="name" pageName="居委组织架构" />
                     </div>
+                    <div v-if="item._children" style="text-align: center" @click="getChildrenData(item, index, nodeConfig.children)">
+                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
+                      <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
+                    </div>
                   </div>
                   <div v-if="item.level === 'unit_chief' || item.level === 'public_welfare_post'">
                     <div @click="gotoPersonnel(item.resiId, '居委组织架构')" class="dyzxh gotoDesc" :title="item.organizationName">
                       {{ spliceNameFun(item.organizationName, 3) }}
                     </div>
+                    <div v-if="item._children" style="text-align: center" @click="getChildrenData(item, index, nodeConfig.children)">
+                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
+                      <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
+                    </div>
                   </div>
                 </div>
               </div>
@@ -80,6 +92,29 @@ export default {
       return this.sixLevelArr.includes(item.level);
     },
 
+    getChildrenData(item, idx, arr) {
+      // if (!item._children) {
+      //   this.$message({
+      //     message: "无下级数据",
+      //     type: "error",
+      //   });
+      //   return;
+      // }
+      // 遍历arr，找到当前点击的item，将其_children赋值给item.children
+      arr.forEach((element, index) => {
+        if (index === idx) {
+          if (element.children) {
+            element._children = element.children;
+            element.children = null;
+          } else {
+            element.children = element._children;
+          }
+        } else {
+          element.children = null;
+        }
+      });
+    },
+
     gotoPersonnel(id, name) {
       if (id) {
         this.$router.push(`/organizational/orgPersonnel/${name}`);
@@ -134,23 +169,42 @@ export default {
 .auto-judge {
   .wgdzb {
     @include spanLevel;
-    width: 132px;
-    height: 96px;
+    width: 90px;
+    height: 126px;
     text-align: center;
     padding-top: 5px;
     background-image: url(~@/assets/images/home/zbbg.png);
     background-size: 100%;
   }
+  .wgdzbHover {
+    @include spanLevel;
+    width: 90px;
+    height: 126px;
+    text-align: center;
+    padding-top: 5px;
+    background-image: url(~@/assets/images/home/zbbgClick.png);
+    background-size: 100%;
+  }
   .lydxz {
     @include spanLevel;
     // @include normalLevel;
     text-align: center;
-    width: 216px;
-    height: 50px;
+    width: 90px;
+    height: 98px;
     padding-top: 5px;
     background-image: url(~@/assets/images/home/lydxzTree.png);
     background-size: 100%;
   }
+  .lydxzHover {
+    @include spanLevel;
+    // @include normalLevel;
+    text-align: center;
+    width: 90px;
+    height: 98px;
+    padding-top: 5px;
+    background-image: url(~@/assets/images/home/lydxzClick.png);
+    background-size: 100%;
+  }
   .dyzxh {
     @include spanLevel;
     @include normalLevel;
diff --git a/src/components/NameSplit/index.vue b/src/components/NameSplit/index.vue
index b9669249c..2fc49280e 100644
--- a/src/components/NameSplit/index.vue
+++ b/src/components/NameSplit/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="node-com">
-    <div v-if="!flag" :title="getAllName(item[areaName])">{{ spliceNameFun(item[areaName], 8) }}</div>
-    <div class="name_more" v-if="item[peopleName] && !item[peopleName].includes(',')" @click="gotoPersonnel(item.resiId)" :title="getAllName(item[peopleName])">{{ spliceNameFun(item[peopleName], 12) }}</div>
+    <div v-if="!flag" class="nodeTitle" :title="getAllName(item[areaName])">{{ spliceNameFun(item[areaName], 4) }}</div>
+    <div class="name_more peoName" v-if="item[peopleName] && !item[peopleName].includes(',')" @click="gotoPersonnel(item.resiId)" :title="getAllName(item[peopleName])">{{ spliceNameFun(item[peopleName], 12) }}</div>
     <div class="name_more" v-if="item[peopleName] && item[peopleName].includes(',')">
       <span v-for="(i, k) in getItemNameArr(item[peopleName])" :key="i" @click="gotoPersonnel(item.resiId.split(',')[k])" :title="getAllName(i)">{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}</span>
       <popTips :item="item" :pageName="pageName" />
@@ -47,9 +47,6 @@ export default {
     },
 
     spliceNameFun(row, num) {
-      if (row && row.length > num) {
-        return row.substring(0, num) + "...";
-      }
       return row;
     },
     gotoPersonnel(id) {
@@ -65,6 +62,20 @@ export default {
 
 <style scope lang="scss">
 .node-com {
+  padding: 0 12px;
+  .nodeTitle {
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #ffffff;
+  }
+  .peoName {
+    font-size: 14px;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #ffffff;
+    opacity: 0.8;
+  }
   .name_more {
     cursor: pointer;
     span {
diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue
index f5b465ea3..84f09132a 100644
--- a/src/components/Tree/nodeWrap.vue
+++ b/src/components/Tree/nodeWrap.vue
@@ -48,7 +48,7 @@
         </div>
       </div>
     </div>
-    <nodeWrap v-if="nodeConfig.childNode" :nodeConfig.sync="nodeConfig.childNode"></nodeWrap>
+    <!-- <nodeWrap v-if="nodeConfig.childNode" :nodeConfig.sync="nodeConfig.childNode"></nodeWrap> -->
   </div>
 </template>
 <script>
@@ -64,12 +64,12 @@ export default {
   watch: {},
   methods: {
     getChildrenData(item) {
-      // if (item.children) {
-      //   item._children = item.children;
-      //   item.children = null;
-      // } else {
-      //   item.children = item._children;
-      // }
+      if (item.children) {
+        item._children = item.children;
+        item.children = null;
+      } else {
+        item.children = item._children;
+      }
     },
   },
 };
@@ -103,8 +103,8 @@ export default {
 .auto-judge {
   .wgdzb {
     @include spanLevel;
-    width: 132px;
-    height: 96px;
+    width: 90px;
+    height: 128px;
     text-align: center;
     padding-top: 5px;
     background-image: url(~@/assets/images/home/zbbg.png);
diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue
index 2aa4e6b41..e2bc04e5f 100644
--- a/src/views/dataBoard/organizational/dangTree/index.vue
+++ b/src/views/dataBoard/organizational/dangTree/index.vue
@@ -74,6 +74,22 @@ export default {
       const myArray = [...new Set(this.levelArr)];
       this.levelArr = this.getLevelArrNum(myArray);
     },
+
+    hideChildrenData(data) {
+      const newData = [...data];
+      newData.forEach((item) => {
+        if (item.laneLevel === 1) {
+          this.hideChildrenData(item.children);
+        }
+        if (item.children && item.children.length > 0 && item.laneLevel >= 2) {
+          item._children = item.children;
+          item.children = null;
+          this.hideChildrenData(item._children);
+        }
+      });
+      console.log(newData);
+    },
+
     //获取树状结构
     getTreeData() {
       this.loading = true;
@@ -87,7 +103,8 @@ export default {
             this.$message.error("暂无数据");
             return;
           }
-          this.nodeConfig = data[0];
+          // this.nodeConfig = data[0];
+          this.hideChildrenData(data);
           this.getDataPLevel(data);
           this.loading = false;
         } else {
@@ -193,7 +210,7 @@ export default {
     .flowLevel-6,
     .flowLevel-7 {
       @include flowLevwlCommon;
-      height: 126px;
+      height: 160px;
     }
 
     .flowLevel-2 {
diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue
index 6cc88bcc0..6058bf62b 100644
--- a/src/views/dataBoard/organizational/jwTree/index.vue
+++ b/src/views/dataBoard/organizational/jwTree/index.vue
@@ -2,7 +2,7 @@
   <div class="wrap">
     <!-- v-on:wheel="zoomSize" :style="'transform: scale(' + nowVal / 100 + ');'" -->
     <div class="content">
-      <div v-for="(item, index) in levelArr" :key="item" :class="[item === 'unit_chief' ? 'lastLevel' : '', item === 'public_welfare_post' ? 'lastLevel1' : '', `flowLevel-${index + 1}`]" :style="{ height: item === 'building_chief' ? '90px' : '', lineHeight: item === 'building_chief' ? '90px' : '' }">
+      <div v-for="(item, index) in levelArr" :key="item" :class="[item === 'unit_chief' ? 'lastLevel' : '', item === 'public_welfare_post' ? 'lastLevel1' : '', `flowLevel-${index + 1}`]" :style="{ height: item === 'building_chief' ? '150px' : '', lineHeight: item === 'building_chief' ? '150px' : '' }">
         <div :class="[item === 'building_chief' ? 'otherTop' : '']">{{ getTitleNameMapFun(item) }}</div>
       </div>
       <el-row>
@@ -10,7 +10,7 @@
           <div class="contentList"></div>
         </el-col>
         <el-col :span="20">
-          <div class="dingflow-design" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
+          <div class="dingflow-design" :style="{ height: treeHeight + 'px' }" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
             <nodeWrapJw :nodeConfig.sync="nodeConfig"></nodeWrapJw>
           </div>
         </el-col>
@@ -27,6 +27,7 @@ export default {
       loading: false,
       levelArr: [],
       nowVal: 100,
+      treeHeight: 300,
       nodeConfig: {},
     };
   },
@@ -82,8 +83,25 @@ export default {
         }
       });
       const myArray = [...new Set(this.levelArr)];
+      this.treeHeight = myArray.length * 180 + 100;
       this.levelArr = this.getLevelArrNum(myArray);
     },
+
+    hideChildrenData(data) {
+      const newData = [...data];
+      newData.forEach((item) => {
+        if (item.laneLevel === 1) {
+          this.hideChildrenData(item.children);
+        }
+        if (item.children && item.children.length > 0 && item.laneLevel >= 2) {
+          item._children = item.children;
+          item.children = null;
+          this.hideChildrenData(item._children);
+        }
+      });
+      this.nodeConfig = newData[0];
+    },
+
     //获取树状结构
     getTreeData() {
       this.loading = true;
@@ -97,8 +115,8 @@ export default {
             this.$message.error("暂无数据");
             return;
           }
-          this.nodeConfig = data[0];
           this.getDataPLevel(data);
+          this.hideChildrenData(data);
           this.loading = false;
         } else {
           this.loading = false;
@@ -167,7 +185,7 @@ export default {
     }
 
     .lastLevel {
-      height: 145px !important;
+      height: 160px !important;
       margin-top: -45px !important;
     }
     .lastLevel1 {
@@ -202,19 +220,19 @@ export default {
     .flowLevel-6,
     .flowLevel-7 {
       @include flowLevwlCommon;
-      height: 126px;
+      height: 180px;
     }
 
     .flowLevel-2 {
       top: 181px;
-      line-height: 110px;
+      line-height: 180px;
 
       div {
         padding-left: 80px;
 
         &::after {
           @include flowLevelAfter;
-          top: 26px;
+          top: 60px;
           left: 15px;
           width: 180px;
           height: 60px;
@@ -224,15 +242,15 @@ export default {
     }
 
     .flowLevel-3 {
-      top: 329px;
-      line-height: 120px;
+      top: 379px;
+      line-height: 185px;
 
       div {
         padding-left: 80px;
 
         &::after {
           @include flowLevelAfter;
-          top: 31px;
+          top: 62px;
           left: 15px;
           width: 180px;
           height: 60px;
@@ -242,7 +260,7 @@ export default {
     }
 
     .flowLevel-4 {
-      top: 475px;
+      top: 577px;
       line-height: 128px;
 
       div {
@@ -250,7 +268,7 @@ export default {
 
         &::after {
           @include flowLevelAfter;
-          top: 35px;
+          top: 43px;
           left: 15px;
           width: 180px;
           height: 60px;
@@ -260,7 +278,7 @@ export default {
     }
 
     .flowLevel-5 {
-      top: 623px;
+      top: 775px;
       line-height: 130px;
 
       div {
@@ -278,15 +296,15 @@ export default {
     }
 
     .flowLevel-6 {
-      top: 771px;
-      line-height: 130px;
+      top: 991px;
+      line-height: 171px;
 
       div {
         padding-left: 80px;
 
         &::after {
           @include flowLevelAfter;
-          top: 35px;
+          top: 55px;
           left: 15px;
           width: 180px;
           height: 60px;
@@ -296,7 +314,7 @@ export default {
     }
 
     .flowLevel-7 {
-      top: 922px;
+      top: 1161px;
       line-height: 130px;
 
       div {
@@ -315,7 +333,7 @@ export default {
 
     .otherTop {
       &::after {
-        top: 15px !important;
+        top: 43px !important;
       }
     }
 
diff --git a/vue.config.js b/vue.config.js
index 808ddb332..fa6a9a897 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,8 +36,8 @@ module.exports = {
       },
       "/api": {
         // target: "http://219.146.91.110:30801", // 测试地址
-        // target: "http://localhost:8080", // 本地地址
-        target: "https://epmet-preview.elinkservice.cn", // 演示地址
+        target: "http://localhost:8080", // 本地地址
+        // target: "https://epmet-preview.elinkservice.cn", // 演示地址
         changeOrigin: true,
         pathRewrite: {
           "^api": "",