check model

safesite/models.py

@@ -878,7 +878,7 @@ class RiskAct(models.Model):  # 风险点表
     group = models.ForeignKey(
         Group, on_delete=models.CASCADE, null=True, blank=True)
     modifytime = models.DateTimeField(auto_now=True)
-    tasktype = models.IntegerField(default=0)
+    tasktype = models.IntegerField(default=0) #0是暂停
     tasktime = models.DateTimeField(null=True, blank=True)  # 最后任务开始时间
 
 class EquipmentCheckItem(models.Model):# 检查项目
@@ -1057,6 +1057,34 @@ class RiskActTask(models.Model):  # 风险点排查清单(任务)
     state = models.IntegerField(default=1)  # 1是正常
     istask = models.IntegerField(default=0)  # 是否是任务
 
+class GridTaskSet(models.Model):
+    """
+    网格化管理任务制定
+    """
+    tasktype_choices = (
+        (1, '8h'),
+        (2, '24h'),
+        (3, '7day'),
+        (4, '1month'),
+        (5, '1year')
+    )
+    riskact = models.ForeignKey(RiskAct, on_delete=models.CASCADE, related_name='gridtaskset_riskact')
+    gridlevel = models.ForeignKey(Dickey, on_delete=models.CASCADE, verbose_name='网格化层级')
+    user = models.ForeignKey(User,on_delete=models.CASCADE,verbose_name='执行人')
+    tasktype = models.IntegerField(default=1, choices=tasktype_choices)
+    note = models.TextField('检查备注', null=True)
+    is_paused = models.BooleanField(default=True, verbose_name='是否暂停派发')
+
+
+
+class GridCheckRecord(models.Model):
+    """
+    网格化排查记录
+    """
+    riskact = models.ForeignKey(RiskAct, on_delete=models.CASCADE, related_name='gridcheckrecord_riskact')
+    
+
+
 
 class Risktask(models.Model):  # 风险排查任务清单
     id = models.AutoField(primary_key=True)

safesite/templates/gridmanage.html

@@ -3,22 +3,6 @@
         <div id="riskactbar" style="padding:5px;height:auto">
             <div>
                 {% load myfilter %}
-                {% if request|has_permission:'b_riskact_import' %}
-                <a onclick="javascript:$('#drriskdg').dialog('open').window('center');" class="easyui-linkbutton"
-                data-options="iconCls:'fa-upload',plain:true">导入风险</a>
-                {% endif %}
-                {% if request|has_permission:'b_riskact_add' %}
-            <a onclick="opendg('新增风险','html/riskact/add/')" class="easyui-linkbutton"
-                data-options="iconCls:'fa-plus',plain:true">新增</a>
-                {% endif %}
-                {% if request|has_permission:'b_riskact_change' %}
-            <a onclick="editriskact()" class="easyui-linkbutton"
-                data-options="iconCls:'fa-pencil',plain:true">编辑</a>
-                {% endif %}
-                {% if request|has_permission:'b_riskact_del' %}
-            <a  onclick="delriskact()" class="easyui-linkbutton"
-                data-options="iconCls:'fa-trash',plain:true">删除</a>
-                {% endif %}
             </div>
             <div>
                 <form id="searchriskactff">
@@ -39,7 +23,7 @@
         </div>
         <table id="riskacttable" style="height:100%;width:auto"></table>
     </div>
-    <div data-options="region:'center',title:'风险',split:true,border:false,collapsible:false" style="width:50%;height:100%;">
+    <div data-options="region:'center',title:'网格化任务制定',split:true,border:false,collapsible:false" style="width:50%;height:100%;">
 
         <div id="riskbar" style="padding:5px;height:auto">
             {% if request|has_permission:'b_risk_add' %}
@@ -59,13 +43,6 @@
         <table id="risktable" style="height:100%;width:auto"></table>
 
     </div>
-    <div id="drriskdg" class="easyui-dialog" title="导入风险" style="width:400px;height:200px;"
-        data-options="iconCls:'fa-upload',resizable:true,modal:true,closed:true,border:false">
-        <p style="color:red;margin-left: 10px">请按模板录入后导入</p>
-        <p style="margin-left: 10px"><a href="/static/safesite/muban/risk.xlsx" target="_blank">点击下载模板</a></p>
-        <p style="margin-left: 10px">录入完成后点击下方按钮上传文件</p>
-        <input type="file" id="drfile" name="" accept=".xls,.xlsx" style="margin-left: 10px" />
-    </div>
 </div>
 <script>
     $('#zrbm').combotree({
@@ -104,7 +81,7 @@
                 { field: 'gkcj', title: '层级', width: 80 },
             { field: 'zrbm__partname', title: '责任部门', width: 80 },
             { field: 'zrr__name', title: '责任人', width: 80 },
-            { field: 'group__groupname', title: '岗位', width: 100 },
+            //{ field: 'group__groupname', title: '岗位', width: 100 },
         ]],
         onSelect: function (index, data) {
             $('#risktable').datagrid({url:'api/risk?a=listall&riskact='+data.id})
@@ -146,135 +123,5 @@
         ]],
     });
 
-    //ajax接收的才是js对象
-    function delrisk() {
-        var row = $('#risktable').datagrid('getSelected');
-        if (row) {
-            $.messager.confirm('提示', '确定删除吗?', function (r) {
-                if (r) {
-                    $.ajax({
-                        type: "GET",
-                        url: 'api/risk?a=del&id=' + row.id,
-                        datatype: "json",
-                        beforeSend: function () { },
-                        success: function (data) {
-                            if (data.code == 1) {
-                                $("#risktable").datagrid('reload');
-                                $("#riskacttable").datagrid('reload');
-                            } else {
-                                $.messager.alert('提示', '您无权删除!');
-                            }
     
-                        },
-
-                        complete: function (XMLHttpRequest, textStatus) {
-                        },
-
-                        error: function () {
-
-                        }
-                    });
-                }
-            }
-            );
-        }
-        else {
-            $.messager.alert('提示', '未选择数据!');
-        }
-    }
-    function editriskact(){
-        var row = $('#riskacttable').datagrid('getSelected');
-        if (row) {
-            opendg('编辑','html/riskact/edit/' + row.id)
-        }
-        else {
-            $.messager.alert('提示', '未选择数据!');
-        }  
-    }
-    function addrisk(){
-        var row = $('#riskacttable').datagrid('getSelected');
-        if (row) {
-            opendg('新增','html/risk/add/' + row.id)
-        }
-        else {
-            $.messager.alert('提示', '请先选择一个风险点!');
-        }  
-    }
-    function editrisk(){
-        var row = $('#risktable').datagrid('getSelected');
-        if (row) {
-            opendg('编辑','html/risk/edit/' + row.id)
-        }
-        else {
-            $.messager.alert('提示', '请先选择一个风险!');
-        }  
-    }
-    document.getElementById('drfile').onchange = function () {
-        var fileObj = this.files[0];
-        var url = 'drapi?a=risk'
-        var form = new FormData();
-        form.append("upfile", fileObj); // 文件对象
-        xhr = new XMLHttpRequest();  // XMLHttpRequest 对象
-        xhr.open("post", url, true); //post方式，url为服务器请求地址，true 该参数规定请求是否异步处理。
-        xhr.send(form)
-        $('#drriskdg').dialog('close')
-        loading('导入中。。');
-        xhr.onload = function (evt) {            //服务断接收完文件返回的结果
-            var data = JSON.parse(evt.target.responseText);
-            removeLoading();
-            if (data.code == 1) {
-                $.messager.alert('提示', '上传成功！', 'info', function () {
-                    $("#main").panel({ href: 'html/risk', title: '风险辨识' });
-                });
-            }
-            else if (data.code == 2) {
-                msg = ''
-                msg += '因重复未成功，其余成功！'
-                $.messager.alert('提示', msg, 'info', function () {
-                    $("#main").panel({ href: 'html/risk', title: '用户' });
-                });
-            }
-            else {
-                $.messager.alert('提示', '失败！文件内容有误');
-            }
-            document.getElementById('drfile').value = '';
-
-        }; //请求完成  
-        xhr.onerror = function (evt) { $.messager.alert('提示', '失败！文件内容有误'); document.getElementById('drfile').value = ''; }; //请求失败  
-    }
-    function delriskact() {
-        var row = $('#riskacttable').datagrid('getSelected');
-        if (row) {
-            $.messager.confirm('提示', '确定删除吗?', function (r) {
-                if (r) {
-                    $.ajax({
-                        type: "GET",
-                        url: 'api/riskact?a=del&id=' + row.id,
-                        datatype: "json",
-                        beforeSend: function () { },
-                        success: function (data) {
-                            if (data.code == 1) {
-                                $("#risktable").datagrid('reload');
-                                $("#riskacttable").datagrid('reload');
-                            } else {
-                                $.messager.alert('提示', '您无权删除!');
-                            }
-
-                        },
-
-                        complete: function (XMLHttpRequest, textStatus) {
-                        },
-
-                        error: function () {
-
-                        }
-                    });
-                }
-            }
-            );
-        }
-        else {
-            $.messager.alert('提示', '未选择数据!');
-        }
-    }
 </script>