From 61801784fca2dca60aeca75effcec23a5906a5b8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 19 Jan 2024 11:37:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20equip=E5=A2=9E=E5=8A=A0tags=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/em/migrations/0010_auto_20240110_1232.py | 11 ++++------- apps/em/migrations/0011_auto_20240119_1135.py | 19 +++++++++++++++++++ apps/em/models.py | 6 +++--- 3 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 apps/em/migrations/0011_auto_20240119_1135.py diff --git a/apps/em/migrations/0010_auto_20240110_1232.py b/apps/em/migrations/0010_auto_20240110_1232.py index 0d22c608..159222b2 100644 --- a/apps/em/migrations/0010_auto_20240110_1232.py +++ b/apps/em/migrations/0010_auto_20240110_1232.py @@ -10,11 +10,6 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AddField( - model_name='equipment', - name='cate', - field=models.CharField(blank=True, default='', max_length=20, verbose_name='设备分类'), - ), migrations.AddField( model_name='equipment', name='coordinates', @@ -23,11 +18,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='equipment', name='parameter_json', - field=models.JSONField(blank=True, default=dict, verbose_name='技术参数'), + field=models.JSONField( + blank=True, default=dict, verbose_name='技术参数'), ), migrations.AlterField( model_name='equipment', name='type', - field=models.PositiveSmallIntegerField(choices=[(10, '生产设备'), (20, '计量设备'), (30, '治理设备')], default=10, verbose_name='类型'), + field=models.PositiveSmallIntegerField( + choices=[(10, '生产设备'), (20, '计量设备'), (30, '治理设备')], default=10, verbose_name='类型'), ), ] diff --git a/apps/em/migrations/0011_auto_20240119_1135.py b/apps/em/migrations/0011_auto_20240119_1135.py new file mode 100644 index 00000000..90233889 --- /dev/null +++ b/apps/em/migrations/0011_auto_20240119_1135.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.12 on 2024-01-19 03:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('em', '0010_auto_20240110_1232'), + ] + + operations = [ + migrations.AddField( + model_name='equipment', + name='tags', + field=models.JSONField( + default=list, null=True, verbose_name='设备标签'), + ), + ] diff --git a/apps/em/models.py b/apps/em/models.py index 1c152852..525f5c76 100644 --- a/apps/em/models.py +++ b/apps/em/models.py @@ -44,13 +44,13 @@ class Equipment(CommonBModel): # (1, '专用'), # (2, '公用'), # ) - cate_list_10 = ['生产设备', '输送设备'] - cate_list_20 = ['雾炮', '干雾', '除尘器', '环卫车', '洗车台'] + tags_list_10 = ['生产设备', '输送设备'] + tags_list_20 = ['雾炮', '干雾', '除尘器', '环卫车', '洗车台'] mgroup = models.ForeignKey( 'mtm.mgroup', on_delete=models.SET_NULL, null=True, blank=True) type = models.PositiveSmallIntegerField( '类型', choices=type_choices, default=10) - cate = models.CharField('设备分类', max_length=20, default='', blank=True) + tags = models.JSONField('设备标签', default=list, null=True) name = models.CharField('设备名称', max_length=50) number_factory = models.CharField( '出厂编号', max_length=50, default='', blank=True)