diff --git a/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot b/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot
index 4d35403..c0feaab 100644
--- a/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot
@@ -5,6 +5,7 @@ Library           OperatingSystem
 Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
 Library           ../../../04-CustomLibrary/Custometest/UIAssert.py
 Library           ../../../04-CustomLibrary/Custometest/ReportSchema.py
+Library           ../../../04-CustomLibrary/Custometest/JsonDiff.py
 Library           DateTime
 Library           json
 Library           Selenium2Library
@@ -62,26 +63,26 @@ ReportInterfaceTest
     # BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"yesterday","rangeInterval":"","rangeUnit":"","jobName":"${TEST NAME}","scheduleId":"","chartList":[{"chartId":${chartId},"timeGranulartiy":30,"timeUnit":"minute","disabled":false}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterCondition":null,"isDisplayTrafficTrend":0}}
 
 
-datasetjsontest
-    ${schemaurl}    Set Variable    http://192.168.44.72:8080/v1/log/schema?logType=security_event_log
-    log    date1111111
-    datasetjson    ${schemaurl}    ${token}
+Reportest
+    log    report
+    #${testdian}    传入测试点，测试点全覆盖 GroupBy  、DataBindings 、Filter  、Having
+    ${testpoint}    Set Variable    Having
+    ${logtype}    Set Variable    security_event_log
+    ${dataset_url}    Set Variable    http://${host}:${port}/${version}/report/dataset
+    ${char_url}    Set Variable    http://${host}:${port}/${version}/report/chart
+    ${report_url}    Set Variable    http://${host}:${port}/${version}/report/offlinejob
+    ${logtypelist}    create list    radius_record_log
+    ReportPositiveTest    ${host}    ${port}    ${token}    ${dataset_url}    ${char_url}    ${report_url}    ${logtypelist}
+    
 
-reporttest
-    log    开始
-    BasePostRequestOK    ${dataset_url}    {"list": {"name": "ReportInterfaceTest", "logType": "security_event_log", "groupColumnList": [{"name": "common_subscriber_id"}, {"name": "common_l7_protocol"}, {"name": "mail_account"}, {"name": "common_device_id"}], "queryColumnList": [{"name": "common_subscriber_id"}, {"name": "common_l7_protocol"}, {"name": "mail_account"}, {"name": "common_device_id"}, {"name": "common_s2c_pkt_num", "expression": "avg"}, {"name": "common_establish_latency_ms", "expression": "max"}], "filterCondition": {"andConditions": [{"orConditions": [{"name": "common_con_duration_ms", "expression": "!=", "value": ["12289"], "type": "int"}]}, {"orConditions": [{"name": "common_establish_latency_ms", "expression": ">", "value": ["12289"], "type": "int"}]}, {"orConditions": [{"name": "common_sled_ip", "expression": "!=", "value": ["192.168.50.11"], "type": "string"}]}]}, "havingCondition": {"andConditions": [{"orConditions": [{"name": "mail_to", "function": "count_distinct", "expression": "=", "value": "97658"}]}, {"orConditions": [{"name": "common_subscriber_id", "function": "count_distinct", "expression": "<", "value": "97658"}]}, {"orConditions": [{"name": "ssl_sni", "function": "count", "expression": "<", "value": "97658"}]}]}}}
-    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=test&logType=&opStartTime=&opEndTime=&opUser=
+datesettest
+    BasePostRequestOK    ${dataset_url}    {"list":{"name":"${TEST NAME}","logType":"security_event_log","groupColumnList":[{"name":"common_recv_time"}],"queryColumnList":[{"name":"common_recv_time","expression":"","label":"Receive Time"},{"name":"common_server_ip","expression":"count"},{"name":"common_server_ip","expression":"count_distinct"}],"filterCondition":null,"havingCondition":null,"isInitialize":0}}
+    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=${TEST NAME}&logType=&opStartTime=&opEndTime=&opUser=
     ${datasetId}    Set Variable    ${response}[data][list][0][id]
     
 
-chartest
-    BasePostRequestOK    ${chart_url}    {"list": {"name": "ReportInterfaceTest", "datasetId": 281, "datasetName": "", "chartType": "pie", "dataTop": 0, "orderBy": "", "orderDesc": "", "xAxis": {"dataBinding": "Client Location", "dataTop": 5, "dataType": 3}, "yAxis": [{"dataBinding": "Establish Latency(ms)", "format": "Default"}]}}
-    # ${response1}    BaseGetRequestOK    ${chart_url}    pageSize=20&pageNo=1&id=&name=${TEST NAME}&opUser=
-    # ${chartId}    Set Variable    ${response1}[data][list][0][id]
-    
-chartest11
-    log    输出111111
-    ${logtype}    Set Variable    security_event_log
-    ${schemaurl}    Set Variable    http://${host}:${port}/${version}/log/schema?logType=${logtype}
-    chartest    ${schemaurl}    ${token}
+jsondifftest
+    ${a}    Set Variable    {"list":{"name":"${TEST NAME}","logType":"security_event_log","groupColumnList":[{"name":"common_recv_time"}],"queryColumnList":[{"name":"common_recv_time","expression":"","label":"Receive Time"},{"name":"common_server_ip","expression":"count"},{"name":"common_server_ip","expression":"count_distinct"}],"filterCondition":null,"havingCondition":null,"isInitialize":0}}
+    ${b}    Set Variable    {"list":{"name":"${TEST NAME}","logType":"security_event_log","groupColumnList":[{"name":"common_recv_time"}],"queryColumnList":[{"name":"common_recv_time","expression":"","label":"Receive Time"},{"name":"common_server_ip","expression":"count"},{"name":"common_server_ip","expression":"count_distinct"}],"filterCondition":null,"havingCondition":null,"isInitialize":0}}
+    json_diff    ${a}    ${b}