diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index abaf8f6..ed3ae52 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,12 +6,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://121.36.58.109:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: Haiwei123456 - url: jdbc:mysql://localhost:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://121.36.58.109:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: root + password: Haiwei123456 +# url: jdbc:mysql://localhost:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: root # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/static/css/lot-ui/Iot-sensorSummaryStyle.css b/ruoyi-admin/src/main/resources/static/css/lot-ui/Iot-sensorSummaryStyle.css index 06031bf..9a34fab 100644 --- a/ruoyi-admin/src/main/resources/static/css/lot-ui/Iot-sensorSummaryStyle.css +++ b/ruoyi-admin/src/main/resources/static/css/lot-ui/Iot-sensorSummaryStyle.css @@ -133,9 +133,9 @@ span{ } .bootstrap-table .fixed-table-container .fixed-table-body{ - /*height: 28em;*/ + height: 27em; overflow-x: auto; - overflow-y: visible; + overflow-y: auto; } .bootstrap-table .fixed-table-container .fixed-table-body::-webkit-scrollbar { diff --git a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html index 96d9c72..4bca9a6 100644 --- a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html +++ b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html @@ -578,7 +578,7 @@ $.cookie('userID', '0000'); var wsImpl = window.WebSocket || window.MozWebSocket; console.log("connecting to server .."); - window.ws = new wsImpl('ws://127.0.0.1:7181'); + window.ws = new wsImpl('ws://121.36.58.109:7181'); ws.onmessage = function (evt) { let result = $.parseJSON(evt.data); console.log(result);