diff --git a/safesite/templates/addtrouble.html b/safesite/templates/addtrouble.html
index cefde17e..ef6d1417 100644
--- a/safesite/templates/addtrouble.html
+++ b/safesite/templates/addtrouble.html
@@ -14,7 +14,7 @@
                 " /> 
             </div>
             <div style="margin-bottom:5px">
-                <input class="easyui-combobox" editable="false" required=true name="yhlxo" id="yhlxo" style="width:480px;" data-options="
+                <input class="easyui-combotree" editable="false" required=true name="yhlxo" id="yhlxo" style="width:480px;" data-options="
                 url:'getdickey?dicclass=56&a=combobox',
                 label:'隐患类型',
 				method: 'get',
diff --git a/safesite/views.py b/safesite/views.py
index 92c9e90f..96b89954 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1656,10 +1656,26 @@ def getdickey(req):
     a = (a.filter(usecomps__contains=',1,') | a.filter(usecomps__contains=',' +
                                                        companyid+',')).exclude(nousecomps__contains=','+companyid+',')
     a = a.values('dickeyid', 'dicparent__dicname', 'dickeyname',
-                 'dicparent__dicid', 'detail').order_by('dickeyid')
+                 'dicparent__dicid', 'detail', 'parent').order_by('dickeyid')
     total = a.count()
     if req.GET.get('a') == 'combobox':
-        return HttpResponse(transstr(a, 'dickeyid', 'dickeyname'), content_type="application/json")
+        r_list = list(a)
+        r_dict={}
+        for i in r_list:
+            i['value'] = i['dickeyid']
+            i['text'] = i['dickeyname']
+            r_dict[i["dickeyid"]]=i
+        ret=[]
+        for i in r_list:
+            parent=i['parent']
+            if parent:
+                if 'children' in r_dict[parent]:
+                    r_dict[parent]['children'].append(i)
+                else:
+                    r_dict[parent]['children'] = [i]
+            else:
+                ret.append(i)
+        return HttpResponse(json.dumps(ret), content_type="application/json")
     else:
         if req.GET.get('dicclass') == '33':
             for i in a:
@@ -1670,7 +1686,23 @@ def getdickey(req):
                     str = str + '-' + x.jdmc
                 i['splcdetail'] = str
             a = a
-        return HttpResponse(transjson(total, a), content_type="application/json")
+        r_list = list(a)
+        r_dict={}
+        for i in r_list:
+            i['value'] = i['dickeyid']
+            i['text'] = i['dickeyname']
+            r_dict[i["dickeyid"]]=i
+        ret=[]
+        for i in r_list:
+            parent=i['parent']
+            if parent:
+                if 'children' in r_dict[parent]:
+                    r_dict[parent]['children'].append(i)
+                else:
+                    r_dict[parent]['children'] = [i]
+            else:
+                ret.append(i)
+        return HttpResponse(json.dumps(ret), content_type="application/json")
 
 
 def addtrain(req):
diff --git a/需求/惠东需求.xlsx b/需求/惠东需求.xlsx
index a3c7f569..a5fd6df1 100644
Binary files a/需求/惠东需求.xlsx and b/需求/惠东需求.xlsx differ