diff --git a/enp/migrations/0024_auto_20220803_1425.py b/enp/migrations/0024_auto_20220803_1425.py new file mode 100644 index 00000000..5fbef5eb --- /dev/null +++ b/enp/migrations/0024_auto_20220803_1425.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.8 on 2022-08-03 14:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enp', '0023_archives_note'), + ] + + operations = [ + migrations.AlterField( + model_name='prevention', + name='preventiontype', + field=models.IntegerField(blank=True, choices=[(1, '废水'), (2, '废气'), (3, '噪声')], default=1, null=True, verbose_name='防治类型'), + ), + ] diff --git a/enp/migrations/0025_auto_20220803_1438.py b/enp/migrations/0025_auto_20220803_1438.py new file mode 100644 index 00000000..0b36db92 --- /dev/null +++ b/enp/migrations/0025_auto_20220803_1438.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.8 on 2022-08-03 14:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enp', '0024_auto_20220803_1425'), + ] + + operations = [ + migrations.AlterField( + model_name='prevention', + name='hdl', + field=models.FloatField(blank=True, max_length=100, null=True, verbose_name='耗电率kWh'), + ), + ] diff --git a/enp/models.py b/enp/models.py index 9590578e..a94d7c7a 100644 --- a/enp/models.py +++ b/enp/models.py @@ -156,11 +156,12 @@ class Facilities(CommonModel): usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司') class Prevention(CommonModel): """ - 废气，废水防治设施 + 废气，废水，噪声防治设施 """ type_choices = ( (1, '废水'), - (2, '废气') + (2, '废气'), + (3, '噪声') ) name = models.CharField('防治设施名称', max_length=100) number = models.CharField('编码', max_length=100) @@ -180,7 +181,7 @@ class Prevention(CommonModel): pkwd = models.FloatField('排口温度℃', max_length=200, null=True, blank=True) yl = models.FloatField('压力kPa', max_length=100, null=True, blank=True) pfsj = models.FloatField('排放时间h', max_length=100, null=True, blank=True) - hdl = models.FloatField('耗电率kWh', max_length=100) + hdl = models.FloatField('耗电率kWh', max_length=100,null=True, blank=True) fcpname = models.CharField('副产品名称', max_length=100, null=True, blank=True) fcwcl = models.FloatField('副产物产生量t', max_length=100, null=True, blank=True) yjname = models.CharField('药剂名称', max_length=100, null=True, blank=True) diff --git a/enp/templates/zprevention.html b/enp/templates/zprevention.html new file mode 100644 index 00000000..f55c0492 --- /dev/null +++ b/enp/templates/zprevention.html @@ -0,0 +1,157 @@ +
+ + +
+
+ 新增 + 编辑 + 删除 +
+
+
+
+ +
+
+ +
+ + + +
+
+ + + +
+
+ + + +
+ +
+ + + +
+
+ + + +
+ +
+ + + + +
+ +
+ 保存 +
+
+
+ \ No newline at end of file diff --git a/enp/urls.py b/enp/urls.py index 2ea9c59a..e8a6f7c2 100644 --- a/enp/urls.py +++ b/enp/urls.py @@ -13,7 +13,8 @@ urlpatterns = [ path('detection/', views.HtmlDetection), path('fuel/', views.HtmlFuel), path('waterequipment/', views.HtmlWaterequipment), - path('archives/', views.HtmlArchives), + path('archives/', views.HtmlArchives), + path('zprevention/', views.HtmlZprevention), ] \ No newline at end of file diff --git a/enp/urls_api.py b/enp/urls_api.py index cc0169e6..a9bed6be 100644 --- a/enp/urls_api.py +++ b/enp/urls_api.py @@ -22,7 +22,8 @@ urlpatterns = [ path('fuel//', views.ApiFuel),#燃料信息表 path('waterequipment//', views.ApiWaterequipment),#废水监测仪器信息表 path('archives//', views.ApiArchives),#档案管理表 - + path('zprevention//', views.ApiZprevention),#噪声防治设施 + diff --git a/enp/views.py b/enp/views.py index e4546cb4..4690031e 100644 --- a/enp/views.py +++ b/enp/views.py @@ -48,6 +48,8 @@ def HtmlGprevention(request): return render(request, 'gprevention.html') def HtmlArchives(request): return render(request, 'archives.html') +def HtmlZprevention(request): + return render(request, 'zprevention.html') # 转换为combobox所用string @@ -559,6 +561,64 @@ def ApiWaterequipment(request, action): obj = Waterequipment.objects.get(id=data['id']) obj.delete() return JsonResponse({"code":1}) +#噪声防治设施 +def ApiZprevention(request, action): + user = User.objects.get(userid=request.session['userid']) + if action == 'list': + objs = Prevention.objects.filter(usecomp=user.usecomp, is_deleted=False,preventiontype=3) + total = objs.count() + startnum, endnum = fenye(request) + objs = objs.order_by('-create_time')[startnum:endnum].values('id', 'name', 'number', 'type', 'cs_name', + 'desig_nnumber', 'em_unit', 'start_time', 'end_time', 'state','zlxl','clfs','hdl' ) + return HttpResponse(transjson(total, objs), content_type="application/json") + elif action == 'create': + data = json.loads(request.body.decode('utf-8')) + obj = Prevention() + obj.create_by = user + obj.update_by = user + obj.usecomp = user.usecomp + obj.name = data['name'] + obj.number = data['number'] + obj.preventiontype=3 + obj.type = data['type'] + obj.cs_name = data['cs_name'] + obj.desig_nnumber = data['desig_nnumber'] + obj.em_unit = data['em_unit'] + obj.start_time = data['start_time'] + obj.end_time = data['end_time'] + obj.state = data['state'] + obj.zlxl = data['zlxl'] + obj.clfs = data['clfs'] + obj.hdl = data['hdl'] + + obj.save() + return JsonResponse({"code":1}) + elif action == 'update': + data = json.loads(request.body.decode('utf-8')) + obj = Prevention.objects.get(id=data['id']) + obj.create_by = user + obj.update_by = user + obj.usecomp = user.usecomp + obj.name = data['name'] + obj.number = data['number'] + obj.preventiontype=3 + obj.type = data['type'] + obj.cs_name = data['cs_name'] + obj.desig_nnumber = data['desig_nnumber'] + obj.em_unit = data['em_unit'] + obj.start_time = data['start_time'] + obj.end_time = data['end_time'] + obj.state = data['state'] + obj.zlxl = data['zlxl'] + obj.clfs = data['clfs'] + obj.hdl = data['hdl'] + obj.save() + return JsonResponse({"code":1}) + elif action == 'delete': + data = json.loads(request.body.decode('utf-8')) + obj = Prevention.objects.get(id=data['id']) + obj.delete() + return JsonResponse({"code":1})