Explorar o código

修改SQL数据集搜索问题

Administrator %!s(int64=3) %!d(string=hai) anos
pai
achega
52edcc8e63

+ 11 - 11
boman-report/src/main/resources/bootstrap.yml

@@ -6,14 +6,14 @@ spring:
     name: boman-report
   profiles:
     active: jiaoyu
-#  cloud:
-#    nacos:
-#      discovery:
-#        server-addr: 192.168.101.10:8848
-#        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局
-#      config:
-#        server-addr: 192.168.101.10:8848
-#        file-extension: yml
-#        shared-configs:
-#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-#        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.101.10:8848
+        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局
+      config:
+        server-addr: 192.168.101.10:8848
+        file-extension: yml
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局

+ 16 - 0
boman-report/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>boman-report</id>
+
+	<classpath>
+		<dir name="E:/jiaoyuju/boman-report/target/classes">
+		</dir>
+	</classpath>
+
+</application>

+ 6 - 4
boman-report/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl

@@ -359,11 +359,11 @@
                             type: 'index',
                             width: 100,
                             align: 'center'
-                        },{
+                        }/*,{
                             title: '表名',
                             key: 'tableName',
                             align: 'center'
-                        },{
+                        }*/,{
                             title: '表备注',
                             key: 'tableComment',
                             align: 'center'
@@ -1972,8 +1972,10 @@
                 let config = {
                     url: api.initTables,
                     data: JSON.stringify({
-                        "pageCurrent": this.genTable.pageCurrent,
-                        "pageSize": this.genTable.pageSize
+                        "tableComment": this.sqlForm.tableComment,
+/*                      "tableComment": this.sqlForm.tableComment,
+                        "pageCurrent": this.pageCurrent,
+                        "pageSize": this.pageSize*/
                     }),
                     method: 'post',
                     headers: {"Content-Type": "application/json;charset=UTF-8"}