Commit cbeb685840994af9fc1d645493249eed18c750ff
Merge branch 'ft_local_dev' into 'main'
pref:修改创建日期为创建时间 See merge request huang/yun-teng-iot-front!353
Showing
2 changed files
with
11 additions
and
3 deletions
@@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [ | @@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [ | ||
76 | width: 180, | 76 | width: 180, |
77 | }, | 77 | }, |
78 | { | 78 | { |
79 | - title: '创建日期', | 79 | + title: '创建时间', |
80 | dataIndex: 'createTime', | 80 | dataIndex: 'createTime', |
81 | width: 180, | 81 | width: 180, |
82 | }, | 82 | }, |
@@ -245,7 +245,7 @@ export const formSchema: QFormSchema[] = [ | @@ -245,7 +245,7 @@ export const formSchema: QFormSchema[] = [ | ||
245 | label: '周期', | 245 | label: '周期', |
246 | required: true, | 246 | required: true, |
247 | colProps: { span: 24 }, | 247 | colProps: { span: 24 }, |
248 | - defaultValue:0, | 248 | + defaultValue: 0, |
249 | componentProps: { | 249 | componentProps: { |
250 | placeholder: '请选择周期', | 250 | placeholder: '请选择周期', |
251 | options: [ | 251 | options: [ |
1 | +/* | ||
2 | + * @Author: fengtao 1400859700@qq.com | ||
3 | + * @Date: 2022-10-12 09:29:11 | ||
4 | + * @LastEditors: fengtao 1400859700@qq.com | ||
5 | + * @LastEditTime: 2022-10-13 17:28:24 | ||
6 | + * @FilePath: \yun-teng-iot-front\src\views\scriptmanage\converscript\config.data.ts | ||
7 | + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||
8 | + */ | ||
1 | import { BasicColumn, FormSchema } from '/@/components/Table'; | 9 | import { BasicColumn, FormSchema } from '/@/components/Table'; |
2 | import moment from 'moment'; | 10 | import moment from 'moment'; |
3 | import { h } from 'vue'; | 11 | import { h } from 'vue'; |
@@ -33,7 +41,7 @@ export const columns: BasicColumn[] = [ | @@ -33,7 +41,7 @@ export const columns: BasicColumn[] = [ | ||
33 | width: 120, | 41 | width: 120, |
34 | }, | 42 | }, |
35 | { | 43 | { |
36 | - title: '创建日期', | 44 | + title: '创建时间', |
37 | dataIndex: 'executeTime', | 45 | dataIndex: 'executeTime', |
38 | width: 180, | 46 | width: 180, |
39 | }, | 47 | }, |