Yaxin
/
Uighur-Recognition-Web
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug英文和$$符号修改

Browse Source
develop
JINGYJ 1 year ago
parent 4776df67e9
commit 87f6b46a40
14 changed files with 162 additions and 134 deletions
Show Stats Download Patch File Download Diff File

10
src/components/TableActionCard/isDelete.tsx
Unescape Escape View File

@ -26,13 +26,13 @@ const IsDelete: React.FC<IsDeleteProps> = (props) => {
<Popconfirm
key="destroy"
placement="topLeft"
title={intl.formatMessage({ id: 'common.tip.title', defaultMessage: '$$$' })}
title={intl.formatMessage({ id: 'common.tip.title', defaultMessage: '温馨提示' })}
description={intl.formatMessage({
id: 'common.modal.table.delete.content',
defaultMessage: '$$$',
defaultMessage: '确定删除吗，删除后将无法找回，请谨慎操作',
})}
okText={intl.formatMessage({ id: 'common.yes', defaultMessage: '$$$' })}
cancelText={intl.formatMessage({ id: 'common.no', defaultMessage: '$$$' })}
okText={intl.formatMessage({ id: 'common.yes', defaultMessage: '是' })}
cancelText={intl.formatMessage({ id: 'common.no', defaultMessage: '否' })}
onConfirm={() => {
props.deleteApi();
}}
@ -48,7 +48,7 @@ const IsDelete: React.FC<IsDeleteProps> = (props) => {
<Button type="link" size="small" danger icon={<DeleteOutlined style={{
marginRight: 3
}}/>}>
<FormattedMessage id="pages.searchTable.destroy" defaultMessage="Destroy" />
<FormattedMessage id="pages.searchTable.destroy" defaultMessage="删除" />
</Button>
)}
</Popconfirm>

8
src/locales/en-US/menu.ts
Unescape Escape View File

@ -1,5 +1,5 @@
export default {
'menu.welcome': 'Welcome',
// 'menu.welcome': 'Welcome',
'menu.more-blocks': 'More Blocks',
'menu.home': 'Home',
'menu.admin': 'Admin',
@ -49,4 +49,10 @@ export default {
'menu.editor.flow': 'Flow Editor',
'menu.editor.mind': 'Mind Editor',
'menu.editor.koni': 'Koni Editor',
'menu.welcome': '首页',
'menu.alarm.alarm-list': '告警列表',
'menu.alarm-list': '告警列表',
'menu.alarm_rules': '告警规则',
'menu.interfaceManage': '接口管理',
'menu.userList': '用户列表',
};

6
src/locales/en-US/pages.ts
Unescape Escape View File

@ -2,7 +2,8 @@ export default {
'pages.layouts.userLayout.title':
'Ant Design is the most influential web design specification in Xihu district',
'pages.login.accountLogin.tab': 'Account Login',
'pages.login.accountLogin.errorMessage': 'Incorrect username/password(admin/ant.design)',
// 'pages.login.accountLogin.errorMessage': 'Incorrect username/password(admin/ant.design)',
'pages.login.accountLogin.errorMessage': '用户名或密码错误',
'pages.login.failure': 'Login failed, please try again!',
'pages.login.success': 'Login successful!',
'pages.login.username.placeholder': 'Username: admin or user',
@ -54,7 +55,8 @@ export default {
'pages.searchTable.nameStatus.abnormal': 'abnormal',
'pages.searchTable.titleUpdatedAt': 'Last Scheduled at',
'pages.searchTable.exception': 'Please enter the reason for the exception!',
'pages.searchTable.titleOption': 'Option',
// 'pages.searchTable.titleOption': 'Option',
'pages.searchTable.titleOption': '操作',
'pages.searchTable.config': 'Configuration',
'pages.searchTable.subscribeAlert': 'Subscribe to alerts',
'pages.searchTable.title': 'Enquiry Form',

7
src/pages/Alarm/AlarmList/components/AlarmDetails.tsx
Unescape Escape View File

@ -53,7 +53,10 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitter={{
resetButtonProps: {
style: {
@ -71,11 +74,11 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
// console.log(values);
postIgnoringvents(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();

36
src/pages/Alarm/alarmRules/components/UpdateForm.tsx
Unescape Escape View File

@ -33,7 +33,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormSmallModelWidth}
title={intl.formatMessage({
id: 'alarm_rules.page.form.title',
defaultMessage: `$$$`,
defaultMessage: `编辑单人徘徊告警`,
})}
open={props.updateModalOpen}
form={form}
@ -41,6 +41,8 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitTimeout={2000}
onFinish={async (values) => {
@ -49,11 +51,11 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
// console.log(values);
await postAlarmRules(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();
@ -67,7 +69,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
label={
<FormattedMessage
id="alarm_rules.page.form.isEnabled"
defaultMessage="$$$"
defaultMessage="启用告警"
/>
}
checkedChildren="启用"
@ -78,13 +80,13 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
<ProFormText
width={proFormSmallItemStyleProps.width}
name="warning_name"
label={<FormattedMessage id="alarm_rules.page.form.name" defaultMessage="$$$" />}
label={<FormattedMessage id="alarm_rules.page.form.name" defaultMessage="告警名称" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.name',
defaultMessage: '$$$',
defaultMessage: '告警名称',
})}`}
required={true}
initialValue={props.values.warning_name}
@ -95,7 +97,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.name"
defaultMessage="name is required"
defaultMessage="请填写告警名称"
/>
),
},
@ -115,10 +117,10 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
// label={<FormattedMessage id="alarm_rules.page.form.triggerConditions" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.triggerConditions',
defaultMessage: '$$$',
defaultMessage: '触发条件',
})}`}
required={true}
initialValue={props.values.time_period}
@ -129,7 +131,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.time_interval"
defaultMessage="name is required"
defaultMessage="请填写时间"
/>
),
},
@ -142,10 +144,10 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
// label={<FormattedMessage id="alarm_rules.page.form.triggerConditions" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.triggerConditions',
defaultMessage: '$$$',
defaultMessage: '触发条件',
})}`}
required={true}
initialValue={props.values.time_interval}
@ -156,7 +158,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.time_interval"
defaultMessage="name is required"
defaultMessage="请填写时间"
/>
),
},
@ -169,10 +171,10 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
// label={<FormattedMessage id="alarm_rules.page.form.triggerConditions" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.triggerConditions',
defaultMessage: '$$$',
defaultMessage: '触发条件',
})}`}
required={true}
initialValue={props.values.appear_number}
@ -183,7 +185,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.appear_number"
defaultMessage="name is required"
defaultMessage="请填写次数"
/>
),
},

28
src/pages/Alarm/alarmRules/components/UpdateMultiForm.tsx
Unescape Escape View File

@ -41,6 +41,8 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitTimeout={2000}
onFinish={async (values) => {
@ -49,11 +51,11 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
// console.log(values);
await postAlarmRules(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();
@ -82,7 +84,7 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
label={
<FormattedMessage
id="alarm_rules.page.form.isEnabled"
defaultMessage="$$$"
defaultMessage="启用告警"
/>
}
checkedChildren="启用"
@ -93,13 +95,13 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
<ProFormText
width={proFormSmallItemStyleProps.width}
name="warning_name"
label={<FormattedMessage id="alarm_rules.page.form.name" defaultMessage="$$$" />}
label={<FormattedMessage id="alarm_rules.page.form.name" defaultMessage="告警名称" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.name',
defaultMessage: '$$$',
defaultMessage: '告警名称',
})}`}
required={true}
initialValue={props.values.warning_name}
@ -110,7 +112,7 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.name"
defaultMessage="name is required"
defaultMessage="请填写告警名称"
/>
),
},
@ -130,10 +132,10 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
// label={<FormattedMessage id="alarm_rules.page.form.triggerConditions" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.triggerConditions',
defaultMessage: '$$$',
defaultMessage: '触发条件',
})}`}
required={true}
initialValue={props.values.person_number}
@ -144,7 +146,7 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.person_number"
defaultMessage="name is required"
defaultMessage="请填写人数"
/>
),
},
@ -157,10 +159,10 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
// label={<FormattedMessage id="alarm_rules.page.form.triggerConditions" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.time_interval',
defaultMessage: '$$$',
defaultMessage: '时间',
})}`}
required={true}
initialValue={props.values.time_interval}
@ -171,7 +173,7 @@ const UpdateMultiForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.time_interval"
defaultMessage="name is required"
defaultMessage="请填写时间"
/>
),
},

28
src/pages/Alarm/alarmRules/components/UpdateTimeForm.tsx
Unescape Escape View File

@ -41,6 +41,8 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitTimeout={2000}
onFinish={async (values) => {
@ -49,11 +51,11 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
// console.log(values);
await postAlarmRules(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();
@ -82,7 +84,7 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
label={
<FormattedMessage
id="alarm_rules.page.form.isEnabled"
defaultMessage="$$$"
defaultMessage="启用告警"
/>
}
checkedChildren="启用"
@ -93,13 +95,13 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
<ProFormText
width={proFormSmallItemStyleProps.width}
name="warning_name"
label={<FormattedMessage id="alarm_rules.page.form.name" defaultMessage="$$$" />}
label={<FormattedMessage id="alarm_rules.page.form.name" defaultMessage="告警名称" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.name',
defaultMessage: '$$$',
defaultMessage: '告警名称',
})}`}
required={true}
initialValue={props.values.warning_name}
@ -110,7 +112,7 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.name"
defaultMessage="name is required"
defaultMessage="请填写告警名称"
/>
),
},
@ -134,10 +136,10 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
name="trigger_start_time"
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.trigger_start_time',
defaultMessage: '$$$',
defaultMessage: '敏感开始时间',
})}`}
required={true}
initialValue={props.values.trigger_start_time}
@ -148,7 +150,7 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.trigger_start_time"
defaultMessage="name is required"
defaultMessage="请填写时间"
/>
),
},
@ -176,10 +178,10 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
// label={<FormattedMessage id="alarm_rules.page.form.triggerConditions" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'alarm_rules.page.form.triggerConditions',
defaultMessage: '$$$',
defaultMessage: '触发条件',
})}`}
required={true}
initialValue={props.values.trigger_end_time}
@ -190,7 +192,7 @@ const UpdateTimeForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="alarm_rules.page.rule.required.trigger_start_time"
defaultMessage="name is required"
defaultMessage="请填写时间"
/>
),
},

17
src/pages/Alarm/alarmRules/index.tsx
Unescape Escape View File

@ -31,11 +31,11 @@ const AlarmRulesList: React.FC = () => {
const handleDestroy = async (selectedRow: API.DeviceCategory) => {
deleteDeviceCategoryDeleteDeviceCategory({ id: selectedRow.id })
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
actionRef.current?.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
};
@ -115,18 +115,18 @@ const AlarmRulesList: React.FC = () => {
const columns: ProColumns<API.DeviceCategory>[] = [
{
title: <FormattedMessage id="alarm_rules.page.name" defaultMessage="$$$" />,
title: <FormattedMessage id="alarm_rules.page.name" defaultMessage="告警规则" />,
dataIndex: 'warning_name',
hideInSearch: true,
},
{
title: <FormattedMessage id="alarm_rules.page.id" defaultMessage="$$$" />,
title: <FormattedMessage id="alarm_rules.page.id" defaultMessage="规则ID" />,
dataIndex: 'id',
hideInSearch: true,
},
{
title: <FormattedMessage id="alarm_rules.page.status" defaultMessage="$$$" />,
title: <FormattedMessage id="alarm_rules.page.status" defaultMessage="规则状态" />,
dataIndex: 'is_use',
hideInSearch: true,
render: (dom) => {
@ -141,7 +141,7 @@ const AlarmRulesList: React.FC = () => {
},
},
{
title: <FormattedMessage id="alarm_rules.page.updateTime" defaultMessage="$$$" />,
title: <FormattedMessage id="alarm_rules.page.updateTime" defaultMessage="修改时间" />,
dataIndex: 'update_time',
sorter: true,
hideInSearch: true,
@ -149,7 +149,7 @@ const AlarmRulesList: React.FC = () => {
},
{
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="Operating" />,
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="操作" />,
dataIndex: 'option',
valueType: 'option',
fixed: 'right',
@ -183,7 +183,7 @@ const AlarmRulesList: React.FC = () => {
setCurrentRow(record);
}}
>
<FormattedMessage id="common.edit" defaultMessage="Update" />
<FormattedMessage id="common.edit" defaultMessage="编辑" />
</Button>
),
},
@ -214,6 +214,7 @@ const AlarmRulesList: React.FC = () => {
actionRef={actionRef}
rowKey="key"
search={false}
showSorterTooltip={false}
pagination={{
...proTablePaginationOptions,
pageSize: currentPageSize,

30
src/pages/Setting/interfaceManage/components/CreateForm.tsx
Unescape Escape View File

@ -32,7 +32,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallModelWidth}
title={intl.formatMessage({
id: 'device.interface_manage.table.list.addPic',
defaultMessage: '$$$',
defaultMessage: '新建图像获取接口',
})}
open={props.createModalOpen}
form={form}
@ -40,17 +40,19 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitTimeout={2000}
onFinish={async (values) => {
console.log(values);
postInterfaces(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();
return true;
@ -61,14 +63,14 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="device_name"
label={
<FormattedMessage id="device.interface_manage.table.list.name" defaultMessage="$$$" />
<FormattedMessage id="device.interface_manage.table.list.name" defaultMessage="接口名称" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'device.interface_manage.table.list.name',
defaultMessage: '$$$',
defaultMessage: '接口名称',
})}`}
required={true}
rules={[
@ -77,7 +79,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
message: (
<FormattedMessage
id="device.interface_manage.table.rule.required.name"
defaultMessage="name is required"
defaultMessage="接口名称为必填项"
/>
),
},
@ -87,14 +89,14 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="device_api"
label={
<FormattedMessage id="device.interface_manage.table.list.address" defaultMessage="$$$" />
<FormattedMessage id="device.interface_manage.table.list.address" defaultMessage="接口地址" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'device.interface_manage.table.list.address',
defaultMessage: '$$$',
defaultMessage: '接口地址',
})}`}
required={true}
rules={[
@ -103,7 +105,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
message: (
<FormattedMessage
id="device.interface_manage.table.rule.required.address"
defaultMessage="name is required"
defaultMessage="接口地址为必填项"
/>
),
},
@ -113,14 +115,14 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="note"
label={
<FormattedMessage id="device.interface_manage.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="device.interface_manage.table.list.remark" defaultMessage="备注" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'device.interface_manage.table.list.remark',
defaultMessage: '$$$',
defaultMessage: '备注',
})}`}
required={false}
/>

28
src/pages/Setting/interfaceManage/components/UpdateForm.tsx
Unescape Escape View File

@ -48,6 +48,8 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitTimeout={2000}
onFinish={async (values) => {
@ -55,11 +57,11 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
values.id = props.values.id
postInterfaces(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();
@ -71,14 +73,14 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="device_name"
label={
<FormattedMessage id="device.interface_manage.table.list.name" defaultMessage="$$$" />
<FormattedMessage id="device.interface_manage.table.list.name" defaultMessage="接口名称" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'device.interface_manage.table.list.name',
defaultMessage: '$$$',
defaultMessage: '接口名称',
})}`}
required={true}
initialValue={props.values.device_name}
@ -88,7 +90,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="device.interface_manage.table.rule.required.name"
defaultMessage="name is required"
defaultMessage="接口名称为必填项"
/>
),
},
@ -97,13 +99,13 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
<ProFormText
width={proFormSmallItemStyleProps.width}
name="device_api"
label={<FormattedMessage id="device.interface_manage.table.list.address" defaultMessage="$$$" />}
label={<FormattedMessage id="device.interface_manage.table.list.address" defaultMessage="接口地址" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'device.interface_manage.table.list.address',
defaultMessage: '$$$',
defaultMessage: '接口地址',
})}`}
required={true}
initialValue={props.values.device_api}
@ -114,7 +116,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="device.interface_manage.table.rule.required.address"
defaultMessage="name is required"
defaultMessage="接口地址为必填项"
/>
),
},
@ -124,14 +126,14 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="note"
label={
<FormattedMessage id="device.interface_manage.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="device.interface_manage.table.list.remark" defaultMessage="备注" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'device.interface_manage.table.list.remark',
defaultMessage: '$$$',
defaultMessage: '备注',
})}`}
initialValue={props.values.note}
required={false}

17
src/pages/Setting/interfaceManage/index.tsx
Unescape Escape View File

@ -30,11 +30,11 @@ const InterfaceManageList: React.FC = () => {
const handleDestroy = async (selectedRow: API.UpdateInterfacesParams) => {
postInterfaces({ id: selectedRow.id, device_status: '3' } )
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
actionRef.current?.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
};
@ -108,18 +108,18 @@ const InterfaceManageList: React.FC = () => {
const columns: ProColumns<API.UpdateInterfacesParams>[] = [
{
title: <FormattedMessage id="device.interface_manage.table.list.name" defaultMessage="$$$" />,
title: <FormattedMessage id="device.interface_manage.table.list.name" defaultMessage="接口名称" />,
dataIndex: 'device_name',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.interface_manage.table.list.address" defaultMessage="$$$" />,
title: <FormattedMessage id="device.interface_manage.table.list.address" defaultMessage="接口地址" />,
dataIndex: 'device_api',
hideInSearch: true,
},
{
title: <FormattedMessage id="device.interface_manage.table.list.createTime" defaultMessage="$$$" />,
title: <FormattedMessage id="device.interface_manage.table.list.createTime" defaultMessage="创建时间" />,
dataIndex: 'create_time',
sorter: true,
hideInSearch: true,
@ -127,7 +127,7 @@ const InterfaceManageList: React.FC = () => {
},
{
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="Operating" />,
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="操作" />,
dataIndex: 'option',
valueType: 'option',
fixed: 'right',
@ -154,7 +154,7 @@ const InterfaceManageList: React.FC = () => {
setCurrentRow(record);
}}
>
<FormattedMessage id="common.edit" defaultMessage="Update" />
<FormattedMessage id="common.edit" defaultMessage="编辑" />
</Button>
),
},
@ -191,7 +191,7 @@ const InterfaceManageList: React.FC = () => {
setCreateModalOpen(true);
}}
>
<FormattedMessage id="device.interface_manage.table.list.add" defaultMessage="add" />
<FormattedMessage id="device.interface_manage.table.list.add" defaultMessage="新建设备/输入源" />
</Button>
</div>
}
@ -206,6 +206,7 @@ const InterfaceManageList: React.FC = () => {
actionRef={actionRef}
rowKey="key"
search={false}
showSorterTooltip={false}
pagination={{
...proTablePaginationOptions,
pageSize: currentPageSize,

30
src/pages/System/UserList/components/CreateForm.tsx
Unescape Escape View File

@ -32,7 +32,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallModelWidth}
title={intl.formatMessage({
id: 'system.user.table.list.create',
defaultMessage: '$$$',
defaultMessage: '新建用户',
})}
open={props.createModalOpen}
form={form}
@ -40,17 +40,19 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitTimeout={2000}
onFinish={async (values) => {
console.log(values);
postUserList(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();
return true;
@ -61,14 +63,14 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="username"
label={
<FormattedMessage id="system.user.table.list.userName" defaultMessage="$$$" />
<FormattedMessage id="system.user.table.list.userName" defaultMessage="用户名" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'system.user.table.list.userName',
defaultMessage: '$$$',
defaultMessage: '用户名',
})}`}
required={true}
rules={[
@ -77,7 +79,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
message: (
<FormattedMessage
id="system.user.table.rule.required.userName"
defaultMessage="name is required"
defaultMessage="用户名为必填项"
/>
),
},
@ -87,14 +89,14 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="password"
label={
<FormattedMessage id="system.user.table.list.password" defaultMessage="$$$" />
<FormattedMessage id="system.user.table.list.password" defaultMessage="密码" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'system.user.table.list.password',
defaultMessage: '$$$',
defaultMessage: '密码',
})}`}
required={true}
rules={[
@ -103,7 +105,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
message: (
<FormattedMessage
id="system.user.table.rule.required.password"
defaultMessage="name is required"
defaultMessage="密码为必填项"
/>
),
},
@ -113,14 +115,14 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="note"
label={
<FormattedMessage id="system.user.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="system.user.table.list.remark" defaultMessage="备注" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'system.user.table.list.remark',
defaultMessage: '$$$',
defaultMessage: '备注',
})}`}
required={false}
/>

30
src/pages/System/UserList/components/UpdateForm.tsx
Unescape Escape View File

@ -40,7 +40,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormSmallModelWidth}
title={intl.formatMessage({
id: 'system.user.table.list.editor',
defaultMessage: `$$$`,
defaultMessage: `编辑用户`,
})}
open={props.updateModalOpen}
form={form}
@ -48,6 +48,8 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
modalProps={{
destroyOnClose: true,
onCancel: () => props.handleModal(),
okText: intl.formatMessage({ id: 'common.yes', defaultMessage: '确认' }),
cancelText: intl.formatMessage({ id: 'common.no', defaultMessage: '取消' }),
}}
submitTimeout={2000}
onFinish={async (values) => {
@ -55,11 +57,11 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
values.id = props.values.id
postUserList(values)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
props.handleModal();
@ -71,14 +73,14 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="username"
label={
<FormattedMessage id="system.user.table.list.userName" defaultMessage="$$$" />
<FormattedMessage id="system.user.table.list.userName" defaultMessage="用户名" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'system.user.table.list.userName',
defaultMessage: '$$$',
defaultMessage: '用户名',
})}`}
required={true}
initialValue={props.values.username}
@ -88,7 +90,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="system.user.table.rule.required.userName"
defaultMessage="name is required"
defaultMessage="用户名为必填项"
/>
),
},
@ -97,13 +99,13 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
<ProFormText
width={proFormSmallItemStyleProps.width}
name="password"
label={<FormattedMessage id="system.user.table.list.password" defaultMessage="$$$" />}
label={<FormattedMessage id="system.user.table.list.password" defaultMessage="密码" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'system.user.table.list.password',
defaultMessage: '$$$',
defaultMessage: '密码',
})}`}
required={true}
initialValue={props.values.password}
@ -114,7 +116,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
message: (
<FormattedMessage
id="system.user.table.rule.required.password"
defaultMessage="name is required"
defaultMessage="密码为必填项"
/>
),
},
@ -124,14 +126,14 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
width={proFormSmallItemStyleProps.width}
name="note"
label={
<FormattedMessage id="system.user.table.list.remark" defaultMessage="$$$" />
<FormattedMessage id="system.user.table.list.remark" defaultMessage="备注" />
}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
defaultMessage: '请输入',
})}${intl.formatMessage({
id: 'system.user.table.list.remark',
defaultMessage: '$$$',
defaultMessage: '备注',
})}`}
initialValue={props.values.note}
required={false}

21
src/pages/System/UserList/index.tsx
Unescape Escape View File

@ -5,7 +5,7 @@ import {
postDeviceCategoryGetDeviceCategoryList,
} from '@/services/device/DeviceCategory';
import { getInterfaces, postInterfaces } from '@/services/alarm/Interfaces'
import { getUserList } from '@/services/system/User'
import { getUserList, postUserList } from '@/services/system/User'
import type { ActionType, ProColumns } from '@ant-design/pro-components';
import { PageContainer, ProTable } from '@ant-design/pro-components';
import { FormattedMessage, useIntl } from '@umijs/max';
@ -27,13 +27,13 @@ const UserList: React.FC = () => {
const [currentPageSize, setCurrentPageSize] = useState<number>(10);
const handleDestroy = async (selectedRow: API.UserList) => {
postInterfaces({ id: selectedRow.id, device_status: '3' } )
postUserList({ ...selectedRow, status: '0' } )
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '成功' }));
actionRef.current?.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '失败' }));
});
};
@ -65,18 +65,18 @@ const UserList: React.FC = () => {
const columns: ProColumns<API.UserList>[] = [
{
title: <FormattedMessage id="system.user.table.list.userName" defaultMessage="$$$" />,
title: <FormattedMessage id="system.user.table.list.userName" defaultMessage="用户名" />,
dataIndex: 'username',
hideInSearch: true,
},
{
title: <FormattedMessage id="system.user.table.list.remark" defaultMessage="$$$" />,
title: <FormattedMessage id="system.user.table.list.remark" defaultMessage="备注" />,
dataIndex: 'note',
hideInSearch: true,
},
{
title: <FormattedMessage id="system.user.table.list.createTime" defaultMessage="$$$" />,
title: <FormattedMessage id="system.user.table.list.createTime" defaultMessage="创建时间" />,
dataIndex: 'date_joined',
sorter: true,
hideInSearch: true,
@ -84,7 +84,7 @@ const UserList: React.FC = () => {
},
{
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="Operating" />,
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="操作" />,
dataIndex: 'option',
valueType: 'option',
fixed: 'right',
@ -111,7 +111,7 @@ const UserList: React.FC = () => {
setCurrentRow(record);
}}
>
<FormattedMessage id="common.edit" defaultMessage="Update" />
<FormattedMessage id="common.edit" defaultMessage="编辑" />
</Button>
),
},
@ -148,7 +148,7 @@ const UserList: React.FC = () => {
setCreateModalOpen(true);
}}
>
<FormattedMessage id="system.user.table.list.create" defaultMessage="add" />
<FormattedMessage id="system.user.table.list.create" defaultMessage="新建用户" />
</Button>
</div>
}
@ -163,6 +163,7 @@ const UserList: React.FC = () => {
actionRef={actionRef}
rowKey="key"
search={false}
showSorterTooltip={false}
pagination={{
...proTablePaginationOptions,
pageSize: currentPageSize,

Write Preview
Loading…
Cancel
Save