diff --git a/safesite/migrations/0342_auto_20200812_2046.py b/safesite/migrations/0342_auto_20200812_2046.py
new file mode 100644
index 00000000..e95addac
--- /dev/null
+++ b/safesite/migrations/0342_auto_20200812_2046.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.2.8 on 2020-08-12 20:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('safesite', '0341_auto_20200811_2113'),
+ ]
+
+ operations = [
+ # migrations.RemoveField(
+ # model_name='companyinfo',
+ # name='liaison_fax',
+ # ),
+ migrations.RemoveField(
+ model_name='map',
+ name='type',
+ ),
+ ]
diff --git a/safesite/migrations/0343_auto_20200812_2104.py b/safesite/migrations/0343_auto_20200812_2104.py
new file mode 100644
index 00000000..94e46c82
--- /dev/null
+++ b/safesite/migrations/0343_auto_20200812_2104.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2.8 on 2020-08-12 21:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('safesite', '0342_auto_20200812_2046'),
+ ]
+
+ operations = [
+ # migrations.RemoveField(
+ # model_name='companyinfo',
+ # name='liaison_fax',
+ # ),
+ migrations.AddField(
+ model_name='riskact',
+ name='kind',
+ field=models.IntegerField(choices=[(1, '工厂'), (2, '矿山')], default=1, verbose_name='类型'),
+ ),
+ ]
diff --git a/safesite/models.py b/safesite/models.py
index b10e4a0c..c0a7acf8 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -58,10 +58,10 @@ class Partment(models.Model):
class Map(models.Model):
- type_choices = (
- (1, '工厂'),
- (2, '矿山'),
- )
+ # type_choices = (
+ # (1, '工厂'),
+ # (2, '矿山'),
+ # )
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=50)
pic = models.CharField(max_length=1000, blank=True)
@@ -69,7 +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)
+ # type = models.IntegerField('地图类型', default=1, choices=type_choices)
default = models.IntegerField(default=0)
deletemark = models.IntegerField(default='1')
@@ -852,9 +852,14 @@ class Relation(models.Model): # 各模块关系表，没用到
class RiskAct(models.Model): # 风险点表
+ kind_choices = (
+ (1, '工厂'),
+ (2, '矿山'),
+ )
id = models.AutoField(primary_key=True)
area = models.ForeignKey(Area, on_delete=models.CASCADE,
null=True, blank=True, related_name='riskactarea')
+ kind = models.IntegerField('类型', default=1, choices=kind_choices)
place = models.CharField(max_length=50, null=True, blank=True)
type = models.ForeignKey(
Dickey, on_delete=models.CASCADE, null=True, blank=True)
diff --git a/safesite/templates/risk.html b/safesite/templates/risk.html
index b550ce47..931d1cb6 100644
--- a/safesite/templates/risk.html
+++ b/safesite/templates/risk.html
@@ -8,7 +8,7 @@
data-options="iconCls:'fa-upload',plain:true">导入风险
{% endif %}
{% if request|has_permission:'b_riskact_add' %}
- 新增
{% endif %}
{% if request|has_permission:'b_riskact_change' %}
@@ -68,6 +68,7 @@