diff --git a/apps/ecm/service.py b/apps/ecm/service.py index dd0436d7..7396e493 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -96,6 +96,8 @@ class EcmService: elif ep_blts == ep_acess and i.type == 20: # 触发非法进入事件 pass + elif i.obj_cate == 'post': + pass else: # 触发未知标签进入事件 pass \ No newline at end of file diff --git a/apps/opm/migrations/0004_auto_20220625_1754.py b/apps/opm/migrations/0004_auto_20220625_1754.py new file mode 100644 index 00000000..fd6d416c --- /dev/null +++ b/apps/opm/migrations/0004_auto_20220625_1754.py @@ -0,0 +1,38 @@ +# Generated by Django 3.2.12 on 2022-06-25 09:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('opm', '0003_gascheck_h2s'), + ] + + operations = [ + migrations.AddField( + model_name='gascheck', + name='f5', + field=models.CharField(blank=True, max_length=10, null=True), + ), + migrations.AlterField( + model_name='gascheck', + name='co', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name='gascheck', + name='h2s', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name='gascheck', + name='lel', + field=models.DecimalField(blank=True, decimal_places=1, max_digits=3, null=True), + ), + migrations.AlterField( + model_name='gascheck', + name='o2', + field=models.DecimalField(blank=True, decimal_places=1, max_digits=3, null=True), + ), + ] diff --git a/apps/opm/models.py b/apps/opm/models.py index dad49b9f..42071fe8 100644 --- a/apps/opm/models.py +++ b/apps/opm/models.py @@ -153,10 +153,11 @@ class GasCheck(CommonADModel): """ check_time = models.DateTimeField('检测时间') check_place = models.CharField('检测部位', max_length=100) - o2 = models.DecimalField(decimal_places=1, max_digits=3) - co = models.PositiveSmallIntegerField() - h2s = models.PositiveSmallIntegerField() - lel = models.DecimalField(decimal_places=1, max_digits=3) + o2 = models.DecimalField(decimal_places=1, max_digits=3, null=True, blank=True) + co = models.PositiveSmallIntegerField(null=True, blank=True) + h2s = models.PositiveSmallIntegerField(null=True, blank=True) + lel = models.DecimalField(decimal_places=1, max_digits=3, null=True, blank=True) + f5 = models.CharField(max_length=10, null=True, blank=True) is_ok = models.BooleanField('是否正常', default=True) checker = models.ForeignKey(User, verbose_name='检测人', on_delete=models.CASCADE) opl = models.ForeignKey(Opl, verbose_name='关联作业许可', on_delete=models.CASCADE)