public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 20:50:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mgt chart fix

Browse Source
This commit is contained in:
MaxKey
2021-07-20 23:39:32 +08:00
parent d62362e617
commit fae33d2be6
4 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java
View File

@@ -18,7 +18,6 @@
package org.maxkey.entity.apps;
import java.io.Serializable;
import java.util.Arrays;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -599,8 +598,6 @@ public class Apps extends JpaBaseEntity implements Serializable {
builder.append(protocol);
builder.append(", secret=");
builder.append(secret);
builder.append(", icon=");
builder.append(Arrays.toString(icon));
builder.append(", iconFile=");
builder.append(iconFile);
builder.append(", visible=");

6
maxkey-web-manage/src/main/resources/static/js/chart.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl
View File

@@ -38,7 +38,7 @@
<link href="<@base />/static/jquery/metisMenu-v3.0.6/css/mm-vertical.css" rel="stylesheet" >
<link href="<@base />/static/jquery/metisMenu-v3.0.6/metisMenu.min.css" rel="stylesheet" >
<script src ="<@base />/static/jquery/metisMenu-v3.0.6/metisMenu.min.js" type="text/javascript" ></script>
<script src ="<@base />/static/js/Chart.min.js" type="text/javascript" ></script>
<script src ="<@base />/static/js/chart.min.js" type="text/javascript" ></script>
<#-- multiple-select-1.5.2 -->
<script type="text/javascript" src="<@base />/static/jquery/multiple-select-1.5.2/multiple-select.min.js"></script>
<script type="text/javascript" src="<@base />/static/jquery/multiple-select-1.5.2/locale/multiple-select-<@locale/>.js"></script>

40
maxkey-web-manage/src/main/resources/templates/views/main.ftl
View File

@@ -204,10 +204,15 @@
xAxes: [{
display: true,
}],
yAxes: [{
display: true,
stacked: true
}]
y: {
title: {
display: true
},
ticks: {
precision : 0
},
beginAtZero: true
}
}
}
};
@@ -231,21 +236,34 @@
},
scales: {
xAxes: [{
display: true,
display: true
}],
yAxes: [{
display: true,
stacked: true
}]
y: {
title: {
display: true
},
ticks: {
precision : 0
/*
callback: function(value, index, values) {
return parseInt(value);
}*/
},
beginAtZero: true
}
}
}
};
window.onload = function() {
var ctxdh = document.getElementById('canvasDayHour').getContext('2d');
window.myLineDayHour = new Chart(ctxdh, configDayHour);
var ctx = document.getElementById('canvasMonth').getContext('2d');
window.myLineMonth = new Chart(ctx, configMonth);
var ctxdh = document.getElementById('canvasDayHour').getContext('2d');
window.myLineDayHour = new Chart(ctxdh, configDayHour);
};
</script>