设备导入bug

cbma_ssl/cbma.ctc-gz.com.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEArqkBN006xcHij/kS/4i/AjRz3ojO+PfCWmvNrS5+udwjI5F/
+RlojAvDJ9Z//BZ8WeQfPKz9quXOIkDYkTI34abQNqQ26XF00m+0LILHSl6+AXjWu
+pt8IeNb9G9rCpxAGg3HhRsT+FWKCcSZNrHooU0tE/uLEGocyVD38blQa/3nVwOsU
+TXu0IL96fXAVG/wGwU4J9A1G1YKARf70TlHMjS84qauNKkFb55tX56tYVNLTLa9n
+x+tVz4ZlEHCcqiQggiTtbbsNtLzmig5Lk6CL6YIiWDLAh4ODnjBEj8enjM2xBckF
+gtpQJBg7TvaxJ88CqfHIVXNyvZL7fR2DeH5H7wIDAQABAoIBABCDmUJV0oNFODs9
+pR61Gr5GIFh/nfYrUtyCyeEgfsnq9wWTabHIrvvFsYrAVHf/GTxbUSq5JcmgE17z
+R45XdA/mfs4npqG6DFHb4Uv3lD5UUTJXKArOFrp6NVdPYU0zdjIyb8bltFJoTIYP
+RZPTvwFVIhJpdXo+ozMU40u5Nw5FmeRvjZ1rfMqjtY3TdFkcGe3xawDpZfHQo+WU
+PTgzQF2leAedpxzkyJqxvBnTlOrjM8hN41PGeaAqFVOeHcXFVjIqH58VJFb11IT0
+FvLVXq0RamXkqqpB94Bi76CXBKMzplL+eIkTeah9dP3/u5jVDO6RjtTnJHrAiQW7
+C9CBYZUCgYEA8m/vzf+IohlscZAP9R/+yHWKzydFJdcysSnryEULZnP/iseH+8os
+r5QCOJhwMEV9yAOoHP9LnXND1ULyy5c0FvQsxYt0kesOTtKik8j4bmSWBLpUtAP5
+8qgE4W6Y0WEOvzwO7x40IJ2Rqlf36q2zrQj051HZ4WGIRbrIimt+N/MCgYEAuG5m
+K+1FdjV+CM1GQWI+Gqk9tMkWluTMDRIyABS9oJUCk/8yDzxEHziAxsBMihkzgrR2
+pcp4dKQ9iuDJjJSjJ2ydtVqccJZs56BCjY01zNDKgilMWpmIDC+D8USlC9QGb8nm
+j3X6099i9GNPb6yglKsmwSRnavvHyoyu7nOiyxUCgYAVIUx1V+BAwJaDD1tUsgUy
+04vVokaUlb0FU/II8nub4mBTaDCh8W0ToILRC/g7PNNJq4frfxTIFFPFMqCWvgb8
+OSvty8nNLf+BPzqMRufgN0QcBWF8jxwp2hsSyuDm3t66LDHhBXDlptYbUq949MrE
+OhOeVbP3wNhvu2ffKJ9HoQKBgQCTYJUAsR/6sBBA1Fg501mxUGBg4PfOKJLuNwYB
+jpFhivF+dkT4a747/JjbObtv92d0IOVW4o6TFtOe8LXeQsCFtoPn8bplNa9dAHFu
+T9MYEhhhHsNG+rz+j9GtsJ767rkeB4bYSPzg5fdbNyi5IodHheT4HjEOCpjCwNzg
+60LBaQKBgBhN+g2EDG8sok3ls5s+7Dk2wRsSGY8NZOkjCdkkKcUkMWVa+sWCGSWF
+iqXA43p7qODLxKgKEQ3i8sBnYhN445sUxlJ3jMpOAKmRedCIIGtmbQP6ULs9aZL2
+LlyfemNjo3gy1KyFPORKXR0x0DxkVt+hebap8TqP1uIjHK7JWMzk
+-----END RSA PRIVATE KEY-----

cbma_ssl/cbma.ctc-gz.com.pem

@@ -0,0 +1,61 @@
+-----BEGIN CERTIFICATE-----
+MIIF8jCCBNqgAwIBAgIQDhnVmEX4gYDOlS8/vMufrjANBgkqhkiG9w0BAQsFADBu
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
+RFYgVExTIENBIC0gRzEwHhcNMjEwNjE1MDAwMDAwWhcNMjIwNjE1MjM1OTU5WjAa
+MRgwFgYDVQQDEw9jYm1hLmN0Yy1nei5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCuqQE3TTrFweKP+RL/iL8CNHPeiM7498Jaa82tLn653CMjkX9G
+WiMC8Mn1n/8FnxZ5B88rP2q5c4iQNiRMjfhptA2pDbpcXTSb7QsgsdKXr4BeNa6m
+3wh41v0b2sKnEAaDceFGxP4VYoJxJk2seihTS0T+4sQahzJUPfxuVBr/edXA6xRN
+e7Qgv3p9cBUb/AbBTgn0DUbVgoBF/vROUcyNLzipq40qQVvnm1fnq1hU0tMtr2fH
+61XPhmUQcJyqJCCCJO1tuw20vOaKDkuToIvpgiJYMsCHg4OeMESPx6eMzbEFyQWC
+2lAkGDtO9rEnzwKp8chVc3K9kvt9HYN4fkfvAgMBAAGjggLeMIIC2jAfBgNVHSME
+GDAWgBRVdE+yck/1YLpQ0dfmUVyaAYca1zAdBgNVHQ4EFgQUQoPZzZZNoKBbVUfK
+brJXHFVa9OwwGgYDVR0RBBMwEYIPY2JtYS5jdGMtZ3ouY29tMA4GA1UdDwEB/wQE
+AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPgYDVR0gBDcwNTAz
+BgZngQwBAgEwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5kaWdpY2VydC5jb20v
+Q1BTMIGABggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRp
+Z2ljZXJ0LmNvbTBKBggrBgEFBQcwAoY+aHR0cDovL2NhY2VydHMuZGlnaWNlcnQu
+Y29tL0VuY3J5cHRpb25FdmVyeXdoZXJlRFZUTFNDQS1HMS5jcnQwCQYDVR0TBAIw
+ADCCAX0GCisGAQQB1nkCBAIEggFtBIIBaQFnAHYAKXm+8J45OSHwVnOfY6V35b5X
+fZxgCvj5TV0mXCVdx4QAAAF6DRi8PAAABAMARzBFAiBO7tRjY+Eq9R06XilTgqQt
+fssgWr3tFBqqImxXkMaSvAIhAN0cMEOrDOpyHcbqvnby4yTDpmrp6UxYCKeqvhOj
+Z6P/AHYAIkVFB1lVJFaWP6Ev8fdthuAjJmOtwEt/XcaDXG7iDwIAAAF6DRi8lAAA
+BAMARzBFAiBxupA/4Gx33PvYOg6lz9bAd6rbyoF0Hb/khKsQONyp8QIhAOjWFyyQ
+JgNQCmFbZ2pvNaDA3rEYhEZMn4BF19mwrXV0AHUAQcjKsd8iRkoQxqE6CUKHXk4x
+ixsD6+tLx2jwkGKWBvYAAAF6DRi8LgAABAMARjBEAiAFsFdZdRnXwpAzJ9FvDEaG
+nqsK7Vg40A0DsFLJhgcugQIgaP/MbwxsUMxfeGPZOfls2HO3KIQTybtEnn4txADS
+otYwDQYJKoZIhvcNAQELBQADggEBAApoQDHbyzZJpSnFxfO88ul8SA6cwZKOjBER
+yT3NNVLjXpXkKD3EASRul24A5NKzVkC7x8sQTe+WMpbBCA3TTm8/RpIkDSPbmHep
+eE8aeGERK5eb3Rdrr6SGuLQsNWiLq9VzKajR94wn6MDObZ7jgFtjBofjDSfvA7Dl
+9NsgAq9+Id6+rHkZnL9ZtQvqGPDwYfP4fd5zjltKvZPPAhYgnvj5iBMU4Te99ezQ
+7+QoaBQSteKjkIynbRVN+E3b6Y2zjownnIEf2JCY2ddeE65sgnga/UU1BSUHWnTG
+ljTB8FEoMKJ1aDBYtKKd1AbEmrLh9ISZcq+kfnTVm0Y7zxRHd+I=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH
+MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc
+oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo
+lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj
+pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h
+yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n
+wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M
+pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf
+BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C
+AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
+Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu
+Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG
+/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B
+SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW
+M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV
+4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ
+sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy
+rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg==
+-----END CERTIFICATE-----

duibiao/calsim.py

@@ -4,7 +4,7 @@ import pickle
 import warnings
 warnings.filterwarnings(action='ignore', category=UserWarning, module='gensim')
 from gensim import corpora, models, similarities
-from gensim.summarization import bm25
+# from gensim.summarization import bm25
 import os
 from django.conf import settings 
 
@@ -14,8 +14,8 @@ basedir = settings.BASE_DIR +'/duibiao/'
 #初始化部分数据
 #设定停用词
 stop_words = basedir +  'chineseStopWords.txt'
-stopwords = codecs.open(stop_words,'r').readlines()
-stopwords = [ w.strip() for w in stopwords ]
+#stopwords = codecs.open(stop_words,'r').readlines()
+stopwords = [ ]
 stop_flag = ['x', 'c', 'u','d', 'p', 't', 'uj', 'm', 'f', 'r']
 
 #标准文件列表

groups/migrations/0001_initial.py

@@ -1,6 +1,7 @@
-# Generated by Django 2.1.5 on 2019-09-19 14:09
+# Generated by Django 2.2.8 on 2021-06-11 09:44
 
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -12,20 +13,41 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Groups',
+            name='Group',
             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': '集团',
+                'verbose_name_plural': '集团',
+                'ordering': ['-createtime'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Groupmember',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+            options={
+                'verbose_name': '集团-公司',
+                'verbose_name_plural': '集团-公司',
+            },
+        ),
+        migrations.CreateModel(
+            name='GroupUser',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('username', models.CharField(max_length=128, unique=True)),
+                ('password', models.CharField(max_length=256)),
+                ('issuper', models.IntegerField(default=0)),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.Group')),
+            ],
+            options={
+                'verbose_name': '管理员',
+                'verbose_name_plural': '管理员',
             },
         ),
     ]

groups/migrations/0002_auto_20191017_0929.py

@@ -1,47 +0,0 @@
-# Generated by Django 2.1.5 on 2019-10-17 09:29
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0277_remove_companyinfo_liaison_fax'),
-        ('groups', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Group',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('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={
-                'verbose_name': '集团',
-                'ordering': ['-createtime'],
-                'verbose_name_plural': '集团',
-            },
-        ),
-        migrations.CreateModel(
-            name='GroupUser',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('username', models.CharField(max_length=128, unique=True)),
-                ('password', models.CharField(max_length=256)),
-                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.Group')),
-                ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='groups',
-            name='members',
-        ),
-        migrations.DeleteModel(
-            name='Groups',
-        ),
-    ]

groups/migrations/0002_auto_20210611_0944.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.8 on 2020-11-15 21:58
+# Generated by Django 2.2.8 on 2021-06-11 09:44
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -6,32 +6,32 @@ import django.db.models.deletion
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
-        ('groups', '0009_groupuser_issuper'),
+        ('groups', '0001_initial'),
+        ('safesite', '0001_initial'),
     ]
 
     operations = [
-        migrations.AlterModelOptions(
-            name='groupmember',
-            options={'verbose_name': '集团-公司', 'verbose_name_plural': '集团-公司'},
+        migrations.AddField(
+            model_name='groupuser',
+            name='user',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'),
         ),
-        migrations.AlterModelOptions(
-            name='groupuser',
-            options={'verbose_name': '管理员', 'verbose_name_plural': '管理员'},
-        ),
-        migrations.AlterField(
-            model_name='group',
-            name='members',
-            field=models.ManyToManyField(related_name='group_members', through='groups.Groupmember', to='safesite.Partment'),
-        ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name='groupmember',
             name='group',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groupmember_group', to='groups.Group'),
         ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name='groupmember',
             name='member',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groupmember_member', to='safesite.Partment'),
         ),
+        migrations.AddField(
+            model_name='group',
+            name='members',
+            field=models.ManyToManyField(related_name='group_members', through='groups.Groupmember', to='safesite.Partment'),
+        ),
     ]

groups/migrations/0003_auto_20191024_1056.py

@@ -1,31 +0,0 @@
-# Generated by Django 2.1.5 on 2019-10-24 10:56
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0281_remove_companyinfo_liaison_fax'),
-        ('groups', '0002_auto_20191017_0929'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Groupmember',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='groupmember',
-            name='group',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.Group'),
-        ),
-        migrations.AddField(
-            model_name='groupmember',
-            name='member',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'),
-        ),
-    ]

groups/migrations/0004_auto_20191024_1109.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.5 on 2019-10-24 11:09
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('groups', '0003_auto_20191024_1056'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='group',
-            old_name='members',
-            new_name='member',
-        ),
-    ]

groups/migrations/0005_remove_group_member.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.1.5 on 2019-10-24 11:11
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('groups', '0004_auto_20191024_1109'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='group',
-            name='member',
-        ),
-    ]

groups/migrations/0006_group_members.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.1.5 on 2019-10-24 11:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0285_remove_companyinfo_liaison_fax'),
-        ('groups', '0005_remove_group_member'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='group',
-            name='members',
-            field=models.ManyToManyField(through='groups.Groupmember', to='safesite.Partment'),
-        ),
-    ]

groups/migrations/0007_role.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.8 on 2020-01-02 17:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0306_auto_20200102_1722'),
-        ('groups', '0006_group_members'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Role',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=32, unique=True, verbose_name='角色')),
-                ('desc', models.CharField(blank=True, max_length=50, null=True, verbose_name='描述')),
-                ('permissions', models.ManyToManyField(blank=True, to='safesite.Menu', verbose_name='URL授权')),
-            ],
-        ),
-    ]

groups/migrations/0008_delete_role.py

@@ -1,16 +0,0 @@
-# Generated by Django 2.2.8 on 2020-01-06 11:25
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('groups', '0007_role'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='Role',
-        ),
-    ]

groups/migrations/0009_groupuser_issuper.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.8 on 2020-01-06 21:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('groups', '0008_delete_role'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='groupuser',
-            name='issuper',
-            field=models.IntegerField(default=0),
-        ),
-    ]

manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings_dev")
     try:
         from django.core.management import execute_from_command_line
     except ImportError:

mysite/settings_dev.py

@@ -0,0 +1,24 @@
+from .settings import *
+
+DEBUG=True
+
+DATABASES = {
+   # 'default': {
+        # 'ENGINE': 'django.db.backends.sqlite3',
+        # 'NAME': os.path.join(BASE_DIR, 'safe.db'),
+    # },
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'safedb',
+        'USER':'postgres',
+        'PASSWORD':'cbma1234',
+        'HOST':'39.105.200.14',
+        'PORT':'5432',
+        # 'CONN_MAX_AGE': 60,
+    },
+    'OPTIONS': {
+        'isolation_level': psycopg2.extensions.ISOLATION_LEVEL_SERIALIZABLE,
+    },
+}
+APPID_MP = 'wx8cc62edbfed029b9'
+APPSECRET_MP= 'eb15364f89139b9ba9453e4b7c8c12e0'

mysite/settings_pro.py

@@ -0,0 +1,24 @@
+from .settings import *
+
+DEBUG=False
+
+DATABASES = {
+   # 'default': {
+        # 'ENGINE': 'django.db.backends.sqlite3',
+        # 'NAME': os.path.join(BASE_DIR, 'safe.db'),
+    # },
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'safedb',
+        'USER':'postgres',
+        'PASSWORD':'cbma1234',
+        'HOST':'localhost',
+        'PORT':'5432',
+        # 'CONN_MAX_AGE': 60,
+    },
+    'OPTIONS': {
+        'isolation_level': psycopg2.extensions.ISOLATION_LEVEL_SERIALIZABLE,
+    },
+}
+APPID_MP = 'wx8cc62edbfed029b9'
+APPSECRET_MP= 'eb15364f89139b9ba9453e4b7c8c12e0'

mysite/wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings_pro")
 
 application = get_wsgi_application()

safesite/daoru.py

@@ -6,6 +6,7 @@ from .models import SafeItem, SafeList, User,Trouble,Dickey,Partment,Dicclass,Tr
 from datetime import datetime,date
 import base64
 from django.conf import settings
+from mysite.settings_dev import APPID_MP, APPSECRET_MP
 import qrcode
 import os
 from django.contrib.auth.hashers import make_password
@@ -300,7 +301,7 @@ def drtodotroubles(companyid,path,userid):
             postdict = {
                 'touser': 'oPGqkweX75QtLmgehUN-ipR4hcyc',
                 'template_id': 'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0',
-                "miniprogram": {"appid": "wx5c39b569f01c27db"},
+                "miniprogram": {"appid": APPID_MP},
                 'data': {
 
                     'first': {
@@ -363,7 +364,7 @@ def drequipments(companyid,path):
         return {'code':0,'msg':'责任人列错误!'}
     catedict = {}
     for i in Dickey.objects.filter(Q(dicparent__dicid=47),Q(usecomps__contains=','+str(companyid)+',')|Q(usecomps__contains=',1,')).exclude(usecomps__contains=','+str(companyid)+','):
-        catedict[i.dicname] = i.dicid
+        catedict[i.dickeyname] = i.dickeyid
     if '其他设备类' not in catedict:
         catedict['其它设备类'] = 361
     numdict = {}
@@ -450,16 +451,16 @@ def drequipments(companyid,path):
                         a.cate=Dickey.objects.get(dickeyid=catedict[cate])
                 a.usecomp=Partment.objects.get(partid=companyid)
                 a.save()
-                a.qrcode = makeqr('https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(a.id))
+                a.qrcode = makeqr('https://cbma.ctc-gz.com/miniprogram/equipment?id='+str(a.id))
                 a.save()
                 numdict[num]=a
             else:
                 numsdict[num]=name
         i = i+1
     if numsdict:
-        return {'code':1,'msg':'全部导入成功!'}
-    else:
         return {'code':2,'msg':'部分未导入成功!','info':numsdict}
+    else:
+        return {'code':1,'msg':'全部导入成功!'}
 
 
 def drusers(companyid,path):
@@ -510,7 +511,8 @@ def drusers(companyid,path):
         #     obj.usecomp = Partment.objects.get(partid=companyid)
         #     obj.save()
         #     groupdict[groupname] = obj.groupid
-        if User.objects.filter(username = username).count() == 0:
+        users = User.objects.filter(username = username)
+        if not users.exists():
             a = User()
             a.name = name
             a.empid = empid
@@ -615,7 +617,7 @@ def drrisks(companyid,path):
                         if users.exists():
                             obj.zrr = users[0] 
                     obj.save()
-                    obj.qrcode = makeqr_riskact('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id))
+                    obj.qrcode = makeqr_riskact('https://cbma.ctc-gz.com/miniprogram/riskact?id='+str(obj.id))
                     obj.save()
                     a = Risk()
                     a.riskact=obj
@@ -657,7 +659,7 @@ def drrisks(companyid,path):
             #             if users.exists():
             #                 obj.zrr = users[0]
             #         obj.save()
-            #         obj.qrcode = makeqr3('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id))
+            #         obj.qrcode = makeqr3('https://cbma.ctc-gz.com/miniprogram/riskact?id='+str(obj.id))
             #         obj.save()
             #         a = Risk()
             #         a.riskact=obj        
@@ -776,7 +778,7 @@ def drsafelist(companyid,path):
         safelist.usecomp = user.usecomp
         safelist.name = safelist_name
         safelist.save()
-        safelist.qrcode = makeqr_safelist('https://safeyun.ctcshe.com/miniprogram/safelist?id='+str(safelist.id))
+        safelist.qrcode = makeqr_safelist('https://cbma.ctc-gz.com/miniprogram/safelist?id='+str(safelist.id))
         safelist.save()
     except:
         return {'code':0,'msg':'创建清单失败!'}

safesite/datashowview.py

@@ -16,7 +16,7 @@ from .export import exportdoc,exportxlsx,exportyjdoc,exportsimplexlsx,exportdoc2
 from .daoru import drusers,drequipments,drrisks
 from django.forms.models import model_to_dict
 from .safespider import getTzzs,getAqzs
-from duibiao import calsim
+# from duibiao import calsim
 from django.db.models import Q
 from django.core.serializers.json import DjangoJSONEncoder
 from io import StringIO
@@ -50,4 +50,4 @@ def getcompany(x):
     if a.ubelongpart.iscompany == 1:
         return str(a.ubelongpart.partid)
     else:
-        return a.ubelongpart.partlink.split(',')[1]
+        return a.ubelongpart.partlink.split(',')[1]

safesite/edu/views.py

@@ -48,7 +48,8 @@ def upload(req):
     filepath = os.path.join(user_upload_folder, file_name)
     filepath = filepath.replace('\\','/')
     with open( filepath, 'wb') as f:
-        f.write(req.FILES['mf'].read())
+        for i in req.FILES['mf'].chunks():
+            f.write(i)
     return JsonResponse({"code":1,"filename":file_name,"filepath":filepath})
 #查询
 def selectDate(req):

safesite/export.py

@@ -719,7 +719,7 @@ def exportxlsx(a,objs):
             if x.area:
                sheet['e'+num] = x.area.name
             sheet['f'+num] = '正常' if x.state==1 else '异常'
-            sheet['g'+num] = 'https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(x.id)
+            sheet['g'+num] = 'https://cbma.ctc-gz.com/miniprogram/equipment?id='+str(x.id)
         nowtime = datetime.now().strftime('%Y%m%d%H%M%S') 
         sheet['b1'] = nowtime
         filename = 'SBS' + nowtime

safesite/migrations/0002_auto_20180627_2206.py

@@ -1,148 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-06-27 22:06
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('safesite', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Dicclass',
-            fields=[
-                ('dicid', models.AutoField(primary_key=True, serialize=False)),
-                ('dicname', models.CharField(max_length=30)),
-                ('parentid', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dicclass')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Dickey',
-            fields=[
-                ('dickeyid', models.AutoField(primary_key=True, serialize=False)),
-                ('dickeyname', models.CharField(max_length=200)),
-                ('dicparent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Dicclass')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Partment',
-            fields=[
-                ('partid', models.AutoField(primary_key=True, serialize=False)),
-                ('partname', models.CharField(default='生产部', max_length=30)),
-                ('partlink', models.CharField(blank=True, max_length=200)),
-                ('partmanager', models.IntegerField(blank=True, null=True)),
-                ('parentid', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Train',
-            fields=[
-                ('trainid', models.AutoField(primary_key=True, serialize=False)),
-                ('trainname', models.CharField(max_length=100)),
-                ('trainplace', models.CharField(max_length=200)),
-                ('starttime', models.DateTimeField(default=django.utils.timezone.now)),
-                ('duration', models.FloatField(default='1')),
-                ('detailcontent', models.CharField(blank=True, max_length=1000, null=True)),
-                ('teacher', models.CharField(blank=True, max_length=200, null=True)),
-                ('otherparticipant', models.CharField(blank=True, max_length=1000, null=True)),
-                ('deletemark', models.IntegerField(default='1')),
-                ('state', models.IntegerField(default='0')),
-                ('participantnum', models.IntegerField(blank=True, default='1', null=True)),
-                ('knownum', models.IntegerField(blank=True, default='1', null=True)),
-                ('material', models.CharField(blank=True, max_length=1000, null=True)),
-                ('manlevel', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='rylx', to='safesite.Dickey')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Trouble',
-            fields=[
-                ('troubleid', models.AutoField(primary_key=True, serialize=False)),
-                ('yhfxsj', models.DateTimeField(default=django.utils.timezone.now)),
-                ('zglx', models.IntegerField(choices=[(1, '立即整改'), (2, '限期整改'), (3, '限期整改B')], default='1')),
-                ('jclx', models.IntegerField(default='1')),
-                ('yhdd', models.CharField(default='test', max_length=200)),
-                ('yhdj', models.IntegerField(default='1')),
-                ('yhlx', models.IntegerField(default='1')),
-                ('yhlb', models.IntegerField(default='1')),
-                ('yhms', models.TextField(default='1')),
-                ('yhyyfx', models.TextField(blank=True)),
-                ('yhzgcs', models.TextField(blank=True)),
-                ('yhtp', models.CharField(blank=True, max_length=1000)),
-                ('zghtp', models.CharField(blank=True, max_length=1000)),
-                ('yhzt', models.IntegerField(choices=[(3, '待关闭'), (1, '待评估'), (2, '待整改'), (4, '已关闭')], default='3')),
-                ('yhtbsj', models.DateTimeField(default=django.utils.timezone.now)),
-                ('yhfxbm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='User',
-            fields=[
-                ('userid', models.AutoField(primary_key=True, serialize=False)),
-                ('empid', models.CharField(blank=True, max_length=20)),
-                ('username', models.CharField(max_length=30)),
-                ('name', models.CharField(max_length=20)),
-                ('password', models.CharField(max_length=30)),
-                ('openid', models.CharField(default='0', max_length=200)),
-                ('manager', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')),
-                ('ubelongpart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='upart', to='safesite.Partment')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='yhfxr',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='yhfxrname', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='yhtbr',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='yhtbrname', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='participant',
-            field=models.ManyToManyField(related_name='cjr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='submituser',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='tbr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='traincontent',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxnr', to='safesite.Dickey'),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='trainlevel',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxjb', to='safesite.Dicclass'),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='trainpart',
-            field=models.ManyToManyField(default='1', related_name='pxbm', to='safesite.Partment'),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='traintype',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxlx', to='safesite.Dickey'),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='usecomp',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'),
-        ),
-        migrations.AddField(
-            model_name='dickey',
-            name='usecomp',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'),
-        ),
-    ]

safesite/migrations/0003_auto_20180628_1159.py

@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-06-28 11:59
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0002_auto_20180627_2206'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Drill',
-            fields=[
-                ('drillid', models.AutoField(primary_key=True, serialize=False)),
-                ('drillnum', models.CharField(default='1', max_length=100)),
-                ('drillname', models.CharField(max_length=100)),
-                ('drillplace', models.CharField(max_length=200)),
-                ('starttime', models.DateTimeField(default=django.utils.timezone.now)),
-                ('submittime', models.DateTimeField(default=django.utils.timezone.now)),
-                ('modifytime', models.DateTimeField(auto_now=True)),
-                ('detailcontent', models.CharField(blank=True, max_length=1000, null=True)),
-                ('commander', models.CharField(blank=True, max_length=200, null=True)),
-                ('otherparticipant', models.CharField(blank=True, max_length=1000, null=True)),
-                ('deletemark', models.IntegerField(default='1')),
-                ('state', models.IntegerField(default='0')),
-                ('participantnum', models.IntegerField(blank=True, default='1', null=True)),
-                ('knownum', models.IntegerField(blank=True, default='1', null=True)),
-                ('plan', models.CharField(blank=True, max_length=1000, null=True)),
-                ('material', models.CharField(blank=True, max_length=1000, null=True)),
-                ('drillcontent', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='ylnr', to='safesite.Dickey')),
-                ('drilllevel', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yljb', to='safesite.Dicclass')),
-                ('drillpart', models.ManyToManyField(default='1', related_name='ylbm', to='safesite.Partment')),
-                ('drilltype', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yllx', to='safesite.Dickey')),
-                ('participant', models.ManyToManyField(related_name='ylcjr', to='safesite.User')),
-                ('submituser', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yltbr', to='safesite.User')),
-                ('usecomp', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='modifytime',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='submittime',
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='trainnum',
-            field=models.CharField(default='1', max_length=100),
-        ),
-    ]

safesite/migrations/0004_auto_20180629_1642.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-06-29 16:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0003_auto_20180628_1159'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='drill',
-            name='drilllevel',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yljb', to='safesite.Dickey'),
-        ),
-    ]

safesite/migrations/0005_auto_20180703_1551.py

@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-03 15:51
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0004_auto_20180629_1642'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='TroubleAccess',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('opinion', models.CharField(max_length=500)),
-                ('result', models.IntegerField(default='1')),
-            ],
-        ),
-        migrations.RenameField(
-            model_name='trouble',
-            old_name='yhfxsj',
-            new_name='fxsj',
-        ),
-        migrations.RenameField(
-            model_name='trouble',
-            old_name='yhtbsj',
-            new_name='tbsj',
-        ),
-        migrations.RenameField(
-            model_name='trouble',
-            old_name='yhyyfx',
-            new_name='yyfx',
-        ),
-        migrations.RemoveField(
-            model_name='trouble',
-            name='yhfxbm',
-        ),
-        migrations.RemoveField(
-            model_name='trouble',
-            name='yhfxr',
-        ),
-        migrations.RemoveField(
-            model_name='trouble',
-            name='yhtbr',
-        ),
-        migrations.RemoveField(
-            model_name='trouble',
-            name='yhzgcs',
-        ),
-        migrations.AddField(
-            model_name='partment',
-            name='deletemark',
-            field=models.IntegerField(default='1'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='deletemark',
-            field=models.IntegerField(default='1'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='fxbm',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='fxbm', to='safesite.Partment'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='fxr',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='fxr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='material',
-            field=models.CharField(blank=True, max_length=1000, null=True),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='tbr',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhtbr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='zgbm',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgbm', to='safesite.Partment'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='zgcs',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='zgr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='deletemark',
-            field=models.IntegerField(default='1'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='zglx',
-            field=models.IntegerField(choices=[(1, '立即整改'), (2, '限期整改')], default='1'),
-        ),
-        migrations.AddField(
-            model_name='troubleaccess',
-            name='pgshr',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='troubleaccess',
-            name='troubleid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='pgsh',
-            field=models.ManyToManyField(related_name='pgsh', through='safesite.TroubleAccess', to='safesite.User'),
-        ),
-    ]

safesite/migrations/0006_troubleaccess_pgsj.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-03 15:54
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0005_auto_20180703_1551'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='troubleaccess',
-            name='pgsj',
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-    ]

safesite/migrations/0007_trouble_todouser.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-03 17:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0006_troubleaccess_pgsj'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='todouser',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='todor', to='safesite.User'),
-        ),
-    ]

safesite/migrations/0008_auto_20180703_2139.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-03 21:39
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0007_trouble_todouser'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='dickey',
-            name='deletemark',
-            field=models.IntegerField(default='1'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='jclx',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='jclx', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhdj',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhdj', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhlb',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhlb', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhlx',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhlx', to='safesite.Dicclass'),
-        ),
-    ]

safesite/migrations/0009_trouble_yhpg.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-03 21:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0008_auto_20180703_2139'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='yhpg',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhpg', to='safesite.Dickey'),
-        ),
-    ]

safesite/migrations/0010_trouble_yhnum.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-04 10:43
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0009_trouble_yhpg'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='yhnum',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-    ]

safesite/migrations/0011_troubleaccess_action.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-05 10:02
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0010_trouble_yhnum'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='troubleaccess',
-            name='action',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-    ]

safesite/migrations/0012_trouble_usecomp.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-05 14:48
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0011_troubleaccess_action'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='usecomp',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'),
-        ),
-    ]

safesite/migrations/0013_auto_20180705_2242.py

@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-05 22:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0012_trouble_usecomp'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='zgxq',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhdj',
-            field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhdj', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhlb',
-            field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlb', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhlx',
-            field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlx', to='safesite.Dicclass'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhms',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhpg',
-            field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhpg', to='safesite.Dickey'),
-        ),
-    ]

safesite/migrations/0014_auto_20180706_1500.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-06 15:00
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0013_auto_20180705_2242'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='todouser2',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='todor2', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='zgms',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhzt',
-            field=models.IntegerField(choices=[(3, '待关闭'), (1, '待评估'), (2, '待整改'), (4, '已关闭'), (5, '措施/方案待确认')], default='3'),
-        ),
-    ]

safesite/migrations/0015_trouble_xgsj.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-06 16:02
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0014_auto_20180706_1500'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='xgsj',
-            field=models.DateTimeField(auto_now=True),
-        ),
-    ]

safesite/migrations/0016_auto_20180706_1624.py

@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-06 16:24
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0015_trouble_xgsj'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='trouble',
-            name='fxbm',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fxbm', to='safesite.Partment'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='fxr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fxr', to='safesite.User'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='jclx',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jclx', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='tbr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhtbr', to='safesite.User'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='todouser',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='todor', to='safesite.User'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='todouser2',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='todor2', to='safesite.User'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='usecomp',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhdj',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhdj', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhlb',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlb', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhlx',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlx', to='safesite.Dicclass'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhpg',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhpg', to='safesite.Dickey'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhzt',
-            field=models.IntegerField(blank=True, choices=[(3, '待关闭'), (1, '待评估'), (2, '待整改'), (4, '已关闭'), (5, '措施/方案待确认')], null=True),
-        ),
-    ]

safesite/migrations/0017_auto_20180706_1633.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-06 16:33
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0016_auto_20180706_1624'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='trouble',
-            name='jclx',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jclx', to='safesite.Dickey'),
-        ),
-    ]

safesite/migrations/0018_remove_trouble_zglx.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-13 17:51
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0017_auto_20180706_1633'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='trouble',
-            name='zglx',
-        ),
-    ]

safesite/migrations/0019_auto_20180714_1457.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-14 14:57
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0018_remove_trouble_zglx'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Group',
-            fields=[
-                ('groupid', models.AutoField(primary_key=True, serialize=False)),
-                ('groupname', models.CharField(blank=True, max_length=30, null=True)),
-                ('users', models.ManyToManyField(related_name='userg', to='safesite.User')),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='partment',
-            name='partmanager',
-        ),
-    ]

safesite/migrations/0020_remove_user_manager.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-14 15:39
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0019_auto_20180714_1457'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='user',
-            name='manager',
-        ),
-    ]

safesite/migrations/0021_auto_20180714_1602.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-14 16:02
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0020_remove_user_manager'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='isaqy',
-            field=models.IntegerField(default='0'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='isbmzg',
-            field=models.IntegerField(default='0'),
-        ),
-    ]

safesite/migrations/0022_auto_20180714_2133.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-14 21:33
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0021_auto_20180714_1602'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='username',
-            field=models.CharField(max_length=30, unique=True),
-        ),
-    ]

safesite/migrations/0023_auto_20180716_1447.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-16 14:47
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0022_auto_20180714_2133'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='trouble',
-            name='tbr',
-        ),
-        migrations.RemoveField(
-            model_name='trouble',
-            name='todouser2',
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='pgfcr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pgfcr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='zgshr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgshr', to='safesite.User'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhzt',
-            field=models.IntegerField(blank=True, choices=[(5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核')], null=True),
-        ),
-    ]

safesite/migrations/0024_auto_20180717_0926.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-17 09:26
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0023_auto_20180716_1447'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='shresult',
-            field=models.IntegerField(default='1'),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhzt',
-            field=models.IntegerField(blank=True, choices=[(5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True),
-        ),
-    ]

safesite/migrations/0025_auto_20180717_0928.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-17 09:28
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0024_auto_20180717_0926'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='trouble',
-            name='shresult',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

safesite/migrations/0026_auto_20180717_1624.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-17 16:24
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0025_auto_20180717_0928'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='trouble',
-            old_name='zgxq',
-            new_name='zgqx',
-        ),
-    ]

safesite/migrations/0027_trouble_zgsj.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-17 22:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0026_auto_20180717_1624'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='zgsj',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

safesite/migrations/0028_auto_20180718_1456.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-18 14:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0027_trouble_zgsj'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='troubleaccess',
-            old_name='pgsj',
-            new_name='accesssj',
-        ),
-        migrations.AddField(
-            model_name='troubleaccess',
-            name='yhzt',
-            field=models.IntegerField(default='1'),
-        ),
-        migrations.AlterField(
-            model_name='troubleaccess',
-            name='result',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

safesite/migrations/0029_auto_20180718_1514.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-18 15:14
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0028_auto_20180718_1456'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='fcyj',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='shyj',
-            field=models.TextField(blank=True),
-        ),
-    ]

safesite/migrations/0030_auto_20180718_2229.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-07-18 22:29
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0029_auto_20180718_1514'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='troubleaccess',
-            old_name='pgshr',
-            new_name='clr',
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='csyj',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='yhzt',
-            field=models.IntegerField(blank=True, choices=[(7, '措施/方案待提交'), (5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True),
-        ),
-    ]

safesite/migrations/0031_trouble_sybzt.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-19 10:55
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0030_auto_20180718_2229'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='sybzt',
-            field=models.IntegerField(blank=True, choices=[(7, '措施/方案待提交'), (5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True),
-        ),
-    ]

safesite/migrations/0032_auto_20180720_0853.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-07-20 08:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0031_trouble_sybzt'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='trouble',
-            name='shresult',
-            field=models.IntegerField(blank=True, choices=[(1, '通过'), (2, '审核未通过'), (3, '复查未通过'), (4, '已修改')], null=True),
-        ),
-    ]

safesite/migrations/0033_yjyc.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-08-29 15:46
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0032_auto_20180720_0853'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Yjyc',
-            fields=[
-                ('yjycid', models.AutoField(primary_key=True, serialize=False)),
-                ('yjsj', models.CharField(max_length=20)),
-                ('yjz', models.IntegerField(blank=True, null=True)),
-                ('ycz', models.IntegerField(blank=True, null=True)),
-                ('troublevalue', models.IntegerField(blank=True, null=True)),
-                ('trainvalue', models.IntegerField(blank=True, null=True)),
-                ('drillvalue', models.IntegerField(blank=True, null=True)),
-            ],
-        ),
-    ]

safesite/migrations/0034_yjyc_usecomp.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-08-30 08:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0033_yjyc'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='yjyc',
-            name='usecomp',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'),
-        ),
-    ]

safesite/migrations/0035_auto_20180830_1022.py

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-08-30 10:22
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0034_yjyc_usecomp'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='partment',
-            name='creattime',
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name='partment',
-            name='drillavg',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='partment',
-            name='modifytime',
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name='partment',
-            name='monthpass',
-            field=models.IntegerField(default='0'),
-        ),
-        migrations.AddField(
-            model_name='partment',
-            name='trainavg',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='partment',
-            name='troubleavg',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='yjyc',
-            name='modifytime',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='ycz',
-            field=models.CharField(max_length=100),
-        ),
-    ]

safesite/migrations/0036_auto_20180830_1027.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-08-30 10:27
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0035_auto_20180830_1022'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjyc',
-            name='ycz',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

safesite/migrations/0037_auto_20180830_1136.py

@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-08-30 11:36
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0036_auto_20180830_1027'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='partment',
-            name='modifytime',
-        ),
-        migrations.RemoveField(
-            model_name='partment',
-            name='monthpass',
-        ),
-    ]

safesite/migrations/0038_auto_20180830_1452.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-08-30 14:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0037_auto_20180830_1136'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjyc',
-            name='drillvalue',
-            field=models.IntegerField(default=0),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='trainvalue',
-            field=models.IntegerField(default=0),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='troublevalue',
-            field=models.IntegerField(default=0),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='ycz',
-            field=models.IntegerField(default=0),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='yjz',
-            field=models.IntegerField(default=0),
-        ),
-    ]

safesite/migrations/0039_partment_iscompany.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-03 16:21
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0038_auto_20180830_1452'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='partment',
-            name='iscompany',
-            field=models.IntegerField(default=0),
-        ),
-    ]

safesite/migrations/0040_yjyc_b.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-03 18:05
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0039_partment_iscompany'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='yjyc',
-            name='b',
-            field=models.IntegerField(default=0),
-        ),
-    ]

safesite/migrations/0041_auto_20180904_0850.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-04 08:50
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0040_yjyc_b'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjyc',
-            name='yjsj',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

safesite/migrations/0042_auto_20180904_0857.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-04 08:57
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0041_auto_20180904_0850'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjyc',
-            name='yjsj',
-            field=models.CharField(max_length=20),
-        ),
-    ]

safesite/migrations/0043_auto_20180904_1522.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-04 15:22
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0042_auto_20180904_0857'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjyc',
-            name='b',
-            field=models.DecimalField(decimal_places=2, max_digits=5),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='drillvalue',
-            field=models.DecimalField(decimal_places=2, max_digits=5),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='trainvalue',
-            field=models.DecimalField(decimal_places=2, max_digits=5),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='troublevalue',
-            field=models.DecimalField(decimal_places=2, max_digits=5),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='ycz',
-            field=models.DecimalField(decimal_places=2, max_digits=6),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='yjz',
-            field=models.DecimalField(decimal_places=2, max_digits=6),
-        ),
-    ]

safesite/migrations/0044_auto_20180904_1532.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-04 15:32
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0043_auto_20180904_1522'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjyc',
-            name='b',
-            field=models.FloatField(),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='drillvalue',
-            field=models.FloatField(),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='trainvalue',
-            field=models.FloatField(),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='troublevalue',
-            field=models.FloatField(),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='ycz',
-            field=models.FloatField(),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='yjz',
-            field=models.FloatField(),
-        ),
-    ]

safesite/migrations/0045_auto_20180910_0902.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-10 09:02
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0044_auto_20180904_1532'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='drill',
-            name='drilllevel',
-            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yljb', to='safesite.Dicclass'),
-        ),
-    ]

safesite/migrations/0046_auto_20180910_1811.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-09-10 18:11
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0045_auto_20180910_0902'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='yjyc',
-            name='yjsj',
-        ),
-        migrations.AddField(
-            model_name='yjyc',
-            name='month',
-            field=models.IntegerField(blank=True, default='1', null=True),
-        ),
-        migrations.AddField(
-            model_name='yjyc',
-            name='week',
-            field=models.IntegerField(blank=True, default='0', null=True),
-        ),
-        migrations.AddField(
-            model_name='yjyc',
-            name='year',
-            field=models.IntegerField(blank=True, default='1', null=True),
-        ),
-    ]

safesite/migrations/0047_auto_20181002_1113.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-10-02 11:13
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0046_auto_20180910_1811'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjyc',
-            name='b',
-            field=models.FloatField(default='0'),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='drillvalue',
-            field=models.FloatField(default='0'),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='trainvalue',
-            field=models.FloatField(default='0'),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='troublevalue',
-            field=models.FloatField(default='0'),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='ycz',
-            field=models.FloatField(default='0'),
-        ),
-        migrations.AlterField(
-            model_name='yjyc',
-            name='yjz',
-            field=models.FloatField(default='0'),
-        ),
-    ]

safesite/migrations/0048_remove_trouble_csyj.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-10-10 17:14
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0047_auto_20181002_1113'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='trouble',
-            name='csyj',
-        ),
-    ]

safesite/migrations/0049_auto_20181010_2255.py

@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-10-10 22:55
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0048_remove_trouble_csyj'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='trouble',
-            name='pgfcr',
-        ),
-        migrations.RemoveField(
-            model_name='trouble',
-            name='zgshr',
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='fcr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fcr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='pgr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pgr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='shr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shr', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trouble',
-            name='zpr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zpr', to='safesite.User'),
-        ),
-    ]

safesite/migrations/0050_trouble_csqrr.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-10-12 18:11
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0049_auto_20181010_2255'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='csqrr',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='csqrr', to='safesite.User'),
-        ),
-    ]

safesite/migrations/0051_auto_20181017_1115.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-10-17 11:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0050_trouble_csqrr'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='headimgurl',
-            field=models.CharField(default='0', max_length=200),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='nickname',
-            field=models.CharField(default='0', max_length=200),
-        ),
-    ]

safesite/migrations/0052_auto_20181017_1533.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-10-17 15:33
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0051_auto_20181017_1115'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='nickname',
-            field=models.CharField(default='wechartname', max_length=200),
-        ),
-    ]

safesite/migrations/0053_auto_20181023_1708.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-10-23 17:08
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0052_auto_20181017_1533'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Trainuser',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('score', models.IntegerField(blank=True, null=True)),
-                ('participant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='train',
-            name='participant',
-        ),
-        migrations.AddField(
-            model_name='train',
-            name='participant',
-            field=models.ManyToManyField(related_name='cjr', through='safesite.Trainuser', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='trainuser',
-            name='trainid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Train'),
-        ),
-    ]

safesite/migrations/0054_auto_20181025_1134.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-10-25 11:34
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0053_auto_20181023_1708'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Drilluser',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('score', models.IntegerField(blank=True, null=True)),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='drill',
-            name='participant',
-        ),
-        migrations.AddField(
-            model_name='drilluser',
-            name='drillid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Drill'),
-        ),
-        migrations.AddField(
-            model_name='drilluser',
-            name='participant',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'),
-        ),
-    ]

safesite/migrations/0055_auto_20181107_1430.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-11-07 14:30
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0054_auto_20181025_1134'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='drill',
-            name='participant',
-            field=models.ManyToManyField(related_name='ylcjr', through='safesite.Drilluser', to='safesite.User'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='mpoenid',
-            field=models.CharField(default='0', max_length=200),
-        ),
-    ]

safesite/migrations/0056_auto_20181118_1144.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.3 on 2018-11-18 11:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0055_auto_20181107_1430'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='user',
-            old_name='mpoenid',
-            new_name='mpopenid',
-        ),
-    ]

safesite/migrations/0057_user_issuper.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-03 16:46
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0056_auto_20181118_1144'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='issuper',
-            field=models.IntegerField(default='0'),
-        ),
-    ]

safesite/migrations/0058_auto_20181205_1107.py

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-05 11:07
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0057_user_issuper'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='dickey',
-            name='usecomp',
-        ),
-        migrations.AddField(
-            model_name='dickey',
-            name='usecomps',
-            field=models.CharField(default=',', max_length=200),
-        ),
-    ]

safesite/migrations/0059_auto_20181205_1113.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-05 11:13
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0058_auto_20181205_1107'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='dickey',
-            name='usecomps',
-            field=models.CharField(default=',1,', max_length=200),
-        ),
-    ]

safesite/migrations/0060_remove_dickey_usecomps.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-05 11:14
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0059_auto_20181205_1113'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='dickey',
-            name='usecomps',
-        ),
-    ]

safesite/migrations/0061_dickey_usecomps.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-05 11:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0060_remove_dickey_usecomps'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='dickey',
-            name='usecomps',
-            field=models.CharField(default=',1,', max_length=200),
-        ),
-    ]

safesite/migrations/0062_auto_20181205_1144.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-05 11:44
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0061_dickey_usecomps'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='empid',
-            field=models.CharField(blank=True, max_length=20, null=True),
-        ),
-    ]

safesite/migrations/0063_auto_20181206_1438.py

@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-06 14:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0062_auto_20181205_1144'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Yjsetup',
-            fields=[
-                ('yjsetupid', models.AutoField(primary_key=True, serialize=False)),
-                ('modifytime', models.DateTimeField(auto_now=True)),
-                ('monthyhavg', models.IntegerField(default='100')),
-                ('safev', models.IntegerField(default='10')),
-                ('warnv', models.IntegerField(default='15')),
-                ('alertv', models.IntegerField(default='20')),
-                ('maxv', models.IntegerField(default='50')),
-                ('yhpg', models.IntegerField(default='4')),
-                ('yhdj', models.IntegerField(default='4')),
-                ('yhsbl', models.IntegerField(default='1')),
-                ('yhzgl', models.IntegerField(default='4')),
-                ('pxdj', models.IntegerField(default='3')),
-                ('pxxg', models.IntegerField(default='4')),
-                ('yldj', models.IntegerField(default='3')),
-                ('ylxg', models.IntegerField(default='3')),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='partment',
-            name='drillavg',
-        ),
-        migrations.RemoveField(
-            model_name='partment',
-            name='trainavg',
-        ),
-        migrations.RemoveField(
-            model_name='partment',
-            name='troubleavg',
-        ),
-        migrations.AddField(
-            model_name='yjsetup',
-            name='usecomp',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'),
-        ),
-    ]

safesite/migrations/0064_auto_20181206_1442.py

@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-06 14:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0063_auto_20181206_1438'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='alertv',
-            field=models.IntegerField(blank=True, default='20', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='maxv',
-            field=models.IntegerField(blank=True, default='50', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='monthyhavg',
-            field=models.IntegerField(blank=True, default='100', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='pxdj',
-            field=models.IntegerField(blank=True, default='3', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='pxxg',
-            field=models.IntegerField(blank=True, default='4', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='safev',
-            field=models.IntegerField(blank=True, default='10', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='warnv',
-            field=models.IntegerField(blank=True, default='15', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='yhdj',
-            field=models.IntegerField(blank=True, default='4', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='yhpg',
-            field=models.IntegerField(blank=True, default='4', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='yhsbl',
-            field=models.IntegerField(blank=True, default='1', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='yhzgl',
-            field=models.IntegerField(blank=True, default='4', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='yldj',
-            field=models.IntegerField(blank=True, default='3', null=True),
-        ),
-        migrations.AlterField(
-            model_name='yjsetup',
-            name='ylxg',
-            field=models.IntegerField(blank=True, default='3', null=True),
-        ),
-    ]

safesite/migrations/0065_auto_20181206_1524.py

@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-06 15:24
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0064_auto_20181206_1442'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='pxdj',
-            new_name='pxdjqz',
-        ),
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='pxxg',
-            new_name='pxxgqz',
-        ),
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='yhdj',
-            new_name='yhdjqz',
-        ),
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='yhpg',
-            new_name='yhpgqz',
-        ),
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='yhsbl',
-            new_name='yhsblqz',
-        ),
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='yhzgl',
-            new_name='yhzglqz',
-        ),
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='yldj',
-            new_name='yldjqz',
-        ),
-        migrations.RenameField(
-            model_name='yjsetup',
-            old_name='ylxg',
-            new_name='ylxgqz',
-        ),
-    ]

safesite/migrations/0066_group_usercomp.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-07 15:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0065_auto_20181206_1524'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='group',
-            name='usercomp',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='usecompg', to='safesite.Partment'),
-        ),
-    ]

safesite/migrations/0067_auto_20181207_1600.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-07 16:00
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0066_group_usercomp'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='group',
-            old_name='usercomp',
-            new_name='usecomp',
-        ),
-    ]

safesite/migrations/0068_group_grouptype.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-07 16:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0067_auto_20181207_1600'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='group',
-            name='grouptype',
-            field=models.IntegerField(default=3),
-        ),
-    ]

safesite/migrations/0069_trouble_pgyj.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-12 15:25
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0068_group_grouptype'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trouble',
-            name='pgyj',
-            field=models.TextField(blank=True),
-        ),
-    ]

safesite/migrations/0070_auto_20181212_1628.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-12 16:28
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0069_trouble_pgyj'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='trouble',
-            name='fcyj',
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='pgyj',
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='trouble',
-            name='shyj',
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]

safesite/migrations/0071_auto_20181212_1709.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-12 17:09
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0070_auto_20181212_1628'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='trouble',
-            name='shresult',
-            field=models.IntegerField(blank=True, choices=[(1, '通过'), (2, '审核未通过'), (3, '复查未通过'), (4, '已修改'), (5, '评估未通过')], null=True),
-        ),
-    ]

safesite/migrations/0072_menu.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-17 11:07
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0071_auto_20181212_1709'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Menu',
-            fields=[
-                ('menuid', models.AutoField(primary_key=True, serialize=False)),
-                ('menuname', models.CharField(blank=True, max_length=30, null=True)),
-                ('menucode', models.CharField(blank=True, max_length=30, null=True)),
-                ('url', models.CharField(blank=True, max_length=30, null=True)),
-                ('detail', models.CharField(blank=True, max_length=100, null=True)),
-                ('bgroup', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')),
-            ],
-        ),
-    ]

safesite/migrations/0073_auto_20181217_1114.py

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-17 11:14
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0072_menu'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='menu',
-            name='bgroup',
-        ),
-        migrations.AddField(
-            model_name='menu',
-            name='bgroup',
-            field=models.ManyToManyField(related_name='bgroup', to='safesite.Group'),
-        ),
-    ]

safesite/migrations/0074_menu_parentid.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-17 11:17
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0073_auto_20181217_1114'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='menu',
-            name='parentid',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Menu'),
-        ),
-    ]

safesite/migrations/0075_auto_20181218_0847.py

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-18 08:47
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0074_menu_parentid'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='menu',
-            name='bgroup',
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='menulink',
-            field=models.CharField(default=',11,', max_length=200),
-        ),
-    ]

safesite/migrations/0076_auto_20181218_0935.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-18 09:35
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0075_auto_20181218_0847'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='group',
-            name='menulink',
-            field=models.CharField(default='11,', max_length=200),
-        ),
-    ]

safesite/migrations/0077_menu_deletemark.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-18 16:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0076_auto_20181218_0935'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='menu',
-            name='deletemark',
-            field=models.IntegerField(default='1'),
-        ),
-    ]

safesite/migrations/0078_user_iselse.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2018-12-18 17:35
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0077_menu_deletemark'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='iselse',
-            field=models.IntegerField(default='1'),
-        ),
-    ]