diff --git a/safesite/migrations/0341_auto_20200811_2113.py b/safesite/migrations/0341_auto_20200811_2113.py new file mode 100644 index 00000000..7d801ad3 --- /dev/null +++ b/safesite/migrations/0341_auto_20200811_2113.py @@ -0,0 +1,22 @@ +# Generated by Django 2.2.8 on 2020-08-11 21:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0340_auto_20200723_2206'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AddField( + model_name='map', + name='type', + field=models.IntegerField(choices=[(1, '工厂'), (2, '矿山')], default=1, verbose_name='地图类型'), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 57ff2afb..b10e4a0c 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -58,6 +58,10 @@ class Partment(models.Model): class Map(models.Model): + type_choices = ( + (1, '工厂'), + (2, '矿山'), + ) id = models.AutoField(primary_key=True) name = models.CharField(max_length=50) pic = models.CharField(max_length=1000, blank=True) @@ -65,6 +69,7 @@ class Map(models.Model): 'self', blank=True, null=True, on_delete=models.CASCADE) link = models.CharField(max_length=200, blank=True) usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE) + type = models.IntegerField('地图类型', default=1, choices=type_choices) default = models.IntegerField(default=0) deletemark = models.IntegerField(default='1') diff --git a/safesite/urls.py b/safesite/urls.py index 67b4a554..b69c82e0 100644 --- a/safesite/urls.py +++ b/safesite/urls.py @@ -78,7 +78,7 @@ urlpatterns = [ path('html/equipment',views.equipment), path('html/inspectitem',views.inspectitem), path('html/inspect',views.inspect), - path('html/risk',views.risk), + path('html/risk//',views.risk), path('html/riskact/add',views.riskactadd), path('html/riskact/edit//',views.riskactedit), path('html/risk/add//',views.riskadd), diff --git a/safesite/views.py b/safesite/views.py index 32ae4be5..4cd0fd23 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -204,8 +204,8 @@ def riskadd(req, id): return render(req, 'riskadd.html', {'id': id}) -def risk(req): - return render(req, 'risk.html') +def risk(req, id): + return render(req, 'risk.html', {'id': id}) def inspect(req):