diff --git a/safesite/migrations/0375_auto_20210125_2120.py b/safesite/migrations/0375_auto_20210125_2120.py new file mode 100644 index 00000000..a0a1638d --- /dev/null +++ b/safesite/migrations/0375_auto_20210125_2120.py @@ -0,0 +1,43 @@ +# Generated by Django 2.2.8 on 2021-01-25 21:20 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0374_auto_20210104_2147'), + ] + + operations = [ + migrations.AddField( + model_name='gridtaskset', + name='trouble', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_trouble', to='safesite.Trouble'), + ), + migrations.AlterField( + model_name='gridtaskset', + name='note', + field=models.TextField(null=True, verbose_name='备注'), + ), + migrations.AlterField( + model_name='gridtaskset', + name='riskact', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_riskact', to='safesite.RiskAct'), + ), + migrations.CreateModel( + name='TroubleFollowTask', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('taskadd', models.DateTimeField(blank=True, null=True, verbose_name='任务创建时间')), + ('taskdo', models.DateTimeField(blank=True, null=True, verbose_name='任务执行时间')), + ('taskexpire', models.DateTimeField(blank=True, null=True, verbose_name='任务过期时间')), + ('desc', models.TextField(blank=True, null=True, verbose_name='跟踪描述')), + ('tasknote', models.TextField(blank=True, null=True, verbose_name='任务执行说明')), + ('taskset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.GridTaskSet', verbose_name='由哪个设置派发')), + ('trouble', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='跟踪人')), + ], + ), + ] diff --git a/safesite/templates/troublechose.html b/safesite/templates/troublechose.html new file mode 100644 index 00000000..c36b47c8 --- /dev/null +++ b/safesite/templates/troublechose.html @@ -0,0 +1,124 @@ +
+
+ + 查询 + 重置 +
+
+
+ + + + + \ No newline at end of file diff --git a/safesite/templates/troublefollow.html b/safesite/templates/troublefollow.html index 09c1fede..5bccff65 100644 --- a/safesite/templates/troublefollow.html +++ b/safesite/templates/troublefollow.html @@ -1,92 +1,18 @@ -
+
- - - 详细筛选 -
-
- {% load myfilter %} - {% if request|has_permission:'b_trouble_add' %} - 新增 - {% endif %} - 处理 - 删除 - 对标 - - 查看详情 - - {% if request|has_permission:'b_trouble_import' %} - 导入待整改隐患 - {% endif %} - {% if request|has_permission:'b_trouble_exportdoc' %} - 导出Word - {% endif %} - - {% if request|has_permission:'b_trouble_exportxls' %} - 导出Excel - {% endif %} -
-
-
-
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
- 查询 - 重置 -
- -
+ 创建隐患跟踪任务 + 删除
-
-
-

请按模板录入后导入

-

点击下载模板

-

录入完成后点击下方按钮上传文件

- -
- +
diff --git a/safesite/templates/troublefollowtasksetadd.html b/safesite/templates/troublefollowtasksetadd.html new file mode 100644 index 00000000..e9041f77 --- /dev/null +++ b/safesite/templates/troublefollowtasksetadd.html @@ -0,0 +1,121 @@ +
+
+
+ 保存 + 取消 +
+
+
+
+
+ + + 选择 +
+
+ +
+
+ + + 选择 +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
\ No newline at end of file diff --git a/safesite/templates/troublefollowtasksetedit.html b/safesite/templates/troublefollowtasksetedit.html new file mode 100644 index 00000000..67a7fbea --- /dev/null +++ b/safesite/templates/troublefollowtasksetedit.html @@ -0,0 +1,126 @@ +
+
+
+ 保存 + 取消 +
+
+
+
+
+ +
+
+ + + 选择 +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
\ No newline at end of file diff --git a/safesite/urls.py b/safesite/urls.py index e7e2fe2d..cf0ce465 100644 --- a/safesite/urls.py +++ b/safesite/urls.py @@ -134,8 +134,10 @@ urlpatterns = [ path('html/scheduleset/', views.scheduleset), path('html/scheduleset/add/', views.schedulesetadd), path('html/scheduleset/edit//',views.schedulesetedit), - + path('html/trouble/chose/',views.troublechose), path('html/troublefollow/',views.troublefollow), + path('html/troublefollowtaskset/add/', views.troublefollowsetadd), + path('html/troublefollowtaskset/edit//', views.troublefollowsetedit), path('html/trainplan/', views.trainplanhtml), path('html/trainplan/add/', views.trainplanaddhtml), path('html/trainplan/edit//', views.trainplanedithtml), diff --git a/safesite/views.py b/safesite/views.py index 91406b71..ccf110ee 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -171,9 +171,16 @@ class EquipmentCheckFormView(TemplateView): def riskas(req): return render(req, 'riskas.html') +def troublechose(req): + return render(req, 'troublechose.html') def troublefollow(req): return render(req, 'troublefollow.html') +def troublefollowsetadd(req): + return render(req, 'troublefollowtasksetadd.html') + +def troublefollowsetedit(req, id): + return render(req, 'troublefollowtasksetedit.html', {'id':id}) def reportedit(req): return render(req, 'reportedit.html', {'year': req.GET.get('year'), 'month': req.GET.get('month'), 'part': req.GET.get('part')}) @@ -2079,6 +2086,9 @@ def troublehandle(req): yhqy = req.GET.get('yhqy') zgbm = req.GET.get('zgbm') fxrname = req.GET.get('fxrname',None) + search = req.GET.get('search', None) + if search: + a = a.filter(Q(yhnum__contains=search)|Q(yhms__contains=search)) if yhzt != '' and yhzt != None: a = a.filter(yhzt=yhzt) if yhlx: @@ -7442,6 +7452,7 @@ def apimyschedule(req): return JsonResponse({'code': 1}) else: return JsonResponse({'code': 0}) + def apigridtaskset(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7457,6 +7468,16 @@ def apigridtaskset(req): objs = objs.order_by('-pk')[startnum:endnum].values('id', 'gridlevel__dickeyname', 'user__name', 'myschedule__name', 'note', 'periodictask__enabled','last_run_at','count') return HttpResponse(transjson(total, objs), content_type="application/json") + elif a == 'list1': + """ + 隐患跟踪任务配置 + """ + objs = GridTaskSet.objects.filter(trouble__usecomp__partid=companyid) + total = objs.count() + startnum, endnum = fenye(req) + objs = objs.order_by('-pk')[startnum:endnum].values('id', 'gridlevel__dickeyname', 'user__name', + 'myschedule__name', 'note', 'periodictask__enabled','last_run_at','count', 'trouble__yhnum', 'trouble__yhms', 'trouble__yhzt') + return HttpResponse(transjson(total, objs), content_type="application/json") elif a == 'add': data = json.loads(req.body.decode('utf-8')) if 'myschedule' in data and data['myschedule']: