首页图表开发

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Logerr.java

@@ -6,13 +6,13 @@ import ${domain}.frame.excel.annotation.ExcelNote;
 import ${domain}.frame.excel.annotation.ExcelSheet;
 
 /**
- * LOGERR - 错误日志
+ * LOGERR - 故障日志
  *
  * @author wangbing
  * @version 0.0.1
  * @since 2020-07-06
  */
-@ExcelSheet("错误日志")
+@ExcelSheet("故障日志")
 public class Logerr extends BaseEntity {
 
     /**

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManager.java

@@ -11,7 +11,7 @@ import ${domain}.module.wsys.rsp.LogerrFindResponse;
 import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
 
 /**
- * 错误日志
+ * 故障日志
  *
  * @author wangbing
  * @version 0.0.1
@@ -56,7 +56,7 @@ public interface LogerrManager {
     LogerrFindResponse find(LogerrFindRequest request, Token token);
 
     /**
-     * 快速添加错误日志
+     * 快速添加故障日志
      *
      * @param logType 日志类型
      * @param logTitle 标题

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManagerImpl.java

@@ -25,7 +25,7 @@ import ${domain}.module.wsys.rsp.LogerrFindResponse;
 import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
 
 /**
- * LOGERR - 错误日志
+ * LOGERR - 故障日志
  *
  * @author wangbing
  * @version 0.0.1
@@ -155,7 +155,7 @@ public class LogerrManagerImpl implements LogerrManager {
     }
 
     /**
-     * 快速添加错误日志
+     * 快速添加故障日志
      *
      * @param logType 日志类型
      * @param logTitle 标题

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java

@@ -9,7 +9,7 @@ import ${domain}.module.wsys.req.LogerrFindRequest;
 import java.util.List;
 
 /**
- * LOGERR - 错误日志
+ * LOGERR - 故障日志
  *
  * @author wangbing
  * @since 2020-07-06

src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * LogerrCreateRequest - 错误日志新增
+ * LogerrCreateRequest - 故障日志新增
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrDeleteRequest.java

@@ -5,7 +5,7 @@ import ${domain}.frame.base.BaseRequest;
 import javax.validation.constraints.NotNull;
 
 /**
- * LogerrDeleteRequest - 错误日志删除
+ * LogerrDeleteRequest - 故障日志删除
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java

@@ -6,7 +6,7 @@ import ${domain}.frame.validation.Select;
 import java.util.Date;
 
 /**
- * LogerrFindRequest - 错误日志查询
+ * LogerrFindRequest - 故障日志查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * LogerrUpdateRequest - 错误日志更新
+ * LogerrUpdateRequest - 故障日志更新
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrCreateResponse.java

@@ -3,7 +3,7 @@ package ${domain}.module.wsys.rsp;
 import ${domain}.frame.base.BaseResponse;
 
 /**
- * LogerrCreateResponse - 错误日志
+ * LogerrCreateResponse - 故障日志
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrDeleteResponse.java

@@ -3,7 +3,7 @@ package ${domain}.module.wsys.rsp;
 import ${domain}.frame.base.BaseResponse;
 
 /**
- * LogerrDeleteResponse - 错误日志
+ * LogerrDeleteResponse - 故障日志
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrFindResponse.java

@@ -4,7 +4,7 @@ import ${domain}.frame.base.BaseFindResponse;
 import ${domain}.module.wsys.ent.Logerr;
 
 /**
- * LogerrFindResponse - 错误日志
+ * LogerrFindResponse - 故障日志
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrUpdateResponse.java

@@ -3,7 +3,7 @@ package ${domain}.module.wsys.rsp;
 import ${domain}.frame.base.BaseResponse;
 
 /**
- * LogerrUpdateResponse - 错误日志
+ * LogerrUpdateResponse - 故障日志
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml

@@ -230,7 +230,7 @@
 <field defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isLike="false" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isLike="false" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 </table>
-<table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" methods="[]" msvr="false" pageAdd="true" pageExp="true" pageImp="true" search="false" sys="true" tableComment="错误日志" tableName="LOGERR" update="true">
+<table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" methods="[]" msvr="false" pageAdd="true" pageExp="true" pageImp="true" search="false" sys="true" tableComment="故障日志" tableName="LOGERR" update="true">
 <field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
 <field defaultValue="NULL" fieldComment="日志类型" fieldLength="20" fieldName="LOG_TYPE" fieldType="Select" isLike="false" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
 <selectItem label="系统错误" value="系统错误"/>

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql

@@ -318,7 +318,7 @@ PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='序列';
 
 -- ----------------------------
--- Table structure for LOGERR - 错误日志
+-- Table structure for LOGERR - 故障日志
 -- Target   : MySQL
 -- Author   : wangbing
 -- Date:    : 2020-07-11
@@ -336,7 +336,7 @@ CREATE TABLE `SYS_LOGERR` (
     `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户',
     `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间',
 PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='故障日志';
 
 -- ----------------------------
 -- Table structure for PROFILES - 系统配置

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_LOGERR.sql

@@ -1,5 +1,5 @@
 -- ----------------------------
--- Table structure for LOGERR - 错误日志
+-- Table structure for LOGERR - 故障日志
 -- Target   : MySQL
 -- Author   : wangbing
 -- Date:    : 2020-07-11
@@ -17,4 +17,4 @@ CREATE TABLE `SYS_LOGERR` (
         `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户',
         `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间',
 PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='故障日志';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql

@@ -499,7 +499,7 @@ COMMENT ON COLUMN "SYS_SEQUENCE"."LAST_UPDATE_BY" is '最后更新用户';
 COMMENT ON COLUMN "SYS_SEQUENCE"."LAST_UPDATE_TIME" is '最后更新时间';
 
 -- ----------------------------
--- Table structure for LOGERR - 错误日志
+-- Table structure for LOGERR - 故障日志
 -- Target   : Oracle
 -- Author   : wangbing
 -- Date:    : 2020-07-11
@@ -517,7 +517,7 @@ CREATE TABLE "SYS_LOGERR" (
 "LAST_UPDATE_BY" NUMBER(19) NULL,
 "LAST_UPDATE_TIME" DATE NULL
 );
-COMMENT ON TABLE "SYS_LOGERR" is '错误日志';
+COMMENT ON TABLE "SYS_LOGERR" is '故障日志';
 COMMENT ON COLUMN "SYS_LOGERR"."ID" is '主键';
 COMMENT ON COLUMN "SYS_LOGERR"."LOG_TYPE" is '日志类型';
 COMMENT ON COLUMN "SYS_LOGERR"."LOG_TITLE" is '任务标题';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_LOGERR.sql

@@ -1,5 +1,5 @@
 -- ----------------------------
--- Table structure for LOGERR - 错误日志
+-- Table structure for LOGERR - 故障日志
 -- Target   : Oracle
 -- Author   : wangbing
 -- Date:    : 2020-07-11
@@ -18,7 +18,7 @@ CREATE TABLE "SYS_LOGERR" (
     "LAST_UPDATE_TIME" DATE NULL
 );
 
-COMMENT ON TABLE "SYS_LOGERR" is '错误日志';
+COMMENT ON TABLE "SYS_LOGERR" is '故障日志';
 COMMENT ON COLUMN "SYS_LOGERR"."ID" is '主键';
 COMMENT ON COLUMN "SYS_LOGERR"."LOG_TYPE" is '日志类型';
 COMMENT ON COLUMN "SYS_LOGERR"."LOG_TITLE" is '任务标题';

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql

@@ -302,7 +302,7 @@ CREATE TABLE IF NOT EXISTS SYS_VISITOR_RES (
 );
 
 -- ----------------------------
--- Table structure for LOGERR - 错误日志
+-- Table structure for LOGERR - 故障日志
 -- Target   : SQLite
 -- Author   : wangbing
 -- Date:    : 2020-09-04

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_LOGERR.sql

@@ -1,5 +1,5 @@
 -- ----------------------------
--- Table structure for LOGERR - 错误日志
+-- Table structure for LOGERR - 故障日志
 -- Target   : SQLite
 -- Author   : wangbing
 -- Date:    : 2020-07-06

src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl

@@ -11,7 +11,7 @@
                         p-id="2846" fill="#ffffff"></path></svg>
             </span>
             <span class="count">3300</span>
-            <span class="info">用户总数</span>
+            <span class="info">用户人数</span>
         </div>
         <div class="total">
             <span class="icon" style="background-color: #e46bbd">
@@ -24,35 +24,27 @@
                           p-id="2846" fill="#ffffff"></path></svg>
             </span>
             <span class="count">3300</span>
-            <span class="info">活跃用户</span>
+            <span class="info">在线人数</span>
         </div>
         <div class="total">
             <span class="icon" style="background-color: #1cbd6b">
-              <svg t="1605239338109" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                <svg t="1605509613034" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4787" width="48" height="48"><path d="M274.4 404.7v-4.8c0-19.3 15.5-35.1 34.4-35.1h27.5c18.9 0 34.4 15.8 34.4 35.1v5.1c0 19.4 4.8 21.2 23.7 21.2h239.4c17.5 0 19.2-2.4 19.2-18.6v-7.8c0-19.3 15.5-35.1 34.4-35.1H714c18.9 0 34.4 15.8 34.4 35.1v6.1c0 17.3 5.8 20.2 22.6 20.2h132.1c17.9 0 23-4.9 23-22.4v-39.2c0-38.6-30.9-70.2-68.7-70.2H166.7c-37.8 0-68.7 31.6-68.7 70.2v36.8c0 19.8 5.7 24.8 26.9 24.8h124.8c20 0.1 24.7-2.1 24.7-21.4z m0 0" fill="#ffffff" p-id="4788"></path><path d="M348.5 475.6c0 18.9-11.5 34.4-25.7 34.4s-25.7-15.5-25.7-34.4v-42.2c0-18.9 11.5-34.4 25.7-34.4s25.7 15.5 25.7 34.4v42.2z m0 0M724 477.5c0 18.9-11.5 34.4-25.7 34.4s-25.7-15.5-25.7-34.4v-42.2c0-18.9 11.5-34.4 25.7-34.4 14.1 0 25.7 15.5 25.7 34.4v42.2z m0 0M367.7 257.7c22-59.7 78.5-102.1 144.6-102.1s122.6 42.5 144.6 102.1c0 0 4.7 19.7 31.9 19.7 27.3 0 27.2-19.7 27.2-19.7C692.1 165.7 610 98 512.4 98s-179.7 67.7-203.8 159.7c0 0-1.5 17.2 26.7 17.2s32.4-17.2 32.4-17.2z m0 0" fill="#ffffff" p-id="4789"></path><path d="M904.9 478.8h-133c-18.5 0-23.5 3.2-23.5 18.9v7.5c0 19.3-15.5 35.1-34.4 35.1h-26.2c-18.9 0-34.4-15.8-34.4-35.1v-4.5c0-4.9-0.4-8.7-1.4-11.7-1.9-7.7-7.1-10.1-18.7-10.1H390.7c-11.6 0-16.8 2.4-18.7 10.1-1 3-1.4 6.8-1.4 11.7v4.5c0 19.3-15.5 35.1-34.4 35.1H310c-18.9 0-34.4-15.8-34.4-35.1v-7.5c0-15.7-5-18.9-23.5-18.9h-133c-14.5 0-21.2 5.3-21.2 21v356c0 38.6 30.9 70.2 68.7 70.2h690.5c37.8 0 68.7-31.6 68.7-70.2v-356c0.2-15.7-6.4-21-20.9-21z" fill="#ffffff" p-id="4790"></path></svg>
-                   xmlns="http://www.w3.org/2000/svg"
-                   p-id="2844" width="48" height="48">
-                    <path d="M945.344 1022.912 78.72 1022.912c0 0-108.288-439.04 433.28-439.04C1053.632 583.872 945.344 1022.912 945.344 1022.912L945.344 1022.912z"
-                          p-id="2845" fill="#ffffff"></path>
-                    <path d="M515.776 537.472c-216.64 0-216.64-322.56-216.64-322.56S299.136 0 515.776 0s216.64 214.912 216.64 214.912S732.352 537.472 515.776 537.472L515.776 537.472z"
-                          p-id="2846" fill="#ffffff"></path></svg>
             </span>
             <span class="count">3300</span>
-            <span class="info">在线人数</span>
+            <span class="info">部门总数</span>
         </div>
         <div class="total">
-            <span class="icon" style="background-color: #ff9901">
+            <span class="icon" style="background-color: #ff0000">
-                <svg t="1605242339431" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                <svg t="1605258499100" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                     xmlns="http://www.w3.org/2000/svg" p-id="6436" width="48" height="48"><path
+                     xmlns="http://www.w3.org/2000/svg" p-id="4247" width="48" height="48"><path
-                        d="M557.6 374.6l2.8-2.8c28-53.2 28-111.9 0-165.1-28-50.4-84-81.2-142.7-81.2-28 0-56 8.4-81.2 22.4-42 22.4-70 58.8-81.2 103.6-11.2 42-2.8 84 19.6 120.3l2.8 5.6h-70v-2.8c-22.4-58.8-22.4-117.5 0-170.7 36.5-84 117.6-139.9 210-139.9 28 0 58.8 5.6 86.8 16.8 56 22.4 100.8 64.4 123.1 120.3 25.2 56 25.2 117.5 0 173.5v2.8h-70v-2.8z"
+                        d="M230.065 736.146L169.78 748.77 61.495 911.958l20.386 20.275 20.386 20.306 164.414-107.588 12.774-59.85 135.22-134.324-49.265-49.017-135.345 134.386z m589.641-614.423c5.666-5.683 14.983-5.683 20.706 0 5.792 5.687 5.792 14.931 0 20.586l-237.217 235.6 36.999 36.767L877.35 179.078c5.788-5.716 15.04-5.716 20.758 0a14.361 14.361 0 0 1 0 20.585L660.895 435.227l33.22 32.961c0.568-0.529 1.136-0.84 1.703-1.439l25.103-24.9v0.035l201.1-199.676c40.15-39.824 40.15-104.364 0-144.163-40.08-39.824-105.137-39.856-145.227 0L576.957 296.376l-26.364 26.213c-0.505 0.592-0.886 1.215-1.387 1.744l33.165 33.02 237.335-235.63zM478.105 312.652c3.396-18.587 4.275-37.545 2.577-56.293-4.216-46.419-24.162-91.716-59.904-127.226C359.3 68.151 269.07 53.375 193.566 84.673L315.574 205.69c18.307 18.278 18.374 47.896-0.066 66.198l-50.904 50.48c-18.31 18.209-48.193 18.272-66.444 0L78.856 203.911c-27.117 73.163-11.262 158.38 47.889 217.11 32.4 32.11 72.74 51.19 114.704 57.725a211.463 211.463 0 0 0 60.032 0.627C428.396 605.483 741.82 916.672 741.82 916.672c47.56 47.14 124.834 47.14 172.341 0 22.964-22.831 35.679-53.162 35.679-85.43 0-32.366-12.715-62.795-35.741-85.626L478.105 312.652z m398.55 566.723c-24.852 24.652-64.936 24.652-89.85 0.064-24.666-24.554-24.666-64.54 0.063-89.094 24.851-24.486 64.935-24.553 89.727 0 24.855 24.554 24.791 64.54 0.06 89.03z"
-                        p-id="6437" fill="#ffffff"></path><path
+                        p-id="4248" fill="#ffffff"></path></svg>
-                        d="M781.5 562.1c-5.6-28-30.8-50.4-56-50.4-16.8 0-30.8 8.4-39.2 19.6v-5.6c0-33.6-25.2-58.8-53.2-58.8-28 0-53.2 28-53.2 58.8V495c0-33.6-25.2-58.8-53.2-58.8-28 0-53.2 28-53.2 58.8V301.9c0-33.6-25.2-58.8-53.2-58.8s-50.4 28-50.4 58.8v341.4c0 16.8-11.2 30.8-28 30.8h-8.4l-75.6-33.6c-8.4-5.6-16.8-2.8-25.2-5.6-28-8.4-53.2 28-53.2 58.8 0 19.6 22.4 44.8 33.6 56l204.3 209.9h313.5c8.4-39.2 39.2-187.5 50.4-279.9 3-44.8 5.8-86.8 0.2-117.6z"
-                        p-id="6438" fill="#ffffff"></path></svg>
             </span>
             <span class="count">3300</span>
-            <span class="info">登录总数</span>
+            <span class="info">故障未处理</span>
         </div>
         <div class="total">
-            <span class="icon" style="background-color: #ff0000">
+            <span class="icon" style="background-color: #ff9901">
                 <svg t="1605258499100" class="icon" viewBox="0 0 1024 1024" version="1.1"
                      xmlns="http://www.w3.org/2000/svg" p-id="4247" width="48" height="48"><path
                         d="M230.065 736.146L169.78 748.77 61.495 911.958l20.386 20.275 20.386 20.306 164.414-107.588 12.774-59.85 135.22-134.324-49.265-49.017-135.345 134.386z m589.641-614.423c5.666-5.683 14.983-5.683 20.706 0 5.792 5.687 5.792 14.931 0 20.586l-237.217 235.6 36.999 36.767L877.35 179.078c5.788-5.716 15.04-5.716 20.758 0a14.361 14.361 0 0 1 0 20.585L660.895 435.227l33.22 32.961c0.568-0.529 1.136-0.84 1.703-1.439l25.103-24.9v0.035l201.1-199.676c40.15-39.824 40.15-104.364 0-144.163-40.08-39.824-105.137-39.856-145.227 0L576.957 296.376l-26.364 26.213c-0.505 0.592-0.886 1.215-1.387 1.744l33.165 33.02 237.335-235.63zM478.105 312.652c3.396-18.587 4.275-37.545 2.577-56.293-4.216-46.419-24.162-91.716-59.904-127.226C359.3 68.151 269.07 53.375 193.566 84.673L315.574 205.69c18.307 18.278 18.374 47.896-0.066 66.198l-50.904 50.48c-18.31 18.209-48.193 18.272-66.444 0L78.856 203.911c-27.117 73.163-11.262 158.38 47.889 217.11 32.4 32.11 72.74 51.19 114.704 57.725a211.463 211.463 0 0 0 60.032 0.627C428.396 605.483 741.82 916.672 741.82 916.672c47.56 47.14 124.834 47.14 172.341 0 22.964-22.831 35.679-53.162 35.679-85.43 0-32.366-12.715-62.795-35.741-85.626L478.105 312.652z m398.55 566.723c-24.852 24.652-64.936 24.652-89.85 0.064-24.666-24.554-24.666-64.54 0.063-89.094 24.851-24.486 64.935-24.553 89.727 0 24.855 24.554 24.791 64.54 0.06 89.03z"
@@ -61,14 +53,13 @@
             <span class="count">3300</span>
             <span class="info">故障总数</span>
         </div>
-
     </div>
     <div>
-        <div id="login" class="chart" style="width: 500px;height: 300px"></div>
+        <div id="LoginChart" class="chart" style="width: 500px;height: 300px"></div>
 
-        <div id="error" class="chart" style="width: 500px;height: 300px"></div>
+        <div id="ErrorChart" class="chart" style="width: 500px;height: 300px"></div>
 
-        <div id="taskAverage" class="chart" style="width: 1020px;height: 300px"></div>
+        <div id="TokenTaskChart" class="chart" style="width: 1020px;height: 300px"></div>
     </div>
 </div>
 <style>
@@ -141,63 +132,8 @@
         el: "#app",
         data: {},
         methods: {
-            initTaskAverage: function () {
+            initLoginChart: function () {
-                var chart = echarts.init(document.getElementById('taskAverage'));
+                var loginChart = echarts.init(document.getElementById('LoginChart'));
-                var option = {
-                    title: {
-                        text: '任务执行效率',
-                        subtext: '最近100次执行平均时间',
-                        textStyle: {
-                            color: '#515151',
-                            fontSize: 14
-                        },
-                        top: '10px',
-                        left: 'center'
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'shadow'
-                        }
-                    },
-                    xAxis: {
-                        type: 'category',
-                        data: ['任务一', '任务二', '任务三', '任务四', '任务五'],
-                        axisTick: {
-                            show: false
-                        },
-                        axisLabel: {
-                            interval: 0,
-                            fontSize: 11,
-                            boundaryGap: false,
-                        }
-                    },
-                    yAxis: {
-                        type: 'value',
-                        axisTick: {
-                            show: false
-                        }
-                    },
-                    series: {
-                        name: '平均(ms)',
-                        type: 'bar',
-                        barWidth: '20%',
-                        data: [30, 52, 17, 20, 10],
-                        itemStyle: {
-                            color: '#2c8aff',
-                        },
-                        label: {
-                            show: true,
-                            color: '#2c8aff',
-                            position: 'top',
-                            formatter: '{c}ms'
-                        }
-                    }
-                };
-                chart.setOption(option);
-            },
-            initLoginLog: function () {
-                var loginChart = echarts.init(document.getElementById('login'));
                 var option = {
                     title: {
                         text: '周登录情况',
@@ -252,11 +188,10 @@
                         }
                     }]
                 };
-                // 使用刚指定的配置项和数据显示图表。
                 loginChart.setOption(option);
             },
-            initErrorLog: function () {
+            initErrorChart: function () {
-                var loginChart = echarts.init(document.getElementById('error'));
+                var loginChart = echarts.init(document.getElementById('ErrorChart'));
                 var option = {
                     title: {
                         text: '周故障情况',
@@ -311,16 +246,97 @@
                         }
                     }]
                 };
-                // 使用刚指定的配置项和数据显示图表。
                 loginChart.setOption(option);
             },
+            initTokenTaskChart: function () {
+                var chart = echarts.init(document.getElementById('TokenTaskChart'));
+                var option = {
+                    title: {
+                        text: '任务执行情况',
+                        subtext: '最近100次执行情况间',
+                        textStyle: {
+                            color: '#515151',
+                            fontSize: 14
+                        },
+                        top: '10px',
+                        left: 'center'
+                    },
+                    grid: {
+                        left: '50px',
+                        right: '50px',
+                        top: '30%',
+                        bottom: '5%',
+                        containLabel: true
+                    },
+                    xAxis: {
+                        type: 'category',
+                        boundaryGap: false,
+                        axisLabel: {
+                            show: false
+                        }
+                    },
+                    yAxis: {
+                        name: '时间(ms)',
+                        type: 'value',
+                        axisTick: false
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross'
+                        }
+                    },
+                    series: [{
+                        name: '执行时间(ms)',
+                        type: 'line',
+                        smooth: true,
+                        itemStyle: {
+                            color: '#2c8df2',
+                        },
+                        data: [30, 52, 17, 20, 10, 11, 10, 13, 10, 10],
+                    }, {
+                        name: '任务',
+                        type: 'pie',
+                        z: 100,
+                        radius: '40%',
+                        center: ['85%', '40%'],
+                        itemStyle: {
+                            opacity: 0.7
+                        },
+                        label: {
+                            formatter: '{b}:{d}%'
+                        },
+                        tooltip: {
+                            trigger: 'item',
+                            formatter: '{b}:{d}%'
+                        },
+                        data: [{
+                            value: 95,
+                            name: '成功率',
+                            itemStyle: {
+                                color: '#2c8df2'
+                            },
+                            label: {
+
+                            }
+                        }, {
+                            value: 5,
+                            name: '失败率',
+                            itemStyle: {
+                                color: '#ff0000'
+                            },
+                        }]
+                    }]
+                };
+                chart.setOption(option);
+            },
         },
         created: function () {
         },
         mounted: function () {
-            this.initLoginLog();
+            this.initLoginChart();
-            this.initErrorLog();
+            this.initErrorChart();
-            this.initTaskAverage();
+            this.initTokenTaskChart();
         },
         watch: {}
     })

src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl

@@ -60,7 +60,7 @@
                 <el-menu-item index="${uuid()}" @click="addTab({title: '调度日志', name: 'logtask', url: '${r'${context}'}/wsys/logtask.htm'})">调度日志</el-menu-item>
                 ${print('</#if>')}
                 ${print('<#if token.hasRes("MNT_LOGERR")>')}
-                <el-menu-item index="${uuid()}" @click="addTab({title: '错误日志', name: 'logerr', url: '${r'${context}'}/wsys/logerr.htm'})">错误日志</el-menu-item>
+                <el-menu-item index="${uuid()}" @click="addTab({title: '故障日志', name: 'logerr', url: '${r'${context}'}/wsys/logerr.htm'})">故障日志</el-menu-item>
                 ${print('</#if>')}
             </el-submenu>
             ${print('</#if>')}

src/main/resources/modules/SpringBoot/test/DataInit.java

@@ -169,11 +169,11 @@ public class DataInit {
                 forDev.add(createRes("02030105", "任务日志删除", "WEB", "/ajax/wsys/logtask/delete"));
                 forDev.add(createRes("02030106", "任务日志更新", "WEB", "/ajax/wsys/logtask/update"));
                 forDev.add(createRes("02030107", "任务日志查询", "WEB", "/ajax/wsys/logtask/find"));
-                forDev.add(createRes("0204", "错误日志菜单", "WEB", "MNT_LOGERR"));
+                forDev.add(createRes("0204", "故障日志菜单", "WEB", "MNT_LOGERR"));
-                forDev.add(createRes("020401", "错误日志管理页", "WEB", "/wsys/logerr.htm"));
+                forDev.add(createRes("020401", "故障日志管理页", "WEB", "/wsys/logerr.htm"));
-                forDev.add(createRes("02040101", "错误日志删除", "WEB", "/ajax/wsys/logerr/delete"));
+                forDev.add(createRes("02040101", "故障日志删除", "WEB", "/ajax/wsys/logerr/delete"));
-                forDev.add(createRes("02040102", "错误日志更新", "WEB", "/ajax/wsys/logerr/update"));
+                forDev.add(createRes("02040102", "故障日志更新", "WEB", "/ajax/wsys/logerr/update"));
-                forDev.add(createRes("02040103", "错误日志查询", "WEB", "/ajax/wsys/logerr/find"));
+                forDev.add(createRes("02040103", "故障日志查询", "WEB", "/ajax/wsys/logerr/find"));
             }
 
             List<Res> forMgr = new ArrayList<>();

src/main/resources/modules/SpringBoot/test/wsys/LogerrTest.java

@@ -20,7 +20,7 @@ import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
 import static junit.framework.TestCase.assertTrue;
 
 /**
- * LogerrTest -  - 错误日志测试用例
+ * LogerrTest -  - 故障日志测试用例
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringMVC_Mybatis/resources/spring-mybatis.ftl

@@ -49,7 +49,7 @@
         <property name="removeAbandoned" value="true"/>
         <!-- 1800秒，也就是30分钟 -->
         <property name="removeAbandonedTimeout" value="1800"/>
-        <!-- 关闭abanded连接时输出错误日志 -->
+        <!-- 关闭abanded连接时输出故障日志 -->
         <property name="logAbandoned" value="true"/>
         <!-- 监控数据库 -->
         <property name="filters" value="mergeStat"/>