Spider/spider-flow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复合并中的错误

Browse Source
This commit is contained in:
mxd 2019-12-06 18:15:28 +08:00
parent c688f5d277
commit c5bbb549c4
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spider-flow-web/src/main/resources/static/spiderList.html
View File

@ -50,7 +50,7 @@
},{
title : 'cron表达式',
field : 'cron',
width : 120,
width : 100,
templet : function(row){
return '<a class="layui-btn layui-btn-sm btn-edit-cron" data-id="'+row.id+'" data-cron="'+row.cron+'">'+(row.cron || '编辑cron')+'</a>';
}
@ -72,10 +72,11 @@
field : 'lastExecuteTime',
align : 'center'
},{
title : '已执行',
width : 80,
title : '运行中/已完成',
width : 120,
field : 'executeCount',
align : 'center'
align : 'center',
templet : '#execute-count'
},{
title : '下次执行时间',
width : 160,
@ -164,8 +165,10 @@
})
layui.layer.close(index);
})
}).on('click','.btn-task',function(){
parent.openTab($(this).data('name') + '-任务详情',$(this).data('id') + '-task','task.html?id=' + $(this).data('id') + '&name=' + encodeURIComponent(encodeURIComponent($(this).data('name'))));
}).on('click','.btn-log',function(){
parent.openTab($(this).data('name') + '-日志',$(this).data('id'),'log.html?id=' + $(this).data('id'));
parent.openTab($(this).data('name') + '-日志',$(this).data('id') + '-log','log.html?id=' + $(this).data('id'));
}).on('click','.btn-edit-cron',function(){
var id = $(this).data('id');
var value = $(this).data('cron') || '';
@ -179,6 +182,9 @@
});
})
</script>
<script type="text/html" id="execute-count">
<a class="layui-btn layui-btn-sm btn-task" data-name="{{d.name}}" data-id="{{d.id}}">{{d.running || 0}}/{{d.executeCount || 0}}</a>
</script>
<script type="text/html" id="buttons">
<a class="layui-btn layui-btn-sm btn-run" data-id="{{d.id}}">手动运行</a>
<a class="layui-btn layui-btn-sm btn-log" data-name="{{d.name}}" data-id="{{d.id}}">查看日志</a>

2
spider-flow-web/src/main/resources/static/task.html
View File

@ -90,7 +90,7 @@
layui.layer.close(index);
})
}).on('click','.btn-log',function(){
parent.openTab(decodeURIComponent(decodeURIComponent(getQueryString('name'))) + '-日志','log.html?id=' + $(this).data('id'));
parent.openTab(decodeURIComponent(decodeURIComponent(getQueryString('name'))) + '-日志',$(this).data('id') + '-log','log.html?id=' + $(this).data('id'));
})
</script>
<script type="text/html" id="buttons">