添加判断是否显示图表

This commit is contained in:
Jerry Yan 2019-05-28 11:29:41 +08:00
parent ee7ddbb1de
commit 182c97fb84
4 changed files with 56 additions and 27 deletions

View File

@ -201,12 +201,16 @@ def getUploadStats():
@app.route("/files/", methods=["GET"]) @app.route("/files/", methods=["GET"])
def fileIndex(): def fileIndex():
a = [] a = []
if not os.path.isdir("/var/lib/openmediavault/rrd"):
OMV_RRD_PATH = False
else:
OMV_RRD_PATH = True
for i in (glob("*.mp4") + glob("*.flv")): for i in (glob("*.mp4") + glob("*.flv")):
a.append({ a.append({
"name": i, "name": i,
"size": Common.parseSize(os.path.getsize(i)) "size": Common.parseSize(os.path.getsize(i))
}) })
return render_template("files.html",files=a) return render_template("files.html",files=a, show=OMV_RRD_PATH)
@app.route("/files/download/<path>", methods=["GET"]) @app.route("/files/download/<path>", methods=["GET"])

View File

@ -27,29 +27,4 @@
</tr> </tr>
</table> </table>
<script src="/static/device.js"></script> <script src="/static/device.js"></script>
<table>
<tr>
<td>CPU近半天</td>
<td><img src="/images/rrd/cpu-0-half_day.png"></td>
</tr>
<tr>
<td>CPU近一天</td>
<td><img src="/images/rrd/cpu-0-day.png"></td>
</tr>
<tr>
<td>CPU近三天</td>
<td><img src="/images/rrd/cpu-0-three_days.png"></td>
</tr>
<tr>
<td>网络近半天</td>
<td><img src="/images/rrd/interface-enp3s0-half_day.png"></td>
</tr>
<tr>
<td>网络近一天</td>
<td><img src="/images/rrd/interface-enp3s0-day.png"></td>
</tr>
<tr>
<td>网络近三天</td>
<td><img src="/images/rrd/interface-enp3s0-three_days.png"></td>
</tr>
</table>

View File

@ -21,6 +21,9 @@
<hr/> <hr/>
<h3><a href="/">录播信息页</a></h3> <h3><a href="/">录播信息页</a></h3>
{% include 'device.html' %} {% include 'device.html' %}
{% if show %}
{% include 'status.html' %}
{% endif %}
</div> </div>
</body> </body>
</html> </html>

47
templates/status.html Normal file
View File

@ -0,0 +1,47 @@
<h3>CPU</h3>
<table>
<tr>
<td>CPU近半天</td>
<td><img src="/images/rrd/cpu-0-half_day.png"></td>
</tr>
<tr>
<td>CPU近一天</td>
<td><img src="/images/rrd/cpu-0-day.png"></td>
</tr>
<tr>
<td>CPU近三天</td>
<td><img src="/images/rrd/cpu-0-three_days.png"></td>
</tr>
</table>
<hr/>
<h3>磁盘</h3>
<table>
<tr>
<td>磁盘近半天</td>
<td><img src="/images/rrd/df-srv-dev-disk-by-id-usb-Hitachi_HTS541612J9AT00_000000000000-0-0-part1-half_day.png"></td>
</tr>
<tr>
<td>磁盘近一天</td>
<td><img src="/images/rrd/df-srv-dev-disk-by-id-usb-Hitachi_HTS541612J9AT00_000000000000-0-0-part1-day.png"></td>
</tr>
<tr>
<td>磁盘近三天</td>
<td><img src="/images/rrd/df-srv-dev-disk-by-id-usb-Hitachi_HTS541612J9AT00_000000000000-0-0-part1-three_days.png"></td>
</tr>
</table>
<hr/>
<h3>网络</h3>
<table>
<tr>
<td>网络近半天</td>
<td><img src="/images/rrd/interface-enp3s0-half_day.png"></td>
</tr>
<tr>
<td>网络近一天</td>
<td><img src="/images/rrd/interface-enp3s0-day.png"></td>
</tr>
<tr>
<td>网络近三天</td>
<td><img src="/images/rrd/interface-enp3s0-three_days.png"></td>
</tr>
</table>