From 9a805efd6e89bf1200bb2f44a185034d1eccac38 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Tue, 27 Oct 2020 22:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E7=BB=86=E7=AD=9B=E9=80=89=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/models.py                     |  1 +
 safesite/templates/checkjob.html       |  8 ++++++++
 safesite/templates/checkjobdetail.html |  2 +-
 safesite/templates/drill.html          |  9 +++++++++
 safesite/templates/inspect.html        |  9 +++++++++
 safesite/templates/inspectitem.html    |  9 +++++++++
 safesite/templates/miss.html           |  9 +++++++++
 safesite/templates/notice.html         |  9 +++++++++
 safesite/templates/observe.html        |  9 +++++++++
 safesite/templates/operation.html      |  9 +++++++++
 safesite/templates/suggest.html        | 10 ++++++++++
 safesite/templates/train.html          | 10 ++++++++++
 safesite/templates/trouble.html        |  9 +++++++++
 13 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/safesite/models.py b/safesite/models.py
index b995b3e7..b92184dd 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -1301,6 +1301,7 @@ class Checktask(models.Model):
     userlist = models.CharField(max_length=200,null=True,)#检查人列表
     zxstate = models.IntegerField(default=1)#1同时执行，2一个执行就执行
     taskstate = models.IntegerField(default=1)#是否暂停，1运行，2暂停
+    
 class Checkjob(models.Model):
     id=models.AutoField(primary_key=True)#主键
     checktask=models.ForeignKey(Checktask,on_delete=models.CASCADE)#关联任务表
diff --git a/safesite/templates/checkjob.html b/safesite/templates/checkjob.html
index e17d3d70..10fbabfe 100644
--- a/safesite/templates/checkjob.html
+++ b/safesite/templates/checkjob.html
@@ -41,6 +41,7 @@
                 </div>
                 <div id='southdiv' data-options="region:'south'" style="height:44px;text-align:center;padding:4px">
                     <a id="yhsearch" onclick="yhsearch()">查询</a>
+                    <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
                 </div>
 
             </div>
@@ -143,7 +144,14 @@
         $('#jobtab').datagrid('load', querydata);
 
     }
+    function reset() {
+        $('#searchyhff').form('clear')
+        $('#jobtab').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#jobtab').datagrid('load');
 
+    }
 
   function addcheckrw() {
           var row = $('#jobtab').datagrid('getSelected');
diff --git a/safesite/templates/checkjobdetail.html b/safesite/templates/checkjobdetail.html
index 07c9793e..3c7668f6 100644
--- a/safesite/templates/checkjobdetail.html
+++ b/safesite/templates/checkjobdetail.html
@@ -34,7 +34,7 @@
 
             </tr>
             <tr>
-                <td style="font-weight: bold;">检查时间：</td>
+                <td style="font-weight: bold;">提交时间：</td>
                 <td>{{jctime}}</td>
                 <td style="font-weight: bold;">整改时间：</td>
                 <td>{{zgtime}}</td>
diff --git a/safesite/templates/drill.html b/safesite/templates/drill.html
index ce8b9222..dfac7ce0 100644
--- a/safesite/templates/drill.html
+++ b/safesite/templates/drill.html
@@ -50,6 +50,7 @@
             </div>
             <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                 <a id="ylsearch" onclick="ylsearch()">查询</a>
+                <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
 
         </div>
@@ -262,6 +263,14 @@
         $('#sdg_yl').dialog('close')
         $('#yltable').datagrid('load', querydata);
     }
+    function reset() {
+        $('#searchylff').form('clear')
+        $('#yltable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#yltable').datagrid('load');
+
+    }
 </script>
 </body>
 
diff --git a/safesite/templates/inspect.html b/safesite/templates/inspect.html
index 3df24eff..26b24288 100644
--- a/safesite/templates/inspect.html
+++ b/safesite/templates/inspect.html
@@ -55,6 +55,7 @@
                     <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                         <a id="xjsearch" onclick="xjsearch()" class="easyui-linkbutton"
                             data-options="iconCls: 'fa-search'">查询</a>
+                            <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
                     </div>
 
                 </div>
@@ -99,6 +100,14 @@
         $("#sdg_xj").dialog("close");
         $('#xjtable').datagrid('load', querydata);
     }
+    function reset() {
+        $('#searchxjff').form('clear')
+        $('#xjtable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#xjtable').datagrid('load');
+
+    }
     $('#xjtable').datagrid({
         url: '',
         rownumbers: true,
diff --git a/safesite/templates/inspectitem.html b/safesite/templates/inspectitem.html
index 5f766011..a42ef520 100644
--- a/safesite/templates/inspectitem.html
+++ b/safesite/templates/inspectitem.html
@@ -46,6 +46,7 @@
             </div>
             <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                 <a id="xjsearch" onclick="xjsearch()" class="easyui-linkbutton" data-options="iconCls: 'fa-search'">查询</a>
+                <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
     
         </div>
@@ -87,6 +88,14 @@
         $("#sdg_xj").dialog("close");
         $('#xjtable').datagrid('load',querydata);
     }
+    function reset() {
+        $('#searchxjff').form('clear')
+        $('#xjtable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#xjtable').datagrid('load');
+
+    }
     $('#xjtable').datagrid({
         url: '',
         rownumbers: true,
diff --git a/safesite/templates/miss.html b/safesite/templates/miss.html
index c3ff4433..6f77ae0d 100644
--- a/safesite/templates/miss.html
+++ b/safesite/templates/miss.html
@@ -41,6 +41,7 @@
             </div>
             <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                 <a id="wssearch" onclick="wssearch()" class="easyui-linkbutton" data-options="iconCls: 'fa-search'">查询</a>
+                <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
     
         </div>
@@ -80,6 +81,14 @@
         $("#sdg_ws").dialog("close");
         $('#wstable').datagrid('load',querydata);
     }
+    function reset() {
+        $('#searchwsff').form('clear')
+        $('#wstable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#wstable').datagrid('load');
+
+    }
     $('#wstable').datagrid({
         url: '',
         rownumbers: true,
diff --git a/safesite/templates/notice.html b/safesite/templates/notice.html
index bc82b356..5c899619 100644
--- a/safesite/templates/notice.html
+++ b/safesite/templates/notice.html
@@ -39,6 +39,7 @@
             </div>
             <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                 <a id="tzsearch" onclick="tzsearch()" class="easyui-linkbutton" data-options="iconCls: 'fa-search'">查询</a>
+                <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
     
         </div>
@@ -62,6 +63,14 @@
         $("#sdg_tz").dialog("close");
         $('#tztable').datagrid('load',querydata);
     }
+    function reset() {
+        $('#searchtzff').form('clear')
+        $('#tztable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#tztable').datagrid('load');
+
+    }
     $('#tztable').datagrid({
         url: '',
         rownumbers: true,
diff --git a/safesite/templates/observe.html b/safesite/templates/observe.html
index a614a390..ef1f6b87 100644
--- a/safesite/templates/observe.html
+++ b/safesite/templates/observe.html
@@ -48,6 +48,7 @@
             <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                 <a id="gcsearch" onclick="gcsearch()" class="easyui-linkbutton"
                     data-options="iconCls: 'fa-search'">查询</a>
+                    <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
 
         </div>
@@ -93,6 +94,14 @@
         $("#sdg_gc").dialog("close");
         $('#gctable').datagrid('load', querydata);
     }
+    function reset() {
+        $('#searchgcff').form('clear')
+        $('#gctable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#gctable').datagrid('load');
+
+    }
     $('#gctable').datagrid({
         url: '',
         rownumbers: true,
diff --git a/safesite/templates/operation.html b/safesite/templates/operation.html
index 259f3dfa..bb1e42d3 100644
--- a/safesite/templates/operation.html
+++ b/safesite/templates/operation.html
@@ -39,6 +39,7 @@
         </div>
         <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
             <a id="zysearch" onclick="zysearch()" class="easyui-linkbutton" data-options="iconCls: 'fa-search'">查询</a>
+            <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
         </div>
 
     </div>
@@ -73,6 +74,14 @@
         $("#sdg_zy").dialog("close");
         $('#zytable').datagrid('load',querydata);
     }
+    function reset() {
+        $('#searchzyff').form('clear')
+        $('#zytable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#zytable').datagrid('load');
+
+    }
     $('#zytable').datagrid({
         url: '',
         rownumbers: true,
diff --git a/safesite/templates/suggest.html b/safesite/templates/suggest.html
index 955ad2a3..5a776bf3 100644
--- a/safesite/templates/suggest.html
+++ b/safesite/templates/suggest.html
@@ -39,6 +39,7 @@
             </div>
             <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                 <a id="jysearch" onclick="jysearch()" class="easyui-linkbutton" data-options="iconCls: 'fa-search'">查询</a>
+                <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
     
         </div>
@@ -64,6 +65,14 @@
         $("#sdg_jy").dialog("close");
         $('#jytable').datagrid('load',querydata);
     }
+    function reset() {
+        $('#searchjyff').form('clear')
+        $('#jytable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#jytable').datagrid('load');
+
+    }
     $('#jytable').datagrid({
         url: '',
         rownumbers: true,
@@ -186,4 +195,5 @@
             $.messager.alert('提示', '请选择一行数据!')
         }
     }
+    
 </script>
\ No newline at end of file
diff --git a/safesite/templates/train.html b/safesite/templates/train.html
index 78c6c3ff..2f7322bf 100644
--- a/safesite/templates/train.html
+++ b/safesite/templates/train.html
@@ -11,6 +11,7 @@
         </select>
         <a onclick="javascript:$('#sdg_px').dialog('open')" class="easyui-linkbutton"
             data-options="iconCls: 'fa-search',plain:true">详细筛选</a>
+            
     </div>    
     <div>
         {% load myfilter %}
@@ -50,6 +51,7 @@
             </div>
             <div id='southdiv' data-options="region:'south'" style="height:46px;text-align:center;padding:6px">
                 <a id="pxsearch" onclick="pxsearch()">查询</a>
+                <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
 
         </div>
@@ -238,6 +240,14 @@
         $('#sdg_px').dialog('close')
         $('#pxtable').datagrid('load', querydata);
     }
+    function reset() {
+        $('#searchpxff').form('clear')
+        $('#pxtable').datagrid('options').queryParams = {
+            a:'listall'
+        }
+        $('#pxtable').datagrid('load');
+
+    }
     function exportpxword() {
 
         var row = $('#pxtable').datagrid('getSelected');
diff --git a/safesite/templates/trouble.html b/safesite/templates/trouble.html
index 07e74310..3f244f42 100644
--- a/safesite/templates/trouble.html
+++ b/safesite/templates/trouble.html
@@ -64,6 +64,7 @@
             </div>
             <div id='southdiv' data-options="region:'south'" style="height:44px;text-align:center;padding:4px">
                 <a id="yhsearch" onclick="yhsearch()">查询</a>
+                <a id="searchreset" onclick="reset()" class="easyui-linkbutton">重置</a>
             </div>
 
         </div>
@@ -306,6 +307,14 @@
         $('#sdg_yh').dialog('close')
         $('#yhtable').datagrid('load', querydata);
 
+    }
+    function reset() {
+        $('#searchyhff').form('clear')
+        $('#yhtable').datagrid('options').queryParams={
+            a:'listall'
+        }
+        $('#yhtable').datagrid('load');
+
     }
     function exportyhexcel() {
         var querydata = $('#searchyhff').serializeJSON();