From 50c33b34f9e6ae19c003d305e4c0b86cea062bec Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 16:30:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx
index fbd1634..9d5545b 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx
@@ -95,7 +95,7 @@
return (
- <Dialog open={open} maxWidth="md" fullWidth>
+ <Dialog open={open} maxWidth="lg" fullWidth>
<Form onSubmit={handleSubmit}>
<DialogCloseButton onClose={handleClose} />
<DialogTitle>{translate('toolbar.siteInit')}</DialogTitle>
@@ -119,35 +119,48 @@
dictTypeCode="sys_device_type"
/>
</Grid>
-
-
<Grid item xs={4}>
<TextInput
- label={translate("table.field.deviceSite.deviceCode")}
- name="deviceCode"
+ label={translate("table.field.deviceSite.channel")}
+ name="channel"
size="small"
type="number"
/>
</Grid>
-
+ <Grid item xs={4}>
+ <ReferenceInput
+ source="deviceSites"
+ reference="basStation"
+ >
+ <SelectInput
+ label="table.field.deviceSite.deviceSite"
+ optionText="stationName"
+ optionValue="stationName"
+ />
+ </ReferenceInput>
+ </Grid>
+ <Grid item xs={4}>
+ <ReferenceInput
+ source="site"
+ reference="basStation"
+ >
+ <SelectInput
+ label="table.field.deviceSite.site"
+ optionText="stationName"
+ optionValue="stationName"
+ />
+ </ReferenceInput>
+
+ </Grid>
<Grid item xs={4}>
<TextInput
- label={translate("table.field.deviceSite.deviceSite")}
- name="deviceSites"
+ label={translate("table.field.deviceSite.target")}
+ name="target"
+ placeholder={translate('common.action.inputPlaceholder')}
size="small"
- type="number"
+ // type="number"
/>
</Grid>
-
- <Grid item xs={4}>
- <TextInput
- label={translate("table.field.deviceSite.sites")}
- name="sites"
- size="small"
- type="number"
- />
- </Grid>
-
<Grid item xs={4}>
<SelectInput
label="table.field.deviceSite.flagInit"
--
Gitblit v1.9.1