机器人生成页面完成
This commit is contained in:
@@ -189,6 +189,7 @@ const SerialNumGenerate = () => {
|
||||
const generateQRCode = async () => {
|
||||
try {
|
||||
const values = await form.validateFields();
|
||||
console.log(values, "jnjn")
|
||||
const { model, config, type, country, province } = values;
|
||||
const ts = Date.now();
|
||||
const suffix = generateSerialSuffix();
|
||||
@@ -218,7 +219,9 @@ const SerialNumGenerate = () => {
|
||||
setSerialNumber(serialNumber);
|
||||
setQrJson(qrContent);
|
||||
setQrUrl(url);
|
||||
} catch (err) { }
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
}
|
||||
};
|
||||
|
||||
// 下载
|
||||
@@ -236,15 +239,16 @@ const SerialNumGenerate = () => {
|
||||
try {
|
||||
setLoading(true);
|
||||
const values = form.getFieldsValue();
|
||||
console.log(values, "oiii", types)
|
||||
const model = models.find(m => m.displayName === values.model);
|
||||
const config = configs.find(c => c.displayName === values.config);
|
||||
const type = types.find(t => t.displayName === values.type);
|
||||
const type = types.find(t => t.storeValue === values.type);
|
||||
|
||||
const data = {
|
||||
serialNumber,
|
||||
modelId: model?.id,
|
||||
configId: config?.id,
|
||||
typeId: type?.id,
|
||||
modelId: model?.id || 0,
|
||||
configId: config?.id || 0,
|
||||
typeId: type?.id || 0,
|
||||
qrCode: qrUrl,
|
||||
qrJson: qrJson
|
||||
};
|
||||
@@ -314,6 +318,7 @@ const SerialNumGenerate = () => {
|
||||
};
|
||||
|
||||
// 表格列
|
||||
// 表格列 —— 已修改:全部显示名称,不显示编码
|
||||
const columns = [
|
||||
{
|
||||
title: '序号',
|
||||
@@ -325,17 +330,30 @@ const SerialNumGenerate = () => {
|
||||
{
|
||||
title: '型号',
|
||||
key: 'model',
|
||||
render: (_, r) => parseQrJson(r.qrJson).model || '-'
|
||||
render: (_, r) => {
|
||||
const qrInfo = parseQrJson(r.qrJson);
|
||||
const modelItem = models.find(m => m.storeValue == qrInfo.model);
|
||||
return modelItem?.displayName || qrInfo.model || '-';
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '配置',
|
||||
key: 'config',
|
||||
render: (_, r) => parseQrJson(r.qrJson).config || '-'
|
||||
render: (_, r) => {
|
||||
const qrInfo = parseQrJson(r.qrJson);
|
||||
const configItem = configs.find(c => c.storeValue === qrInfo.config);
|
||||
return configItem?.displayName || qrInfo.config || '-';
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '类型',
|
||||
key: 'type',
|
||||
render: (_, r) => parseQrJson(r.qrJson).type || '-'
|
||||
render: (_, r) => {
|
||||
const qrInfo = parseQrJson(r.qrJson);
|
||||
console.log(types, qrInfo.type)
|
||||
const typeItem = types.find(t => t.storeValue === qrInfo.type);
|
||||
return typeItem?.displayName || qrInfo.type || '-';
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '国家',
|
||||
@@ -444,17 +462,17 @@ const SerialNumGenerate = () => {
|
||||
<Form form={form} labelCol={{ md: 5 }} wrapperCol={{ md: 19 }} size="large">
|
||||
<Form.Item name="model" label="型号" rules={[{ required: true }]}>
|
||||
<Select placeholder="选择型号" showSearch>
|
||||
{models.map(m => <Option key={m.id} value={m.displayName}>{m.modelName}</Option>)}
|
||||
{models.map(m => <Option key={m.id} value={m.storeValue}>{m.displayName}</Option>)}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item name="config" label="配置" rules={[{ required: true }]}>
|
||||
<Select placeholder="选择配置" showSearch>
|
||||
{configs.map(c => <Option key={c.id} value={c.displayName}>{c.configName}</Option>)}
|
||||
{configs.map(c => <Option key={c.id} value={c.storeValue}>{c.displayName}</Option>)}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item name="type" label="类型" rules={[{ required: true }]}>
|
||||
<Select placeholder="选择类型" showSearch>
|
||||
{types.map(t => <Option key={t.id} value={t.displayName}>{t.storeValue}</Option>)}
|
||||
{types.map(t => <Option key={t.id} value={t.storeValue}>{t.displayName}</Option>)}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item name="country" label="国家">
|
||||
@@ -506,7 +524,7 @@ const SerialNumGenerate = () => {
|
||||
|
||||
{/* 数据管理 */}
|
||||
<Modal open={manageVisible} title="数据管理" width="90%" style={{ maxWidth: 900 }} onCancel={() => setManageVisible(false)} footer={<Button onClick={() => setManageVisible(false)}>关闭</Button>} destroyOnClose>
|
||||
<DictManager title="机器人类型" data={types} fields={[{ name: 'storeValue', label: '类型名称', required: true }, { name: 'displayName', label: '存储值', required: true }, { name: 'remark', label: '备注' }]} onAdd={handleAddType} onUpdate={handleUpdateType} onDelete={deleteRobotTypeApi} refresh={loadTypeList} />
|
||||
<DictManager title="机器人类型" data={types} fields={[{ name: 'displayName', label: '类型名称', required: true }, { name: 'storeValue', label: '存储值', required: true }, { name: 'remark', label: '备注' }]} onAdd={handleAddType} onUpdate={handleUpdateType} onDelete={deleteRobotTypeApi} refresh={loadTypeList} />
|
||||
<DictManager title="机器人型号" data={models} fields={[{ name: 'displayName', label: '型号名称', required: true }, { name: 'storeValue', label: '存储值', required: true }]} onAdd={handleAddModel} onUpdate={handleUpdateModel} onDelete={deleteRobotModelApi} refresh={loadModelList} />
|
||||
<DictManager title="配置" data={configs} fields={[{ name: 'displayName', label: '配置名称', required: true }, { name: 'storeValue', label: '存储值', required: true }]} onAdd={handleAddConfig} onUpdate={handleUpdateConfig} onDelete={deleteRobotConfigApi} refresh={loadConfigList} />
|
||||
</Modal>
|
||||
|
||||
Reference in New Issue
Block a user