Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite

safesite/models.py

@@ -378,7 +378,6 @@ class Miss(models.Model):  # 未遂事件
     reads = models.ManyToManyField(
         User, related_name='misstouser', through='Missto')
 
-
 class Missto(models.Model):  # 未遂事件阅读表
     id = models.AutoField(primary_key=True)
     miss = models.ForeignKey(Miss, on_delete=models.CASCADE)
@@ -386,6 +385,20 @@ class Missto(models.Model):  # 未遂事件阅读表
     read = models.IntegerField(default=0)
     submittime = models.DateTimeField(default=timezone.now)
 
+class Offence(models.Model):
+    """
+    违章举报
+    """
+    type = models.CharField(verbose_name="人员类型", default="公司员工", max_length=200)
+    dept = models.CharField(verbose_name="车间", default="", max_length=200)
+    post = models.CharField(verbose_name="岗位", default="", max_length=200)
+    area = models.CharField(verbose_name="具体区域", default="", max_length=200)
+    parter = models.CharField(verbose_name="当事人", default="", max_length=200)
+    description = models.TextField("描述", null=True, blank=True)
+    imgs = models.TextField("图片地址", null=True, blank=True)
+    reporter = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name="举报人")
+
+
 
 class Group(models.Model):  # 用户组，岗位
     type_choices = (

safesite/static/safesite/easyui/themes/icon.css

@@ -203,7 +203,9 @@
     background: url('icons/discharge.png') no-repeat center center;
 }
 
-
+.icon-offence {
+    background: url('icons/offence.png') no-repeat center center;
+}