From 1f77de9c9976a8e9dcc84cfb9a35ba945fff2302 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 25 Dec 2019 21:40:00 +0800 Subject: [PATCH] xx --- safesite/admin.py | 9 +++ safesite/models.py | 29 ++++++---- safesite/static/safesite/mystatic/js/util.js | 3 + safesite/templates/area.html | 19 ++++++- safesite/templates/dichtml.html | 13 +++++ safesite/templates/drill.html | 33 +++++++---- safesite/templates/edulessonindex.html | 33 +++++++---- safesite/templates/equipment.html | 28 +++++++++- safesite/templates/exampaper.html | 23 +++++++- safesite/templates/examtest.html | 19 +++++-- safesite/templates/examtestdetail.html | 4 ++ safesite/templates/inspect.html | 20 ++++--- safesite/templates/lawsindex.html | 24 +++++++- safesite/templates/mgtindex.html | 12 +++- safesite/templates/miss.html | 26 ++++++--- safesite/templates/notice.html | 26 ++++++--- safesite/templates/observe.html | 33 +++++++---- safesite/templates/operation.html | 11 ++++ safesite/templates/personaltrain.html | 26 +++++---- safesite/templates/putree.html | 30 ++++++++++ safesite/templates/question.html | 50 ++++++++++++++--- safesite/templates/rights.html | 2 +- safesite/templates/risk.html | 15 +++++ safesite/templates/riskadd.html | 6 ++ safesite/templates/safecert.html | 7 +++ safesite/templates/socert.html | 8 ++- safesite/templates/suggest.html | 29 ++++++---- safesite/templates/task.html | 3 + safesite/templates/train.html | 32 +++++++---- safesite/templates/trouble.html | 59 +++++++++++--------- safesite/templates/usergroup.html | 23 +++++++- safesite/templates/userhtml.html | 16 ++++++ safesite/templates/zuoyepeizhi.html | 20 ++++++- safesite/urls.py | 2 - 34 files changed, 537 insertions(+), 156 deletions(-) diff --git a/safesite/admin.py b/safesite/admin.py index 47bc150d..8f8beaad 100644 --- a/safesite/admin.py +++ b/safesite/admin.py @@ -6,3 +6,12 @@ admin.site.register(models.Trouble) admin.site.register(models.Dicclass) admin.site.register(models.Dickey) admin.site.register(models.Partment) + +@admin.register(models.Menu) +class Menuadmin(admin.ModelAdmin): + list_display = ('menuname','menucode','type','url') + list_display_links = ('menuname',) + def formfield_for_foreignkey(self, db_field, request, **kwargs): + if db_field.name == "parentid": + kwargs["queryset"] = models.Menu.objects.filter(type=1) + return super().formfield_for_foreignkey(db_field, request, **kwargs) \ No newline at end of file diff --git a/safesite/models.py b/safesite/models.py index 441d4328..f9e9a10e 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -372,17 +372,26 @@ class Groupuser2(models.Model): # 比较好的方式 class Menu(models.Model): # 菜单 - menuid = models.AutoField(primary_key=True) - menuname = models.CharField(max_length=30, blank=True, null=True) - menucode = models.CharField(max_length=30, blank=True, null=True) - url = models.CharField(max_length=30, blank=True, null=True) - detail = models.CharField(max_length=100, blank=True, null=True) + type_choices = ( + (1, '菜单'), + (2, '按钮'), + ) + menuid = models.AutoField(primary_key=True,verbose_name='ID') + menuname = models.CharField(max_length=30, blank=True, null=True,verbose_name='名称') + menucode = models.CharField(max_length=30, blank=True, null=True,verbose_name='菜单标识') + url = models.CharField(max_length=30, blank=True, null=True,verbose_name='操作地址') + detail = models.CharField(max_length=100, blank=True, null=True,verbose_name='描述') parentid = models.ForeignKey( - 'self', blank=True, null=True, on_delete=models.CASCADE) - icon = models.CharField(max_length=100, blank=True, null=True) - sortnum = models.IntegerField(default=1) - deletemark = models.IntegerField(default=1) - type = models.IntegerField(default=1)#1是菜单，2是按钮 + 'self', blank=True, null=True, on_delete=models.CASCADE,verbose_name='上级') + icon = models.CharField(max_length=100, blank=True, null=True,verbose_name='图标') + sortnum = models.IntegerField(default=1,verbose_name='排序号') + deletemark = models.IntegerField(default=1,verbose_name='删除标记') + type = models.IntegerField(default=1,choices=type_choices,verbose_name='类型')#1是菜单，2是按钮 + class Meta: + verbose_name = '菜单&按钮' + verbose_name_plural = "菜单&按钮" + def __str__(self): + return self.menuname+self.menucode class Yjyc(models.Model): # 预警预测表 diff --git a/safesite/static/safesite/mystatic/js/util.js b/safesite/static/safesite/mystatic/js/util.js index 8053b121..28bcd191 100644 --- a/safesite/static/safesite/mystatic/js/util.js +++ b/safesite/static/safesite/mystatic/js/util.js @@ -164,6 +164,9 @@ function convertmenu(rows) { var row = rows[i]; if (row.parentid == node.id) { var child = { id: row.menuid, text: row.menuname, attributes: row.url, iconCls: row.icon, checked: row.checked }; + if (row.type!=1){ + node.state = 'closed' + } if (node.children) { node.children.push(child); } else { diff --git a/safesite/templates/area.html b/safesite/templates/area.html index 88095640..a53bfa81 100644 --- a/safesite/templates/area.html +++ b/safesite/templates/area.html @@ -6,12 +6,25 @@
+ + {% load myfilter %} + {% if request|has_permission:'b_map_add' %} 新增 + data-options="iconCls:'fa-plus',plain:true">新增 + {% endif %} + {% if request|has_permission:'b_map_upd' %} 编辑 + data-options="iconCls:'fa-pencil',plain:true">编辑 + {% endif %} + {% if request|has_permission:'b_map_del' %} 删除 + data-options="iconCls:'fa-trash',plain:true">删除 + {% endif %} + + + + +
diff --git a/safesite/templates/dichtml.html b/safesite/templates/dichtml.html index 39e55ba8..06d9405b 100644 --- a/safesite/templates/dichtml.html +++ b/safesite/templates/dichtml.html @@ -5,9 +5,22 @@
+ + {% load myfilter %} + {% if request|has_permission:'b_dict_add' %} 新增 + {% endif %} + {% if request|has_permission:'b_dict_upd' %} 编辑 + {% endif %} + {% if request|has_permission:'b_dict_del' %} 删除 + {% endif %} + + + + +
diff --git a/safesite/templates/drill.html b/safesite/templates/drill.html index 26aa7356..ce8b9222 100644 --- a/safesite/templates/drill.html +++ b/safesite/templates/drill.html @@ -1,16 +1,7 @@
-
-
+ -
+
详细筛选 +
+
+ {% load myfilter %} + {% if request|has_permission:'b_drill_add' %} + 新增 + {% endif %} + 评估 + + {% if request|has_permission:'b_drill_del' %} + 删除 + {% endif %} + {% if request|has_permission:'b_drill_detail' %} + 查看详情 + {% endif %} + {% if request|has_permission:'b_drill_exportdoc' %} + 导出Word + {% endif %} + {% if request|has_permission:'b_drill_exportxls' %} + 导出Excel + {% endif %}
diff --git a/safesite/templates/edulessonindex.html b/safesite/templates/edulessonindex.html index 27bf0401..0ee05fd9 100644 --- a/safesite/templates/edulessonindex.html +++ b/safesite/templates/edulessonindex.html @@ -1,16 +1,7 @@ -
-
- 上传视频 - 上传文件 - 删除文件 + -
+
+
+
+ {% load myfilter %} + {% if request|has_permission:'b_edu_addvideo' %} + 上传视频 + {% endif %} + {% if request|has_permission:'b_edu_addfile' %} + 上传文件 + {% endif %} + {% if request|has_permission:'b_edu_del' %} + 删除文件 + {% endif %} + {% if request|has_permission:'b_edu_study' %} + 点击学习 + {% endif %} + {% if request|has_permission:'b_edu_detail' %} + 观看历史 + {% endif %} + +
diff --git a/safesite/templates/equipment.html b/safesite/templates/equipment.html index ca770a8f..d784c15f 100644 --- a/safesite/templates/equipment.html +++ b/safesite/templates/equipment.html @@ -6,14 +6,22 @@
+ {% load myfilter %} + {% if request|has_permission:'b_equipment_add' %} 新增设备 + + {% endif %} + {% if request|has_permission:'b_equipment_import' %} 导入设备 + {% endif %} + {% if request|has_permission:'b_equipment_del' %} 删除 + {% endif %}
@@ -29,7 +37,12 @@ 查询 + {% if request|has_permission:'b_equipment_exportxls' %} 导出Excel + {% endif %} + {% if request|has_permission:'b_equipment_change' %} + + {% endif %}
@@ -76,7 +89,9 @@ style="height:100px;width:90%" data-options="multiline:true" /> - 保存 + + 保存 + @@ -99,6 +114,11 @@
查询 diff --git a/safesite/templates/zuoyepeizhi.html b/safesite/templates/zuoyepeizhi.html index 3f1042a4..531ec1bf 100644 --- a/safesite/templates/zuoyepeizhi.html +++ b/safesite/templates/zuoyepeizhi.html @@ -6,15 +6,31 @@
+ + {% load myfilter %} + {% if request|has_permission:'b_zuoyepeizhi_risk_add' %} 新增 - 删除 + {% endif %} + {% if request|has_permission:'b_zuoyepeizhi_risk_del' %} + 删除 + {% endif %} + + + +
+ {% if request|has_permission:'b_zuoyepeizhi_shenpi_add' %} 新增 - 删除 + {% endif %} + {% if request|has_permission:'b_zuoyepeizhi_shenpi_del' %} + 删除 + {% endif %} + +
diff --git a/safesite/urls.py b/safesite/urls.py index 9359a89c..5f678d62 100644 --- a/safesite/urls.py +++ b/safesite/urls.py @@ -184,8 +184,6 @@ urlpatterns = [ path('api/getresbilitydata',views.getresbilitydata),#责任制 path('api/getprodata',views.getprodata),#操作规程 path('boUR15vyNu.txt',views.minip_px), - - #合作模块 path('edu/',include('safesite.edu.urls')), path('datashow/',datashowview.area, name='datashow'),