Showing
1 changed file
with
1 additions
and
32 deletions
| @@ -7,14 +7,11 @@ import { copyTransFun } from '/@/utils/fnUtils'; | @@ -7,14 +7,11 @@ import { copyTransFun } from '/@/utils/fnUtils'; | ||
| 7 | import { findDictItemByCode } from '/@/api/system/dict'; | 7 | import { findDictItemByCode } from '/@/api/system/dict'; |
| 8 | import { isTiming, isWeek, isMonth, isFixedTime } from './timeConfig'; | 8 | import { isTiming, isWeek, isMonth, isFixedTime } from './timeConfig'; |
| 9 | import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config'; | 9 | import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config'; |
| 10 | -import { Moment } from 'moment'; | ||
| 11 | import { | 10 | import { |
| 12 | getPacketIntervalByRange, | 11 | getPacketIntervalByRange, |
| 13 | getPacketIntervalByValue, | 12 | getPacketIntervalByValue, |
| 14 | intervalOption, | 13 | intervalOption, |
| 15 | } from '../../device/localtion/cpns/TimePeriodForm/helper'; | 14 | } from '../../device/localtion/cpns/TimePeriodForm/helper'; |
| 16 | -import { USER_INFO_KEY } from '/@/enums/cacheEnum'; | ||
| 17 | -import { getAuthCache } from '/@/utils/auth'; | ||
| 18 | 15 | ||
| 19 | export enum QueryWay { | 16 | export enum QueryWay { |
| 20 | LATEST = 'latest', | 17 | LATEST = 'latest', |
| @@ -75,12 +72,8 @@ export const columns: BasicColumn[] = [ | @@ -75,12 +72,8 @@ export const columns: BasicColumn[] = [ | ||
| 75 | }, | 72 | }, |
| 76 | { | 73 | { |
| 77 | title: '创建人', | 74 | title: '创建人', |
| 78 | - dataIndex: 'creator', | 75 | + dataIndex: 'createUserName', |
| 79 | width: 180, | 76 | width: 180, |
| 80 | - format: (_text: string, record: Recordable) => { | ||
| 81 | - const userInfo: any = getAuthCache(USER_INFO_KEY); | ||
| 82 | - if (record.creator == userInfo.userId) return userInfo.realName || userInfo.username; | ||
| 83 | - }, | ||
| 84 | }, | 77 | }, |
| 85 | { | 78 | { |
| 86 | title: '创建日期', | 79 | title: '创建日期', |
| @@ -438,30 +431,6 @@ export const formSchema: QFormSchema[] = [ | @@ -438,30 +431,6 @@ export const formSchema: QFormSchema[] = [ | ||
| 438 | defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')], | 431 | defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')], |
| 439 | }, | 432 | }, |
| 440 | }, | 433 | }, |
| 441 | - // componentProps({ formActionType }) { | ||
| 442 | - // const { setFieldsValue } = formActionType; | ||
| 443 | - // let dates: Moment[] = []; | ||
| 444 | - // return { | ||
| 445 | - // placeholder: ['请选择开始时间', '请选择结束时间'], | ||
| 446 | - // showTime: { | ||
| 447 | - // defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')], | ||
| 448 | - // }, | ||
| 449 | - // // onCalendarChange(value: Moment[]) { | ||
| 450 | - // // dates = value; | ||
| 451 | - // // }, | ||
| 452 | - // // disabledDate(current: Moment) { | ||
| 453 | - // // if (!dates || dates.length === 0 || !current) { | ||
| 454 | - // // return false; | ||
| 455 | - // // } | ||
| 456 | - // // const diffDate = current.diff(dates[0], 'years', true); | ||
| 457 | - // // return Math.abs(diffDate) > 1; | ||
| 458 | - // // }, | ||
| 459 | - // onChange() { | ||
| 460 | - // dates = []; | ||
| 461 | - // setFieldsValue({ [SchemaFiled.INTERVAL]: null }); | ||
| 462 | - // }, | ||
| 463 | - // }; | ||
| 464 | - // }, | ||
| 465 | colProps: { | 434 | colProps: { |
| 466 | span: 10, | 435 | span: 10, |
| 467 | }, | 436 | }, |