diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index e63ecd4..2cc08f7 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -33,6 +33,10 @@ spring: # url: jdbc:sqlserver://localhost:1433;SelectMethod=cursor;DatabaseName=hw_iot_ems # username: userapp # password: Vk^4HNLkX< +# 柬埔寨山东能源八亿橡胶 +# url: jdbc:sqlserver://localhost:1433;SelectMethod=cursor;DatabaseName=hw_iot_ems +# username: sa +# password: haiwei@123 # 从库数据源 slave: # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/ruoyi-admin/src/main/resources/templates/system/TempertureData/TempertureReport.html b/ruoyi-admin/src/main/resources/templates/system/TempertureData/TempertureReport.html index 7ba1163..6d0e8dd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/TempertureData/TempertureReport.html +++ b/ruoyi-admin/src/main/resources/templates/system/TempertureData/TempertureReport.html @@ -125,7 +125,7 @@ tempData = eval(result); var tempInfo = ''; for (let i = 0; i < tempData.length; i++) { - tempInfo += '
'; + tempInfo += ''; /* tempInfo += ''; */ /*info += '