diff --git a/enp/migrations/0026_auto_20220902_1004.py b/enp/migrations/0026_auto_20220902_1004.py
new file mode 100644
index 00000000..51f7e775
--- /dev/null
+++ b/enp/migrations/0026_auto_20220902_1004.py
@@ -0,0 +1,424 @@
+# Generated by Django 2.2.8 on 2022-09-02 10:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enp', '0025_auto_20220803_1438'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='archives',
+            name='title',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='drain',
+            name='name',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='名称'),
+        ),
+        migrations.AlterField(
+            model_name='drain',
+            name='number',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='编号'),
+        ),
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='accept_count',
+            field=models.FloatField(blank=True, null=True, verbose_name='接收数量'),
+        ),
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='accept_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='接收时间'),
+        ),
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='container',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='容器规格'),
+        ),
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='container_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='容器个数'),
+        ),
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='handle_method',
+            field=models.IntegerField(blank=True, choices=[(1, '自行利用'), (2, '委托处置'), (3, '自行处置')], default=1, null=True, verbose_name='处置方式'),
+        ),
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='handle_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='处置时间'),
+        ),
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='source',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='废物来源'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='container',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='容器规格'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='container_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='容器个数'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='goto',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='去向'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='in_count',
+            field=models.FloatField(blank=True, null=True, verbose_name='入库数量'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='in_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='入库时间'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='out_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='出库数量'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='out_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='出库时间'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='place',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='存放位置'),
+        ),
+        migrations.AlterField(
+            model_name='dwastekeeprecord',
+            name='source',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='废物来源'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakelist',
+            name='companyname',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='处理企业名称'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakelist',
+            name='gen_count',
+            field=models.FloatField(blank=True, null=True, verbose_name='年度产生量(吨)'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakelist',
+            name='goto',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='废物流向'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakelist',
+            name='license',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='许可证编号'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakelist',
+            name='process',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='产生工序'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakelist',
+            name='source',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='源/车间'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakelist',
+            name='waste',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='enp.Waste', verbose_name='关联废物'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakerecord',
+            name='container',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='容器情况'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakerecord',
+            name='container_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='容器个数'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakerecord',
+            name='gen_count',
+            field=models.FloatField(blank=True, null=True, verbose_name='产生数量'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakerecord',
+            name='gen_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='产生时间'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakerecord',
+            name='trans_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='转移个数'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakerecord',
+            name='trans_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='转移时间'),
+        ),
+        migrations.AlterField(
+            model_name='dwastemakerecord',
+            name='waste',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='enp.Waste', verbose_name='关联废物'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='ability',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='生产能力'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='al_unit',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='生产能力单位'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='cs_name',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='设备参数名'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='desig_nnumber',
+            field=models.FloatField(blank=True, max_length=100, null=True, verbose_name='设备设计值'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='em_unit',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='设备单位'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='end_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='运行结束时间'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='material_account',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='有害有毒元素占比'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='material_address',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='原料来源地'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='material_composition',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='有害有毒元素成分'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='material_count',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='原辅料用量'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='material_name',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='原辅料名称'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='material_type',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='原辅料种类'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='material_unit',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='原辅料单位'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='name',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='生产设施设备名称'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='number',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='编码'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='pdc_Load',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='生产负荷'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='start_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='运行开始时间'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='type',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='生产设施型号'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='zz_product',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='最终产品'),
+        ),
+        migrations.AlterField(
+            model_name='facilities',
+            name='zz_unit',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='最终产品单位'),
+        ),
+        migrations.AlterField(
+            model_name='fuel',
+            name='name',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='燃料名称'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_nox',
+            field=models.FloatField(blank=True, null=True, verbose_name='氮氧化物'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_nox_s',
+            field=models.FloatField(blank=True, null=True, verbose_name='氮氧化物s'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_o2',
+            field=models.FloatField(blank=True, null=True, verbose_name='氧含量'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_particle',
+            field=models.FloatField(blank=True, null=True, verbose_name='颗粒物'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_particle_s',
+            field=models.FloatField(blank=True, null=True, verbose_name='颗粒物s'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_smoke',
+            field=models.FloatField(blank=True, null=True, verbose_name='标态干烟气量'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_so2',
+            field=models.FloatField(blank=True, null=True, verbose_name='二氧化硫'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='in_so2_s',
+            field=models.FloatField(blank=True, null=True, verbose_name='二氧化硫s'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_nox',
+            field=models.FloatField(blank=True, null=True, verbose_name='氮氧化物'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_nox_s',
+            field=models.FloatField(blank=True, null=True, verbose_name='氮氧化物s'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_o2',
+            field=models.FloatField(blank=True, null=True, verbose_name='氧含量'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_particle',
+            field=models.FloatField(blank=True, null=True, verbose_name='颗粒物'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_particle_s',
+            field=models.FloatField(blank=True, null=True, verbose_name='颗粒物s'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_smoke',
+            field=models.FloatField(blank=True, null=True, verbose_name='标态干烟气量'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_so2',
+            field=models.FloatField(blank=True, null=True, verbose_name='二氧化硫'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='out_so2_s',
+            field=models.FloatField(blank=True, null=True, verbose_name='二氧化硫s'),
+        ),
+        migrations.AlterField(
+            model_name='gasemit',
+            name='watch_time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='监测时间'),
+        ),
+        migrations.AlterField(
+            model_name='normalwasterecord',
+            name='dis_count',
+            field=models.FloatField(blank=True, null=True, verbose_name='委托处置量'),
+        ),
+        migrations.AlterField(
+            model_name='normalwasterecord',
+            name='dis_date',
+            field=models.DateField(blank=True, null=True, verbose_name='处置日期'),
+        ),
+        migrations.AlterField(
+            model_name='normalwasterecord',
+            name='gen_count',
+            field=models.FloatField(blank=True, null=True, verbose_name='产生数量'),
+        ),
+        migrations.AlterField(
+            model_name='normalwasterecord',
+            name='gen_date',
+            field=models.DateField(blank=True, null=True, verbose_name='产生日期'),
+        ),
+        migrations.AlterField(
+            model_name='normalwasterecord',
+            name='inv_count',
+            field=models.FloatField(blank=True, null=True, verbose_name='库存量'),
+        ),
+        migrations.AlterField(
+            model_name='normalwasterecord',
+            name='operator',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='经办人'),
+        ),
+        migrations.AlterField(
+            model_name='normalwasterecord',
+            name='waste',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='enp.Waste', verbose_name='关联废物'),
+        ),
+        migrations.AlterField(
+            model_name='prevention',
+            name='clfs',
+            field=models.CharField(blank=True, choices=[('1', '自行利用'), ('2', '委托处置'), ('3', '自行处置')], default='1', max_length=50, null=True, verbose_name='处置方式'),
+        ),
+        migrations.AlterField(
+            model_name='waste',
+            name='name',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='名称'),
+        ),
+        migrations.AlterField(
+            model_name='waste',
+            name='number',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='编号'),
+        ),
+        migrations.AlterField(
+            model_name='waste',
+            name='type',
+            field=models.IntegerField(blank=True, choices=[(1, '一般工业固废'), (2, '危废')], default=1, null=True, verbose_name='废物类型'),
+        ),
+    ]
diff --git a/enp/migrations/0027_auto_20220902_1005.py b/enp/migrations/0027_auto_20220902_1005.py
new file mode 100644
index 00000000..0b3a547f
--- /dev/null
+++ b/enp/migrations/0027_auto_20220902_1005.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.8 on 2022-09-02 10:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enp', '0026_auto_20220902_1004'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dwastehandlerecord',
+            name='handle_method',
+            field=models.CharField(blank=True, choices=[('1', '自行利用'), ('2', '委托处置'), ('3', '自行处置')], default='1', max_length=50, null=True, verbose_name='处置方式'),
+        ),
+    ]
diff --git a/enp/models.py b/enp/models.py
index a94d7c7a..d7d91612 100644
--- a/enp/models.py
+++ b/enp/models.py
@@ -11,9 +11,9 @@ class Waste(CommonModel):
         (1, '一般工业固废'),
         (2, '危废')
     )
-    number = models.CharField('编号', max_length=100)
-    name = models.CharField('名称', max_length=100)
-    type = models.IntegerField('废物类型', choices=type_choices, default=1)
+    number = models.CharField('编号', max_length=100,null=True, blank=True)
+    name = models.CharField('名称', max_length=100,null=True, blank=True)
+    type = models.IntegerField('废物类型', choices=type_choices, default=1,null=True, blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 
 
@@ -21,39 +21,39 @@ class NormalWasteRecord(CommonModel):
     """
     一般废物排放记录
     """
-    gen_date = models.DateField('产生日期')
-    dis_date = models.DateField('处置日期')
-    gen_count = models.FloatField('产生数量')
-    dis_count = models.FloatField('委托处置量')
-    inv_count = models.FloatField('库存量')
-    waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物')
-    operator = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='经办人')
+    gen_date = models.DateField('产生日期',null=True, blank=True)
+    dis_date = models.DateField('处置日期',null=True, blank=True)
+    gen_count = models.FloatField('产生数量',null=True, blank=True)
+    dis_count = models.FloatField('委托处置量',null=True, blank=True)
+    inv_count = models.FloatField('库存量',null=True, blank=True)
+    waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物',null=True, blank=True)
+    operator = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='经办人',null=True, blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 
 class DWasteMakeList(CommonModel):
     """
     危废产生一览表
     """
-    waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物')
-    process = models.CharField('产生工序', max_length=100)
-    source = models.CharField('源/车间', max_length=100)
-    goto = models.CharField('废物流向', max_length=100)
-    companyname = models.CharField('处理企业名称', max_length=100)
-    gen_count = models.FloatField('年度产生量(吨)')
-    license = models.CharField('许可证编号', max_length=100)
+    waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物',null=True, blank=True)
+    process = models.CharField('产生工序', max_length=100,null=True, blank=True)
+    source = models.CharField('源/车间', max_length=100,null=True, blank=True)
+    goto = models.CharField('废物流向', max_length=100,null=True, blank=True)
+    companyname = models.CharField('处理企业名称', max_length=100,null=True, blank=True)
+    gen_count = models.FloatField('年度产生量(吨)',null=True, blank=True)
+    license = models.CharField('许可证编号', max_length=100,null=True, blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 
 class DWasteMakeRecord(CommonModel):
     """
     危废产生环节记录
     """
-    waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物')
-    gen_time = models.DateTimeField('产生时间')
-    gen_count = models.FloatField('产生数量')
-    container = models.CharField('容器情况', max_length=100)
-    container_count = models.IntegerField('容器个数')
-    trans_time = models.DateTimeField('转移时间')
-    trans_count = models.IntegerField('转移个数')
+    waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物',null=True, blank=True)
+    gen_time = models.DateTimeField('产生时间',null=True, blank=True)
+    gen_count = models.FloatField('产生数量',null=True, blank=True)
+    container = models.CharField('容器情况', max_length=100,null=True, blank=True)
+    container_count = models.IntegerField('容器个数',null=True, blank=True)
+    trans_time = models.DateTimeField('转移时间',null=True, blank=True)
+    trans_count = models.IntegerField('转移个数',null=True, blank=True)
     goto = models.CharField('去向', max_length=100)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 
@@ -63,15 +63,15 @@ class DWasteKeepRecord(CommonModel):
     危废贮存环节记录
     """
     waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物')
-    in_time = models.DateTimeField('入库时间')
-    in_count = models.FloatField('入库数量')
-    source = models.CharField('废物来源', max_length=100)
-    container = models.CharField('容器规格', max_length=100)
-    container_count = models.IntegerField('容器个数')
-    place = models.CharField('存放位置', max_length=50)
-    out_time = models.DateTimeField('出库时间')
-    out_count = models.IntegerField('出库数量')
-    goto = models.CharField('去向', max_length=100)
+    in_time = models.DateTimeField('入库时间',null=True, blank=True)
+    in_count = models.FloatField('入库数量',null=True, blank=True)
+    source = models.CharField('废物来源', max_length=100,null=True, blank=True)
+    container = models.CharField('容器规格', max_length=100,null=True, blank=True)
+    container_count = models.IntegerField('容器个数',null=True, blank=True)
+    place = models.CharField('存放位置', max_length=50,null=True, blank=True)
+    out_time = models.DateTimeField('出库时间',null=True, blank=True)
+    out_count = models.IntegerField('出库数量',null=True, blank=True)
+    goto = models.CharField('去向', max_length=100,null=True, blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 
 
@@ -79,14 +79,19 @@ class DWasteHandleRecord(CommonModel):
     """
     危废处置环节记录
     """
+    type_choices = (
+         ('1', '自行利用'),
+        ('2', '委托处置'),
+          ('3', '自行处置')
+    )
     waste = models.ForeignKey(Waste, on_delete=models.CASCADE, verbose_name='关联废物')
-    accept_time = models.DateTimeField('接收时间')
-    accept_count = models.FloatField('接收数量')
-    source = models.CharField('废物来源', max_length=100)
-    container = models.CharField('容器规格', max_length=100)
-    container_count = models.IntegerField('容器个数')
-    handle_time = models.DateTimeField('处置时间')
-    handle_method = models.CharField('处置方式', max_length=100)
+    accept_time = models.DateTimeField('接收时间',null=True, blank=True)
+    accept_count = models.FloatField('接收数量',null=True, blank=True)
+    source = models.CharField('废物来源', max_length=100,null=True, blank=True)
+    container = models.CharField('容器规格', max_length=100,null=True, blank=True)
+    container_count = models.IntegerField('容器个数',null=True, blank=True)
+    handle_time = models.DateTimeField('处置时间',null=True, blank=True)
+    handle_method = models.CharField('处置方式', max_length=50,choices=type_choices,null=True,default='1', blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 
 class Drain(CommonModel):
@@ -98,8 +103,8 @@ class Drain(CommonModel):
         (20, '排气')
     )
     type = models.PositiveSmallIntegerField('排污口类型', default=10, choices=DRAIN_TYPE_CHOICES)
-    number = models.CharField('编号', max_length=100)
-    name = models.CharField('名称', max_length=100)
+    number = models.CharField('编号', max_length=100,null=True, blank=True)
+    name = models.CharField('名称', max_length=100,null=True, blank=True)
     location = JSONField('点位坐标', null=True, blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 
@@ -108,51 +113,51 @@ class GasEmit(CommonModel):
     废气排放记录
     """
     drain = models.ForeignKey(Drain, verbose_name='关联排放口', on_delete=models.CASCADE)
-    watch_time = models.DateTimeField('监测时间')
-    out_smoke = models.FloatField('标态干烟气量')
-    out_o2 = models.FloatField("氧含量")
-    out_so2 = models.FloatField("二氧化硫")
-    out_so2_s = models.FloatField("二氧化硫s")
-    out_particle = models.FloatField("颗粒物")
-    out_particle_s = models.FloatField("颗粒物s")
-    out_nox = models.FloatField("氮氧化物")
-    out_nox_s = models.FloatField("氮氧化物s")
-    in_smoke = models.FloatField('标态干烟气量')
-    in_o2 = models.FloatField("氧含量")
-    in_so2 = models.FloatField("二氧化硫")
-    in_so2_s = models.FloatField("二氧化硫s")
-    in_particle = models.FloatField("颗粒物")
-    in_particle_s = models.FloatField("颗粒物s")
-    in_nox = models.FloatField("氮氧化物")
-    in_nox_s = models.FloatField("氮氧化物s")
+    watch_time = models.DateTimeField('监测时间',null=True, blank=True)
+    out_smoke = models.FloatField('标态干烟气量',null=True, blank=True)
+    out_o2 = models.FloatField("氧含量",null=True, blank=True)
+    out_so2 = models.FloatField("二氧化硫",null=True, blank=True)
+    out_so2_s = models.FloatField("二氧化硫s",null=True, blank=True)
+    out_particle = models.FloatField("颗粒物",null=True, blank=True)
+    out_particle_s = models.FloatField("颗粒物s",null=True, blank=True)
+    out_nox = models.FloatField("氮氧化物",null=True, blank=True)
+    out_nox_s = models.FloatField("氮氧化物s",null=True, blank=True)
+    in_smoke = models.FloatField('标态干烟气量',null=True, blank=True)
+    in_o2 = models.FloatField("氧含量",null=True, blank=True)
+    in_so2 = models.FloatField("二氧化硫",null=True, blank=True)
+    in_so2_s = models.FloatField("二氧化硫s",null=True, blank=True)
+    in_particle = models.FloatField("颗粒物",null=True, blank=True)
+    in_particle_s = models.FloatField("颗粒物s",null=True, blank=True)
+    in_nox = models.FloatField("氮氧化物",null=True, blank=True)
+    in_nox_s = models.FloatField("氮氧化物s",null=True, blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 class Facilities(CommonModel):
     """
     生产设施信息表
     """
-    name = models.CharField('生产设施设备名称', max_length=100)
-    number = models.CharField('编码', max_length=100)
-    type = models.CharField('生产设施型号', max_length=100)
-    cs_name = models.CharField('设备参数名', max_length=100)
-    desig_nnumber = models.FloatField('设备设计值', max_length=100)
+    name = models.CharField('生产设施设备名称', max_length=100,null=True, blank=True)
+    number = models.CharField('编码', max_length=100,null=True, blank=True)
+    type = models.CharField('生产设施型号', max_length=100,null=True, blank=True)
+    cs_name = models.CharField('设备参数名', max_length=100,null=True, blank=True)
+    desig_nnumber = models.FloatField('设备设计值', max_length=100,null=True, blank=True)
     actual_number = models.FloatField('设备实际值',null=True, blank=True, max_length=100)
-    em_unit = models.CharField('设备单位', max_length=50)
-    ability = models.CharField('生产能力', max_length=200)
-    al_unit = models.CharField('生产能力单位', max_length=50)
-    start_time = models.DateTimeField('运行开始时间')
-    end_time = models.DateTimeField('运行结束时间')
-    pdc_Load = models.CharField('生产负荷', max_length=200)
+    em_unit = models.CharField('设备单位', max_length=50,null=True, blank=True)
+    ability = models.CharField('生产能力', max_length=200,null=True, blank=True)
+    al_unit = models.CharField('生产能力单位', max_length=50,null=True, blank=True)
+    start_time = models.DateTimeField('运行开始时间',null=True, blank=True)
+    end_time = models.DateTimeField('运行结束时间',null=True, blank=True)
+    pdc_Load = models.CharField('生产负荷', max_length=200,null=True, blank=True)
     zj_product = models.CharField('中间产品',null=True, blank=True, max_length=200)
     zj_unit = models.CharField('中间产品单位',null=True, blank=True, max_length=50)
-    zz_product = models.CharField('最终产品', max_length=200)
-    zz_unit = models.CharField('最终产品单位', max_length=50)
-    material_name = models.CharField('原辅料名称', max_length=200)
-    material_type = models.CharField('原辅料种类', max_length=200)
-    material_unit = models.CharField('原辅料单位', max_length=50)
-    material_count = models.CharField('原辅料用量', max_length=200)
-    material_composition = models.CharField('有害有毒元素成分', max_length=50)
-    material_account = models.CharField('有害有毒元素占比', max_length=200)
-    material_address = models.CharField('原料来源地', max_length=50)
+    zz_product = models.CharField('最终产品', max_length=200,null=True, blank=True)
+    zz_unit = models.CharField('最终产品单位', max_length=50,null=True, blank=True)
+    material_name = models.CharField('原辅料名称', max_length=200,null=True, blank=True)
+    material_type = models.CharField('原辅料种类', max_length=200,null=True, blank=True)
+    material_unit = models.CharField('原辅料单位', max_length=50,null=True, blank=True)
+    material_count = models.CharField('原辅料用量', max_length=200,null=True, blank=True)
+    material_composition = models.CharField('有害有毒元素成分', max_length=50,null=True, blank=True)
+    material_account = models.CharField('有害有毒元素占比', max_length=200,null=True, blank=True)
+    material_address = models.CharField('原料来源地', max_length=50,null=True, blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 class Prevention(CommonModel):
     """
@@ -163,6 +168,11 @@ class Prevention(CommonModel):
         (2, '废气'),
         (3, '噪声')
     )
+    clfs_choices = (
+        ('1', '自行利用'),
+        ('2', '委托处置'),
+          ('3', '自行处置')
+    )
     name = models.CharField('防治设施名称', max_length=100)
     number = models.CharField('编码', max_length=100)
     type = models.CharField('防治设施型号', max_length=100)
@@ -190,7 +200,7 @@ class Prevention(CommonModel):
     ckll = models.FloatField('出口流量', max_length=100, null=True, blank=True)
     pqfx = models.CharField('排放去向', max_length=50, null=True, blank=True)
     wncsl = models.CharField('污泥产生量', max_length=50, null=True, blank=True)
-    clfs = models.CharField('处理方式', max_length=100, null=True, blank=True)
+    clfs = models.CharField('处置方式', max_length=50,choices=clfs_choices,null=True,default='1', blank=True)
     usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE, verbose_name='所属公司')
 class abnormal(CommonModel):
     """
@@ -229,7 +239,7 @@ class Fuel(CommonModel):
     """
     燃料信息表
     """
-    name = models.CharField('燃料名称', max_length=100)
+    name = models.CharField('燃料名称', max_length=100,null=True, blank=True)
     count = models.FloatField('用量', max_length=100, null=True, blank=True)
     dwcount = models.FloatField('低位热值', max_length=100, null=True, blank=True)
     unit = models.CharField('单位', max_length=200, null=True, blank=True)
@@ -259,7 +269,7 @@ class Archives(CommonModel):
     """
     档案管理
     """
-    title = models.CharField(max_length=50)#标题
+    title = models.CharField(max_length=50,null=True, blank=True)#标题
     type=models.ForeignKey(Dickey,on_delete=models.CASCADE,null=True,blank=True)#档案类型
     path = models.CharField(max_length=200,null=True,blank=True)#上传文件
     createuser = models.ForeignKey(User,on_delete=models.CASCADE)#上传者
diff --git a/enp/templates/abnormal.html b/enp/templates/abnormal.html
index fa7057c3..a68af2b3 100644
--- a/enp/templates/abnormal.html
+++ b/enp/templates/abnormal.html
@@ -22,24 +22,24 @@
         </div>
       
         <div style="margin-bottom:10px">
-            <input name="start_time" data-options="label:'异常起始时刻', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;" required ></input>
+            <input name="start_time" data-options="label:'异常起始时刻', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;"  ></input>
        
-            <input name="end_time" data-options="label:'异常终止时刻', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;" required ></input>
+            <input name="end_time" data-options="label:'异常终止时刻', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="type" data-options="label:'污染物种类',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="type" data-options="label:'污染物种类',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="pfnd" data-options="label:'排放浓度', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="pfnd" data-options="label:'排放浓度', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="pffx" data-options="label:'排放方向',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="pffx" data-options="label:'排放方向',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="sjyy" data-options="label:'事件原因', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="sjyy" data-options="label:'事件原因', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="sfbg" data-options="label:'是否报告',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="sfbg" data-options="label:'是否报告',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="ydcs" data-options="label:'应对措施', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="ydcs" data-options="label:'应对措施', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
        
         <div style="text-align: center;">
diff --git a/enp/templates/dangerousWaste.html b/enp/templates/dangerousWaste.html
index 909b527f..742fdc0f 100644
--- a/enp/templates/dangerousWaste.html
+++ b/enp/templates/dangerousWaste.html
@@ -65,30 +65,30 @@
         <input name="waste" type="hidden" id="dwasteFormItem">
         <div style="margin-bottom:10px">
             <input class="easyui-combobox" name="waste"
-    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" required>
+    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" >
         </div>
         <div style="margin-bottom:10px">
-            <input name="license" data-options="label:'许可证', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="license" data-options="label:'许可证', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="process" data-options="label:'产生工序', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="source" data-options="label:'生产源/车间', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="goto" data-options="label:'废物流向', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="companyname" data-options="label:'处理企业', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="gen_count" data-options="label:'年度产生量(吨)', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="text-align: center;">
             <a class="easyui-linkbutton" iconCls="fa-floppy-o" onclick="saveDwasteMakeList()">保存</a>
@@ -102,34 +102,34 @@
         <input name="waste" type="hidden" id="dwasteMakeRecordForm_waste">
         <div style="margin-bottom:10px">
             <input class="easyui-combobox" name="waste"
-    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" required>
+    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" >
         </div>
         <div style="margin-bottom:10px">
-            <input name="gen_time" data-options="label:'产生时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;" required></input>
+            <input name="gen_time" data-options="label:'产生时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="gen_count" data-options="label:'产生数量', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+            <input name="gen_count" data-options="label:'产生数量(kg)', labelWidth:100" class="easyui-numberbox" style="width:300px;"
+                ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="container" data-options="label:'容器规格', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+            <input name="container" data-options="label:'容器规格(kg/个)', labelWidth:110" class="easyui-textbox" style="width:300px;"
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="container_count" data-options="label:'容器个数', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="trans_time" data-options="label:'转移时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="trans_count" data-options="label:'转移个数', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="goto" data-options="label:'去向', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="text-align: center;">
             <a class="easyui-linkbutton" iconCls="fa-floppy-o" onclick="saveDwasteMakeRecord()">保存</a>
@@ -143,42 +143,42 @@
         <input name="waste" type="hidden" id="dwasteKeepRecordForm_waste">
         <div style="margin-bottom:10px">
             <input class="easyui-combobox" name="waste"
-    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" required>
+    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" >
         </div>
         <div style="margin-bottom:10px">
-            <input name="in_time" data-options="label:'入库时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;" required></input>
+            <input name="in_time" data-options="label:'入库时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="in_count" data-options="label:'入库数量', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="source" data-options="label:'废物来源', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="container" data-options="label:'容器规格', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+            <input name="container" data-options="label:'容器规格(kg/个)', labelWidth:110" class="easyui-textbox" style="width:300px;"
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="container_count" data-options="label:'容器个数', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="place" data-options="label:'存放位置', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="out_time" data-options="label:'出库时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="out_count" data-options="label:'出库数量', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="goto" data-options="label:'去向', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="text-align: center;">
             <a class="easyui-linkbutton" iconCls="fa-floppy-o" onclick="saveDwasteKeepRecord()">保存</a>
@@ -192,34 +192,40 @@
         <input name="waste" type="hidden" id="dwasteHandleRecordForm_waste">
         <div style="margin-bottom:10px">
             <input class="easyui-combobox" name="waste"
-    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" required>
+    data-options="label:'危废', valueField:'id',textField:'name',url:'/api/enp/waste/combobox/?type=2', labelWidth:100" style="width:300px;" >
         </div>
         <div style="margin-bottom:10px">
-            <input name="accept_time" data-options="label:'接收时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;" required></input>
+            <input name="accept_time" data-options="label:'接收时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="accept_count" data-options="label:'接收数量', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="source" data-options="label:'废物来源', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="container" data-options="label:'容器规格', labelWidth:100" class="easyui-textbox" style="width:300px;"
-                required></input>
+            <input name="container" data-options="label:'容器规格(kg/个)', labelWidth:110" class="easyui-textbox" style="width:300px;"
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="container_count" data-options="label:'容器个数', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="handle_time" data-options="label:'处置时间', labelWidth:100" class="easyui-datetimebox" style="width:300px;"
-                required></input>
+                ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="handle_method" data-options="label:'处置方式', labelWidth:100" class="easyui-numberbox" style="width:300px;"
-                required></input>
+           
+
+                <select class="easyui-combobox" data-options="label:'处置方式' " name="handle_method" style="width:300px;">
+                    <option value="1">自行利用</option>
+                    <option value="2">委托处置</option>
+                    <option value="3">自行处置</option>
+                </select>
+
         </div>
         <div style="text-align: center;">
             <a class="easyui-linkbutton" iconCls="fa-floppy-o" onclick="saveDwasteHandleRecord()">保存</a>
@@ -298,7 +304,7 @@
             { field: 'waste__name', title: '废物名称', width: 100 },
             { field: 'gen_time', title: '产生时间', width: 100 },
             { field: 'gen_count', title: '产生数量', width: 80 },
-            { field: 'container', title: '容器规格', width: 100 },
+            { field: 'container', title: '容器规格(kg/个)', width: 100 },
             { field: 'container_count', title: '容器个数', width: 80 },
             { field: 'trans_time', title: '转移时间', width: 100 },
             { field: 'trans_count', title: '转移个数', width: 80 },
@@ -326,7 +332,7 @@
             { field: 'in_time', title: '入库时间', width: 100 },
             { field: 'in_count', title: '入库数量', width: 80 },
             { field: 'source', title: '废物来源', width: 100 },
-            { field: 'container', title: '容器规格', width: 100 },
+            { field: 'container', title: '容器规格(kg/个)', width: 100 },
             { field: 'container_count', title: '容器个数', width: 80 },
             { field: 'place', title: '存放位置', width: 100 },
             { field: 'out_time', title: '出库时间', width: 100 },
@@ -354,10 +360,22 @@
             { field: 'accept_time', title: '接收时间', width: 100 },
             { field: 'accept_count', title: '接收数量', width: 80 },
             { field: 'source', title: '废物来源', width: 100 },
-            { field: 'container', title: '容器规格', width: 100 },
+            { field: 'container', title: '容器规格(kg/个)', width: 100 },
             { field: 'container_count', title: '容器个数', width: 80 },
             { field: 'handle_time', title: '处置时间', width: 100 },
-            { field: 'handle_method', title: '处置方式', width: 80 }
+            {field:'handle_method',title:'处置方式', width:80,
+			formatter: function(value,row,index){
+				if (value=='1'){
+					return '自行利用';
+				} 
+                 else if (value=='2')  {
+					return '委托处置';
+				}
+                else{
+                    return '自行处置';
+                }
+			}
+		}
         ]],
         onClickRow: function (index, row) {
             
diff --git a/enp/templates/detection.html b/enp/templates/detection.html
index 613adc0a..ab702fe2 100644
--- a/enp/templates/detection.html
+++ b/enp/templates/detection.html
@@ -17,33 +17,33 @@
         <input name="id" type="hidden">
         <div style="margin-bottom:10px">
            
-            <input name="number" data-options="label:'排放口编码', labelWidth:100" class="easyui-textbox" style="width:600px;" required></input>
+            <input name="number" data-options="label:'排放口编码', labelWidth:100" class="easyui-textbox" style="width:600px;" ></input>
         </div>
       
         <div style="margin-bottom:10px">
-            <input name="jcDate" data-options="label:'监测日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="jcDate" data-options="label:'监测日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
        
-            <input name="jctime" data-options="label:'监测时间', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;" required ></input>
+            <input name="jctime" data-options="label:'监测时间', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="ckhxxyl" data-options="label:'出口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckhxxyl" data-options="label:'出口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="ckshxll" data-options="label:'出口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckshxll" data-options="label:'出口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="ckad" data-options="label:'出口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckad" data-options="label:'出口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="ckxfw" data-options="label:'出口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckxfw" data-options="label:'出口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="jkhxxyl" data-options="label:'进口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkhxxyl" data-options="label:'进口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" reqired></input>
       
-            <input name="jkshxll" data-options="label:'进口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkshxll" data-options="label:'进口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="jkad" data-options="label:'进口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkad" data-options="label:'进口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="jkxfw" data-options="label:'进口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkxfw" data-options="label:'进口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
        
         <div style="text-align: center;">
diff --git a/enp/templates/facilities.html b/enp/templates/facilities.html
index d248fbc4..41c52638 100644
--- a/enp/templates/facilities.html
+++ b/enp/templates/facilities.html
@@ -16,62 +16,62 @@
     <form method="post" id="facilitiesForm">
         <input name="id" type="hidden">
         <div style="margin-bottom:10px">
-            <input name="name" data-options="label:'生产设施名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="name" data-options="label:'生产设施名称', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="type" data-options="label:'生产设施型号',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="type" data-options="label:'生产设施型号',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="actual_number" data-options="label:'实际值', labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="actual_number" data-options="label:'实际值', labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="em_unit" data-options="label:'参数单位',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="em_unit" data-options="label:'参数单位',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="ability" data-options="label:'生产能力', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="ability" data-options="label:'生产能力', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="al_unit" data-options="label:'能力单位',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="al_unit" data-options="label:'能力单位',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="pdc_Load" data-options="label:'生产负荷', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="pdc_Load" data-options="label:'生产负荷', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="start_time" data-options="label:'开始时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="start_time" data-options="label:'开始时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
        
-            <input name="end_time" data-options="label:'结束日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="end_time" data-options="label:'结束日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="zj_product" data-options="label:'中间产品',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="zj_product" data-options="label:'中间产品',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="zj_unit" data-options="label:'中间产品单位', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="zj_unit" data-options="label:'中间产品单位', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="zz_product" data-options="label:'最终产品',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="zz_product" data-options="label:'最终产品',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="zz_unit" data-options="label:'最终产品单位', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="zz_unit" data-options="label:'最终产品单位', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="material_name" data-options="label:'原辅料名称',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="material_name" data-options="label:'原辅料名称',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="material_type" data-options="label:'原辅料种类', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="material_type" data-options="label:'原辅料种类', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="material_count" data-options="label:'原辅料用量',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="material_count" data-options="label:'原辅料用量',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="material_unit" data-options="label:'原辅料单位', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="material_unit" data-options="label:'原辅料单位', labelWidth:100" class="easyui-textbox" style="width:300px;"></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="material_composition" data-options="label:'有毒有害成分',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="material_composition" data-options="label:'有毒有害成分',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="material_account" data-options="label:'有毒有害占比', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="material_account" data-options="label:'有毒有害占比', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="material_address" data-options="label:'来源地',labelWidth:100" class="easyui-textbox" style="width:600px;" required></input>
+            <input name="material_address" data-options="label:'来源地',labelWidth:100" class="easyui-textbox" style="width:600px;" ></input>
       
           
         </div>
diff --git a/enp/templates/gprevention.html b/enp/templates/gprevention.html
index 6a0113e9..a81ea75f 100644
--- a/enp/templates/gprevention.html
+++ b/enp/templates/gprevention.html
@@ -16,63 +16,63 @@
     <form method="post" id="gpreventionForm">
         <input name="id" type="hidden">
         <div style="margin-bottom:10px">
-            <input name="name" data-options="label:'设施名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="name" data-options="label:'设施名称', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="type" data-options="label:'设施型号',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="type" data-options="label:'设施型号',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
-            <input name="em_unit" data-options="label:'单位',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="em_unit" data-options="label:'单位',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
         </div>
         
         <div style="margin-bottom:10px">
-            <input name="start_time" data-options="label:'运行开始时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="start_time" data-options="label:'运行开始时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
        
-            <input name="end_time" data-options="label:'运行结束日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="end_time" data-options="label:'运行结束日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="state" data-options="label:'运行状态',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="state" data-options="label:'运行状态',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="pfyql" data-options="label:'排放烟气量(m3/h)', labelWidth:130" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="pfyql" data-options="label:'排放烟气量(m3/h)', labelWidth:130" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="wryz" data-options="label:'污染因子',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="wryz" data-options="label:'污染因子',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="zlxl" data-options="label:'治理效率', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="zlxl" data-options="label:'治理效率', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="sjly" data-options="label:'数据来源',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="sjly" data-options="label:'数据来源',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="pqtgd" data-options="label:'排气筒高度m', labelWidth:110" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="pqtgd" data-options="label:'排气筒高度m', labelWidth:110" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="pkwd" data-options="label:'排口温度℃',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="pkwd" data-options="label:'排口温度℃',labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="yl" data-options="label:'压力kPa', labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="yl" data-options="label:'压力kPa', labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="pfsj" data-options="label:'排放时间h',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="pfsj" data-options="label:'排放时间h',labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="hdl" data-options="label:'耗电率kWh', labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="hdl" data-options="label:'耗电率kWh', labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="fcpname" data-options="label:'副产品名称',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="fcpname" data-options="label:'副产品名称',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="fcwcl" data-options="label:'副产物产生量(t)', labelWidth:110" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="fcwcl" data-options="label:'副产物产生量(t)', labelWidth:110" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="yjname" data-options="label:'药剂名称',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="yjname" data-options="label:'药剂名称',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="tjtime" data-options="label:'添加时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="tjtime" data-options="label:'添加时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
        </div>
        <div style="margin-bottom:10px">
-        <input name="tjl" data-options="label:'添加量',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+        <input name="tjl" data-options="label:'添加量',labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
   
         </div>
         <div style="text-align: center;">
diff --git a/enp/templates/waste.html b/enp/templates/waste.html
index f888db11..78823baf 100644
--- a/enp/templates/waste.html
+++ b/enp/templates/waste.html
@@ -42,23 +42,23 @@
         <input name="waste" type="hidden" id="wasteFormItem">
         <input name="operator" type="hidden" id="operatorFormItem">
         <div style="margin-bottom:10px">
-            <input name="gen_date" data-options="label:'产生日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="gen_date" data-options="label:'产生日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="gen_count" data-options="label:'产生数量(吨)', labelWidth:100, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="gen_count" data-options="label:'产生数量(吨)', labelWidth:100, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="dis_date" data-options="label:'处置日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="dis_date" data-options="label:'处置日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="dis_count" data-options="label:'委托处置量(吨)', labelWidth:100, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="dis_count" data-options="label:'委托处置量(吨)', labelWidth:100, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="inv_count" data-options="label:'库存(吨)', labelWidth:100, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="inv_count" data-options="label:'库存(吨)', labelWidth:100, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
             <input name="operator__name" data-options="label:'经办人', labelWidth:100" class="easyui-textbox" style="width:300px;" id="operator__nameFormItem"
-                required readonly></input>
+                 readonly></input>
             <a class='easyui-linkbutton' onclick="choseuser('operator')" style="width:auto">选择</a>
         </div>
         <div style="text-align: center;">
diff --git a/enp/templates/wgas.html b/enp/templates/wgas.html
index 4979930c..b526afa3 100644
--- a/enp/templates/wgas.html
+++ b/enp/templates/wgas.html
@@ -40,55 +40,55 @@
         <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;" required ></input>
+            <input name="watch_time" data-options="label:'监测时间', editable:false, labelWidth:120" class="easyui-datetimebox" style="width:300px;"  ></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;" required></input>
+            <input name="out_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="out_o2" data-options="label:'出:氧含量', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="out_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="out_so2" data-options="label:'出:二氧化硫', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="out_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="out_so2_s" data-options="label:'出:二氧化硫:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="out_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="out_particle" data-options="label:'出:颗粒物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="out_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="out_particle_s" data-options="label:'出:颗粒物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="out_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="out_nox" data-options="label:'出:氮氧化物', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <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;" required></input>
+            <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;" required></input>
+            <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;" required></input>
+            <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;" required></input>
+            <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;" required></input>
+            <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;" required></input>
+            <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;" required></input>
+            <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;" required></input>
+            <input name="in_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="in_nox_s" data-options="label:'入:氮氧化物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="in_nox_s" data-options="label:'入:氮氧化物:折标', labelWidth:120, min:0,precision:2" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="text-align: center;">
             <a class="easyui-linkbutton" iconCls="fa-floppy-o" onclick="saveGasEmitRecord()">保存</a>
diff --git a/enp/templates/wprevention.html b/enp/templates/wprevention.html
index 99a4e4ab..a88d3019 100644
--- a/enp/templates/wprevention.html
+++ b/enp/templates/wprevention.html
@@ -16,57 +16,62 @@
     <form method="post" id="wpreventionForm">
         <input name="id" type="hidden">
         <div style="margin-bottom:10px">
-            <input name="name" data-options="label:'设施名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="name" data-options="label:'设施名称', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="type" data-options="label:'设施型号',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="type" data-options="label:'设施型号',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
-            <input name="em_unit" data-options="label:'单位',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="em_unit" data-options="label:'单位',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
         </div>
         
         <div style="margin-bottom:10px">
-            <input name="start_time" data-options="label:'运行开始时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="start_time" data-options="label:'运行开始时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
        
-            <input name="end_time" data-options="label:'运行结束日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="end_time" data-options="label:'运行结束日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="state" data-options="label:'运行状态',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
-            <input name="ckll" data-options="label:'出口流量',  labelWidth:100" class="easyui-numberbox" style="width:300px;" required ></input>
+            <input name="state" data-options="label:'运行状态',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
+            <input name="ckll" data-options="label:'出口流量',  labelWidth:100" class="easyui-numberbox" style="width:300px;"  ></input>
           
         </div>
         <div style="margin-bottom:10px">
-            <input name="wryz" data-options="label:'污染因子',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="wryz" data-options="label:'污染因子',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="zlxl" data-options="label:'治理效率', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="zlxl" data-options="label:'治理效率', labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="sjly" data-options="label:'数据来源',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="sjly" data-options="label:'数据来源',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
-            <input name="pqfx" data-options="label:'排放去向',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="pqfx" data-options="label:'排放去向',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
         </div>
    
         <div style="margin-bottom:10px">
-            <input name="wncsl" data-options="label:'污泥产生量', labelWidth:100" class="easyui-textbox" style="width:300px;" required ></input>
-            <input name="clfs" data-options="label:'处理方式',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="wncsl" data-options="label:'污泥产生量', labelWidth:100" class="easyui-textbox" style="width:300px;"  ></input>
+            
+            <select class="easyui-combobox" data-options="label:'处理方式' " name="clfs" style="width:300px;">
+                <option value="1">自行利用</option>
+                <option value="2">委托处置</option>
+                <option value="3">自行处置</option>
+            </select>
           
         </div>
        
         <div style="margin-bottom:10px">
-            <input name="hdl" data-options="label:'耗电量kWh', labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
-            <input name="yjname" data-options="label:'药剂名称',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="hdl" data-options="label:'耗电量kWh', labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
+            <input name="yjname" data-options="label:'药剂名称',labelWidth:100" class="easyui-textbox" style="width:300px;" ></input>
       
             
        </div>
        <div style="margin-bottom:10px">
-        <input name="tjtime" data-options="label:'添加时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
-        <input name="tjl" data-options="label:'添加量',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
+        <input name="tjtime" data-options="label:'添加时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
+        <input name="tjl" data-options="label:'添加量',labelWidth:100" class="easyui-numberbox" style="width:300px;" ></input>
   
         </div>
         <div style="text-align: center;">
@@ -103,7 +108,19 @@
             { field: 'sjly', title: '数据来源', width: 200 },
             { field: 'pqfx', title: '排放去向', width: 200 },
             { field: 'wncsl', title: '污泥产生量', width: 200 },
-            { field: 'clfs', title: '处理方式', width: 200 },
+            {field:'clfs',title:'处理方式', width:200,
+			formatter: function(value,row,index){
+				if (value=='1'){
+					return '自行利用';
+				} 
+                 else if (value=='2')  {
+					return '委托处置';
+				}
+                else{
+                    return '自行处置';
+                }
+			}
+		},
             { field: 'hdl', title: '耗电量kWh', width: 200 },
             { field: 'yjname', title: '药剂名称', width: 200 },
             { field: 'tjtime', title: '添加时间', width: 200 },
diff --git a/enp/templates/wwater.html b/enp/templates/wwater.html
index ca66c03c..255cefa6 100644
--- a/enp/templates/wwater.html
+++ b/enp/templates/wwater.html
@@ -40,33 +40,33 @@
 
         <div style="margin-bottom:10px">
            
-            <input name="number" data-options="label:'排放口编码', labelWidth:100" class="easyui-textbox" style="width:600px;" required></input>
+            <input name="number" data-options="label:'排放口编码', labelWidth:100" class="easyui-textbox" style="width:600px;" ></input>
         </div>
       
         <div style="margin-bottom:10px">
-            <input name="jcDate" data-options="label:'监测日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="jcDate" data-options="label:'监测日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;"  ></input>
        
-            <input name="jctime" data-options="label:'监测时间', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;" required ></input>
+            <input name="jctime" data-options="label:'监测时间', editable:false, labelWidth:100" class="easyui-datetimespinner" style="width:300px;"  ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="ckhxxyl" data-options="label:'出口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckhxxyl" data-options="label:'出口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="ckshxll" data-options="label:'出口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckshxll" data-options="label:'出口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="ckad" data-options="label:'出口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckad" data-options="label:'出口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="ckxfw" data-options="label:'出口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="ckxfw" data-options="label:'出口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="jkhxxyl" data-options="label:'进口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkhxxyl" data-options="label:'进口化学需氧量（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="jkshxll" data-options="label:'进口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkshxll" data-options="label:'进口生化需氧量（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="jkad" data-options="label:'进口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkad" data-options="label:'进口氨氮（mg/L）',labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
       
-            <input name="jkxfw" data-options="label:'进口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" required></input>
+            <input name="jkxfw" data-options="label:'进口悬浮物（mg/L）', labelWidth:180" class="easyui-numberbox" style="width:300px;" ></input>
         </div>
        
         <div style="text-align: center;">
diff --git a/enp/templates/zprevention.html b/enp/templates/zprevention.html
index f55c0492..d8e432cd 100644
--- a/enp/templates/zprevention.html
+++ b/enp/templates/zprevention.html
@@ -1,11 +1,13 @@
 <div class="easyui-layout" style="width:100%;height:100%;">
 
-   
+
     <div data-options="region:'center',title:'噪声防治设施表',split:true,border:false" style="height:100%;">
         <div id="wpreventionTableBar">
             <a onclick="addzprevention()" class="easyui-linkbutton" data-options="iconCls: 'fa-plus',plain: true">新增</a>
-                <a onclick="edizprevention()" class="easyui-linkbutton" data-options="iconCls: 'fa-pencil',plain: true">编辑</a>
-            <a onclick="delzprevention()" class="easyui-linkbutton" data-options="iconCls: 'fa-trash',plain: true">删除</a>
+            <a onclick="edizprevention()" class="easyui-linkbutton"
+                data-options="iconCls: 'fa-pencil',plain: true">编辑</a>
+            <a onclick="delzprevention()" class="easyui-linkbutton"
+                data-options="iconCls: 'fa-trash',plain: true">删除</a>
         </div>
         <table id="zpreventionTable" style="height:100%"></table>
     </div>
@@ -16,48 +18,63 @@
     <form method="post" id="zpreventionForm">
         <input name="id" type="hidden">
         <div style="margin-bottom:10px">
-            <input name="name" data-options="label:'设施名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
-      
-            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="name" data-options="label:'设施名称', labelWidth:100" class="easyui-textbox"
+                style="width:300px;"></input>
+
+            <input name="number" data-options="label:'编码', labelWidth:100" class="easyui-textbox"
+                style="width:300px;"></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="type" data-options="label:'设施型号',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
-      
-            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
+            <input name="type" data-options="label:'设施型号',labelWidth:100" class="easyui-textbox"
+                style="width:300px;"></input>
+
+            <input name="cs_name" data-options="label:'参数名称', labelWidth:100" class="easyui-textbox"
+                style="width:300px;"></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
-            <input name="em_unit" data-options="label:'单位',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
-      
+            <input name="desig_nnumber" data-options="label:'设计值',labelWidth:100" class="easyui-numberbox"
+                style="width:300px;"></input>
+            <input name="em_unit" data-options="label:'单位',labelWidth:100" class="easyui-textbox"
+                style="width:300px;"></input>
+
         </div>
-        
+
         <div style="margin-bottom:10px">
-            <input name="start_time" data-options="label:'运行开始时间', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
-       
-            <input name="end_time" data-options="label:'运行结束日期', editable:false, labelWidth:100" class="easyui-datebox" style="width:300px;" required ></input>
+            <input name="start_time" data-options="label:'运行开始时间', editable:false, labelWidth:100"
+                class="easyui-datebox" style="width:300px;"></input>
+
+            <input name="end_time" data-options="label:'运行结束日期', editable:false, labelWidth:100" class="easyui-datebox"
+                style="width:300px;"></input>
         </div>
         <div style="margin-bottom:10px">
-            <input name="state" data-options="label:'运行状态',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
-            <input name="clfs" data-options="label:'处理方式',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
-          
+            <input name="state" data-options="label:'运行状态',labelWidth:100" class="easyui-textbox"
+                style="width:300px;"></input>
+            <select class="easyui-combobox" data-options="label:'处理方式' " name="clfs" style="width:300px;">
+                <option value="1">自行利用</option>
+                <option value="2">委托处置</option>
+                <option value="3">自行处置</option>
+            </select>
+
         </div>
-       
+
         <div style="margin-bottom:10px">
-            <input name="hdl" data-options="label:'耗电量kWh', labelWidth:100" class="easyui-numberbox" style="width:300px;" required></input>
-            <input name="zlxl" data-options="label:'治理效率',labelWidth:100" class="easyui-textbox" style="width:300px;" required></input>
-      
-            
-       </div>
-     
+            <input name="hdl" data-options="label:'耗电量kWh', labelWidth:100" class="easyui-numberbox"
+                style="width:300px;"></input>
+            <input name="zlxl" data-options="label:'治理效率',labelWidth:100" class="easyui-textbox"
+                style="width:300px;"></input>
+
+
+        </div>
+
         <div style="text-align: center;">
             <a class="easyui-linkbutton" iconCls="fa-floppy-o" onclick="savezprevention()">保存</a>
         </div>
     </form>
 </div>
 <script>
-   
+
     var zprevention_action_url = '/api/enp/zprevention/create/';
-    
+
     $('#zpreventionTable').datagrid({
         url: '/api/enp/zprevention/list/',
         rownumbers: true,
@@ -78,16 +95,29 @@
             { field: 'end_time', title: '运行结束时间', width: 200 },
             { field: 'state', title: '运行状态', width: 200 },
             { field: 'zlxl', title: '治理效率', width: 200 },
-            { field: 'clfs', title: '处理方式', width: 200 },
+            {
+                field: 'clfs', title: '处理方式', width: 200,
+                formatter: function (value, row, index) {
+                    if (value == '1') {
+                        return '自行利用';
+                    }
+                    else if (value == '2') {
+                        return '委托处置';
+                    }
+                    else {
+                        return '自行处置';
+                    }
+                }
+            },
             { field: 'hdl', title: '耗电量kWh', width: 200 },
-           
-            
+
+
         ]],
         onClickRow: function (index, row) {
 
         }
     });
-   
+
     //新增
     function addzprevention() {
         $('#zpreventionDialog').dialog('open').dialog('setTitle', '新增噪声防治设施').window('center');
@@ -110,23 +140,24 @@
             success: function (data) {
                 $("#zpreventionTable").datagrid('reload');
                 $("#zpreventionDialog").dialog("close");
-               
+
             },
         });
     }
     //编辑数据
-    function edizprevention(){
-          var row = $('#zpreventionTable').datagrid('getSelected');
-        if(row){
+    function edizprevention() {
+        var row = $('#zpreventionTable').datagrid('getSelected');
+        if (row) {
             $('#zpreventionDialog').dialog('open').dialog('setTitle', '编辑噪声防治设施').window('center');
-        $('#zpreventionForm').form('load', row);
-        zprevention_action_url = '/api/enp/zprevention/update/'}
-        else{
+            $('#zpreventionForm').form('load', row);
+            zprevention_action_url = '/api/enp/zprevention/update/'
+        }
+        else {
             $.messager.alert('提示', '请选择一条数据!');
         }
     }
     //删除数据
-    function delzprevention(){
+    function delzprevention() {
         var row = $('#zpreventionTable').datagrid('getSelected');
         if (row) {
             $.messager.confirm('提示', '确定删除吗?', function (r) {