|
@@ -13,11 +13,16 @@ import {
|
|
|
} from 'antd';
|
|
|
import { useEffect, useState } from 'react';
|
|
|
import { Scrollbars } from 'react-custom-scrollbars';
|
|
|
-import { getDamperDataFileDetail, getSelectData, getDamperChartDataList, updateDamperDataFileDetail } from './api';
|
|
|
+import {
|
|
|
+ getDamperDataFileDetail,
|
|
|
+ getSelectData,
|
|
|
+ getDamperChartDataList,
|
|
|
+ updateDamperDataFileDetail,
|
|
|
+} from './api';
|
|
|
import EChart from '@/components/EChart';
|
|
|
import drawHelp from '@/components/EChart/drawHelp';
|
|
|
import type { ColumnsType } from 'antd/es/table';
|
|
|
-import styles from '../index.css';
|
|
|
+import styles from './index.css';
|
|
|
|
|
|
//评价曲线
|
|
|
const DamperChart: React.FC<{
|
|
@@ -56,7 +61,6 @@ const DamperDataDatail: React.FC<{
|
|
|
pagination: any; // 分页信息
|
|
|
infoUpdate: any; // 刷新函数
|
|
|
}> = ({ dataSource, pagination, infoUpdate }) => {
|
|
|
-
|
|
|
const [open, setOpen] = useState<boolean>(false);
|
|
|
const [loading, setLoading] = useState<boolean>(false);
|
|
|
const [damperId, setDamperId] = useState<number>();
|
|
@@ -94,7 +98,7 @@ const DamperDataDatail: React.FC<{
|
|
|
message.error(res.msg);
|
|
|
}
|
|
|
infoUpdate();
|
|
|
- setOpen(false)
|
|
|
+ setOpen(false);
|
|
|
setLoading(false);
|
|
|
};
|
|
|
|
|
@@ -114,7 +118,7 @@ const DamperDataDatail: React.FC<{
|
|
|
align: 'center',
|
|
|
dataIndex: 'frequency',
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
},
|
|
|
{
|
|
|
title: '位移(amplitude)',
|
|
@@ -125,7 +129,7 @@ const DamperDataDatail: React.FC<{
|
|
|
align: 'center',
|
|
|
dataIndex: 'amplitude',
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
},
|
|
|
{
|
|
|
title: '复原速度(reboundVel)',
|
|
@@ -136,7 +140,7 @@ const DamperDataDatail: React.FC<{
|
|
|
align: 'center',
|
|
|
dataIndex: 'reboundVel',
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
},
|
|
|
{
|
|
|
title: '复原(rebound)',
|
|
@@ -147,7 +151,7 @@ const DamperDataDatail: React.FC<{
|
|
|
align: 'center',
|
|
|
dataIndex: 'rebound',
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
},
|
|
|
{
|
|
|
title: '压缩速度(compressionVel)',
|
|
@@ -158,7 +162,7 @@ const DamperDataDatail: React.FC<{
|
|
|
align: 'center',
|
|
|
dataIndex: 'compressionVel',
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
},
|
|
|
{
|
|
|
title: '压缩(compression)',
|
|
@@ -169,7 +173,7 @@ const DamperDataDatail: React.FC<{
|
|
|
align: 'center',
|
|
|
dataIndex: 'compression',
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
},
|
|
|
{
|
|
|
title: '操作',
|
|
@@ -177,7 +181,13 @@ const DamperDataDatail: React.FC<{
|
|
|
align: 'center',
|
|
|
render: (_: any, record: any) => (
|
|
|
<Space size="middle">
|
|
|
- <a onClick={() => { updateHandle(record) }}>编辑</a>
|
|
|
+ <a
|
|
|
+ onClick={() => {
|
|
|
+ updateHandle(record);
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 编辑
|
|
|
+ </a>
|
|
|
</Space>
|
|
|
),
|
|
|
},
|
|
@@ -196,75 +206,48 @@ const DamperDataDatail: React.FC<{
|
|
|
<Modal
|
|
|
open={open}
|
|
|
title="修改用户信息"
|
|
|
- onCancel={() => { setOpen(false) }}
|
|
|
+ onCancel={() => {
|
|
|
+ setOpen(false);
|
|
|
+ }}
|
|
|
onOk={onFinish}
|
|
|
- afterClose={() => { form.resetFields() }}
|
|
|
+ afterClose={() => {
|
|
|
+ form.resetFields();
|
|
|
+ }}
|
|
|
>
|
|
|
<Spin spinning={loading}>
|
|
|
- <Form
|
|
|
- {...formItemLayout}
|
|
|
- form={form}
|
|
|
- name="baseForm"
|
|
|
- >
|
|
|
- <Form.Item
|
|
|
- name="speed"
|
|
|
- label="speed"
|
|
|
- className={styles.formSelect}
|
|
|
- >
|
|
|
+ <Form {...formItemLayout} form={form} name="baseForm">
|
|
|
+ <Form.Item name="speed" label="speed" className={styles.formSelect}>
|
|
|
<Input />
|
|
|
</Form.Item>
|
|
|
- <Form.Item
|
|
|
- name="amplitude"
|
|
|
- label="amplitude"
|
|
|
- className={styles.formSelect}
|
|
|
- >
|
|
|
+ <Form.Item name="amplitude" label="amplitude" className={styles.formSelect}>
|
|
|
<Input />
|
|
|
</Form.Item>
|
|
|
- <Form.Item
|
|
|
- name="reboundVel"
|
|
|
- label="reboundVel"
|
|
|
- className={styles.formSelect}
|
|
|
- >
|
|
|
+ <Form.Item name="reboundVel" label="reboundVel" className={styles.formSelect}>
|
|
|
<Input />
|
|
|
</Form.Item>
|
|
|
- <Form.Item
|
|
|
- name="rebound"
|
|
|
- label="rebound"
|
|
|
- className={styles.formSelect}
|
|
|
- >
|
|
|
+ <Form.Item name="rebound" label="rebound" className={styles.formSelect}>
|
|
|
<Input />
|
|
|
</Form.Item>
|
|
|
- <Form.Item
|
|
|
- name="compressionVel"
|
|
|
- label="compressionVel"
|
|
|
- className={styles.formSelect}
|
|
|
- >
|
|
|
+ <Form.Item name="compressionVel" label="compressionVel" className={styles.formSelect}>
|
|
|
<Input />
|
|
|
</Form.Item>
|
|
|
- <Form.Item
|
|
|
- name="compression"
|
|
|
- label="compression"
|
|
|
- className={styles.formSelect}
|
|
|
- >
|
|
|
+ <Form.Item name="compression" label="compression" className={styles.formSelect}>
|
|
|
<Input />
|
|
|
</Form.Item>
|
|
|
- <Form.Item
|
|
|
- name="work"
|
|
|
- label="work"
|
|
|
- className={styles.formSelect}
|
|
|
- >
|
|
|
+ <Form.Item name="work" label="work" className={styles.formSelect}>
|
|
|
<Input />
|
|
|
</Form.Item>
|
|
|
</Form>
|
|
|
</Spin>
|
|
|
</Modal>
|
|
|
- </div >
|
|
|
+ </div>
|
|
|
);
|
|
|
};
|
|
|
|
|
|
const TestResult: React.FC<{
|
|
|
idNumber: number;
|
|
|
}> = ({ idNumber }) => {
|
|
|
+ const [form] = Form.useForm();
|
|
|
const [frontPage, setFrontPage] = useState<number>(1);
|
|
|
const [frontPageSize, setFrontPageSize] = useState<number>(5);
|
|
|
const [rearpage, setRearPage] = useState<number>(1);
|
|
@@ -274,7 +257,9 @@ const TestResult: React.FC<{
|
|
|
const [loading, setLoading] = useState<boolean>(false);
|
|
|
const [selectData, setSelectData] = useState<{ label: string; value: number }[]>([]);
|
|
|
const [selectType, setSelectType] = useState<number>();
|
|
|
- const [frontChartDataList, setFrontChartDataList] = useState<ShockDataType.damperDetailParam[]>([]);
|
|
|
+ const [frontChartDataList, setFrontChartDataList] = useState<ShockDataType.damperDetailParam[]>(
|
|
|
+ [],
|
|
|
+ );
|
|
|
const [rearChartDataList, setRearChartDataList] = useState<ShockDataType.damperDetailParam[]>([]);
|
|
|
const [damperChartDataList, setDamperChartDataList] = useState<ShockDataType.curveDataType[]>([]);
|
|
|
|
|
@@ -283,14 +268,14 @@ const TestResult: React.FC<{
|
|
|
setLoading(true);
|
|
|
if (selectType != null) {
|
|
|
const value: any = {
|
|
|
- attachId: selectType
|
|
|
+ attachId: selectType,
|
|
|
};
|
|
|
const res = await getDamperDataFileDetail(value);
|
|
|
if (res.code === 0) {
|
|
|
setFrontChartDataList(res.result.frontDamperDataList);
|
|
|
setRearChartDataList(res.result.rearDamperDataList);
|
|
|
- setFrontTotal(frontChartDataList.length)
|
|
|
- setRearTotal(rearChartDataList.length)
|
|
|
+ setFrontTotal(frontChartDataList.length);
|
|
|
+ setRearTotal(rearChartDataList.length);
|
|
|
}
|
|
|
}
|
|
|
setLoading(false);
|
|
@@ -384,6 +369,14 @@ const TestResult: React.FC<{
|
|
|
},
|
|
|
};
|
|
|
|
|
|
+ //查询表单提交
|
|
|
+ const onQueryFinish = async () => {
|
|
|
+ form.validateFields().then(async (values) => {
|
|
|
+ setSelectType(values.selectType);
|
|
|
+ getDamperDataList();
|
|
|
+ });
|
|
|
+ };
|
|
|
+
|
|
|
return (
|
|
|
<Scrollbars
|
|
|
autoHide
|
|
@@ -399,26 +392,30 @@ const TestResult: React.FC<{
|
|
|
<div>
|
|
|
<div>
|
|
|
<Spin spinning={loading}>
|
|
|
- <Space>
|
|
|
- <div>
|
|
|
- <span>数据文件: </span>
|
|
|
- <Select
|
|
|
- value={selectType}
|
|
|
- placeholder="请选择数据文件"
|
|
|
- style={{ width: 200 }}
|
|
|
- options={selectData.map((item) => ({
|
|
|
- value: item.value,
|
|
|
- label: item.label,
|
|
|
- }))}
|
|
|
- onChange={(e: any) => {
|
|
|
- setSelectType(e);
|
|
|
- }}
|
|
|
- />
|
|
|
- </div>
|
|
|
- <Button type="dashed" onClick={getDamperDataList} style={{ marginLeft: '50%' }}>
|
|
|
- 查询
|
|
|
- </Button>
|
|
|
- </Space>
|
|
|
+ <Form form={form} onFinish={onQueryFinish} layout="inline">
|
|
|
+ <Form.Item
|
|
|
+ label="文件名称"
|
|
|
+ colon={false}
|
|
|
+ className={styles.formSelect}
|
|
|
+ name={'selectType'}
|
|
|
+ >
|
|
|
+ <Select placeholder="请选择文件">
|
|
|
+ {selectData.map((option) => (
|
|
|
+ <Select.Option key={option.label} value={option.value}>
|
|
|
+ {option.label}
|
|
|
+ </Select.Option>
|
|
|
+ ))}
|
|
|
+ </Select>
|
|
|
+ </Form.Item>
|
|
|
+
|
|
|
+ <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
|
|
|
+ <Space>
|
|
|
+ <Button htmlType="submit" type="dashed">
|
|
|
+ 查询
|
|
|
+ </Button>
|
|
|
+ </Space>
|
|
|
+ </Form.Item>
|
|
|
+ </Form>
|
|
|
</Spin>
|
|
|
</div>
|
|
|
<Typography.Title level={4} style={{ color: 'rgb(34,147,202)', marginTop: '1%' }}>
|
|
@@ -449,7 +446,9 @@ const TestResult: React.FC<{
|
|
|
试验曲线
|
|
|
</Typography.Title>
|
|
|
<div style={{ marginTop: 10 }}>
|
|
|
- {damperChartDataList.length !== 0 ? <DamperChart chartDataList={damperChartDataList} /> : null}
|
|
|
+ {damperChartDataList.length !== 0 ? (
|
|
|
+ <DamperChart chartDataList={damperChartDataList} />
|
|
|
+ ) : null}
|
|
|
</div>
|
|
|
</div>
|
|
|
</Scrollbars>
|