Commit 1a6b8f6e489829494769879fbdc3ce903bff16fa
Merge branch 'dev-ft' into 'main'
fix:修改Teambition上的问题 See merge request huang/yun-teng-iot-front!287
Showing
4 changed files
with
6 additions
and
12 deletions
@@ -36,11 +36,6 @@ export const columns: BasicColumn[] = [ | @@ -36,11 +36,6 @@ export const columns: BasicColumn[] = [ | ||
36 | width: 160, | 36 | width: 160, |
37 | }, | 37 | }, |
38 | { | 38 | { |
39 | - title: '备注', | ||
40 | - dataIndex: 'remark', | ||
41 | - width: 160, | ||
42 | - }, | ||
43 | - { | ||
44 | title: '发送时间', | 39 | title: '发送时间', |
45 | dataIndex: 'sendTime', | 40 | dataIndex: 'sendTime', |
46 | width: 180, | 41 | width: 180, |
@@ -36,11 +36,6 @@ export const columns: BasicColumn[] = [ | @@ -36,11 +36,6 @@ export const columns: BasicColumn[] = [ | ||
36 | }, | 36 | }, |
37 | }, | 37 | }, |
38 | { | 38 | { |
39 | - title: '备注', | ||
40 | - dataIndex: 'remark', | ||
41 | - width: 160, | ||
42 | - }, | ||
43 | - { | ||
44 | title: '发送时间', | 39 | title: '发送时间', |
45 | dataIndex: 'sendTime', | 40 | dataIndex: 'sendTime', |
46 | width: 160, | 41 | width: 160, |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <div> | 2 | <div> |
3 | <BasicModal | 3 | <BasicModal |
4 | v-bind="$attrs" | 4 | v-bind="$attrs" |
5 | - width="110rem" | 5 | + width="1460px" |
6 | :height="heightNum" | 6 | :height="heightNum" |
7 | @register="register" | 7 | @register="register" |
8 | title="调度日志" | 8 | title="调度日志" |
@@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
47 | format="YYYY-MM-DD HH:mm:ss" | 47 | format="YYYY-MM-DD HH:mm:ss" |
48 | /> | 48 | /> |
49 | </a-col> | 49 | </a-col> |
50 | - <a-col :span="4" style="margin-left: 10rem"> | 50 | + <a-col :span="4" style="margin-left: 12rem"> |
51 | <a-button type="primary" @click="handleClearData">重置</a-button> | 51 | <a-button type="primary" @click="handleClearData">重置</a-button> |
52 | <a-button style="margin-left: 10px" @click="handleSearchInfo">查询</a-button> | 52 | <a-button style="margin-left: 10px" @click="handleSearchInfo">查询</a-button> |
53 | </a-col> | 53 | </a-col> |
@@ -67,6 +67,10 @@ export const searchSchedueFormSchema: FormSchema[] = [ | @@ -67,6 +67,10 @@ export const searchSchedueFormSchema: FormSchema[] = [ | ||
67 | label: '系统', | 67 | label: '系统', |
68 | value: EJobGroup.SYSTEM, | 68 | value: EJobGroup.SYSTEM, |
69 | }, | 69 | }, |
70 | + { | ||
71 | + label: '报表', | ||
72 | + value: EJobGroup.REPORT, | ||
73 | + }, | ||
70 | ], | 74 | ], |
71 | placeholder: '请选择任务组名', | 75 | placeholder: '请选择任务组名', |
72 | }, | 76 | }, |