From e63737a9fad5c365b7c5faa1f817cbb526d0c784 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 21 Oct 2019 10:28:58 +0800 Subject: [PATCH] groups1 --- .../migrations/0278_auto_20191018_1723.py | 24 + safesite/models.py | 2 +- safesite/templates/main.html | 3 +- .../bower_components/bootstrap/CHANGELOG.md | 5 + .../groups/bower_components/bootstrap/Gemfile | 8 + .../bower_components/bootstrap/Gemfile.lock | 74 + .../bower_components/bootstrap/Gruntfile.js | 430 + .../bootstrap/ISSUE_TEMPLATE.md | 22 + .../groups/bower_components/bootstrap/LICENSE | 21 + .../bower_components/bootstrap/README.md | 149 + .../bower_components/bootstrap/bower.json | 34 + .../bootstrap/dist/css/bootstrap-theme.css | 587 ++ .../dist/css/bootstrap-theme.css.map | 1 + .../dist/css/bootstrap-theme.min.css | 6 + .../dist/css/bootstrap-theme.min.css.map | 1 + .../bootstrap/dist/css/bootstrap.css | 6834 +++++++++++++ .../bootstrap/dist/css/bootstrap.css.map | 1 + .../bootstrap/dist/css/bootstrap.min.css | 6 + .../bootstrap/package-lock.json | 8870 +++++++++++++++++ .../bower_components/bootstrap/package.js | 32 + .../bower_components/bootstrap/package.json | 101 + static/safesite/easyui/changelog.txt | 649 ++ .../easyui/demo/timespinner/hour12.html | 25 + static/safesite/easyui/license_freeware.txt | 14 + static/safesite/easyui/readme.txt | 4 + .../safesite/easyui/themes/default/easyui.css | 10 +- static/safesite/easyui/themes/icon.css | 7 +- static/safesite/easyui/themes/icons/gmt.png | Bin 0 -> 859 bytes static/safesite/easyui/themes/react.css | 659 ++ static/safesite/muban/tm.xlsx | Bin 0 -> 10684 bytes static/safesite/mystatic/js/conversion.js | 1 + static/safesite/mystatic/js/util.js | 18 +- 32 files changed, 18584 insertions(+), 14 deletions(-) create mode 100644 safesite/migrations/0278_auto_20191018_1723.py create mode 100644 static/groups/bower_components/bootstrap/CHANGELOG.md create mode 100644 static/groups/bower_components/bootstrap/Gemfile create mode 100644 static/groups/bower_components/bootstrap/Gemfile.lock create mode 100644 static/groups/bower_components/bootstrap/Gruntfile.js create mode 100644 static/groups/bower_components/bootstrap/ISSUE_TEMPLATE.md create mode 100644 static/groups/bower_components/bootstrap/LICENSE create mode 100644 static/groups/bower_components/bootstrap/README.md create mode 100644 static/groups/bower_components/bootstrap/bower.json create mode 100644 static/groups/bower_components/bootstrap/dist/css/bootstrap-theme.css create mode 100644 static/groups/bower_components/bootstrap/dist/css/bootstrap-theme.css.map create mode 100644 static/groups/bower_components/bootstrap/dist/css/bootstrap-theme.min.css create mode 100644 static/groups/bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map create mode 100644 static/groups/bower_components/bootstrap/dist/css/bootstrap.css create mode 100644 static/groups/bower_components/bootstrap/dist/css/bootstrap.css.map create mode 100644 static/groups/bower_components/bootstrap/dist/css/bootstrap.min.css create mode 100644 static/groups/bower_components/bootstrap/package-lock.json create mode 100644 static/groups/bower_components/bootstrap/package.js create mode 100644 static/groups/bower_components/bootstrap/package.json create mode 100644 static/safesite/easyui/changelog.txt create mode 100644 static/safesite/easyui/demo/timespinner/hour12.html create mode 100644 static/safesite/easyui/license_freeware.txt create mode 100644 static/safesite/easyui/readme.txt create mode 100644 static/safesite/easyui/themes/icons/gmt.png create mode 100644 static/safesite/easyui/themes/react.css create mode 100644 static/safesite/muban/tm.xlsx create mode 100644 static/safesite/mystatic/js/conversion.js diff --git a/safesite/migrations/0278_auto_20191018_1723.py b/safesite/migrations/0278_auto_20191018_1723.py new file mode 100644 index 00000000..d704cc7b --- /dev/null +++ b/safesite/migrations/0278_auto_20191018_1723.py @@ -0,0 +1,24 @@ +# Generated by Django 2.1.5 on 2019-10-18 17:23 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0277_remove_companyinfo_liaison_fax'), + ] + + operations = [ + migrations.AlterField( + model_name='riskact', + name='area', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskactarea', to='safesite.Area'), + ), + migrations.AlterField( + model_name='safecert', + name='url', + field=models.CharField(blank=True, max_length=1000, null=True), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 76efbbe4..51c28e6c 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -374,7 +374,7 @@ class Safecert(models.Model):#安全资格证书 yxqkssj = models.DateField(null=True,blank=True) yxqjssj = models.DateField(null=True,blank=True) zszt = models.IntegerField(choices = type_choices,null=True,blank=True) - url = models.CharField(max_length=200,null=True,blank=True) + url = models.CharField(max_length=1000,null=True,blank=True) class Suggest(models.Model):#合理化建议 ZT_CHOICES = ( diff --git a/safesite/templates/main.html b/safesite/templates/main.html index f87af4a3..5a85e0aa 100644 --- a/safesite/templates/main.html +++ b/safesite/templates/main.html @@ -326,7 +326,7 @@ float: left;"> -
+