Compare commits

..

No commits in common. "e23f937749906e0a8fd1753826c6a8d18de3cd11" and "0f03bc49d24e1c845b33e53b6657c5a0dc59fc91" have entirely different histories.

4 changed files with 10 additions and 25 deletions

View File

@ -10,7 +10,7 @@ module.exports = {
javaGitBranch: "dev",
// 本地联调 safetyEval-servicecontext-path: /safetyEval默认端口 8095
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
API_HOST: "http://192.168.0.103",
API_HOST: "http://192.168.0.152",
},
production: {
// 应用后端分支名称,部署上线需要

View File

@ -59,17 +59,9 @@ export default function AttachmentUpload({ name, label, disabled = false, maxCou
action={`${window.process.env.app.API_HOST}/safetyEval/file/upload`}
beforeUpload={(file) => {
if (!accept) return true;
const rules = accept.split(",").map((e) => e.trim().toLowerCase());
const exts = accept.split(",").map((e) => e.trim().toLowerCase());
const ext = "." + file.name.split(".").pop().toLowerCase();
const matchExt = rules.includes(ext);
const matchMime = rules.some((r) => {
if (r.endsWith("/*")) {
const prefix = r.slice(0, -1);
return file.type && file.type.toLowerCase().startsWith(prefix);
}
return false;
});
if (!matchExt && !matchMime) {
if (!exts.includes(ext)) {
message.error(`仅支持 ${accept} 格式文件`);
return Upload.LIST_IGNORE;
}

View File

@ -116,7 +116,6 @@ function EquipInfoPage(props) {
label="设备名称"
placeholder="请输入"
allowClear
maxLength={30}
/>
</Form.Item>,
<Form.Item key="instrumentType" name="instrumentType">
@ -162,7 +161,7 @@ function EquipInfoPage(props) {
width: 200,
ellipsis: true,
},
{ title: "设备型号", dataIndex: "deviceModel", ellipsis: true, },
{ title: "设备型号", dataIndex: "deviceModel" },
{ title: "仪器类型", dataIndex: "instrumentTypeName" },
{ title: "设备类型", dataIndex: "deviceTypeName" },
{
@ -354,7 +353,7 @@ function EquipFormModal({
label="设备名称"
rules={[{ required: true, message: "请输入设备名称" }]}
>
<Input placeholder="请输入设备名称" maxLength={30} showCount />
<Input placeholder="请输入设备名称" />
</Form.Item>
</Col>
<Col span={12}>
@ -363,7 +362,7 @@ function EquipFormModal({
label="型号"
rules={[{ required: true, message: "请输入型号" }]}
>
<Input placeholder="请输入型号" maxLength={50} showCount />
<Input placeholder="请输入型号" />
</Form.Item>
</Col>
<Col span={12}>
@ -398,12 +397,12 @@ function EquipFormModal({
label="厂家"
rules={[{ required: true, message: "请输入厂家" }]}
>
<Input placeholder="请输入厂家" maxLength={50} showCount />
<Input placeholder="请输入厂家" />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item name="flowDesc" label="设备流量说明">
<Input placeholder="请输入设备流量说明" maxLength={100} showCount />
<Input placeholder="请输入设备流量说明" />
</Form.Item>
</Col>
<Col span={12}>
@ -432,7 +431,7 @@ function EquipFormModal({
</Col>
<Col span={12}>
<Form.Item name="calibrationUnit" label="校准单位">
<Input placeholder="请输入校准单位" maxLength={30} showCount />
<Input placeholder="请输入校准单位" />
</Form.Item>
</Col>
<Col span={12}>

View File

@ -349,13 +349,7 @@ const ExperManage = (props) => {
>
<Input placeholder="请输入" allowClear maxLength={20} />
</Form.Item>
<AttachmentUpload
name="certificate"
label="证书"
maxCount={10}
accept="image/*,.pdf"
extra="支持上传图片和PDF文件最多10个"
/>
<AttachmentUpload name="certificate" maxCount={1} label="证书" />
</Form>
</Modal>
</PageLayout>