diff --git a/safesite/templates/report.html b/safesite/templates/report.html
index 4e1c3a94..b893835d 100644
--- a/safesite/templates/report.html
+++ b/safesite/templates/report.html
@@ -206,7 +206,7 @@
     var now = new Date();
     var _year;
     var _month;
-    var part='';
+    var part = '';
     var table1v;
     var table2v;
     var table3v;
@@ -239,19 +239,19 @@
             $('#month').combobox().combobox('setValue', res.month);
             BindZt();
         })
-        
-    });
-    function getDetail(year,month,part){
-        $.get('api/report?a=detail&year='+year+'&month='+month+'&part='+part,function(res){
-        if(res.code==1){
-            $('#yyfxdiv').html(res.data.cause)
-            $('#jydiv').html(res.data.suggest)
-        }else{
-            $('#yyfxdiv').empty()
-            $('#jydiv').empty()
-        }
 
-    })
+    });
+    function getDetail(year, month, part) {
+        $.get('api/report?a=detail&year=' + year + '&month=' + month + '&part=' + part, function (res) {
+            if (res.code == 1) {
+                $('#yyfxdiv').html(res.data.cause)
+                $('#jydiv').html(res.data.suggest)
+            } else {
+                $('#yyfxdiv').empty()
+                $('#jydiv').empty()
+            }
+
+        })
     }
     //编辑分析报告
     function reportEdit() {
@@ -281,7 +281,7 @@
         //bindmap3('map3', _year, _month);
         bindmap3_o('map3', { 'year': _year, 'month': _month, 'part': part })
         //bindmap4('map4', _year, _month);
-        bindmap4_o('map4', { 'year': _year, 'month': _month, 'part': part })
+        // bindmap4_o('map4', { 'year': _year, 'month': _month, 'part': part })
         bindmap5('map5', { 'year': _year, 'month': _month, 'part': part });
         bindmap6('map6', { 'year': _year, 'month': _month, 'part': part });
         bindmapgclx('map7', { 'year': _year, 'month': _month, 'part': part });
@@ -293,7 +293,7 @@
         bindTable5(part);          // 下一级部门应急演练次数
         bindTable6(part);          // 下一级部门行为观察次数
         bindTable7(part); // 下一级部门未遂事件次数
-        getDetail(_year,_month,part)
+        getDetail(_year, _month, part)
         $('#createdate').html('报告生成时间：' + now.getFullYear() + '年' + (now.getMonth() + 1) + '月' + now.getDate() + '日');
     }
     // function getDates() {
diff --git a/safesite/templates/troubleashtml.html b/safesite/templates/troubleashtml.html
index f267bfd0..b4a1e5d6 100644
--- a/safesite/templates/troubleashtml.html
+++ b/safesite/templates/troubleashtml.html
@@ -4,7 +4,8 @@
             <label>起始时间</label><input id="sqssj" name="qssj" class="easyui-datebox" style="width:110px;height:22px" />
             <label>结束时间</label><input id="sjssj" name="jssj" class="easyui-datebox" style="width:110px;height:22px" />
             <label>发现部门</label><input id="sfxbm" name="fxbm" style="width:200px;height:22px" />
-            <a onclick="yhbztsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a></form>
+            <a onclick="yhbztsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
+        </form>
     </div>
 </div>
 <div style="width:100%;height:500px;padding: 20px">
@@ -26,69 +27,74 @@
 <div id="yhqst" style="width:100%;height:400px;padding: 20px">
 </div>
 <div style="width: 60%; margin: 0px auto; ">
-<table name="" id="fxrpmtable" class='easyui-datagrid' title="隐患发现人排名"  data-options="
+    <table name="" id="fxrpmtable" class='easyui-datagrid' title="隐患发现人排名" data-options="
     rownumbers:true,
     singleSelect:true,
     striped: true,           
     method:'get',
     url: 'fxhandle?a=yhfxpm',
     toolbar:'#fxrpmbar'" style="height:400px">
-    <thead>
-        <tr>
-            <th data-options="field:'fxr__userid',hidden:true">用户ID</th>
-            <th data-options="field:'fxr__name',align:'right'" width="30%">姓名</th>
-            <th data-options="field:'fxbm__partname',align:'right'" width="40%">所属部门</th>
-            <th data-options="field:'number',align:'right'" width="20%">填报隐患数</th>
-        </tr>
-    </thead>
-</table>
-<div id='fxrpmbar'>
-    <form id="fxrpms">
-        <a onclick="fxrpmsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
-        <a onclick="fxrpmexport()" class='easyui-linkbutton' iconCls='fa-upload' plain=true>导出</a>
-        <div>
-            <label>发现部门</label><input id="sfxbm2" name="fxbm" style="width:180px;height:22px" />
-            <label>起始时间</label><input id="sqssj" name="qssj" class="easyui-datebox" style="width:80px;height:22px" />
-            <label>结束时间</label><input id="sjssj" name="jssj" class="easyui-datebox" style="width:80px;height:22px" />
-            <label>检查类型</label><input id="sjclx" name="jclx" class="easyui-combobox" style="width:100px;height:22px" data-options="
+        <thead>
+            <tr>
+                <th data-options="field:'fxr__userid',hidden:true">用户ID</th>
+                <th data-options="field:'fxr__name',align:'right'" width="30%">姓名</th>
+                <th data-options="field:'fxbm__partname',align:'right'" width="40%">所属部门</th>
+                <th data-options="field:'number',align:'right'" width="20%">填报隐患数</th>
+            </tr>
+        </thead>
+    </table>
+    <div id='fxrpmbar'>
+        <form id="fxrpms">
+            <a onclick="fxrpmsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
+            <a onclick="fxrpmexport()" class='easyui-linkbutton' iconCls='fa-upload' plain=true>导出</a>
+            <div>
+                <label>发现部门</label><input id="sfxbm2" name="fxbm" style="width:180px;height:22px" />
+                <label>起始时间</label><input id="sqssj" name="qssj" class="easyui-datebox"
+                    style="width:80px;height:22px" />
+                <label>结束时间</label><input id="sjssj" name="jssj" class="easyui-datebox"
+                    style="width:80px;height:22px" />
+                <label>检查类型</label><input id="sjclx" name="jclx" class="easyui-combobox" style="width:100px;height:22px"
+                    data-options="
             method: 'get',
             valueField:'value',
             textField:'text',
             url:'getdickey?dicclass=14&a=combobox'
-            "/>
-        </div>
+            " />
+            </div>
 
-    </form>
-</div>
-<div style="height:20px"></div>
-<table name="" id="zgrpmtable" class='easyui-datagrid' title="隐患整改人排名" data-options="
+        </form>
+    </div>
+    <div style="height:20px"></div>
+    <table name="" id="zgrpmtable" class='easyui-datagrid' title="隐患整改人排名" data-options="
     rownumbers:true,
     singleSelect:true,
     striped: true,           
     method:'get',
     url: 'fxhandle?a=yhzgpm',
     toolbar:'#zgrpmbar'" style="height:400px">
-    <thead>
-        <tr>
-            <th data-options="field:'zgr__userid',hidden:true">用户ID</th>
-            <th data-options="field:'zgr__name',align:'right'" width="30%">姓名</th>
-            <th data-options="field:'zgbm__partname',align:'right'" width="40%">所属部门</th>
-            <th data-options="field:'number',align:'right'" width="20%">整改隐患数</th>
-        </tr>
-    </thead>
-</table>
+        <thead>
+            <tr>
+                <th data-options="field:'zgr__userid',hidden:true">用户ID</th>
+                <th data-options="field:'zgr__name',align:'right'" width="30%">姓名</th>
+                <th data-options="field:'zgbm__partname',align:'right'" width="40%">所属部门</th>
+                <th data-options="field:'number',align:'right'" width="20%">整改隐患数</th>
+            </tr>
+        </thead>
+    </table>
 
-<div id='zgrpmbar'>
-    <form id="zgrpms">
-        <a onclick="zgrpmsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
-        <a onclick="zgrpmexport()" class='easyui-linkbutton' iconCls='fa-upload' plain=true>导出</a>
-        <div>
-            <label>整改人</label><input class="easyui-textbox" name="zgr" style="width:80px;height:22px" />
-            <label>起始时间</label><input id="sqssj" name="qssj" class="easyui-datebox" style="width:80px;height:22px" />
-            <label>结束时间</label><input id="sjssj" name="jssj" class="easyui-datebox" style="width:80px;height:22px" />
-        </div>
-    </form>
-</div>
+    <div id='zgrpmbar'>
+        <form id="zgrpms">
+            <a onclick="zgrpmsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
+            <a onclick="zgrpmexport()" class='easyui-linkbutton' iconCls='fa-upload' plain=true>导出</a>
+            <div>
+                <label>整改人</label><input class="easyui-textbox" name="zgr" style="width:80px;height:22px" />
+                <label>起始时间</label><input id="sqssj" name="qssj" class="easyui-datebox"
+                    style="width:80px;height:22px" />
+                <label>结束时间</label><input id="sjssj" name="jssj" class="easyui-datebox"
+                    style="width:80px;height:22px" />
+            </div>
+        </form>
+    </div>
 </div>
 
 
@@ -125,15 +131,15 @@
     function yhbztsearch() {
         var querydata = $('#yhbztf').serializeJSON();
         bindmap3_o('yhlbt', querydata)
-        bindmap4_o('yhpgt', querydata)
+        // bindmap4_o('yhpgt', querydata)
         bindmap8('yhztt', querydata)
-        bindmap7('yhqst',querydata);
+        bindmap7('yhqst', querydata);
     }
     var now = new Date();
     var year = now.getFullYear();
     var month = now.getMonth() + 1;
     bindmap3_o('yhlbt', { 'year': year, 'month': month });
-    bindmap4_o('yhpgt', { 'year': year, 'month': month });
+    // bindmap4_o('yhpgt', { 'year': year, 'month': month });
     bindmap7('yhqst');
     bindmap8('yhztt');
     function fxrpmexport() {