From 8bda1e3d2ca60a765b31c37e9c82b6acc987993b Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 25 Dec 2019 13:55:25 +0800
Subject: [PATCH 1/2] xuigaiquanxian

---
 safesite/templates/riskadd.html | 6 ++++++
 safesite/urls.py                | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/safesite/templates/riskadd.html b/safesite/templates/riskadd.html
index 9fc16317..0937d301 100644
--- a/safesite/templates/riskadd.html
+++ b/safesite/templates/riskadd.html
@@ -74,6 +74,12 @@
 </div>
 <script>
     var riskactid = {{ id }}
+    // $("#result").combobox({
+    //    url: 'api/getprodata?a=dic&&dicclass=33',
+    //    valueField: 'value',
+    //    textField: 'text',
+    //    editable: false,
+    //});
     $.get('api/riskact?a=detail&id=' + riskactid, function (res) {
         var data = res.data
         $('#fxqy').textbox('setValue', data.area__name)
diff --git a/safesite/urls.py b/safesite/urls.py
index 9fa5e944..5f678d62 100644
--- a/safesite/urls.py
+++ b/safesite/urls.py
@@ -181,14 +181,9 @@ urlpatterns = [
     path('test',views.test),
     path('.well-known/pki-validation/fileauth.txt',views.vewechat),#验证
     path('miniprogram/boUR15vyNu.txt',views.minip_px),
-<<<<<<< HEAD
     path('api/getresbilitydata',views.getresbilitydata),#责任制
     path('api/getprodata',views.getprodata),#操作规程
-=======
     path('boUR15vyNu.txt',views.minip_px),
-
->>>>>>> a4a3b20c8aa023a59b49709971b32d9bc8d9bb43
-
     #合作模块
     path('edu/',include('safesite.edu.urls')),
     path('datashow/',datashowview.area, name='datashow'),

From c1fc602e26a87351fb3cbaf5b5cbb147751d95f8 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 25 Dec 2019 16:54:57 +0800
Subject: [PATCH 2/2] annaiu

---
 safesite/templates/area.html          | 19 ++++++++--
 safesite/templates/dichtml.html       | 13 +++++++
 safesite/templates/exampaper.html     | 23 ++++++++++--
 safesite/templates/lawsindex.html     | 24 ++++++++++++-
 safesite/templates/mgtindex.html      | 12 +++++--
 safesite/templates/personaltrain.html | 26 ++++++++------
 safesite/templates/putree.html        | 30 ++++++++++++++++
 safesite/templates/question.html      | 50 ++++++++++++++++++++++-----
 safesite/templates/safecert.html      |  7 ++++
 safesite/templates/socert.html        |  8 ++++-
 safesite/templates/usergroup.html     | 23 ++++++++++--
 safesite/templates/userhtml.html      | 16 +++++++++
 safesite/templates/zuoyepeizhi.html   | 20 +++++++++--
 13 files changed, 238 insertions(+), 33 deletions(-)

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 @@
         <!-- <div id="gwfl" height="30%"></div> -->
         <div id="qylb" height="70%" title="区域列表">
             <div id="qylbbar" style="padding:5px;height:auto">
+
+                {% load myfilter %}
+                {% if request|has_permission:'b_map_add' %}
                 <a id="addqy" onclick="javascript:opendg('新增区域','html/area/add')" class="easyui-linkbutton"
-                    data-options="iconCls:'fa-plus',plain:true">新增</a>
+                   data-options="iconCls:'fa-plus',plain:true">新增</a>
+                {% endif %}
+                {% if request|has_permission:'b_map_upd' %}
                 <a id="editqy" onclick="editqy()" class="easyui-linkbutton"
-                    data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+                   data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+                {% endif %}
+                {% if request|has_permission:'b_map_del' %}
                 <a id="delqy'" onclick="delqy()" class="easyui-linkbutton"
-                    data-options="iconCls:'fa-trash',plain:true">删除</a>
+                   data-options="iconCls:'fa-trash',plain:true">删除</a>
+                {% endif %}
+
+
+
+
+
             </div>
             <ul id="qylblist" data-options="animate:true,toolbar:'#qylbbar'" style="height:100%"></ul>
         </div>
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 @@
     <div data-options="region:'center',title:'字典内容',split:true,border:false" style="height:100%;">
 
         <div id="dicbar" style="padding:5px;height:auto">
+
+            {% load myfilter %}
+            {% if request|has_permission:'b_dict_add' %}
             <a id="adddict" onclick="adddict()">新增</a>
+            {% endif %}
+            {% if request|has_permission:'b_dict_upd' %}
             <a id="editdict" onclick="editdict()">编辑</a>
+            {% endif %}
+            {% if request|has_permission:'b_dict_del' %}
             <a id="deldict" onclick="deldict()">删除</a>
+            {% endif %}
+
+
+
+
+
         </div>
         <table id="dictable" style="height:100%;"></table>
 
diff --git a/safesite/templates/exampaper.html b/safesite/templates/exampaper.html
index 19ebcf91..2d3bd933 100644
--- a/safesite/templates/exampaper.html
+++ b/safesite/templates/exampaper.html
@@ -1,11 +1,30 @@
 <table id="sjtable" style="width:auto;height:100%;"></table>
 <div id="sjtablebar" style="padding:6px;height:auto">
     <div style="margin-bottom:2px;margin-top:2px">
+
+
+        {% load myfilter %}
+        {% if request|has_permission:'b_exampaper_zujuan' %}
         <a id="addsj" class="easyui-linkbutton" onclick="addsj()" data-options="iconCls: 'fa-plus',plain:true">手动组卷</a>
+        {% endif %}
+        {% if request|has_permission:'b_exampaper_upd' %}
         <a id="editsj" class="easyui-linkbutton" onclick="editsj()" data-options="iconCls: 'fa-pencil',plain:true">编辑试卷</a>
-        <a id="stopsj" class="easyui-linkbutton" onclick="stopsj()" data-options="iconCls: 'fa-stop',plain:true">停用</a> 
-        <a id="delsj" class="easyui-linkbutton" onclick="delsj()" data-options="iconCls: 'fa-trash',plain:true">删除</a> 
+        {% endif %}
+        {% if request|has_permission:'b_exampaper_stop' %}
+        <a id="stopsj" class="easyui-linkbutton" onclick="stopsj()" data-options="iconCls: 'fa-stop',plain:true">停用</a>
+        {% endif %}
+        {% if request|has_permission:'b_exampaper_del' %}
+        <a id="delsj" class="easyui-linkbutton" onclick="delsj()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
+        {% endif %}
+        {% if request|has_permission:'b_exampaper_daochu' %}
         <a id="exportsjword" onclick="exportsjword()" class="easyui-linkbutton" data-options="iconCls: 'fa-download',plain:true">导出Word</a>
+        {% endif %}
+
+
+
+
+
+
     </div>
 </div>
 <script>
diff --git a/safesite/templates/lawsindex.html b/safesite/templates/lawsindex.html
index 7a83acd3..9736c48b 100644
--- a/safesite/templates/lawsindex.html
+++ b/safesite/templates/lawsindex.html
@@ -6,9 +6,20 @@
         <!-- <div id="gwfl" height="30%"></div> -->
         <div id="zjfl" height="60%" title="自建分类">
             <div id="zjflbar" style="padding:5px;height:auto">
+
+                {% load myfilter %}
+                {% if request|has_permission:'b_laws_user_add' %}
                 <a id="addtmfl2" onclick="javascript:opendg('新建分类','rlt/html/laws/add')" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">新增</a>
+                {% endif %}
+                {% if request|has_permission:'b_laws_user_upd' %}
                 <a id="edittmfl2" onclick="edittmfl2()" class="easyui-linkbutton" data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+                {% endif %}
+                {% if request|has_permission:'b_laws_user_del' %}
                 <a id="deltmfl2" onclick="deltmfl2()" class="easyui-linkbutton" data-options="iconCls:'fa-trash',plain:true">删除</a>
+                {% endif %}
+
+
+
             </div>
             <ul id="zjfltree" data-options="animate:true,toolbar:'#zjflbar'"></ul>
         </div>
@@ -16,13 +27,24 @@
     <div data-options="region:'center',title:'法律法规管理',split:true,border:false" style="height:100%;">
 
         <div id="tmbar" style="padding:5px;height:auto">
+
+            {% if request|has_permission:'b_laws_add' %}
             <a id="addtm" onclick="javascript:opendg('新增法律法规信息','rlt/html/laws/addlaws')" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">新建</a>
+            {% endif %}
+            {% if request|has_permission:'b_laws_upd' %}
             <a id="edittm" onclick="edittm()" class="easyui-linkbutton"
                data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+            {% endif %}
+            {% if request|has_permission:'b_laws_del' %}
+
             <a id="deltm" onclick="deltm()" class="easyui-linkbutton"
                data-options="iconCls:'fa-trash',plain:true">删除</a>
+            {% endif %}
+
+
+
             <!--<a id="edittm" onclick="edittm()" class="easyui-linkbutton"
-               data-options="iconCls:'fa-pencil',plain:true">详情</a>-->
+    data-options="iconCls:'fa-pencil',plain:true">详情</a>-->
         </div>
         <table id="tmtable" style="height:100%;"></table>
 
diff --git a/safesite/templates/mgtindex.html b/safesite/templates/mgtindex.html
index 09e87bae..022bf90f 100644
--- a/safesite/templates/mgtindex.html
+++ b/safesite/templates/mgtindex.html
@@ -1,10 +1,16 @@
 
     <div id="edubar" style="padding: 4px;height: 40px;background-color:#FCFCFC">
         <div style="width: 500px;padding: 5px;">
-            <a id="addedu" class="easyui-linkbutton" onclick="javascript:opendg('新增文件','mgt/add')" data-options="iconCls: 'fa-plus',plain:true">新增</a>
-            <a id="deledu" class="easyui-linkbutton" onclick="deledu()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
 
-       
+
+            {% load myfilter %}
+            {% if request|has_permission:'b_mgt_add' %}
+            <a id="addedu" class="easyui-linkbutton" onclick="javascript:opendg('新增文件','mgt/add')" data-options="iconCls: 'fa-plus',plain:true">新增</a>
+            {% endif %}
+            {% if request|has_permission:'b_mgt_del' %}
+            <a id="deledu" class="easyui-linkbutton" onclick="deledu()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
+            {% endif %}
+
 
         </div>
        
diff --git a/safesite/templates/personaltrain.html b/safesite/templates/personaltrain.html
index 16b942d2..628a3d9e 100644
--- a/safesite/templates/personaltrain.html
+++ b/safesite/templates/personaltrain.html
@@ -4,22 +4,26 @@
     <div>
         <label>部门</label>
         <input class="easyui-combobox" id="sbm" editable=false data-options="
-        method: 'get',
-        loadFilter: function(rows){
-            return convert(rows);
+               method: 'get' ,
+               loadFilter: function(rows){
+               return convert(rows);
+               },
+               formatter:function(node){
+               var s=node.text;
+               if (node.children){
+               s +='&nbsp;<span style=\' color:blue\'>(' + node.children.length + ')</span>';
+        }
+        return s;
         },
-        formatter:function(node){
-                var s = node.text;
-                if (node.children){
-                    s += '&nbsp;<span style=\'color:blue\'>(' + node.children.length + ')</span>';
-                }
-                return s;
-            },
-    ">
+        ">
         <label>人员</label>
         <input class="easyui-combobox" id="sry" editable=false>
         <a class="easyui-linkbutton" data-options="iconCls: 'fa-search',plain:true" onclick="grpxsearch()">查询</a>
+        {% load myfilter %}
+        {% if request|has_permission:'b_personaltrain_exportexl' %}
         <a class="easyui-linkbutton" data-options="iconCls: 'fa-download',plain:true" onclick="exportgrpxexcel()">导出Excel</a>
+        {% endif %}
+
     </div>
 </div>
 <script>
diff --git a/safesite/templates/putree.html b/safesite/templates/putree.html
index 01c0e685..500ba14e 100644
--- a/safesite/templates/putree.html
+++ b/safesite/templates/putree.html
@@ -1,9 +1,20 @@
 <div class="easyui-layout" style="width:100%;height:100%;">
     <div data-options="region:'west',title:'组织机构',split:true,border:false" style="width: 400px;height:100%;">
         <div id="partbar" style="padding:5px;height:auto">
+
+            {% load myfilter %}
+            {% if request|has_permission:'b_mgt_add' %}
             <a id="addpart" onclick="addpart()">新增</a>
+            {% endif %}
+            {% if request|has_permission:'b_putree_upd' %}
             <a id="editpart" onclick="editpart()">编辑</a>
+            {% endif %}
+            {% if request|has_permission:'b_putree_del' %}
+
             <a id="delpart" onclick="delpart()">删除</a>
+            {% endif %}
+
+
         </div>
         <ul id="parttree" data-options="animate:true,toolbar:'#partbar'"></ul>
     </div>
@@ -68,16 +79,35 @@
 
     </div>
     <div id='partzgbar'>
+        {% if request|has_permission:'b_putree_director_add' %}
         <a id="addpartzg" onclick="addpartzg()" class="easyui-linkbutton" iconCls='fa-plus' plain=true>新增</a>
+        {% endif %}
+        {% if request|has_permission:'b_putree_director_del' %}
+
         <a id="removepartzg" onclick="removepartzg()" class="easyui-linkbutton" iconCls='fa-close' plain=true>移除</a>
+        {% endif %}
+
+
     </div>
     <div id='partaqybar'>
+        {% if request|has_permission:'b_putree_hon_add' %}
         <a id="addpartaqy" onclick="addpartaqy()" class="easyui-linkbutton" iconCls='fa-plus' plain=true>新增</a>
+        {% endif %}
+        {% if request|has_permission:'b_putree_hon_del' %}
+
         <a id="removepartaqy" onclick="removepartaqy()" class="easyui-linkbutton" iconCls='fa-close' plain=true>移除</a>
+        {% endif %}
+
     </div>
     <div id='partbsqbar'>
+        {% if request|has_permission:'b_putree_author_add' %}
         <a id="addpartaqy" onclick="addpartbsq()" class="easyui-linkbutton" iconCls='fa-plus' plain=true>新增</a>
+        {% endif %}
+        {% if request|has_permission:'b_putree_author_del' %}
         <a id="removepartaqy" onclick="removepartbsq()" class="easyui-linkbutton" iconCls='fa-close' plain=true>移除</a>
+        {% endif %}
+
+
     </div>
 </div>
 </div>
diff --git a/safesite/templates/question.html b/safesite/templates/question.html
index 41f97059..457b589f 100644
--- a/safesite/templates/question.html
+++ b/safesite/templates/question.html
@@ -5,26 +5,60 @@
         </div>
         <!-- <div id="gwfl" height="30%"></div> -->
         <div id="zjfl" height="60%" title="自建分类">
-                <div id="zjflbar" style="padding:5px;height:auto">
-                        <a id="addtmfl2" onclick="javascript:opendg('新建分类','html/questioncat/add')" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">新增</a>
-                        <a id="edittmfl2" onclick="edittmfl2()" class="easyui-linkbutton" data-options="iconCls:'fa-pencil',plain:true">编辑</a>
-                        <a id="deltmfl2" onclick="deltmfl2()" class="easyui-linkbutton" data-options="iconCls:'fa-trash',plain:true">删除</a>
-                    </div>
+            <div id="zjflbar" style="padding:5px;height:auto">
+
+                {% load myfilter %}
+                {% if request|has_permission:'b_question_user_add' %}
+                <a id="addtmfl2" onclick="javascript:opendg('新建分类','html/questioncat/add')" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">新增</a>
+                {% endif %}
+                {% if request|has_permission:'b_question_user_upd' %}
+                <a id="edittmfl2" onclick="edittmfl2()" class="easyui-linkbutton" data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+                {% endif %}
+                {% if request|has_permission:'b_question_user_del' %}
+                <a id="deltmfl2" onclick="deltmfl2()" class="easyui-linkbutton" data-options="iconCls:'fa-trash',plain:true">删除</a>
+                {% endif %}
+
+
+
+
+
+            </div>
             <ul id="zjfltree" data-options="animate:true,toolbar:'#zjflbar'"></ul>
         </div>
     </div>
     <div data-options="region:'center',title:'题目',split:true,border:false" style="height:100%;">
 
         <div id="tmbar" style="padding:5px;height:auto">
+
+            {% if request|has_permission:'b_question_danxuan' %}
             <a id="addtm" onclick="javascript:opendg('新增单选','html/question/add')" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">单选题</a>
+            {% endif %}
+            {% if request|has_permission:'b_question_duoxuan' %}
             <a onclick="javascript:opendg('新增多选','html/question/add2')" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">多选题</a>
+            {% endif %}
+            {% if request|has_permission:'b_question_panduan' %}
             <a onclick="javascript:opendg('新增判断','html/question/add3')" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">判断题</a>
+            {% endif %}
+            {% if request|has_permission:'b_question_upd' %}
             <a id="edittm" onclick="edittm()" class="easyui-linkbutton"
-                data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+               data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+            {% endif %}
+            {% if request|has_permission:'b_question_del' %}
             <a id="deltm" onclick="deltm()" class="easyui-linkbutton"
-                data-options="iconCls:'fa-trash',plain:true">删除</a>
+               data-options="iconCls:'fa-trash',plain:true">删除</a>
+            {% endif %}
+            {% if request|has_permission:'b_question_daoru' %}
             <a id="drtms" onclick="javascript:$('#drtmdg').dialog('open').window('center');" class="easyui-linkbutton"
-                data-options="iconCls:'fa-upload',plain:true">导入试题</a>
+               data-options="iconCls:'fa-upload',plain:true">导入试题</a>
+            {% endif %}
+
+
+
+
+
+
+
+
         </div>
         <table id="tmtable" style="height:100%;"></table>
 
diff --git a/safesite/templates/safecert.html b/safesite/templates/safecert.html
index 3b3aabfb..5fd6d1c1 100644
--- a/safesite/templates/safecert.html
+++ b/safesite/templates/safecert.html
@@ -2,9 +2,16 @@
 <a id="downa" href="" target="_blank" style="display:none"></a>
 <div id="aqzstablebar" style="padding: 4px;height: 40px;">
     <div style="width: 300px;float: right;padding: 5px;">
+        {% load myfilter %}
+        {% if request|has_permission:'b_safecert_add' %}
         <a id="addaqzs" class="easyui-linkbutton" onclick="addaqzs()" data-options="iconCls: 'fa-plus',plain:true">新增</a>
+        {% endif %}
+        {% if request|has_permission:'b_safecert_del' %}
         <a id="delaqzs" class="easyui-linkbutton" onclick="delaqzs()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
+        {% endif %}
+        {% if request|has_permission:'b_safecert_exportexl' %}
         <a id="exportaqzsexcel" onclick="javascript:$('#aqzstable').datagrid('toExcel','证书.xls')" class="easyui-linkbutton" data-options="iconCls: 'fa-download',plain:true">导出Excel</a>
+        {% endif %}
     </div>
     <div style="padding: 5px;float: left;width: 400px;">
         <label>快捷查询</label>
diff --git a/safesite/templates/socert.html b/safesite/templates/socert.html
index 9ad33842..d4caada2 100644
--- a/safesite/templates/socert.html
+++ b/safesite/templates/socert.html
@@ -2,10 +2,16 @@
 <a id="downa" href="" target="_blank" style="display:none"></a>
 <div id="tzzstablebar" style="padding: 4px;height: 40px;">
     <div style="width: 300px;float: right;padding: 5px;">
-
+        {% load myfilter %}
+        {% if request|has_permission:'b_socert_add' %}
         <a id="addtzzs" class="easyui-linkbutton" onclick="addtzzs()" data-options="iconCls: 'fa-plus',plain:true">新增</a>
+        {% endif %}
+        {% if request|has_permission:'b_socert_del' %}
         <a id="deltzzs" class="easyui-linkbutton" onclick="deltzzs()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
+        {% endif %}
+        {% if request|has_permission:'b_socert_exportexl' %}
         <a id="exporttzzsexcel" onclick="javascript:$('#tzzstable').datagrid('toExcel','证书.xls')" class="easyui-linkbutton" data-options="iconCls: 'fa-download',plain:true">导出Excel</a>
+        {% endif %}
     </div>
     <div style="padding: 5px;float: left;width: 400px;">
         <!-- <a id="tzzssearch" onclick="tzzssearch()" class="easyui-linkbutton" data-options="iconCls: 'fa-search',plain:true">查询</a> -->
diff --git a/safesite/templates/usergroup.html b/safesite/templates/usergroup.html
index bf2d05ac..be3f3982 100644
--- a/safesite/templates/usergroup.html
+++ b/safesite/templates/usergroup.html
@@ -1,17 +1,36 @@
     <div class="easyui-layout" style="width:100%;height:100%;fit:true">
     <div data-options="region:'west',title:'用户组',split:true,border:false" id='groupdiv' style="width:300px;height:100%;">
         <div id="groupbar" style="padding:5px;height:auto">
+
+            {% load myfilter %}
+            {% if request|has_permission:'b_usergroup_add' %}
             <a id="addgroup" onclick="addgroup()">新增</a>
+            {% endif %}
+            {% if request|has_permission:'b_usergroup_del' %}
             <a id="delgroup" onclick="delgroup()">删除</a>
+            {% endif %}
+            {% if request|has_permission:'b_usergroup_author' %}
             <a id="souquan" class="easyui-linkbutton" iconCls="fa-plug" plain=true onclick="souquan()">授权</a>
+            {% endif %}
+
+
+
+
+
         </div>
         <table id="grouptable" style="height:100%;"></table>
     </div>
     <div data-options="region:'center',title:'用户组成员',split:true,border:false"  id='guserdiv' style="height:100%;">
             
         <div id="guserbar" style="padding:5px;height:auto">
-            <a  id="addguser" onclick="addguser()">新增</a>
-            <a  id="delguser" onclick="delguser()">移除</a>
+            {% if request|has_permission:'b_usergroup_user_add' %}
+            <a id="addguser" onclick="addguser()">新增</a>
+            {% endif %}
+            {% if request|has_permission:'b_usergroup_user_del' %}
+
+            <a id="delguser" onclick="delguser()">移除</a>
+            {% endif %}
+
         </div>
         <table id="gusertable" style="height:100%;"></table>
     </div>
diff --git a/safesite/templates/userhtml.html b/safesite/templates/userhtml.html
index fe5ec32d..4c10eb55 100644
--- a/safesite/templates/userhtml.html
+++ b/safesite/templates/userhtml.html
@@ -5,11 +5,27 @@
     <div data-options="region:'center',title:'用户列表',split:true,border:false" style="height:100%;">
         <div id="userbar" style="padding:5px;height:auto">
             <div>
+
+                {% load myfilter %}
+                {% if request|has_permission:'b_user_add' %}
                 <a id="adduser" onclick="adduser()" class="easyui-linkbutton" data-options="iconCls:'fa-plus',plain:true">新增</a>
+                {% endif %}
+                {% if request|has_permission:'b_user_upd' %}
                 <a id="edituser" onclick="edituser()" class="easyui-linkbutton" data-options="iconCls:'fa-pencil',plain:true">编辑</a>
+                {% endif %}
+                {% if request|has_permission:'b_user_del' %}
                 <a id="deluser" onclick="deluser()" class="easyui-linkbutton" data-options="iconCls:'fa-trash',plain:true">删除</a>
+                {% endif %}
+                {% if request|has_permission:'b_user_updpwd' %}
                 <a id="resetpass" onclick="resetpass()" class="easyui-linkbutton" data-options="iconCls:'fa-window-restore',plain:true">重置密码</a>
+                {% endif %}
+                {% if request|has_permission:'b_user_up' %}
                 <a id="drusers" onclick="drusers()" class="easyui-linkbutton" data-options="iconCls:'fa-upload',plain:true">导入用户</a>
+                {% endif %}
+
+
+
+
                 <script></script>
                 <label>姓名</label><input id='sname' class='easyui-textbox' />
                 <a onclick="usersearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
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 @@
         <div style="height:50%">
             <table id="fxcstable" style="width:auto;height:100%;" title='风险分析和安全措施'></table>
             <div id="fxcsbar" style="padding:6px;height:auto">
+
+                {% load myfilter %}
+                {% if request|has_permission:'b_zuoyepeizhi_risk_add' %}
                 <a id="addfxcs" class="easyui-linkbutton" onclick="addfxcs()" data-options="iconCls: 'fa-plus',plain:true">新增</a>
-                <a id="delfxcs" class="easyui-linkbutton" onclick="delfxcs()" data-options="iconCls: 'fa-trash',plain:true">删除</a> 
+                {% endif %}
+                {% if request|has_permission:'b_zuoyepeizhi_risk_del' %}
+                <a id="delfxcs" class="easyui-linkbutton" onclick="delfxcs()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
+                {% endif %}
+
+
+
+
             </div>
         </div>
         <div style="height:50%">
                 <table id="spjdtable" style="width:auto;height:100%;" title='审批节点(除作业部门和属地部门外,按排序进行)'></table>
                 <div id="spjdbar" style="padding:6px;height:auto">
+                    {% if request|has_permission:'b_zuoyepeizhi_shenpi_add' %}
                     <a id="addspjd" class="easyui-linkbutton" onclick="addspjd()" data-options="iconCls: 'fa-plus',plain:true">新增</a>
-                    <a id="delspjd" class="easyui-linkbutton" onclick="delspjd()" data-options="iconCls: 'fa-trash',plain:true">删除</a> 
+                    {% endif %}
+                    {% if request|has_permission:'b_zuoyepeizhi_shenpi_del' %}
+                    <a id="delspjd" class="easyui-linkbutton" onclick="delspjd()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
+                    {% endif %}
+
+
                 </div>
             </div>
     </div>