diff --git a/groups/templates/groups/login.html b/groups/templates/groups/login.html index 6b9a44a9..6d12ef52 100644 --- a/groups/templates/groups/login.html +++ b/groups/templates/groups/login.html @@ -1,62 +1,116 @@ -{% load static %} - - - - - - - - - - - 登录 - - -
-
- -
-
+ + - - - - - + + {% load static %} + + + 集团后台|登陆 + + + + + + + + + + + + - - - + + + + + \ No newline at end of file + + + + \ No newline at end of file diff --git a/groups/templates/groups/login33.html b/groups/templates/groups/login33.html new file mode 100644 index 00000000..8ea32f37 --- /dev/null +++ b/groups/templates/groups/login33.html @@ -0,0 +1,62 @@ +{% load static %} + + + + + + + + + + + 登录 + + +
+
+ +
+
+ + + + + + + + + + \ No newline at end of file diff --git a/groups/views.py b/groups/views.py index 6b3f0323..b354a695 100644 --- a/groups/views.py +++ b/groups/views.py @@ -34,7 +34,6 @@ def login(request): request.session['user_name'] = user.username return redirect('/groups/index/') else: - message = '密码不正确!' return render(request, 'groups/login.html', locals()) else: return render(request, 'groups/login.html', locals()) 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 bf09e322..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 = ( @@ -693,7 +693,7 @@ class Inspect(models.Model):#设备巡检记录 class RiskAct(models.Model):#风险点表 id = models.AutoField(primary_key=True) - area = models.ForeignKey(Area,on_delete=models.CASCADE,null=True,blank=True) + area = models.ForeignKey(Area,on_delete=models.CASCADE,null=True,blank=True,related_name='riskactarea') place = models.CharField(max_length=50,null=True,blank=True) type = models.ForeignKey(Dickey,on_delete=models.CASCADE,null=True,blank=True) name = models.CharField(max_length=200,null=True,blank=True) diff --git a/safesite/static/safesite/easyui/themes/icon.css b/safesite/static/safesite/easyui/themes/icon.css index ec677c31..b3d93cc6 100644 --- a/safesite/static/safesite/easyui/themes/icon.css +++ b/safesite/static/safesite/easyui/themes/icon.css @@ -166,7 +166,9 @@ .icon-taskdo{ background:url('icons/taskdo.png') no-repeat center center; } - +.icon-bhr { + background: url('icons/behv.png') no-repeat center center; +} diff --git a/safesite/static/safesite/easyui/themes/icons/behv.png b/safesite/static/safesite/easyui/themes/icons/behv.png new file mode 100644 index 00000000..8ce20513 Binary files /dev/null and b/safesite/static/safesite/easyui/themes/icons/behv.png differ diff --git a/safesite/templates/behavior.html b/safesite/templates/behavior.html new file mode 100644 index 00000000..1fe2d098 --- /dev/null +++ b/safesite/templates/behavior.html @@ -0,0 +1,321 @@ + + + + +
+ + + +
+ +
+
+
+ + + + +
+ +
+
+
+ + + + + + + + + + +
用户ID观察记录人姓名观察部门行为观察数
+
+
+ 查询 + 导出 +
+ + + +
+ +
+
+ + + +
+
+
+ + + \ No newline at end of file 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;"> -
+