diff --git a/ruoyi-admin/src/main/resources/static/img/card.png b/ruoyi-admin/src/main/resources/static/img/card.png deleted file mode 100644 index 12ca16e..0000000 Binary files a/ruoyi-admin/src/main/resources/static/img/card.png and /dev/null differ diff --git a/ruoyi-admin/src/main/resources/static/img/title.png b/ruoyi-admin/src/main/resources/static/img/title.png new file mode 100644 index 0000000..ae155bb Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/title.png differ diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 0153f97..a38866b 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -21,7 +21,8 @@ .tipfloat{display:none;z-index:999;border:1px #8e9cde solid; position:absolute; bottom:0px; right:17px; width: 268px;height:auto; background:#fff} - + +
diff --git a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html index 118fcd0..ea00db5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html +++ b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html @@ -7,8 +7,17 @@ -
@@ -125,7 +133,7 @@ tempData = eval(result); var tempInfo = ''; for (let i = 0; i < tempData.length; i++) { - tempInfo += '
'; + tempInfo += '
'; /* tempInfo += '
'; */ /*info += '
'+tempData[i].name+'
' border: solid 1px greenyellow;padding: 10px 10px;;*/ } @@ -137,8 +145,12 @@ text: tempData[i].name.length > 18 ? tempData[i].name.substring(0, 18) + '\n' + tempData[i].name.substring(18) : tempData[i].name, subtext: tempData[i].refushTime, left: 'center', + top: 0, textStyle: { fontSize: 10 // 调小主标题字体大小 + }, + subtextStyle: { + fontSize: 10 } }, tooltip: { @@ -152,7 +164,8 @@ detail: {formatter: '{value}℃', fontSize: 12}, showSymbol: false, animation: false, // 关闭动画 - radius: '90%', + radius: 90, + center: ['50%', 130], // startAngle: 180, // 仪表盘起始角度(默认 225) // endAngle: 0, // 仪表盘结束角度(默认 -45) data: [{value: tempData[i].value}], @@ -257,4 +270,4 @@ - \ No newline at end of file +