Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibztask
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibztask
提交
9b431076
提交
9b431076
编写于
11个月前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lab_xuhui 发布系统代码 [ibiz-task,任务调度]
上级
fb3fe17a
变更
5
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
33 行增加
和
1 行删除
+33
-1
jobs-info_BO_CN_base.ts
.../locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts
+1
-0
jobs-info_en_US_base.ts
.../locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts
+1
-0
jobs-info_zh_CN_base.ts
.../locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts
+1
-0
main-grid-base.vue
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
+25
-1
main-grid-model.ts
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
+5
-0
未找到文件。
app_web/src/locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts
浏览文件 @
9b431076
...
@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
...
@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
next_time
:
commonLogic
.
appcommonhandle
(
"下次调度时间"
,
null
),
next_time
:
commonLogic
.
appcommonhandle
(
"下次调度时间"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
timeout
:
commonLogic
.
appcommonhandle
(
"任务执行超时时间(秒)"
,
null
),
timeout
:
commonLogic
.
appcommonhandle
(
"任务执行超时时间(秒)"
,
null
),
update_time
:
commonLogic
.
appcommonhandle
(
"更新时间"
,
null
),
last_time_format
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
last_time_format
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
},
},
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts
浏览文件 @
9b431076
...
@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
...
@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
next_time
:
commonLogic
.
appcommonhandle
(
"下次调度时间"
,
null
),
next_time
:
commonLogic
.
appcommonhandle
(
"下次调度时间"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
timeout
:
commonLogic
.
appcommonhandle
(
"任务执行超时时间(秒)"
,
null
),
timeout
:
commonLogic
.
appcommonhandle
(
"任务执行超时时间(秒)"
,
null
),
update_time
:
commonLogic
.
appcommonhandle
(
"更新时间"
,
null
),
last_time_format
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
last_time_format
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
},
},
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts
浏览文件 @
9b431076
...
@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
...
@@ -71,6 +71,7 @@ function getLocaleResourceBase(){
next_time
:
commonLogic
.
appcommonhandle
(
"下次调度时间"
,
null
),
next_time
:
commonLogic
.
appcommonhandle
(
"下次调度时间"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
timeout
:
commonLogic
.
appcommonhandle
(
"任务执行超时时间(秒)"
,
null
),
timeout
:
commonLogic
.
appcommonhandle
(
"任务执行超时时间(秒)"
,
null
),
update_time
:
commonLogic
.
appcommonhandle
(
"更新时间"
,
null
),
last_time_format
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
last_time_format
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
},
},
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
浏览文件 @
9b431076
...
@@ -133,6 +133,18 @@
...
@@ -133,6 +133,18 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</template>
</template>
<
template
v-if=
"getColumnState('update_time')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'update_time'"
:label=
"$t('entities.jobsinfo.main_grid.columns.update_time')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.jobsinfo.main_grid.columns.update_time'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<app-format-data
format=
"YYYY-MM-DD HH:mm:ss"
:data=
"row.update_time"
></app-format-data>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('last_time_format')"
>
<
template
v-if=
"getColumnState('last_time_format')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'last_time_format'"
:label=
"$t('entities.jobsinfo.main_grid.columns.last_time_format')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'last_time_format'"
:label=
"$t('entities.jobsinfo.main_grid.columns.last_time_format')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<template
v-slot:header=
"
{column}">
...
@@ -785,6 +797,15 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -785,6 +797,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit
:
false
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
enableCond
:
3
,
},
},
{
name
:
'update_time'
,
label
:
'更新时间'
,
langtag
:
'entities.jobsinfo.main_grid.columns.update_time'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
{
name
:
'last_time_format'
,
name
:
'last_time_format'
,
label
:
'上次执行时间'
,
label
:
'上次执行时间'
,
...
@@ -1509,7 +1530,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1509,7 +1530,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
* @memberof MainBase
*/
*/
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
let
allColumns
:
Array
<
any
>
=
[
'id'
,
'app'
,
'remark'
,
'handler'
,
'cron'
,
'last_time'
,
'next_time'
,
'status'
,
'timeout'
,
'last_time_format'
];
let
allColumns
:
Array
<
any
>
=
[
'id'
,
'app'
,
'remark'
,
'handler'
,
'cron'
,
'last_time'
,
'next_time'
,
'status'
,
'timeout'
,
'
update_time'
,
'
last_time_format'
];
if
(
row
&&
row
.
children
)
{
if
(
row
&&
row
.
children
)
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
return
[
1
,
allColumns
.
length
+
1
];
return
[
1
,
allColumns
.
length
+
1
];
...
@@ -1598,6 +1619,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1598,6 +1619,7 @@ export default class MainBase extends Vue implements ControlInterface {
next_time
:
''
,
next_time
:
''
,
status
:
''
,
status
:
''
,
timeout
:
''
,
timeout
:
''
,
update_time
:
''
,
last_time_format
:
''
,
last_time_format
:
''
,
children
:
children
children
:
children
}
}
...
@@ -1634,6 +1656,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1634,6 +1656,7 @@ export default class MainBase extends Vue implements ControlInterface {
next_time
:
''
,
next_time
:
''
,
status
:
''
,
status
:
''
,
timeout
:
''
,
timeout
:
''
,
update_time
:
''
,
last_time_format
:
''
,
last_time_format
:
''
,
children
:
child
children
:
child
}
}
...
@@ -1690,6 +1713,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1690,6 +1713,7 @@ export default class MainBase extends Vue implements ControlInterface {
next_time
:
''
,
next_time
:
''
,
status
:
''
,
status
:
''
,
timeout
:
''
,
timeout
:
''
,
update_time
:
''
,
last_time_format
:
''
,
last_time_format
:
''
,
children
:
children
,
children
:
children
,
}
}
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
浏览文件 @
9b431076
...
@@ -71,6 +71,11 @@ export default class MainModel {
...
@@ -71,6 +71,11 @@ export default class MainModel {
prop
:
'timeout'
,
prop
:
'timeout'
,
dataType
:
'INT'
,
dataType
:
'INT'
,
},
},
{
name
:
'update_time'
,
prop
:
'update_time'
,
dataType
:
'DATETIME'
,
},
{
{
name
:
'last_time_format'
,
name
:
'last_time_format'
,
prop
:
'last_time_format'
,
prop
:
'last_time_format'
,
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录