Skip to content

I
ibztask
提交 b1b2e9dc 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_xuhui 发布系统代码 [ibiz-task，任务调度]

上级 9d2ba5a5
隐藏空白字符变更
内嵌 并排
正在显示 包含 11 行增加 和 65 行删除
app_web/src/locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts
浏览文件 @ b1b2e9dc
......@@ -70,8 +70,6 @@ function getLocaleResourceBase(){
cron: commonLogic.appcommonhandle("任务执行CRON",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
last_time: commonLogic.appcommonhandle("上次调度时间",null),
next_time: commonLogic.appcommonhandle("下次调度时间",null),
status: commonLogic.appcommonhandle("状态",null),
timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
update_time: commonLogic.appcommonhandle("更新时间",null),
......
app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts
浏览文件 @ b1b2e9dc
......@@ -70,8 +70,6 @@ function getLocaleResourceBase(){
cron: commonLogic.appcommonhandle("任务执行CRON",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
last_time: commonLogic.appcommonhandle("上次调度时间",null),
next_time: commonLogic.appcommonhandle("下次调度时间",null),
status: commonLogic.appcommonhandle("状态",null),
timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
update_time: commonLogic.appcommonhandle("更新时间",null),
......
app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts
浏览文件 @ b1b2e9dc
......@@ -70,8 +70,6 @@ function getLocaleResourceBase(){
cron: commonLogic.appcommonhandle("任务执行CRON",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
last_time: commonLogic.appcommonhandle("上次调度时间",null),
next_time: commonLogic.appcommonhandle("下次调度时间",null),
status: commonLogic.appcommonhandle("状态",null),
timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
update_time: commonLogic.appcommonhandle("更新时间",null),
......
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
浏览文件 @ b1b2e9dc
......@@ -107,30 +107,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('last_time')">
<el-table-column show-overflow-tooltip :prop="'last_time'" :label="$t('entities.jobsinfo.main_grid.columns.last_time')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.jobsinfo.main_grid.columns.last_time')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.last_time}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('next_time')">
<el-table-column show-overflow-tooltip :prop="'next_time'" :label="$t('entities.jobsinfo.main_grid.columns.next_time')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.jobsinfo.main_grid.columns.next_time')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.next_time}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('status')">
<el-table-column show-overflow-tooltip :prop="'status'" :label="$t('entities.jobsinfo.main_grid.columns.status')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -791,24 +767,6 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'last_time',
label: '上次调度时间',
langtag: 'entities.jobsinfo.main_grid.columns.last_time',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'next_time',
label: '下次调度时间',
langtag: 'entities.jobsinfo.main_grid.columns.next_time',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'status',
label: '状态',
......@@ -1551,7 +1509,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['id','app','remark','handler','cron','last_run','next_run','last_time','next_time','status','timeout','update_time'];
let allColumns:Array<any> = ['id','app','remark','handler','cron','last_run','next_run','status','timeout','update_time'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1638,8 +1596,6 @@ export default class MainBase extends Vue implements ControlInterface {
cron:'',
last_run:'',
next_run:'',
last_time:'',
next_time:'',
status:'',
timeout:'',
update_time:'',
......@@ -1676,8 +1632,6 @@ export default class MainBase extends Vue implements ControlInterface {
cron:'',
last_run:'',
next_run:'',
last_time:'',
next_time:'',
status:'',
timeout:'',
update_time:'',
......@@ -1734,8 +1688,6 @@ export default class MainBase extends Vue implements ControlInterface {
cron:'',
last_run:'',
next_run:'',
last_time:'',
next_time:'',
status:'',
timeout:'',
update_time:'',
......
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
浏览文件 @ b1b2e9dc
......@@ -61,16 +61,6 @@ export default class MainModel {
prop: 'next_run',
dataType: 'DATETIME',
},
{
name: 'last_time',
prop: 'last_time',
dataType: 'BIGINT',
},
{
name: 'next_time',
prop: 'next_time',
dataType: 'BIGINT',
},
{
name: 'status',
prop: 'status',
......@@ -86,6 +76,16 @@ export default class MainModel {
prop: 'update_time',
dataType: 'DATETIME',
},
{
name: 'last_time',
prop: 'last_time',
dataType: 'BIGINT',
},
{
name: 'next_time',
prop: 'next_time',
dataType: 'BIGINT',
},
{
name: 'srfkey',
prop: 'id',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或