diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java
index 6ec7bd94..31351761 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java
@@ -26,9 +26,10 @@ public class ReportDataController extends BaseController {
     private ITBdProducttypeService producttypeService;
     @RequiresPermissions("nanjing:report:view")
     @GetMapping()
-    public String stationProduct(ModelMap map)
+    public String reportData(ModelMap map)
     {
-        return prefix + "/Report";
+//        return prefix + "/Report";
+        return "redirect:"+"http://127.0.0.1:18080/RDP-SERVER/rdppage/main/d354a3beb6dae7938155b3f9a962e479";
     }
 
     @PostMapping("/report")
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 1aa08dcc..e19abc6f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=SecondNanjing
+                url: jdbc:sqlserver://121.36.58.109:1433;SelectMethod=cursor;DatabaseName=SecondNanjing
                 username: sa
-                password: 123456
+                password: haiwei@123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
index eec70c7b..30df9290 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
@@ -67,8 +67,12 @@
                     field:'value',
                     title:'参数值'
                 },
-            ]
+            ],
+            onLoadSuccess:function(data){
+                mergeTable(data,"table");
+            },
         })
+
     }
 </script>
 </body>