From 5c5589c0d343437275563a1a84f3a415a4ea16d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 16:50:40 +0800
Subject: [PATCH] fix
---
src/main/resources/templates/febs/views/index.html | 251 +++----------------------------------------------
1 files changed, 19 insertions(+), 232 deletions(-)
diff --git a/src/main/resources/templates/febs/views/index.html b/src/main/resources/templates/febs/views/index.html
index d27068d..81e787d 100644
--- a/src/main/resources/templates/febs/views/index.html
+++ b/src/main/resources/templates/febs/views/index.html
@@ -96,21 +96,25 @@
</div>
</div>
<div class="layui-col-md6 layui-col-sm12 layui-col-xs12">
- <div class="layui-col-md-offset5">
+ <div class="layui-col-md-offset4">
<table class="login-count-table">
<tr>
- <td>今日IP</td>
- <td>今日访问</td>
- <td>总访问量</td>
+ <td>今日业绩</td>
+ <td>昨日业绩</td>
+ <td>本月业绩</td>
+ <td>上月业绩</td>
</tr>
<tr>
- <td class="count" id="today-ip">
+ <td class="count" id="today">
0
</td>
- <td class="count" id="today-visit-count">
+ <td class="count" id="lastDay">
0
</td>
- <td class="count" id="total-visit-count">
+ <td class="count" id="thisMonth">
+ 0
+ </td>
+ <td class="count" id="lastMonth">
0
</td>
</tr>
@@ -122,151 +126,10 @@
</div>
</div>
<div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
- <div class="layui-card">
- <div class="layui-card-body">
- <div id="chart" style="height: 350px"></div>
- </div>
- </div>
- </div>
- <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
- <div class="layui-card">
- <div class="layui-card-body">
- <table class="project-table">
- <tr>
- <td style="padding: .8rem;">进行中的项目</td>
- <td style="padding: .8rem;text-align: right">
- <a target="_blank" href="https://github.com/wuyouzhuguli?tab=repositories">所有项目</a>
- </td>
- </tr>
- <tr>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Cloud">FEBS
- Cloud</a>
- </div>
- <div class="project-desc">
- Spring Cloud 微服务权限管理系统。
- </div>
- </div>
- </div>
- </div>
- </td>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Cloud-Web">FEBS
- Cloud Web</a>
- </div>
- <div class="project-desc">
- FEBS-Cloud前端，使用 vue-element-admin 构建。
- </div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- <tr>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Shiro">FEBS
- Shiro</a>
- </div>
- <div class="project-desc">
- Spring Boot 2.0.4 & Shiro1.4.0 权限管理系统。
- </div>
- </div>
- </div>
- </div>
- </td>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Security">FEBS
- Security</a>
- </div>
- <div class="project-desc">
- Spring Boot 2.0.4 & Spring Security 5.0.7 权限管理系统。
- </div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- <tr>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Actuator">FEBS
- Cloud K8S</a>
- </div>
- <div class="project-desc">
- FEBS Cloud K8S集群部署脚本。
- </div>
- </div>
- </div>
- </div>
- </td>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/SpringAll">SpringAll</a>
- </div>
- <div class="project-desc">
- 循序渐进学习Spring Boot、Spring Cloud与Spring Security。
- </div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- <tr>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Vue">FEBS
- Vue</a>
- </div>
- <div class="project-desc">
- FEBS-Shiro前后端分离版本，前端架构采用Vue全家桶。
- </div>
- </div>
- </div>
- </div>
- </td>
- <td class="project-table-td">
- <div class="layui-row">
- <div class="layui-col-md12 layui-col-xs12">
- <div class="layui-row">
- <div class="layui-col-md12">
- <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Actuator">FEBS Actuator</a>
- </div>
- <div class="project-desc">
- 使用Spring Boot Admin 2.0.2构建，用于监控FEBS。
- </div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
- </div>
+<!-- <div class="layui-card">-->
+<!-- <div class="layui-card-body">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
</div>
@@ -297,9 +160,10 @@
];
var index = Math.floor((Math.random() * welcomeArr.length));
var welcomeMessage = time + '，<a id="febs-index-user">' + currentUser.username + '</a>，' + welcomeArr[index];
- $view.find('#today-ip').text(data.todayIp).end()
- .find('#today-visit-count').text(data.todayVisitCount).end()
- .find('#total-visit-count').text(data.totalVisitCount).end()
+ $view.find('#today').text(data.today).end()
+ .find('#lastDay').text(data.lastDay).end()
+ .find('#thisMonth').text(data.thisMonth).end()
+ .find('#lastMonth').text(data.lastMonth).end()
.find('#user-dept').text(currentUser.deptName ? currentUser.deptName : '暂无所属部门').end()
.find('#user-role').text(currentUser.roleName ? currentUser.roleName : '暂无角色').end()
.find('#last-login-time').text(currentUser.lastLoginTime ? currentUser.lastLoginTime : '第一次访问系统').end()
@@ -341,83 +205,6 @@
});
if (!contain) totalVisitCount.push(0);
});
-
- var options = {
- chart: {
- height: 350,
- type: 'area',
- toolbar: {
- show: false
- }
- },
- colors: ['#1890ff', '#0acf97'],
- plotOptions: {
- bar: {
- horizontal: false,
- columnWidth: '32rem'
- }
- },
- dataLabels: {
- enabled: false
- },
- stroke: {
- width: [3, 3],
- curve: 'smooth'
- },
- series: [{
- name: '总数',
- data: totalVisitCount
- }, {
- name: '您',
- data: yourVisitCount
- }],
- xaxis: {
- categories: lastTenDays,
- axisTicks: {
- show: true
- },
- axisBorder: {
- show: true,
- color: '#f1f1f1'
- }
- },
- fill: {
- type: 'gradient',
- gradient: {
- shadeIntensity: 1,
- inverseColors: false,
- opacityFrom: 0.5,
- opacityTo: 0,
- stops: [0, 90, 100]
- }
- },
- title: {
- text: '近10天系统访问记录',
- align: 'left',
- style: {
- color: 'rgba(0, 0, 0, .65)'
- }
- },
- tooltip: {
- y: {
- formatter: function (val) {
- return "访问次数 " + val + " 次"
- }
- }
- },
- grid: {
- row: {
- colors: ['transparent', 'transparent'],
- opacity: 0.2
- },
- borderColor: '#f1f1f1'
- }
- };
-
- new ApexCharts(
- document.querySelector("#chart"),
- options
- ).render();
}
$view.on('click', '#febs-index-user',function () {
--
Gitblit v1.9.1