@@ -43,39 +45,42 @@
-
- |
-
-
- |
+ |
+ {{job.group}} |
+ {{job.user && job.user.length > 0 ? job.user : '-'}} |
+ {{job.name}} |
+
+ -
+ {{formatLatest(job.latestStatus)}}
+
+ {{formatNextRunTime(job.nextRunTime)}}
+ |
+
+ -
+ {{$L(job.latestStatus.success ? 'successed' : 'failed')}} |
+ latest |
+
+ |
+
+ | {{job.cmd}} |
+
@@ -100,7 +105,7 @@ export default {
jobs: []
}
},
-
+
mounted: function(){
this.fillParams();
var vm = this;
@@ -157,6 +162,7 @@ export default {
vm.jobs = resp;
vm.$nextTick(()=>{
$(vm.$el).find('table .ui.dropdown').dropdown();
+ $(vm.$refs.ruletip).popup();
});
}).do();
},
@@ -194,7 +200,7 @@ export default {
formatExecResult: function(st){
if (!st) return '-';
- return
+ return
},
formatLatest: function(latest){
@@ -209,6 +215,13 @@ export default {
this.$refs.executeJobModal.show(jobName, jobGroup, jobId);
},
+ showTimer: function(rules){
+ var timers = rules.map(function (rule) {
+ return rule.timer;
+ });
+ return timers.join("\n");
+ },
+
batch: function(op){
switch(op) {
case 'start': break;
diff --git a/web/ui/src/main.js b/web/ui/src/main.js
index 44e0180..1c177a8 100644
--- a/web/ui/src/main.js
+++ b/web/ui/src/main.js
@@ -46,6 +46,19 @@ var restApi = new Rest('/v1/', (msg) => {
bus.$emit('goLogin')
}
});
+var loadNodes = function(resolve) {
+ restApi.GET('nodes').onsucceed(200, (resp) => {
+ var nodes = {};
+ for (var i in resp) {
+ nodes[resp[i].id] = resp[i];
+ }
+ store.commit('setNodes', nodes);
+ if(typeof resolve == "function"){
+ resolve();
+ }
+ }).do();
+}
+
Vue.use((Vue, options) => {
Vue.prototype.$rest = restApi;
}, null);
@@ -60,6 +73,8 @@ Vue.use((Vue) => {
}
Vue.use(Config);
bus.$emit('conf_loaded', resp);
+ loadNodes();
+
}).onfailed((data, xhr) => {
var msg = data ? data : xhr.status + ' ' + xhr.statusText;
bus.$emit('error', msg);
@@ -132,18 +147,7 @@ var initConf = new Promise((resolve) => {
restApi.GET('configurations').onsucceed(200, (resp) => {
Vue.use((Vue) => Vue.prototype.$appConfig = resp);
bus.$emit('conf_loaded', resp);
-
- var loadNodes = function() {
- restApi.GET('nodes').onsucceed(200, (resp) => {
- var nodes = {};
- for (var i in resp) {
- nodes[resp[i].id] = resp[i];
- }
- store.commit('setNodes', nodes);
- resolve();
- }).do();
- }
- loadNodes();
+ loadNodes(resolve);
setInterval(loadNodes, 60*1000);
}).onfailed((data, xhr) => {