From 5280a4d03296c9dc17503bc779b737b42153a521 Mon Sep 17 00:00:00 2001 From: JINGYJ <1458671527@qq.com> Date: Mon, 11 Dec 2023 17:51:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=BB=84/=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/zh-CN/DCSDevice.ts | 57 ++++++++- .../DeviceCategoryList/components/Columns.tsx | 12 +- .../components/CreateForm.tsx | 18 +-- .../components/UpdateForm.tsx | 26 ++-- .../DCSDevice/DeviceCategoryList/index.tsx | 48 ++++---- .../DeviceGroupList/components/Columns.tsx | 28 ++--- .../DeviceGroupList/components/CreateForm.tsx | 48 ++++---- .../DeviceGroupList/components/UpdateForm.tsx | 64 +++++----- src/pages/DCSDevice/DeviceGroupList/index.tsx | 79 ++++++------ src/pages/DCSDevice/DeviceList/index.tsx | 115 +++++++++--------- 10 files changed, 272 insertions(+), 223 deletions(-) diff --git a/src/locales/zh-CN/DCSDevice.ts b/src/locales/zh-CN/DCSDevice.ts index fc3cb8d..8b4fd44 100644 --- a/src/locales/zh-CN/DCSDevice.ts +++ b/src/locales/zh-CN/DCSDevice.ts @@ -7,19 +7,68 @@ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -// 设备类别 +// 设备组 export const DCSDevice_group_list: { [key: string]: string } = { - 'DCSDeviceList.device_group.table.list.name': '设备名称' + 'DCSDeviceList.device_group.table.list.id': 'ID', + 'DCSDeviceList.device_group.table.list.name': '分组名称', + 'DCSDeviceList.device_group.table.list.code': '分组代码', + 'DCSDeviceList.device_group.table.list.address': '设备组地址', + 'DCSDeviceList.device_group.table.list.telephone': '电话', + 'DCSDeviceList.device_group.table.list.lon': '经度', + 'DCSDeviceList.device_group.table.list.lat': '纬度', + 'DCSDeviceList.device_group.table.list.managerName': '负责人', + 'DCSDeviceList.device_group.table.list.managerPhone': '负责人联系方式', + 'DCSDeviceList.device_group.table.list.isEnable': '是否启用', + 'DCSDeviceList.device_group.table.list.parentFkId': '父设备组', + 'DCSDeviceList.device_group.table.list.remark': '备注', + 'DCSDeviceList.device_group.table.list.createTime': '创建时间', + 'DCSDeviceList.device_group.table.list.updateTime': '更新时间', + 'DCSDeviceList.device_group.table.rule.required.name': '分组名称为必填项', + 'DCSDeviceList.device_group.table.rule.required.code': '分组代码为必填项', + 'DCSDeviceList.device_group.table.rule.required.managerName': '负责人姓名为必填项', + 'DCSDeviceList.device_group.table.rule.required.managerPhone': '负责人联系方式为必填项', + 'DCSDeviceList.device_group.table.rule.required.parentFkId': '父节点为必填项', + 'DCSDeviceList.device_group.table.list.add': '新建设备分组', + 'DCSDeviceList.device_group.table.list.update': '更新设备分组', + 'DCSDeviceList.device_group.table.list.treeAdd': '新建', + 'DCSDeviceList.device_group.table.list.create_son': '添加子节点', + 'DCSDeviceList.device_group.table.list.editor': '编辑', } // 设备类别 export const DCSDevice_category_list: { [key: string]: string } = { - 'DCSDeviceList.device_category.table.list.name': '设备名称' + 'DCSDeviceList.device_category.table.list.id': 'ID', + 'DCSDeviceList.device_category.table.list.name': '类别名称', + 'DCSDeviceList.device_category.table.list.code': '类别代码', + 'DCSDeviceList.device_category.table.list.remark': '备注', + 'DCSDeviceList.device_category.table.list.createTime': '创建时间', + 'DCSDeviceList.device_category.table.list.updateTime': '更新时间', + 'DCSDeviceList.device_category.table.rule.required.name': '类别名称为必填项', + 'DCSDeviceList.device_category.table.rule.required.code': '类别代码为必填项', + 'DCSDeviceList.device_category.table.list.add': '新建设备类别', + 'DCSDeviceList.device_category.table.list.update': '更新设备类别', + 'DCSDeviceList.device_category.table.list.editor': '编辑', } // 设备列表 export const DCSDevice_list: { [key: string]: string } = { - 'DCSDeviceList.device.table.list.name': '设备名称' + 'DCSDeviceList.device.table.list.id': 'ID', + 'DCSDeviceList.device.table.list.name': '设备名称', + 'DCSDeviceList.device.table.list.code': '设备代码', + 'DCSDeviceList.device.table.list.position': '位置', + 'DCSDeviceList.device.table.list.param': '设备参数', + 'DCSDeviceList.device.table.list.spec': '设备规格', + 'DCSDeviceList.device.table.list.categoryFkId': '设备类别', + 'DCSDeviceList.device.table.list.groupFkId': '设备分组', + 'DCSDeviceList.device.table.list.isEnable': '是否启用', + 'DCSDeviceList.device.table.list.remark': '备注', + 'DCSDeviceList.device.table.list.createTime': '创建时间', + 'DCSDeviceList.device.table.list.updateTime': '更新时间', + 'DCSDeviceList.device.table.rule.required.name': '设备名称为必填项', + 'DCSDeviceList.device.table.rule.required.code': '设备代码为必填项', + 'DCSDeviceList.device.table.list.add': '新建设备', + 'DCSDeviceList.device.table.list.update': '更新设备', + 'DCSDeviceList.device_category.table.list.editor': '编辑', } // 设备状态 diff --git a/src/pages/DCSDevice/DeviceCategoryList/components/Columns.tsx b/src/pages/DCSDevice/DeviceCategoryList/components/Columns.tsx index 45d6c35..90f714b 100644 --- a/src/pages/DCSDevice/DeviceCategoryList/components/Columns.tsx +++ b/src/pages/DCSDevice/DeviceCategoryList/components/Columns.tsx @@ -1,32 +1,32 @@ import { FormattedMessage} from '@umijs/max'; export const DeviceCategoryColumns = [{ title: (), dataIndex: "id", },{ title: (), dataIndex: "name", },{ title: (), dataIndex: "code", },{ title: (), dataIndex: "remark", },{ title: (), dataIndex: "create_time", },{ title: (), dataIndex: "update_time", },] diff --git a/src/pages/DCSDevice/DeviceCategoryList/components/CreateForm.tsx b/src/pages/DCSDevice/DeviceCategoryList/components/CreateForm.tsx index abf8d84..137116e 100644 --- a/src/pages/DCSDevice/DeviceCategoryList/components/CreateForm.tsx +++ b/src/pages/DCSDevice/DeviceCategoryList/components/CreateForm.tsx @@ -30,7 +30,7 @@ const CreateForm: React.FC = (props) => { width={proFormSmallModelWidth} title={intl.formatMessage({ - id: 'device.device_category.table.list.add', + id: 'DCSDeviceList.device_category.table.list.add', defaultMessage: '$$$', })} open={props.createModalOpen} @@ -59,13 +59,13 @@ const CreateForm: React.FC = (props) => { width={proFormSmallItemStyleProps.width} name="name" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.name', + id: 'DCSDeviceList.device_category.table.list.name', defaultMessage: '$$$', })}`} required={true} @@ -74,7 +74,7 @@ const CreateForm: React.FC = (props) => { required: true, message: ( ), @@ -85,13 +85,13 @@ const CreateForm: React.FC = (props) => { width="lg" name="code" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.code', + id: 'DCSDeviceList.device_category.table.list.code', defaultMessage: '$$$', })}`} required={!isAuto} @@ -105,7 +105,7 @@ const CreateForm: React.FC = (props) => { required: true, message: ( ), @@ -125,13 +125,13 @@ const CreateForm: React.FC = (props) => { width={proFormSmallItemStyleProps.width} name="remark" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.remark', + id: 'DCSDeviceList.device_category.table.list.remark', defaultMessage: '$$$', })}`} required={false} diff --git a/src/pages/DCSDevice/DeviceCategoryList/components/UpdateForm.tsx b/src/pages/DCSDevice/DeviceCategoryList/components/UpdateForm.tsx index 4be2c5b..64ea0c0 100644 --- a/src/pages/DCSDevice/DeviceCategoryList/components/UpdateForm.tsx +++ b/src/pages/DCSDevice/DeviceCategoryList/components/UpdateForm.tsx @@ -34,7 +34,7 @@ const UpdateForm: React.FC = (props) => { width={proFormModelWidth} title={intl.formatMessage({ - id: 'device.device_category.table.list.update', + id: 'DCSDeviceList.device_category.table.list.update', defaultMessage: '$$$', })} open={props.updateModalOpen} @@ -71,13 +71,13 @@ const UpdateForm: React.FC = (props) => { width={proFormItemStyleProps.column2Width} name="name" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.name', + id: 'DCSDeviceList.device_category.table.list.name', defaultMessage: '$$$', })}`} required={true} @@ -88,7 +88,7 @@ const UpdateForm: React.FC = (props) => { required: true, message: ( ), @@ -99,13 +99,13 @@ const UpdateForm: React.FC = (props) => { width={proFormItemStyleProps.column2Width} name="code" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.code', + id: 'DCSDeviceList.device_category.table.list.code', defaultMessage: '$$$', })}`} required={true} @@ -116,7 +116,7 @@ const UpdateForm: React.FC = (props) => { required: true, message: ( ), @@ -127,13 +127,13 @@ const UpdateForm: React.FC = (props) => { width={proFormItemStyleProps.column2Width} name="remark" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.remark', + id: 'DCSDeviceList.device_category.table.list.remark', defaultMessage: '$$$', })}`} required={false} @@ -145,7 +145,7 @@ const UpdateForm: React.FC = (props) => { name="createTime" label={ } @@ -153,7 +153,7 @@ const UpdateForm: React.FC = (props) => { id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.createTime', + id: 'DCSDeviceList.device_category.table.list.createTime', defaultMessage: '$$$', })}`} required={false} @@ -165,7 +165,7 @@ const UpdateForm: React.FC = (props) => { name="updateTime" label={ } @@ -173,7 +173,7 @@ const UpdateForm: React.FC = (props) => { id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_category.table.list.updateTime', + id: 'DCSDeviceList.device_category.table.list.updateTime', defaultMessage: '$$$', })}`} required={false} diff --git a/src/pages/DCSDevice/DeviceCategoryList/index.tsx b/src/pages/DCSDevice/DeviceCategoryList/index.tsx index 2344320..ef5fa17 100644 --- a/src/pages/DCSDevice/DeviceCategoryList/index.tsx +++ b/src/pages/DCSDevice/DeviceCategoryList/index.tsx @@ -76,39 +76,39 @@ const DeviceCategoryList: React.FC = () => { }; const columns: ProColumns[] = [ - { - title: , - dataIndex: 'id', - sorter: true, - render: (dom, entity) => { - return ( - { - setCurrentRow(entity); - setShowDetail(true); - }} - > - {dom} - - ); - }, - }, + // { + // title: , + // dataIndex: 'id', + // sorter: true, + // render: (dom, entity) => { + // return ( + // { + // setCurrentRow(entity); + // setShowDetail(true); + // }} + // > + // {dom} + // + // ); + // }, + // }, { - title: , + title: , dataIndex: 'name', - hideInSearch: true, + hideInSearch: false, }, { - title: , + title: , dataIndex: 'code', hideInSearch: true, }, { title: ( - + ), dataIndex: 'remark', hideInSearch: true, @@ -116,7 +116,7 @@ const DeviceCategoryList: React.FC = () => { { title: ( - + ), dataIndex: 'createTime', sorter: true, @@ -126,7 +126,7 @@ const DeviceCategoryList: React.FC = () => { { title: ( - + ), dataIndex: 'updateTime', sorter: true, @@ -155,7 +155,7 @@ const DeviceCategoryList: React.FC = () => { setCurrentRow(record); }} > - + ), }, diff --git a/src/pages/DCSDevice/DeviceGroupList/components/Columns.tsx b/src/pages/DCSDevice/DeviceGroupList/components/Columns.tsx index b2631bf..9d9204d 100644 --- a/src/pages/DCSDevice/DeviceGroupList/components/Columns.tsx +++ b/src/pages/DCSDevice/DeviceGroupList/components/Columns.tsx @@ -1,72 +1,72 @@ import { FormattedMessage} from '@umijs/max'; export const DeviceGroupColumns = [{ title: (), dataIndex: "id", },{ title: (), dataIndex: "name", },{ title: (), dataIndex: "code", },{ title: (), dataIndex: "address", },{ title: (), dataIndex: "telephone", },{ title: (), dataIndex: "lon", },{ title: (), dataIndex: "lat", },{ title: (), dataIndex: "manager_name", },{ title: (), dataIndex: "manager_phone", },{ title: (), dataIndex: "is_enable", },{ title: (), dataIndex: "parent_fk_id", },{ title: (), dataIndex: "remark", },{ title: (), dataIndex: "create_time", },{ title: (), dataIndex: "update_time", },] diff --git a/src/pages/DCSDevice/DeviceGroupList/components/CreateForm.tsx b/src/pages/DCSDevice/DeviceGroupList/components/CreateForm.tsx index d407433..1720737 100644 --- a/src/pages/DCSDevice/DeviceGroupList/components/CreateForm.tsx +++ b/src/pages/DCSDevice/DeviceGroupList/components/CreateForm.tsx @@ -45,7 +45,7 @@ const CreateForm: React.FC = (props) => { width={proFormModelWidth} title={intl.formatMessage({ - id: 'device.device_group.table.list.add', + id: 'DCSDeviceList.device_group.table.list.add', defaultMessage: '$$$', })} open={props.createModalOpen} @@ -76,13 +76,13 @@ const CreateForm: React.FC = (props) => { initialValue={parentId} disabled={true} label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_select', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.parentFkId', + id: 'DCSDeviceList.device_group.table.list.parentFkId', defaultMessage: '$$$', })}`} request={async () => parentSelectOptions} @@ -90,12 +90,12 @@ const CreateForm: React.FC = (props) => { } + label={} placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.name', + id: 'DCSDeviceList.device_group.table.list.name', defaultMessage: '$$$', })}`} required={true} @@ -104,7 +104,7 @@ const CreateForm: React.FC = (props) => { required: true, message: ( ), @@ -114,12 +114,12 @@ const CreateForm: React.FC = (props) => { } + label={} placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.code', + id: 'DCSDeviceList.device_group.table.list.code', defaultMessage: '$$$', })}`} required={!isAuto} @@ -133,7 +133,7 @@ const CreateForm: React.FC = (props) => { required: true, message: ( ), @@ -153,18 +153,18 @@ const CreateForm: React.FC = (props) => { width={proFormItemStyleProps.column2Width} name="address" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.address', + id: 'DCSDeviceList.device_group.table.list.address', defaultMessage: '$$$', })}`} required={false} /> - = (props) => { defaultMessage: '$$$', })}`} required={false} - /> - */} + {/* } @@ -204,13 +204,13 @@ const CreateForm: React.FC = (props) => { defaultMessage: '$$$', })}`} required={false} - /> + /> */} } @@ -218,7 +218,7 @@ const CreateForm: React.FC = (props) => { id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.managerName', + id: 'DCSDeviceList.device_group.table.list.managerName', defaultMessage: '$$$', })}`} required={false} @@ -228,7 +228,7 @@ const CreateForm: React.FC = (props) => { name="managerPhone" label={ } @@ -236,7 +236,7 @@ const CreateForm: React.FC = (props) => { id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.managerPhone', + id: 'DCSDeviceList.device_group.table.list.managerPhone', defaultMessage: '$$$', })}`} required={false} @@ -247,25 +247,25 @@ const CreateForm: React.FC = (props) => { width={proFormItemStyleProps.column2Width} name="remark" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.remark', + id: 'DCSDeviceList.device_group.table.list.remark', defaultMessage: '$$$', })}`} required={false} /> - + } initialValue={true} - /> + /> */} ); diff --git a/src/pages/DCSDevice/DeviceGroupList/components/UpdateForm.tsx b/src/pages/DCSDevice/DeviceGroupList/components/UpdateForm.tsx index e090ff1..3902f62 100644 --- a/src/pages/DCSDevice/DeviceGroupList/components/UpdateForm.tsx +++ b/src/pages/DCSDevice/DeviceGroupList/components/UpdateForm.tsx @@ -32,7 +32,7 @@ const UpdateForm: React.FC = (props) => { width={proFormModelWidth} title={intl.formatMessage({ - id: 'device.device_group.table.list.update', + id: 'DCSDeviceList.device_group.table.list.update', defaultMessage: '$$$', })} open={props.updateModalOpen} @@ -70,12 +70,12 @@ const UpdateForm: React.FC = (props) => { } + label={} placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.name', + id: 'DCSDeviceList.device_group.table.list.name', defaultMessage: '$$$', })}`} required={true} @@ -86,7 +86,7 @@ const UpdateForm: React.FC = (props) => { required: true, message: ( ), @@ -96,12 +96,12 @@ const UpdateForm: React.FC = (props) => { } + label={} placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.code', + id: 'DCSDeviceList.device_group.table.list.code', defaultMessage: '$$$', })}`} required={true} @@ -112,7 +112,7 @@ const UpdateForm: React.FC = (props) => { required: true, message: ( ), @@ -123,30 +123,30 @@ const UpdateForm: React.FC = (props) => { width={proFormItemStyleProps.column2Width} name="address" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.address', + id: 'DCSDeviceList.device_group.table.list.address', defaultMessage: '$$$', })}`} required={false} initialValue={props.values.address} disabled={false} /> - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.telephone', + id: 'DCSDeviceList.device_group.table.list.telephone', defaultMessage: '$$$', })}`} required={false} @@ -156,12 +156,12 @@ const UpdateForm: React.FC = (props) => { } + label={} placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.lon', + id: 'DCSDeviceList.device_group.table.list.lon', defaultMessage: '$$$', })}`} required={false} @@ -171,24 +171,24 @@ const UpdateForm: React.FC = (props) => { } + label={} placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.lat', + id: 'DCSDeviceList.device_group.table.list.lat', defaultMessage: '$$$', })}`} required={false} initialValue={props.values.lat} disabled={false} - /> + /> */} } @@ -196,7 +196,7 @@ const UpdateForm: React.FC = (props) => { id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.managerName', + id: 'DCSDeviceList.device_group.table.list.managerName', defaultMessage: '$$$', })}`} required={false} @@ -208,7 +208,7 @@ const UpdateForm: React.FC = (props) => { name="managerPhone" label={ } @@ -216,51 +216,51 @@ const UpdateForm: React.FC = (props) => { id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.managerPhone', + id: 'DCSDeviceList.device_group.table.list.managerPhone', defaultMessage: '$$$', })}`} required={false} initialValue={props.values.managerPhone} disabled={false} /> - + } initialValue={props.values.isEnable} disabled={false} - /> + /> */} + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.remark', + id: 'DCSDeviceList.device_group.table.list.remark', defaultMessage: '$$$', })}`} required={false} initialValue={props.values.remark} disabled={false} /> - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.createTime', + id: 'DCSDeviceList.device_group.table.list.createTime', defaultMessage: '$$$', })}`} required={false} @@ -271,19 +271,19 @@ const UpdateForm: React.FC = (props) => { width={proFormItemStyleProps.column2Width} name="updateTime" label={ - + } placeholder={`${intl.formatMessage({ id: 'common.please_input', defaultMessage: '$$$', })}${intl.formatMessage({ - id: 'device.device_group.table.list.updateTime', + id: 'DCSDeviceList.device_group.table.list.updateTime', defaultMessage: '$$$', })}`} required={false} initialValue={props.values.updateTime} disabled={true} - /> + /> */} ); diff --git a/src/pages/DCSDevice/DeviceGroupList/index.tsx b/src/pages/DCSDevice/DeviceGroupList/index.tsx index 7fc2103..d387865 100644 --- a/src/pages/DCSDevice/DeviceGroupList/index.tsx +++ b/src/pages/DCSDevice/DeviceGroupList/index.tsx @@ -78,6 +78,7 @@ const DeviceGroupList: React.FC = () => { } }; const handleCreateModal = () => { + console.log(createModalOpen,'createModalOpen'); if (createModalOpen) { setCreateModalOpen(false); setCurrentRow(undefined); @@ -107,7 +108,7 @@ const DeviceGroupList: React.FC = () => { const columns: ProColumns[] = [ // TODO 确认是否需要和一级内容对齐 { - title: , + title: , dataIndex: 'name', sorter: true, render: (dom, entity) => { @@ -126,54 +127,54 @@ const DeviceGroupList: React.FC = () => { fixed: 'left', }, { - title: , + title: , dataIndex: 'code', hideInSearch: true, }, { - title: , + title: , dataIndex: 'address', hideInSearch: true, }, { title: ( - + ), dataIndex: 'telephone', hideInSearch: true, }, - { - title: , - dataIndex: 'lon', - hideInSearch: true, - }, + // { + // title: , + // dataIndex: 'lon', + // hideInSearch: true, + // }, - { - title: , - dataIndex: 'lat', - hideInSearch: true, - }, - { - title: ( - - ), - dataIndex: 'managerName', - hideInSearch: true, - }, + // { + // title: , + // dataIndex: 'lat', + // hideInSearch: true, + // }, + // { + // title: ( + // + // ), + // dataIndex: 'managerName', + // hideInSearch: true, + // }, - { - title: ( - - ), - dataIndex: 'managerPhone', - hideInSearch: true, - }, + // { + // title: ( + // + // ), + // dataIndex: 'managerPhone', + // hideInSearch: true, + // }, { - title: , + title: , dataIndex: 'isEnable', filters: true, onFilter: true, @@ -215,15 +216,15 @@ const DeviceGroupList: React.FC = () => { // }, // }, - { - title: , - dataIndex: 'remark', - hideInSearch: true, - }, + // { + // title: , + // dataIndex: 'remark', + // hideInSearch: true, + // }, { title: ( - + ), dataIndex: 'createTime', sorter: true, @@ -233,7 +234,7 @@ const DeviceGroupList: React.FC = () => { { title: ( - + ), dataIndex: 'updateTime', sorter: true, @@ -263,7 +264,7 @@ const DeviceGroupList: React.FC = () => { // setShowDetail(true); }} > - + ), }, @@ -279,7 +280,7 @@ const DeviceGroupList: React.FC = () => { setCurrentRow(record); }} > - + ), }, @@ -355,7 +356,7 @@ const DeviceGroupList: React.FC = () => { }} > {' '} - + , ]} diff --git a/src/pages/DCSDevice/DeviceList/index.tsx b/src/pages/DCSDevice/DeviceList/index.tsx index c55ff1a..e81eb39 100644 --- a/src/pages/DCSDevice/DeviceList/index.tsx +++ b/src/pages/DCSDevice/DeviceList/index.tsx @@ -194,10 +194,11 @@ const DeviceList: React.FC = () => { const columns: ProColumns[] = [ { - title: , + title: , dataIndex: 'name', width: '150', sorter: true, + hideInSearch: true, render: (dom, entity) => { return ( { // }, { - title: , + title: , dataIndex: 'code', hideInSearch: true, }, { - title: , + title: , dataIndex: 'position', hideInSearch: true, }, { - title: , + title: , dataIndex: 'param', hideInSearch: true, }, { - title: , + title: , dataIndex: 'spec', hideInSearch: true, }, { - title: , + title: , dataIndex: 'categoryFkId', - hideInSearch: false, + hideInSearch: true, render: (text, record) => { if (category_fk_id_column_open) { return ( @@ -316,9 +317,9 @@ const DeviceList: React.FC = () => { }, { - title: , + title: , dataIndex: 'groupFkId', - hideInSearch: false, + hideInSearch: true, render: (text, record) => { if (group_fk_id_column_open) { return ( @@ -370,7 +371,7 @@ const DeviceList: React.FC = () => { }, { - title: , + title: , dataIndex: 'isEnable', filters: true, onFilter: true, @@ -379,13 +380,13 @@ const DeviceList: React.FC = () => { }, { - title: , + title: , dataIndex: 'remark', hideInSearch: true, }, { - title: , + title: , dataIndex: 'createTime', sorter: true, hideInSearch: true, @@ -393,7 +394,7 @@ const DeviceList: React.FC = () => { }, { - title: , + title: , dataIndex: 'updateTime', sorter: true, hideInSearch: true, @@ -421,7 +422,7 @@ const DeviceList: React.FC = () => { setCurrentRow(record); }} > - + ), }, @@ -435,45 +436,45 @@ const DeviceList: React.FC = () => { > ), }, - { - key: 'video', - renderDom: ( - - ), - }, + // { + // key: 'video', + // renderDom: ( + // + // ), + // }, ]} >, ], @@ -532,9 +533,7 @@ const DeviceList: React.FC = () => { actionRef={actionRef} rowKey="key" scroll={{ x: 2000, y: proTableCommonOptions.commscrollY }} - search={{ - labelWidth: proTableCommonOptions.searchLabelWidth, - }} + search={false} onDataSourceChange={(data) => { let CategoryFkIdIds: any = data.map((v) => { return v.categoryFkId; @@ -593,7 +592,7 @@ const DeviceList: React.FC = () => { )} @@ -610,7 +609,7 @@ const DeviceList: React.FC = () => { ) : ( )} - +