diff --git a/app.js b/app.js
index ce5696f..d24175a 100644
--- a/app.js
+++ b/app.js
@@ -97,8 +97,8 @@ App({
       perms:[],
       openid:null
     },
-    //serverUrl: 'https://safeyun.ctcshe.com/',
-    serverUrl: 'http://127.0.0.1:8000/',
+    serverUrl: 'https://safeyun.ctcshe.com/',
+    //serverUrl: 'http://127.0.0.1:8000/',
     //serverUrl: 'http://10.21.28.148:8000/',
     //serverUrl: 'http://192.168.0.103:8000/',
     //serverUrl:'http://10.0.11.195:8000/',
diff --git a/app.json b/app.json
index 3ce49f0..78645ff 100644
--- a/app.json
+++ b/app.json
@@ -84,7 +84,8 @@
     "pages/inspect/index2",
     "pages/inspect/detail2",
     "pages/inspect/handle",
-    "pages/train/access"
+    "pages/train/access",
+    "pages/dickey/treeselect"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/pages/dickey/treeselect.js b/pages/dickey/treeselect.js
new file mode 100644
index 0000000..5002477
--- /dev/null
+++ b/pages/dickey/treeselect.js
@@ -0,0 +1,108 @@
+Page({
+  data: {
+    value: [],
+  },
+  selThis(e) {
+    //console.log(e.detail);
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2];
+    prevPage.setData({
+      sdbm__partname: e.detail.name,
+      sdbm: e.detail.id,
+      pxbm: e.detail.id,
+      pxbm__partname: e.detail.name,
+      zgbm__partname: e.detail.name,
+      zgbm: e.detail.id,
+      newbm__partname: e.detail.name,
+      newbm: e.detail.id,
+    })
+    if(prevPage.route.indexOf('operation')!=-1){
+      prevPage.getspr12array()
+    }
+    wx.request({
+      url: getApp().globalData.serverUrl + 'getuser?a=combobox&partid='+e.detail.id,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': getApp().globalData.sessionId,
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          prevPage.setData({
+            zgrArray: res.data,
+            newrArray: res.data,
+            skrArray:res.data,
+          })
+          wx.navigateBack()
+        }
+      }
+    });
+  },
+  convert(rows) {
+    function exists(rows, parentId) {
+      for (var i = 0; i < rows.length; i++) {
+        if (rows[i].id == parentId) return true;
+      }
+      return false;
+    }
+
+    var nodes = [];
+    // get the top level nodes
+    for (var i = 0; i < rows.length; i++) {
+      var row = rows[i];
+      if (!exists(rows, row.parentId)) {
+        nodes.push({
+          id: row.id,
+          name: row.name
+        });
+      }
+    }
+
+    var toDo = [];
+    for (var i = 0; i < nodes.length; i++) {
+      toDo.push(nodes[i]);
+    }
+    while (toDo.length) {
+      var node = toDo.shift();	// the parent node
+      // get the children nodes
+      for (var i = 0; i < rows.length; i++) {
+        var row = rows[i];
+        if (row.parentId == node.id) {
+          var child = { id: row.id, name: row.name };
+          if (node.children) {
+            node.children.push(child);
+          } else {
+            node.children = [child];
+          }
+          toDo.push(child);
+        }
+      }
+    }
+    return nodes;
+  },
+  onLoad:function(option) {
+    let strurl
+    if(option.a=='yhlx'){
+      strurl = getApp().globalData.serverUrl + 'parthandle?a='+strurl
+      this.setData({
+        text:'隐患类型'
+      })
+    }
+    wx.request({
+      url: strurl,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': getApp().globalData.sessionId,
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          var rows = res.data
+          this.setData({
+            value: this.convert(rows)
+          })
+        }
+      }
+    });
+  },
+});
diff --git a/pages/dickey/treeselect.json b/pages/dickey/treeselect.json
new file mode 100644
index 0000000..2e6ab9b
--- /dev/null
+++ b/pages/dickey/treeselect.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {
+    "path-view": "/components/path-view/index"
+  }}
\ No newline at end of file
diff --git a/pages/dickey/treeselect.wxml b/pages/dickey/treeselect.wxml
new file mode 100644
index 0000000..36eb00b
--- /dev/null
+++ b/pages/dickey/treeselect.wxml
@@ -0,0 +1,8 @@
+
+
+<view class="container">
+  <text class="item">公司组织机构</text>
+  <path-view value="{{value}}"
+             btnTxt='选中本项'
+             catchtapBtn="selThis"></path-view>
+</view>
diff --git a/pages/dickey/treeselect.wxss b/pages/dickey/treeselect.wxss
new file mode 100644
index 0000000..a32f022
--- /dev/null
+++ b/pages/dickey/treeselect.wxss
@@ -0,0 +1,12 @@
+.item {
+  display: block;
+  margin: 20px 0 10px;
+  padding-left: 10px;
+  font-size: 16px;
+}
+.ps {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  color: #666;
+  font-size: 24rpx;
+}
\ No newline at end of file
diff --git a/pages/trouble/addtrouble.wxml b/pages/trouble/addtrouble.wxml
index c0d6102..fd4b3fb 100644
--- a/pages/trouble/addtrouble.wxml
+++ b/pages/trouble/addtrouble.wxml
@@ -86,9 +86,9 @@
         </view>
 
         <view class="weui-cell__bd">
-          <navigator url="/pages/area/tree">
+          <navigator url="/pages/dickey/treeselect?a=yhlx">
             <view class="weui-select">
-              {{yhqy__name}}
+              {{yhlx__name}}
             </view>
           </navigator>
         </view>