diff --git a/plugins/op_waf/index.html b/plugins/op_waf/index.html
index 28e84949e..8c4273738 100755
--- a/plugins/op_waf/index.html
+++ b/plugins/op_waf/index.html
@@ -231,6 +231,8 @@
 			<p onclick="wafScreen();">防火墙首页</p>
 			<p onclick="wafGloabl();">全局配置</p>
 			<p onclick="wafSite();">站点配置</p>
+            <p onclick="wafSite();">封锁历史</p>
+            <p onclick="wafLogs();">操作日志</p>
 		</div>
 		<!-- lib-con  -->
 		<div class="bt-w-con pd15">
diff --git a/plugins/op_waf/index.py b/plugins/op_waf/index.py
index 4fbd5bd58..0e4d1ea34 100755
--- a/plugins/op_waf/index.py
+++ b/plugins/op_waf/index.py
@@ -128,7 +128,8 @@ def reload():
     return 'ok'
 
 
-
+def getWafConf():
+    return public.getJson([])
 
 
 if __name__ == "__main__":
@@ -145,5 +146,7 @@ if __name__ == "__main__":
         print reload()
     elif func == 'conf':
         print getConf()
+    elif func == 'waf_conf':
+        print getWafConf()
     else:
         print 'error'
diff --git a/plugins/op_waf/js/op_waf.js b/plugins/op_waf/js/op_waf.js
index 2d42556d0..c3595e7bf 100755
--- a/plugins/op_waf/js/op_waf.js
+++ b/plugins/op_waf/js/op_waf.js
@@ -57,6 +57,11 @@ function wafGloabl(){
             </thead>\
         </table>\
         </div>';
+
+    con += '<div style="width:480px;"><ul class="help-info-text c7">\
+        <li>继承: 全局设置将在站点配置中自动继承为默认值</li>\
+        <li>优先级: IP白名单 > IP黑名单 > URL白名单 > URL黑名单 > CC防御 > 禁止国外IP访问 > User-Agent > URI过滤 > URL参数 > Cookie > POST</li>\
+        </ul></div>';
     $(".soft-man-con").html(con);
 }
 
@@ -74,3 +79,22 @@ function wafSite(){
         </div>';
     $(".soft-man-con").html(con);
 }
+
+
+
+function wafLogs(){
+    var con = '<div class="divtable">\
+        <table class="table table-hover waftable" style="color:#fff;">\
+            <thead><tr><th width="18%">名称</th>\
+            <th width="44%">描述</th>\
+            <th width="10%">响应</th>\
+            <th style="text-align: center;" width="10%">状态</th>\
+            <th style="text-align: right;">操作</th></tr>\
+            </thead>\
+        </table>\
+        </div>';
+
+
+    
+    $(".soft-man-con").html(con);
+}