Yaxin
/
General-AI-Platform-Web
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 设备组/设备类别

Browse Source
develop
JINGYJ 1 year ago
parent 628daf4cd1
commit 5280a4d032
10 changed files with 272 additions and 223 deletions
Show Stats Download Patch File Download Diff File

57
src/locales/zh-CN/DCSDevice.ts
Unescape Escape View File

@ -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': '编辑',
}
// 设备状态

12
src/pages/DCSDevice/DeviceCategoryList/components/Columns.tsx
Unescape Escape View File

@ -1,32 +1,32 @@
import { FormattedMessage} from '@umijs/max';
export const DeviceCategoryColumns = [{
title: (<FormattedMessage
id="device.device_category.table.list.id"
id="DCSDeviceList.device_category.table.list.id"
defaultMessage="$$$"/>),
dataIndex: "id",
},{
title: (<FormattedMessage
id="device.device_category.table.list.name"
id="DCSDeviceList.device_category.table.list.name"
defaultMessage="$$$"/>),
dataIndex: "name",
},{
title: (<FormattedMessage
id="device.device_category.table.list.code"
id="DCSDeviceList.device_category.table.list.code"
defaultMessage="$$$"/>),
dataIndex: "code",
},{
title: (<FormattedMessage
id="device.device_category.table.list.remark"
id="DCSDeviceList.device_category.table.list.remark"
defaultMessage="$$$"/>),
dataIndex: "remark",
},{
title: (<FormattedMessage
id="device.device_category.table.list.createTime"
id="DCSDeviceList.device_category.table.list.createTime"
defaultMessage="$$$"/>),
dataIndex: "create_time",
},{
title: (<FormattedMessage
id="device.device_category.table.list.updateTime"
id="DCSDeviceList.device_category.table.list.updateTime"
defaultMessage="$$$"/>),
dataIndex: "update_time",
},]

18
src/pages/DCSDevice/DeviceCategoryList/components/CreateForm.tsx
Unescape Escape View File

@ -30,7 +30,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
<ModalForm<API.DeviceCategory>
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<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="name"
label={
<FormattedMessage id="device.device_category.table.list.name" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.name" defaultMessage="$$$" />
}
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<CreateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_category.table.rule.required.name"
id="DCSDeviceList.device_category.table.rule.required.name"
defaultMessage="name is required"
/>
),
@ -85,13 +85,13 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width="lg"
name="code"
label={
<FormattedMessage id="device.device_category.table.list.code" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.code" defaultMessage="$$$" />
}
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<CreateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_category.table.rule.required.code"
id="DCSDeviceList.device_category.table.rule.required.code"
defaultMessage="code is required"
/>
),
@ -125,13 +125,13 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="remark"
label={
<FormattedMessage id="device.device_category.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.remark" defaultMessage="$$$" />
}
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}

26
src/pages/DCSDevice/DeviceCategoryList/components/UpdateForm.tsx
Unescape Escape View File

@ -34,7 +34,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
<ModalForm<API.DeviceCategory>
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<UpdateFormProps> = (props) => {
width={proFormItemStyleProps.column2Width}
name="name"
label={
<FormattedMessage id="device.device_category.table.list.name" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.name" defaultMessage="$$$" />
}
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<UpdateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_category.table.rule.required.name"
id="DCSDeviceList.device_category.table.rule.required.name"
defaultMessage="name is required"
/>
),
@ -99,13 +99,13 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormItemStyleProps.column2Width}
name="code"
label={
<FormattedMessage id="device.device_category.table.list.code" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.code" defaultMessage="$$$" />
}
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<UpdateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_category.table.rule.required.code"
id="DCSDeviceList.device_category.table.rule.required.code"
defaultMessage="code is required"
/>
),
@ -127,13 +127,13 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormItemStyleProps.column2Width}
name="remark"
label={
<FormattedMessage id="device.device_category.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.remark" defaultMessage="$$$" />
}
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<UpdateFormProps> = (props) => {
name="createTime"
label={
<FormattedMessage
id="device.device_category.table.list.createTime"
id="DCSDeviceList.device_category.table.list.createTime"
defaultMessage="$$$"
/>
}
@ -153,7 +153,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (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<UpdateFormProps> = (props) => {
name="updateTime"
label={
<FormattedMessage
id="device.device_category.table.list.updateTime"
id="DCSDeviceList.device_category.table.list.updateTime"
defaultMessage="$$$"
/>
}
@ -173,7 +173,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (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}

48
src/pages/DCSDevice/DeviceCategoryList/index.tsx
Unescape Escape View File

@ -76,39 +76,39 @@ const DeviceCategoryList: React.FC = () => {
};
const columns: ProColumns<API.DeviceCategory>[] = [
{
title: <FormattedMessage id="device.device_category.table.list.id" defaultMessage="id" />,
dataIndex: 'id',
sorter: true,
render: (dom, entity) => {
return (
<a
onClick={() => {
setCurrentRow(entity);
setShowDetail(true);
}}
>
{dom}
</a>
);
},
},
// {
// title: <FormattedMessage id="DCSDeviceList.device_category.table.list.id" defaultMessage="id" />,
// dataIndex: 'id',
// sorter: true,
// render: (dom, entity) => {
// return (
// <a
// onClick={() => {
// setCurrentRow(entity);
// setShowDetail(true);
// }}
// >
// {dom}
// </a>
// );
// },
// },
{
title: <FormattedMessage id="device.device_category.table.list.name" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device_category.table.list.name" defaultMessage="$$$" />,
dataIndex: 'name',
hideInSearch: true,
hideInSearch: false,
},
{
title: <FormattedMessage id="device.device_category.table.list.code" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device_category.table.list.code" defaultMessage="$$$" />,
dataIndex: 'code',
hideInSearch: true,
},
{
title: (
<FormattedMessage id="device.device_category.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.remark" defaultMessage="$$$" />
),
dataIndex: 'remark',
hideInSearch: true,
@ -116,7 +116,7 @@ const DeviceCategoryList: React.FC = () => {
{
title: (
<FormattedMessage id="device.device_category.table.list.createTime" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.createTime" defaultMessage="$$$" />
),
dataIndex: 'createTime',
sorter: true,
@ -126,7 +126,7 @@ const DeviceCategoryList: React.FC = () => {
{
title: (
<FormattedMessage id="device.device_category.table.list.updateTime" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.updateTime" defaultMessage="$$$" />
),
dataIndex: 'updateTime',
sorter: true,
@ -155,7 +155,7 @@ const DeviceCategoryList: React.FC = () => {
setCurrentRow(record);
}}
>
<FormattedMessage id="pages.searchTable.update" defaultMessage="Update" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.editor" defaultMessage="Update" />
</Button>
),
},

28
src/pages/DCSDevice/DeviceGroupList/components/Columns.tsx
Unescape Escape View File

@ -1,72 +1,72 @@
import { FormattedMessage} from '@umijs/max';
export const DeviceGroupColumns = [{
title: (<FormattedMessage
id="device.device_group.table.list.id"
id="DCSDeviceList.device_group.table.list.id"
defaultMessage="$$$"/>),
dataIndex: "id",
},{
title: (<FormattedMessage
id="device.device_group.table.list.name"
id="DCSDeviceList.device_group.table.list.name"
defaultMessage="$$$"/>),
dataIndex: "name",
},{
title: (<FormattedMessage
id="device.device_group.table.list.code"
id="DCSDeviceList.device_group.table.list.code"
defaultMessage="$$$"/>),
dataIndex: "code",
},{
title: (<FormattedMessage
id="device.device_group.table.list.address"
id="DCSDeviceList.device_group.table.list.address"
defaultMessage="$$$"/>),
dataIndex: "address",
},{
title: (<FormattedMessage
id="device.device_group.table.list.telephone"
id="DCSDeviceList.device_group.table.list.telephone"
defaultMessage="$$$"/>),
dataIndex: "telephone",
},{
title: (<FormattedMessage
id="device.device_group.table.list.lon"
id="DCSDeviceList.device_group.table.list.lon"
defaultMessage="$$$"/>),
dataIndex: "lon",
},{
title: (<FormattedMessage
id="device.device_group.table.list.lat"
id="DCSDeviceList.device_group.table.list.lat"
defaultMessage="$$$"/>),
dataIndex: "lat",
},{
title: (<FormattedMessage
id="device.device_group.table.list.managerName"
id="DCSDeviceList.device_group.table.list.managerName"
defaultMessage="$$$"/>),
dataIndex: "manager_name",
},{
title: (<FormattedMessage
id="device.device_group.table.list.managerPhone"
id="DCSDeviceList.device_group.table.list.managerPhone"
defaultMessage="$$$"/>),
dataIndex: "manager_phone",
},{
title: (<FormattedMessage
id="device.device_group.table.list.isEnable"
id="DCSDeviceList.device_group.table.list.isEnable"
defaultMessage="$$$"/>),
dataIndex: "is_enable",
},{
title: (<FormattedMessage
id="device.device_group.table.list.parentFkId"
id="DCSDeviceList.device_group.table.list.parentFkId"
defaultMessage="$$$"/>),
dataIndex: "parent_fk_id",
},{
title: (<FormattedMessage
id="device.device_group.table.list.remark"
id="DCSDeviceList.device_group.table.list.remark"
defaultMessage="$$$"/>),
dataIndex: "remark",
},{
title: (<FormattedMessage
id="device.device_group.table.list.createTime"
id="DCSDeviceList.device_group.table.list.createTime"
defaultMessage="$$$"/>),
dataIndex: "create_time",
},{
title: (<FormattedMessage
id="device.device_group.table.list.updateTime"
id="DCSDeviceList.device_group.table.list.updateTime"
defaultMessage="$$$"/>),
dataIndex: "update_time",
},]

48
src/pages/DCSDevice/DeviceGroupList/components/CreateForm.tsx
Unescape Escape View File

@ -45,7 +45,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
<ModalForm<API.DeviceGroup>
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<CreateFormProps> = (props) => {
initialValue={parentId}
disabled={true}
label={
<FormattedMessage id="device.device_group.table.list.parentFkId" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.parentFkId" defaultMessage="$$$" />
}
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<CreateFormProps> = (props) => {
<ProFormText
width={proFormItemStyleProps.column2Width}
name="name"
label={<FormattedMessage id="device.device_group.table.list.name" defaultMessage="$$$" />}
label={<FormattedMessage id="DCSDeviceList.device_group.table.list.name" defaultMessage="$$$" />}
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<CreateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_group.table.rule.required.name"
id="DCSDeviceList.device_group.table.rule.required.name"
defaultMessage="name is required"
/>
),
@ -114,12 +114,12 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
<ProFormText
width={proFormItemStyleProps.column2Width}
name="code"
label={<FormattedMessage id="device.device_group.table.list.code" defaultMessage="$$$" />}
label={<FormattedMessage id="DCSDeviceList.device_group.table.list.code" defaultMessage="$$$" />}
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<CreateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_group.table.rule.required.code"
id="DCSDeviceList.device_group.table.rule.required.code"
defaultMessage="code is required"
/>
),
@ -153,18 +153,18 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormItemStyleProps.column2Width}
name="address"
label={
<FormattedMessage id="device.device_group.table.list.address" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.address" defaultMessage="$$$" />
}
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}
/>
<ProFormText
{/* <ProFormText
width={proFormItemStyleProps.column2Width}
name="telephone"
label={
@ -178,8 +178,8 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
defaultMessage: '$$$',
})}`}
required={false}
/>
<ProFormText
/> */}
{/* <ProFormText
width={proFormItemStyleProps.column2Width}
name="lon"
label={<FormattedMessage id="device.device_group.table.list.lon" defaultMessage="$$$" />}
@ -204,13 +204,13 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
defaultMessage: '$$$',
})}`}
required={false}
/>
/> */}
<ProFormText
width={proFormItemStyleProps.column2Width}
name="managerName"
label={
<FormattedMessage
id="device.device_group.table.list.managerName"
id="DCSDeviceList.device_group.table.list.managerName"
defaultMessage="$$$"
/>
}
@ -218,7 +218,7 @@ const CreateForm: React.FC<CreateFormProps> = (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<CreateFormProps> = (props) => {
name="managerPhone"
label={
<FormattedMessage
id="device.device_group.table.list.managerPhone"
id="DCSDeviceList.device_group.table.list.managerPhone"
defaultMessage="$$$"
/>
}
@ -236,7 +236,7 @@ const CreateForm: React.FC<CreateFormProps> = (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<CreateFormProps> = (props) => {
width={proFormItemStyleProps.column2Width}
name="remark"
label={
<FormattedMessage id="device.device_group.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.remark" defaultMessage="$$$" />
}
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}
/>
<ProFormSwitch
{/* <ProFormSwitch
width={proFormItemStyleProps.column2Width}
name="isEnable"
label={
<FormattedMessage id="device.device_group.table.list.isEnable" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.isEnable" defaultMessage="$$$" />
}
initialValue={true}
/>
/> */}
</ProForm.Group>
</ModalForm>
);

64
src/pages/DCSDevice/DeviceGroupList/components/UpdateForm.tsx
Unescape Escape View File

@ -32,7 +32,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
<ModalForm<API.DeviceGroup>
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<UpdateFormProps> = (props) => {
<ProFormText
width={proFormItemStyleProps.column2Width}
name="name"
label={<FormattedMessage id="device.device_group.table.list.name" defaultMessage="$$$" />}
label={<FormattedMessage id="DCSDeviceList.device_group.table.list.name" defaultMessage="$$$" />}
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<UpdateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_group.table.rule.required.name"
id="DCSDeviceList.device_group.table.rule.required.name"
defaultMessage="name is required"
/>
),
@ -96,12 +96,12 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
<ProFormText
width={proFormItemStyleProps.column2Width}
name="code"
label={<FormattedMessage id="device.device_group.table.list.code" defaultMessage="$$$" />}
label={<FormattedMessage id="DCSDeviceList.device_group.table.list.code" defaultMessage="$$$" />}
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<UpdateFormProps> = (props) => {
required: true,
message: (
<FormattedMessage
id="device.device_group.table.rule.required.code"
id="DCSDeviceList.device_group.table.rule.required.code"
defaultMessage="code is required"
/>
),
@ -123,30 +123,30 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormItemStyleProps.column2Width}
name="address"
label={
<FormattedMessage id="device.device_group.table.list.address" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.address" defaultMessage="$$$" />
}
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}
/>
<ProFormText
{/* <ProFormText
width={proFormItemStyleProps.column2Width}
name="telephone"
label={
<FormattedMessage id="device.device_group.table.list.telephone" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.telephone" defaultMessage="$$$" />
}
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<UpdateFormProps> = (props) => {
<ProFormText
width={proFormItemStyleProps.column2Width}
name="lon"
label={<FormattedMessage id="device.device_group.table.list.lon" defaultMessage="$$$" />}
label={<FormattedMessage id="DCSDeviceList.device_group.table.list.lon" defaultMessage="$$$" />}
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<UpdateFormProps> = (props) => {
<ProFormText
width={proFormItemStyleProps.column2Width}
name="lat"
label={<FormattedMessage id="device.device_group.table.list.lat" defaultMessage="$$$" />}
label={<FormattedMessage id="DCSDeviceList.device_group.table.list.lat" defaultMessage="$$$" />}
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}
/>
/> */}
<ProFormText
width={proFormItemStyleProps.column2Width}
name="managerName"
label={
<FormattedMessage
id="device.device_group.table.list.managerName"
id="DCSDeviceList.device_group.table.list.managerName"
defaultMessage="$$$"
/>
}
@ -196,7 +196,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (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<UpdateFormProps> = (props) => {
name="managerPhone"
label={
<FormattedMessage
id="device.device_group.table.list.managerPhone"
id="DCSDeviceList.device_group.table.list.managerPhone"
defaultMessage="$$$"
/>
}
@ -216,51 +216,51 @@ const UpdateForm: React.FC<UpdateFormProps> = (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}
/>
<ProFormSwitch
{/* <ProFormSwitch
width={proFormItemStyleProps.column2Width}
name="isEnable"
label={
<FormattedMessage id="device.device_group.table.list.isEnable" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.isEnable" defaultMessage="$$$" />
}
initialValue={props.values.isEnable}
disabled={false}
/>
/> */}
<ProFormText
width={proFormItemStyleProps.column2Width}
name="remark"
label={
<FormattedMessage id="device.device_group.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.remark" defaultMessage="$$$" />
}
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}
/>
<ProFormDateTimePicker
{/* <ProFormDateTimePicker
width={proFormItemStyleProps.column2Width}
name="createTime"
label={
<FormattedMessage id="device.device_group.table.list.createTime" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.createTime" defaultMessage="$$$" />
}
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<UpdateFormProps> = (props) => {
width={proFormItemStyleProps.column2Width}
name="updateTime"
label={
<FormattedMessage id="device.device_group.table.list.updateTime" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.updateTime" defaultMessage="$$$" />
}
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}
/>
/> */}
</ProForm.Group>
</ModalForm>
);

79
src/pages/DCSDevice/DeviceGroupList/index.tsx
Unescape Escape View File

@ -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<API.DeviceGroup>[] = [
// TODO 确认是否需要和一级内容对齐
{
title: <span style={{paddingLeft: 0}}><FormattedMessage id="device.device_group.table.list.name" defaultMessage="id" /></span>,
title: <span style={{paddingLeft: 0}}><FormattedMessage id="DCSDeviceList.device_group.table.list.name" defaultMessage="id" /></span>,
dataIndex: 'name',
sorter: true,
render: (dom, entity) => {
@ -126,54 +127,54 @@ const DeviceGroupList: React.FC = () => {
fixed: 'left',
},
{
title: <FormattedMessage id="device.device_group.table.list.code" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device_group.table.list.code" defaultMessage="$$$" />,
dataIndex: 'code',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.device_group.table.list.address" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device_group.table.list.address" defaultMessage="$$$" />,
dataIndex: 'address',
hideInSearch: true,
},
{
title: (
<FormattedMessage id="device.device_group.table.list.telephone" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.telephone" defaultMessage="$$$" />
),
dataIndex: 'telephone',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.device_group.table.list.lon" defaultMessage="$$$" />,
dataIndex: 'lon',
hideInSearch: true,
},
// {
// title: <FormattedMessage id="device.device_group.table.list.lon" defaultMessage="$$$" />,
// dataIndex: 'lon',
// hideInSearch: true,
// },
{
title: <FormattedMessage id="device.device_group.table.list.lat" defaultMessage="$$$" />,
dataIndex: 'lat',
hideInSearch: true,
},
{
title: (
<FormattedMessage id="device.device_group.table.list.managerName" defaultMessage="$$$" />
),
dataIndex: 'managerName',
hideInSearch: true,
},
// {
// title: <FormattedMessage id="device.device_group.table.list.lat" defaultMessage="$$$" />,
// dataIndex: 'lat',
// hideInSearch: true,
// },
// {
// title: (
// <FormattedMessage id="device.device_group.table.list.managerName" defaultMessage="$$$" />
// ),
// dataIndex: 'managerName',
// hideInSearch: true,
// },
{
title: (
<FormattedMessage id="device.device_group.table.list.managerPhone" defaultMessage="$$$" />
),
dataIndex: 'managerPhone',
hideInSearch: true,
},
// {
// title: (
// <FormattedMessage id="device.device_group.table.list.managerPhone" defaultMessage="$$$" />
// ),
// dataIndex: 'managerPhone',
// hideInSearch: true,
// },
{
title: <FormattedMessage id="device.device_group.table.list.isEnable" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device_group.table.list.isEnable" defaultMessage="$$$" />,
dataIndex: 'isEnable',
filters: true,
onFilter: true,
@ -215,15 +216,15 @@ const DeviceGroupList: React.FC = () => {
// },
// },
{
title: <FormattedMessage id="device.device_group.table.list.remark" defaultMessage="$$$" />,
dataIndex: 'remark',
hideInSearch: true,
},
// {
// title: <FormattedMessage id="device.device_group.table.list.remark" defaultMessage="$$$" />,
// dataIndex: 'remark',
// hideInSearch: true,
// },
{
title: (
<FormattedMessage id="device.device_group.table.list.createTime" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.createTime" defaultMessage="$$$" />
),
dataIndex: 'createTime',
sorter: true,
@ -233,7 +234,7 @@ const DeviceGroupList: React.FC = () => {
{
title: (
<FormattedMessage id="device.device_group.table.list.updateTime" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.updateTime" defaultMessage="$$$" />
),
dataIndex: 'updateTime',
sorter: true,
@ -263,7 +264,7 @@ const DeviceGroupList: React.FC = () => {
// setShowDetail(true);
}}
>
<FormattedMessage id="common.create_son" defaultMessage="Create" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.create_son" defaultMessage="Create" />
</Button>
),
},
@ -279,7 +280,7 @@ const DeviceGroupList: React.FC = () => {
setCurrentRow(record);
}}
>
<FormattedMessage id="pages.searchTable.update" defaultMessage="Update" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.editor" defaultMessage="Update" />
</Button>
),
},
@ -355,7 +356,7 @@ const DeviceGroupList: React.FC = () => {
}}
>
<PlusOutlined />{' '}
<FormattedMessage id="device.device_group.table.list.treeAdd" defaultMessage="New" />
<FormattedMessage id="DCSDeviceList.device_group.table.list.treeAdd" defaultMessage="New" />
</Button>
</Access>,
]}

115
src/pages/DCSDevice/DeviceList/index.tsx
Unescape Escape View File

@ -194,10 +194,11 @@ const DeviceList: React.FC = () => {
const columns: ProColumns<API.Device>[] = [
{
title: <FormattedMessage id="device.device.table.list.name" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.name" defaultMessage="$$$" />,
dataIndex: 'name',
width: '150',
sorter: true,
hideInSearch: true,
render: (dom, entity) => {
return (
<a
@ -238,33 +239,33 @@ const DeviceList: React.FC = () => {
// },
{
title: <FormattedMessage id="device.device.table.list.code" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.code" defaultMessage="$$$" />,
dataIndex: 'code',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.device.table.list.position" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.position" defaultMessage="$$$" />,
dataIndex: 'position',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.device.table.list.param" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.param" defaultMessage="$$$" />,
dataIndex: 'param',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.device.table.list.spec" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.spec" defaultMessage="$$$" />,
dataIndex: 'spec',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.device.table.list.categoryFkId" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.categoryFkId" defaultMessage="$$$" />,
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: <FormattedMessage id="device.device.table.list.groupFkId" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.groupFkId" defaultMessage="$$$" />,
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: <FormattedMessage id="device.device.table.list.isEnable" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.isEnable" defaultMessage="$$$" />,
dataIndex: 'isEnable',
filters: true,
onFilter: true,
@ -379,13 +380,13 @@ const DeviceList: React.FC = () => {
},
{
title: <FormattedMessage id="device.device.table.list.remark" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.remark" defaultMessage="$$$" />,
dataIndex: 'remark',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.device.table.list.createTime" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.createTime" defaultMessage="$$$" />,
dataIndex: 'createTime',
sorter: true,
hideInSearch: true,
@ -393,7 +394,7 @@ const DeviceList: React.FC = () => {
},
{
title: <FormattedMessage id="device.device.table.list.updateTime" defaultMessage="$$$" />,
title: <FormattedMessage id="DCSDeviceList.device.table.list.updateTime" defaultMessage="$$$" />,
dataIndex: 'updateTime',
sorter: true,
hideInSearch: true,
@ -421,7 +422,7 @@ const DeviceList: React.FC = () => {
setCurrentRow(record);
}}
>
<FormattedMessage id="pages.searchTable.update" defaultMessage="Update" />
<FormattedMessage id="DCSDeviceList.device_category.table.list.editor" defaultMessage="Update" />
</Button>
),
},
@ -435,45 +436,45 @@ const DeviceList: React.FC = () => {
></IsDelete>
),
},
{
key: 'video',
renderDom: (
<Button
key="video"
type="link"
size="small"
onClick={() => {
setVideoOpening(true);
if (record.param) {
postDeviceOpenRtspCamera({ url: record.param })
.then((resp) => {
setVideoServerParam(resp.data);
setVideoOpening(false);
setVideoModalOpen(true);
console.log(resp.data);
setCurrentRow(record);
})
.catch(() => {
setVideoOpening(false);
message.error(
intl.formatMessage({
id: 'common.open_failure',
defaultMessage: '$$$',
}),
);
});
} else {
setVideoOpening(false);
message.error(
intl.formatMessage({ id: 'common.open_failure', defaultMessage: '$$$' }),
);
}
}}
>
<FormattedMessage id="common.open_video" defaultMessage="$$$" />
</Button>
),
},
// {
// key: 'video',
// renderDom: (
// <Button
// key="video"
// type="link"
// size="small"
// onClick={() => {
// setVideoOpening(true);
// if (record.param) {
// postDeviceOpenRtspCamera({ url: record.param })
// .then((resp) => {
// setVideoServerParam(resp.data);
// setVideoOpening(false);
// setVideoModalOpen(true);
// console.log(resp.data);
// setCurrentRow(record);
// })
// .catch(() => {
// setVideoOpening(false);
// message.error(
// intl.formatMessage({
// id: 'common.open_failure',
// defaultMessage: '$$$',
// }),
// );
// });
// } else {
// setVideoOpening(false);
// message.error(
// intl.formatMessage({ id: 'common.open_failure', defaultMessage: '$$$' }),
// );
// }
// }}
// >
// <FormattedMessage id="common.open_video" defaultMessage="$$$" />
// </Button>
// ),
// },
]}
></TableActionCard>,
],
@ -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 = () => {
<FormattedMessage id="common.show" defaultMessage="$$$" />
)}
<FormattedMessage
id="device.device.table.list.categoryFkId"
id="DCSDeviceList.device.table.list.categoryFkId"
defaultMessage="$$$"
/>
</Button>
@ -610,7 +609,7 @@ const DeviceList: React.FC = () => {
) : (
<FormattedMessage id="common.show" defaultMessage="$$$" />
)}
<FormattedMessage id="device.device.table.list.groupFkId" defaultMessage="$$$" />
<FormattedMessage id="DCSDeviceList.device.table.list.groupFkId" defaultMessage="$$$" />
</Button>
<Button

Write Preview
Loading…
Cancel
Save