diff --git a/enp/templates/wgas.html b/enp/templates/wgas.html
index 206ceff6..b80eef0a 100644
--- a/enp/templates/wgas.html
+++ b/enp/templates/wgas.html
@@ -40,58 +40,62 @@
         </div>
     </form>
 </div>
-<div id="gasEmitDialog" class="easyui-dialog" style="width:400px;height:800px;padding:5px 15px;"
+<div id="gasEmitDialog" class="easyui-dialog" style="width:700px;height:500px;padding:5px 15px;"
     data-options="resizable:true,modal:true,closed:true,border:false">
     <form method="post" id="gasEmitForm">
         <input name="id" type="hidden">
         <input name="drain" type="hidden" id="gasEmitForm_drain">
         <div style="margin-bottom:10px">
-            <input name="watch_time" data-options="label:'监测时间', editable:false, labelWidth:120" class="easyui-datetimebox" style="width:300px;"  ></input>
+            <input name="watch_time" data-options="label:'监测时间', editable:false, labelWidth:120" class="easyui-datetimebox" style="width:300px;float:left"  ></input>
+       
+            <input name="out_smoke" data-options="label:'出:标态干烟气量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="out_smoke" data-options="label:'出:标态干烟气量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="out_o2" data-options="label:'出:氧含量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:left" ></input>
+      
+            <input name="out_so2" data-options="label:'出:二氧化硫', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
+
         <div style="margin-bottom:10px">
-            <input name="out_o2" data-options="label:'出:氧含量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="out_so2_s" data-options="label:'出:二氧化硫:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:left" ></input>
+      
+            <input name="out_particle" data-options="label:'出:颗粒物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
+
+
         <div style="margin-bottom:10px">
-            <input name="out_so2" data-options="label:'出:二氧化硫', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="out_particle_s" data-options="label:'出:颗粒物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:left" ></input>
+      
+            <input name="out_nox" data-options="label:'出:氮氧化物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
+
+
+
         <div style="margin-bottom:10px">
-            <input name="out_so2_s" data-options="label:'出:二氧化硫:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="out_nox_s" data-options="label:'出:氮氧化物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:left" ></input>
+       
+            <input name="in_smoke" data-options="label:'入:标态干烟气量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
+
+
         <div style="margin-bottom:10px">
-            <input name="out_particle" data-options="label:'出:颗粒物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="in_o2" data-options="label:'入:氧含量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:left" ></input>
+      
+            <input name="in_so2" data-options="label:'入:二氧化硫', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
+
+
         <div style="margin-bottom:10px">
-            <input name="out_particle_s" data-options="label:'出:颗粒物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="in_so2_s" data-options="label:'入:二氧化硫:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:left" ></input>
+      
+            <input name="in_particle" data-options="label:'入:颗粒物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
+
+
         <div style="margin-bottom:10px">
-            <input name="out_nox" data-options="label:'出:氮氧化物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="out_nox_s" data-options="label:'出:氮氧化物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="in_smoke" data-options="label:'入:标态干烟气量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="in_o2" data-options="label:'入:氧含量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="in_so2" data-options="label:'入:二氧化硫', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="in_so2_s" data-options="label:'入:二氧化硫:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="in_particle" data-options="label:'入:颗粒物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="in_particle_s" data-options="label:'入:颗粒物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
-        </div>
-        <div style="margin-bottom:10px">
-            <input name="in_nox" data-options="label:'入:氮氧化物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="in_particle_s" data-options="label:'入:颗粒物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:left" ></input>
+      
+            <input name="in_nox" data-options="label:'入:氮氧化物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;float:right" ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="in_nox_s" data-options="label:'入:氮氧化物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
diff --git a/safesite/static/safesite/muban/trouble.xlsx b/safesite/static/safesite/muban/trouble.xlsx
index 9c229f40..30699be7 100644
Binary files a/safesite/static/safesite/muban/trouble.xlsx and b/safesite/static/safesite/muban/trouble.xlsx differ
diff --git a/safesite/templates/datashow.html b/safesite/templates/datashow.html
index f8d1162a..55532e0a 100644
--- a/safesite/templates/datashow.html
+++ b/safesite/templates/datashow.html
@@ -31,7 +31,7 @@
 	</head>
 	<body>
 		<header>
-			企业安全管理数据统计
+			企业环保管理数据统计
 			<span id=localtime style=" font-size:14px; position: absolute; right: 30px; top:-20px; "></span>
 		</header>
 		<div id="content">
diff --git a/safesite/templates/datashow2.html b/safesite/templates/datashow2.html
index 17bc9b16..5f245041 100644
--- a/safesite/templates/datashow2.html
+++ b/safesite/templates/datashow2.html
@@ -16,7 +16,7 @@
 <body>
 
     <header>
-        企业安全数据显示大屏
+        企业环保数据显示大屏
     </header>
     <div class="center_top">
         <div id="map" class="map" style="width:100%;height:100%;outline: #4A74A8 solid 0.15em;">
diff --git a/safesite/templates/putree.html b/safesite/templates/putree.html
index 500ba14e..39496147 100644
--- a/safesite/templates/putree.html
+++ b/safesite/templates/putree.html
@@ -41,7 +41,7 @@
                     </table>
                 </td>
                 <td>
-                    <table name="" id="partaqytable" class='easyui-datagrid' title="安全员" data-options="  
+                    <table name="" id="partaqytable" class='easyui-datagrid' title="环保员" data-options="  
                 rownumbers:true,
                 singleSelect:true,       
                 method:'get',