Browse Source

调度报表

xueli.xue 8 years ago
parent
commit
66e6dd9352

+ 4 - 3
xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl View File

58
                             <span class="info-box-number">${jobLogCount}</span>
58
                             <span class="info-box-number">${jobLogCount}</span>
59
 
59
 
60
                             <div class="progress">
60
                             <div class="progress">
61
-                                <div class="progress-bar" <#if jobLogCount gt 0> style="width: ${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}%" </#if> ></div>
61
+                                <div class="progress-bar" style="width: 100%" ></div>
62
                             </div>
62
                             </div>
63
                             <span class="progress-description">
63
                             <span class="progress-description">
64
-                                <#if jobLogCount gt 0>
64
+                                调度中心触发的调度次数
65
+                                <#--<#if jobLogCount gt 0>
65
                                     调度成功率:${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small>
66
                                     调度成功率:${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small>
66
-                                </#if>
67
+                                </#if>-->
67
                             </span>
68
                             </span>
68
                         </div>
69
                         </div>
69
                     </div>
70
                     </div>

+ 1 - 1
xxl-job-admin/src/main/webapp/static/js/index.js View File

103
     function pieChartInit(data) {
103
     function pieChartInit(data) {
104
         var option = {
104
         var option = {
105
             title : {
105
             title : {
106
-                text: '调度总次数',
106
+                text: '成功比例图',
107
                 /*subtext: 'subtext',*/
107
                 /*subtext: 'subtext',*/
108
                 x:'center'
108
                 x:'center'
109
             },
109
             },

+ 1 - 2
xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java View File

25
 	@Override
25
 	@Override
26
 	public ReturnT<String> execute(String... params) throws Exception {
26
 	public ReturnT<String> execute(String... params) throws Exception {
27
 		logger.info("----------- glue.version:{} -----------", glueUpdatetime);
27
 		logger.info("----------- glue.version:{} -----------", glueUpdatetime);
28
-		jobHandler.execute(params);
29
-		return ReturnT.SUCCESS;
28
+		return jobHandler.execute(params);
30
 	}
29
 	}
31
 
30
 
32
 }
31
 }