From 113b7abf08b879b26693fbb867c29e7827fc7680 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 19 Sep 2019 14:19:18 +0800 Subject: [PATCH] gc --- groups/migrations/0001_initial.py | 32 ++++++++++++++++++++++++++++++ safesite/daoru.py | 6 +++--- safesite/models.py | 2 +- safesite/templates/addobserve.html | 12 +++++++++++ safesite/templates/areaedit.html | 1 + safesite/views.py | 30 ++++++++++++++++++---------- 6 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 groups/migrations/0001_initial.py diff --git a/groups/migrations/0001_initial.py b/groups/migrations/0001_initial.py new file mode 100644 index 00000000..5da27209 --- /dev/null +++ b/groups/migrations/0001_initial.py @@ -0,0 +1,32 @@ +# Generated by Django 2.1.5 on 2019-09-19 14:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('safesite', '0269_auto_20190919_1409'), + ] + + operations = [ + migrations.CreateModel( + name='Groups', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128, unique=True)), + ('password', models.CharField(max_length=256)), + ('groupname', models.CharField(max_length=128, unique=True)), + ('type', models.CharField(choices=[('real', '集团'), ('fictitious', '组合')], default='集团', max_length=32)), + ('createtime', models.DateTimeField(auto_now_add=True)), + ('members', models.ManyToManyField(to='safesite.Partment')), + ], + options={ + 'ordering': ['-createtime'], + 'verbose_name_plural': '集团', + 'verbose_name': '集团', + }, + ), + ] diff --git a/safesite/daoru.py b/safesite/daoru.py index 47291199..46f8cd94 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -17,7 +17,7 @@ def makeqr(data): filepath = os.path.join(upload_folder, data.split('=')[1]+'.png').replace('\\','/') img.save(filepath) return filepath -def makeqr2(data): +def makeqr_train(data): upload_folder = 'media/qr_train' if not os.path.exists(upload_folder): os.mkdir(upload_folder) @@ -26,7 +26,7 @@ def makeqr2(data): img.save(filepath) return filepath -def makeqr3(data): +def makeqr_riskact(data): upload_folder = 'media/qr_riskact' if not os.path.exists(upload_folder): os.mkdir(upload_folder) @@ -35,7 +35,7 @@ def makeqr3(data): img.save(filepath) return filepath -def makeqr4(data): +def makeqr_examtest(data): upload_folder = 'media/qr_examtest' if not os.path.exists(upload_folder): os.mkdir(upload_folder) diff --git a/safesite/models.py b/safesite/models.py index d66da860..e572a1fc 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -212,7 +212,7 @@ class Observe(models.Model):#行为观察 lookplace = models.CharField(max_length=200) looktime = models.DateTimeField(default = timezone.now) looktime2 = models.DateTimeField(null=True,blank=True) - #accompanyman = models.ManyToManyField(User,related_name='gcptr',null=True,blank=True)#陪同人员 + lookers = models.ManyToManyField(User,related_name='gcrs')#陪同人员 lookpart = models.ForeignKey(Partment,related_name='gcbm',on_delete=models.CASCADE) #观察部门 looker = models.ForeignKey(User,related_name='gcr',default='1', on_delete=models.CASCADE)#观察人 lookeder = models.CharField(max_length=100,null=True,blank=True)#被观察对象 diff --git a/safesite/templates/addobserve.html b/safesite/templates/addobserve.html index 724ec220..15acfea4 100644 --- a/safesite/templates/addobserve.html +++ b/safesite/templates/addobserve.html @@ -6,6 +6,12 @@
+
+ + + 选择 +
@@ -68,6 +74,12 @@