feat: 样式调整

config/routes.ts

@@ -36,12 +36,7 @@ const getDrivingCompareRoutes = () => {
 
 // 零部件
 const getComponentRoutes = () => {
-  const routes = [
-    'bushingData',
-    'shockAbsorberDebugging',
-    'tireData',
-    'springData',
-  ];
+  const routes = ['bushingData', 'shockAbsorberDebugging', 'tireData', 'springData'];
   return routes.map((item) => ({
     path: `/component/${item}/detail/:id`,
     name: '数据详情',
@@ -51,12 +46,7 @@ const getComponentRoutes = () => {
   }));
 };
 const getComponentCompareRoutes = () => {
-  const routes = [
-    'bushingData',
-    'shockAbsorberDebugging',
-    'tireData',
-    'springData',
-  ];
+  const routes = ['bushingData', 'shockAbsorberDebugging', 'tireData', 'springData'];
   return routes.map((item) => ({
     path: `/component/${item}/dataComparison/:carParam`,
     name: '数据对比',
@@ -345,7 +335,7 @@ export default [
     routes: [
       {
         path: '/component',
-        redirect: '/component/bushingData',
+        redirect: '/component/shockAbsorberDebugging',
       },
       {
         path: '/component/shockAbsorberDebugging',

src/global.less

@@ -3,15 +3,11 @@
 html,
 body,
 #root {
-  // width: 1440px;
   width: 100%;
   height: 100%;
-  background-image: url('../src/assets/background19.png') !important;
+  background-image: url('../src/assets/background21.png') !important;
   background-repeat: no-repeat;
-  /*设置背景不重复*/
   background-size: 100% 100%;
-  // background-attachment: fixed; /*背景图片不会随着页面的滚动而滚动。*/
-  // background-size:cover;/* 此时会保持图像的纵横比并将图像缩放成将完全覆盖背景定位区域的最小大小。*/
 }
 
 .ant-layout-header {
@@ -305,15 +301,6 @@ ol {
   left: 4%;
 }
 
-//侧边栏
-.ant-layout-sider {
-  background-size: 100% 100%;
-}
-
-.ant-pro-menu-item {
-  color: #fff;
-}
-
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected .ant-pro-menu-item {
   color: #0e78cb;
 }
@@ -340,23 +327,23 @@ ol {
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: white;
+  color: white !important;
   font-size: 14px;
   font-variant: tabular-nums;
   line-height: 1.5715;
   list-style: none;
-  background: rgba(0, 0, 0, 0);
+  background: rgba(0, 0, 0, 0) !important;
   border-radius: 2px;
   font-feature-settings: 'tnum', 'tnum';
 }
 
 .ant-table-thead > tr > th {
   position: relative;
-  color: rgba(250, 249, 249, 0.85);
+  color: rgba(250, 249, 249, 0.85) !important;
   font-weight: 500;
   text-align: left;
-  background: rgba(17, 62, 104, 0.25);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+  background: rgba(17, 62, 104, 0.25) !important;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.06) !important;
   transition: background 0.3s ease;
 }
 
@@ -380,7 +367,7 @@ tr.ant-table-expanded-row:hover > td {
   width: 17px;
   height: 17px;
   padding: 0;
-  color: #1890ff;
+  color: #1890ff !important;
   color: var(--ant-primary-color);
   color: inherit;
   line-height: 17px;
@@ -443,3 +430,8 @@ tr.ant-table-expanded-row:hover > td {
     color: whitesmoke;
   }
 }
+
+.ant-table-cell-fix-left,
+.ant-table-cell-fix-right {
+  background-color: rgba(17, 62, 104, 0.35) !important;
+}

src/pages/Component/DataQuery/index.css

@@ -1,14 +1,7 @@
 .form {
-    /* width: 990px; */
     height: 160px;
     border: 1px solid gray;
-    margin-bottom: 10px;
-}
-
-.formItem {
-    margin-left: 20px;
-    margin-top: 20px;
-    margin-bottom: 20px;
+    margin-bottom: 10px !important;
 }
 
 .input {
@@ -22,16 +15,16 @@
 
 .formSelect {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .inputNumber {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .formButtonSY {

src/pages/Component/Detail/BushingDataT/TestData/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/Component/Detail/BushingDataT/TestData/index.tsx

@@ -1,18 +1,6 @@
-import {
-  Button,
-  Col,
-  DatePicker,
-  Drawer,
-  Form,
-  Input,
-  Popconfirm,
-  Row,
-  Space,
-  Spin,
-  Table,
-  message,
-} from 'antd';
+import { Button, DatePicker, Drawer, Form, Popconfirm, Space, Spin, Table, message } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
+import MyInput from '@/components/MyInput';
 import { useEffect, useState } from 'react';
 import { deleteDataList, getDataList, previewData } from './api';
 import { TableRowSelection } from 'antd/lib/table/interface';
@@ -24,7 +12,9 @@ import { range } from 'lodash';
 import { download } from '@/utils/tools';
 import { CloseOutlined } from '@ant-design/icons';
 import PreviewPDF from '@/components/PreviewPDF';
+import styles from './index.css';
 
+// 衬套
 const TestData: React.FC<{
   idNumber: number;
 }> = ({ idNumber }) => {
@@ -235,35 +225,27 @@ const TestData: React.FC<{
   return (
     <div>
       <div>
-        <Form form={form} component={false} autoComplete="off">
-          <Row>
-            <Col span={8}>
-              <Form.Item label="文件名称" colon={false} name="fileName">
-                <Input placeholder="请输入文件名称" />
-              </Form.Item>
-            </Col>
-          </Row>
-          <Row>
-            <Col span={8} offset={16}>
-              <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
-                <Space>
-                  <Button htmlType="button" type="dashed" onClick={getData}>
-                    查询
-                  </Button>
-                  <Button
-                    htmlType="button"
-                    type="dashed"
-                    onClick={() => {
-                      form.resetFields();
-                      getData();
-                    }}
-                  >
-                    重置
-                  </Button>
-                </Space>
-              </Form.Item>
-            </Col>
-          </Row>
+        <Form name="basic" layout="inline" autoComplete="off" form={form}>
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
+            <MyInput placeholder="请输入文件名称" />
+          </Form.Item>
+          <Form.Item>
+            <Space>
+              <Button htmlType="button" type="dashed" onClick={getData}>
+                查询
+              </Button>
+              <Button
+                htmlType="button"
+                type="dashed"
+                onClick={() => {
+                  form.resetFields();
+                  getData();
+                }}
+              >
+                重置
+              </Button>
+            </Space>
+          </Form.Item>
         </Form>
       </div>
       <hr />

src/pages/Component/Detail/BushingDataT/TestReport/api.ts

@@ -5,7 +5,7 @@ import { postData } from '@/utils/request';
  * @param data
  * @returns
  */
-export async function getDataList(data: TestApplication.ConditionQuery) {
+export async function getDataList(data: any) {
   const result = await postData(`api/bushing/queryBushingFileReportList`, data);
   return result;
 }

src/pages/Component/Detail/BushingDataT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/Component/Detail/BushingDataT/TestReport/index.tsx

@@ -1,22 +1,13 @@
 import MyInput from '@/components/MyInput';
 import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
-import {
-  Button,
-  Form,
-  Popconfirm,
-  Select,
-  Space,
-  Spin,
-  Table,
-  TableColumnsType,
-  message,
-} from 'antd';
+import { Button, Form, Popconfirm, Space, Spin, Table, TableColumnsType, message } from 'antd';
 import { useEffect, useState } from 'react';
-import { deleteFile, downloadFile, getDataList } from './api';
+import { deleteFile, getDataList } from './api';
 import { TableRowSelection } from 'antd/lib/table/interface';
 import { download } from '@/utils/tools';
 import TestApplicationType from './type';
 import UploadS from '@/components/UploadS';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -37,39 +28,8 @@ const SuperTable: React.FC<{
   };
 
   const downloadHandle = async (record: any) => {
-    // const condition: any = {
-    //   id: record.id,
-    // };
-    // const res = await downloadFile(condition);
-    // if (res.code === 0) {
     download(record?.path, record?.fileName);
     infoUpdate();
-    // } else {
-    //   message.error(res.msg);
-    // }
-  };
-
-  const preview = async (record: any) => {
-    const condition: any = {
-      id: record.id,
-    };
-    const res = await downloadFile(condition);
-    if (res.code === 0) {
-      const eleLink = document.createElement('a');
-      eleLink.target = 'blank';
-      eleLink.style.display = 'none';
-      eleLink.href = 'https://view.xdocin.com/view?src=' + res.result;
-      document.body.appendChild(eleLink);
-      eleLink.click();
-      document.body.removeChild(eleLink);
-      infoUpdate();
-    } else {
-      message.error(res.msg);
-    }
-  };
-
-  const previewHandle = (record: any) => {
-    preview(record);
   };
 
   const columns: TableColumnsType<TestApplicationType.DataType> = [
@@ -82,11 +42,6 @@ const SuperTable: React.FC<{
       render: (text, record, index) =>
         `${(pagination.current - 1) * pagination.pageSize + (index + 1)}`,
     },
-    // {
-    //   title: '试验类别',
-    //   dataIndex: 'businessType',
-    //   align: 'center',
-    // },
     {
       title: '名称',
       dataIndex: 'fileName',
@@ -109,7 +64,6 @@ const SuperTable: React.FC<{
       render: (_, record) => (
         <Space size="middle">
           <a onClick={() => downloadHandle(record)}>下载</a>
-          {/* <a onClick={() => previewHandle(record)}>预览</a> */}
           <Popconfirm
             title="是否删除此信息？"
             onConfirm={() => deleteHandle(record)}
@@ -228,20 +182,9 @@ const TestReport: React.FC<{
             getAll(e.fileName);
           }}
         >
-          <Form.Item label="文件名" name="fileName">
-            <MyInput placeholder="请输入文件名" />
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
+            <MyInput placeholder="请输入文件名称" />
           </Form.Item>
-          {/* <Form.Item label="试验类别" name="businessType">
-            <Select
-              allowClear
-              placeholder="请选择试验类别"
-              style={{ width: 200 }}
-              options={[
-                { value: 4, label: '平顺性试验报告' },
-                { value: 9, label: '操作稳定性试验报告' },
-              ]}
-            />
-          </Form.Item> */}
           <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
             <Button type="dashed" htmlType="submit">
               查询
@@ -281,25 +224,7 @@ const TestReport: React.FC<{
         name="multipartFile"
         data={{
           ownerId: idNumber,
-          // ownerType: 'car_info',
         }}
-      // extraFormData={[
-      //   {
-      //     name: 'businessType',
-      //     label: '试验类别',
-      //     children: (
-      //       // <Select
-      //       //   allowClear
-      //       //   placeholder="请选择试验类别"
-      //       //   options={[
-      //       //     { value: 4, label: '平顺性试验报告' },
-      //       //     { value: 9, label: '操作稳定性试验报告' },
-      //       //   ]}
-      //       // />
-      //       <></>
-      //     ),
-      //   },
-      // ]}
       ></UploadS>
     </div>
   );

src/pages/Component/Detail/BushingDataT/TestResult/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/Component/Detail/BushingDataT/TestResult/index.tsx

@@ -4,6 +4,7 @@ import { getData, getSelectData } from './api';
 import EChart from '@/components/EChart';
 import drawHelp from '@/components/EChart/drawHelp';
 import { Scrollbars } from 'react-custom-scrollbars';
+import styles from './index.css';
 
 const TestResult: React.FC<{
   idNumber: number;
@@ -70,7 +71,12 @@ const TestResult: React.FC<{
           >
             <Row gutter={16}>
               <Col span={8}>
-                <Form.Item label="数据文件" name="attachId" rules={[{ required: true }]}>
+                <Form.Item
+                  label="数据文件"
+                  name="attachId"
+                  rules={[{ required: true }]}
+                  className={styles.formSelect}
+                >
                   <Select placeholder="请选择数据文件" options={selectData} />
                 </Form.Item>
               </Col>
@@ -80,6 +86,7 @@ const TestResult: React.FC<{
                   name="testType"
                   initialValue={0}
                   rules={[{ required: true }]}
+                  className={styles.formSelect}
                 >
                   <Select
                     placeholder="请选择测试方式"
@@ -97,6 +104,7 @@ const TestResult: React.FC<{
                   name="chartName"
                   initialValue={'径向实心刚度'}
                   rules={[{ required: true }]}
+                  className={styles.formSelect}
                 >
                   <Select
                     placeholder="请选择图像名称"
@@ -116,17 +124,32 @@ const TestResult: React.FC<{
             </Row>
             <Row gutter={16}>
               <Col span={8}>
-                <Form.Item label="拟合曲线阶数" name="order" initialValue={1}>
+                <Form.Item
+                  label="拟合曲线阶数"
+                  name="order"
+                  initialValue={1}
+                  className={styles.formSelect}
+                >
                   <InputNumber placeholder="请输入拟合曲线阶数" style={{ width: '100%' }} />
                 </Form.Item>
               </Col>
               <Col span={8}>
-                <Form.Item label="拟合起始值" name="startX" initialValue={-5}>
+                <Form.Item
+                  label="拟合起始值"
+                  name="startX"
+                  initialValue={-5}
+                  className={styles.formSelect}
+                >
                   <InputNumber placeholder="请输入拟合起始值" style={{ width: '100%' }} />
                 </Form.Item>
               </Col>
               <Col span={8}>
-                <Form.Item label="拟合终止值" name="endX" initialValue={5}>
+                <Form.Item
+                  label="拟合终止值"
+                  name="endX"
+                  initialValue={5}
+                  className={styles.formSelect}
+                >
                   <InputNumber placeholder="请输入拟合终止值" style={{ width: '100%' }} />
                 </Form.Item>
               </Col>

src/pages/Component/Detail/BushingDataT/index.tsx

@@ -1,43 +1,7 @@
-import React, { useState } from 'react';
-import { Tabs } from 'antd';
-import type { TabsProps } from 'antd';
 import TestData from './TestData/index';
 import TestResult from './TestResult/index';
 import TestReport from './TestReport';
 
-// const BushingDataT: React.FC<{
-//   idNumber: number;
-// }> = ({ idNumber }) => {
-//   const [which, setWhich] = useState<string>('1');
-
-//   const items: TabsProps['items'] = [
-//     {
-//       key: '1',
-//       label: '试验数据',
-//       children: <TestData idNumber={idNumber} />,
-//     },
-//     {
-//       key: '2',
-//       label: '试验结果',
-//       children: <TestResult idNumber={idNumber} />,
-//     },
-//     {
-//       key: '3',
-//       label: '试验报告',
-//       children: <TestReport idNumber={idNumber} />,
-//     },
-//   ];
-
-//   return (
-//     <Tabs
-//       activeKey={which}
-//       items={items}
-//       onChange={(item) => setWhich(item)}
-//       destroyInactiveTabPane
-//     />
-//   );
-// };
-
 const BushingDataT = (idNumber: number) => {
   return [
     {

src/pages/Component/Detail/ShockAbsorberDebuggingT/TestData/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/Component/Detail/ShockAbsorberDebuggingT/TestData/index.tsx

@@ -1,14 +1,4 @@
-import {
-  Button,
-  Form,
-  Input,
-  Popconfirm,
-  Space,
-  Spin,
-  Table,
-  message,
-  Drawer,
-} from 'antd';
+import { Button, Form, Input, Popconfirm, Space, Spin, Table, message, Drawer } from 'antd';
 import { useEffect, useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
 import { deleteDataList, getDamperDataFileList, getShockDataTemplate, previewData } from './api';
@@ -18,7 +8,7 @@ import { useModel } from 'umi';
 import { download } from '@/utils/tools';
 import PreviewPDF from '@/components/PreviewPDF';
 import { CloseOutlined } from '@ant-design/icons';
-
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -26,7 +16,6 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const [loading, setLoading] = useState<boolean>(false);
   const [fileurl, setFileUrl] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
@@ -130,7 +119,13 @@ const SuperTable: React.FC<{
       render: (_: any, record: any) => (
         <Space size="middle">
           <a onClick={() => previewHandle(record)}>预览</a>
-          <a onClick={() => { downloadHandle(record); }}>下载</a>
+          <a
+            onClick={() => {
+              downloadHandle(record);
+            }}
+          >
+            下载
+          </a>
           <Popconfirm
             title="是否删除此数据？"
             onConfirm={() => delectHandle([record.id])}
@@ -167,7 +162,6 @@ const SuperTable: React.FC<{
         rowSelection={rowSelection}
       />
     </div>
-
   );
 };
 
@@ -280,15 +274,14 @@ const TestData: React.FC<{
           name="basic"
           layout="inline"
           autoComplete="off"
-          form={form}
           onFinish={(e: any) => {
             getData();
           }}
         >
-          <Form.Item label="文件名称" name="fileName">
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
             <Input placeholder="请输入文件名称" />
           </Form.Item>
-          <Form.Item>
+          <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
             <Space>
               <Button type="dashed" htmlType="submit">
                 查询
@@ -321,10 +314,7 @@ const TestData: React.FC<{
           >
             <Button type="dashed">批量删除</Button>
           </Popconfirm>
-          <Button
-            type="dashed"
-            onClick={() => downloadTemplate()}
-          >
+          <Button type="dashed" onClick={() => downloadTemplate()}>
             下载模板
           </Button>
           <Button type="dashed" onClick={opeanHandle}>
@@ -359,7 +349,7 @@ const TestData: React.FC<{
           }}
         />
       </div>
-    </div >
+    </div>
   );
 };
 

src/pages/Component/Detail/ShockAbsorberDebuggingT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/Component/Detail/ShockAbsorberDebuggingT/TestReport/index.tsx

@@ -20,6 +20,7 @@ import UploadS from '@/components/UploadS';
 import { useModel } from 'umi';
 import PreviewPDF from '@/components/PreviewPDF';
 import { CloseOutlined } from '@ant-design/icons';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -27,7 +28,6 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const [loading, setLoading] = useState<boolean>(false);
   const [fileurl, setFileUrl] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
@@ -81,7 +81,6 @@ const SuperTable: React.FC<{
     setOpenDrawer(false);
   };
 
-
   const columns: TableColumnsType<TestReportType.DataType> = [
     {
       title: '序号',
@@ -156,7 +155,6 @@ const SuperTable: React.FC<{
         rowSelection={rowSelection}
       />
     </div>
-
   );
 };
 
@@ -257,7 +255,7 @@ const TestReport: React.FC<{
             getAll(e.fileName);
           }}
         >
-          <Form.Item label="文件名称" name="fileName">
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
             <MyInput placeholder="请输入文件名称" />
           </Form.Item>
           <Form.Item>

src/pages/Component/Detail/SpringDataT/ResourceData/index.css

@@ -6,4 +6,8 @@
     border: 1px solid #d9d9d9;
     background: none;
     box-shadow: none;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/Component/Detail/SpringDataT/ResourceData/index.tsx

@@ -1,16 +1,7 @@
 import MyInput from '@/components/MyInput';
 import styles from './index.css';
 import { Scrollbars } from 'react-custom-scrollbars';
-import {
-  Button,
-  Form,
-  Popconfirm,
-  Space,
-  Spin,
-  Table,
-  TableColumnsType,
-  message,
-} from 'antd';
+import { Button, Form, Popconfirm, Space, Spin, Table, TableColumnsType, message } from 'antd';
 import { useEffect, useState } from 'react';
 import { getResourceFileList, downloadZipFile, deleteResourceFile } from './api';
 import { TableRowSelection } from 'antd/lib/table/interface';
@@ -23,7 +14,6 @@ import moment from 'moment';
 import DatePicker from 'antd/es/date-picker';
 import { RangePickerProps } from 'antd/lib/date-picker';
 import { range } from 'lodash';
-import Select from 'antd/es/select';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -31,7 +21,6 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const deleteHandle = async (record: any) => {
     const condition: any = {
       attachIdList: [record.id],
@@ -114,7 +103,7 @@ const ResourceData: React.FC<{
   idNumber: number;
 }> = ({ idNumber }) => {
   const [dataSource, setDataSource] = useState<ResourceDataType.DataType[]>([]);
-  const [current, setCurrent] = useState<number>(1);
+  const [currentPage, setCurrentPage] = useState<number>(1);
   const [page, setPage] = useState<number>(5);
   const [total, setTotal] = useState<number>(0);
   const [loading, setLoading] = useState<boolean>(false);
@@ -134,12 +123,11 @@ const ResourceData: React.FC<{
   };
 
   //获取原始数据文件列表
-  const getAll = async (
-  ) => {
+  const getAll = async () => {
     form.validateFields().then(async (values) => {
       const condition: ResourceDataType.ConditionQuery = {
         ...values,
-        pageNum: current,
+        pageNum: currentPage,
         pageSize: page,
         carId: idNumber,
         businessId: 97,
@@ -156,12 +144,11 @@ const ResourceData: React.FC<{
         setLoading(false);
       }
     });
-
   };
 
   useEffect(() => {
     getAll();
-  }, [current, page]);
+  }, [currentPage, page]);
 
   const deleteHandle = async () => {
     if (selectedRowKeys.length != 0) {
@@ -181,7 +168,7 @@ const ResourceData: React.FC<{
   };
 
   const pagination = {
-    current: current,
+    current: currentPage,
     pageSize: page,
     total: total,
     pageSizeOptions: [5, 10, 20, 50],
@@ -189,7 +176,7 @@ const ResourceData: React.FC<{
     showSizeChanger: true,
     showQuickJumper: true,
     onChange: (cur: number, p: number) => {
-      setCurrent(cur);
+      setCurrentPage(cur);
       setPage(p);
     },
   };
@@ -215,7 +202,7 @@ const ResourceData: React.FC<{
     };
   };
 
-  // 批量下载  
+  // 批量下载
   const downloadFileList = async () => {
     const condition: ResourceDataType.ConditionQuery = {
       carId: idNumber,
@@ -233,7 +220,7 @@ const ResourceData: React.FC<{
     window.URL.revokeObjectURL(objectURL);
     btn.remove();
     setLoading(false);
-  }
+  };
 
   return (
     <Scrollbars
@@ -258,7 +245,7 @@ const ResourceData: React.FC<{
               getAll();
             }}
           >
-            <Form.Item label="文件名称" name="fileName" style={{ width: '17vw' }}>
+            <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
               <MyInput placeholder="请输入文件名称" />
             </Form.Item>
             <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
@@ -337,7 +324,7 @@ const ResourceData: React.FC<{
               ],
               children: (
                 <DatePicker
-                  className='uploadFileTime'
+                  className="uploadFileTime"
                   style={{ width: '100%', color: 'black ! important' }}
                   format="YYYY-MM-DD HH:mm:ss"
                   disabledDate={disabledDate}

src/pages/Component/Detail/SpringDataT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/Component/Detail/SpringDataT/TestReport/index.tsx

@@ -20,6 +20,7 @@ import TestReportType from './type';
 import UploadS from '@/components/UploadS';
 import { useModel } from 'umi';
 import PreviewPDF from '@/components/PreviewPDF';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -27,13 +28,11 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const [loading, setLoading] = useState<boolean>(false);
   const [fileurl, setFileUrl] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
   const [preFileName, setPreFileName] = useState<any>();
 
-
   const deleteHandle = async (record: any) => {
     const condition: any = {
       attachIdList: [record.id],
@@ -51,7 +50,6 @@ const SuperTable: React.FC<{
     infoUpdate();
   };
 
-
   //预览
   const previewHandle = async (record: any) => {
     setLoading(true);
@@ -161,7 +159,6 @@ const SuperTable: React.FC<{
         rowSelection={rowSelection}
       />
     </div>
-
   );
 };
 
@@ -189,9 +186,7 @@ const TestReport: React.FC<{
   };
 
   //获取试验报告
-  const getAll = async (
-    fileName: string | undefined = undefined,
-  ) => {
+  const getAll = async (fileName: string | undefined = undefined) => {
     const condition: TestReportType.QueryType = {
       pageNum: current,
       pageSize: page,
@@ -261,7 +256,7 @@ const TestReport: React.FC<{
       autoHeightMax="64vh"
     >
       <div>
-        <div >
+        <div>
           <Form
             name="basic"
             layout="inline"
@@ -271,8 +266,8 @@ const TestReport: React.FC<{
               getAll(e.fileName);
             }}
           >
-            <Form.Item label="文件名" name="fileName">
-              <MyInput placeholder="请输入文件名" />
+            <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
+              <MyInput placeholder="请输入文件名称" />
             </Form.Item>
             <Form.Item>
               <Button type="dashed" htmlType="submit">

src/pages/Component/Detail/SpringDataT/TestResult/index.css

@@ -6,4 +6,8 @@
     border: 1px solid #d9d9d9;
     background: none;
     box-shadow: none;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/Component/Detail/SpringDataT/TestResult/index.tsx

@@ -8,7 +8,7 @@ import {
   Table,
   TableColumnsType,
   message,
-  Input
+  Input,
 } from 'antd';
 import { useEffect, useState } from 'react';
 import { history } from 'umi';
@@ -25,6 +25,7 @@ import DatePicker from 'antd/es/date-picker';
 import { range } from 'lodash';
 import UploadSWithDownload from '@/components/UploadSWithDownload';
 import TestResultType from './type';
+import styles from './index.css';
 
 const TestResult: React.FC<{
   idNumber: number;
@@ -134,9 +135,7 @@ const TestResult: React.FC<{
   };
 
   const detailHandle = (record: TestResultType.DataType) => {
-    history.push(
-      `/component/springData/resultDetail/${idNumber + '&' + record.id}`,
-    );
+    history.push(`/component/springData/resultDetail/${idNumber + '&' + record.id}`);
   };
 
   //表头
@@ -219,7 +218,7 @@ const TestResult: React.FC<{
     };
   };
 
-  // 批量下载  
+  // 批量下载
   const downloadFileList = async () => {
     const values = form.getFieldsValue();
     const condition: TestResultType.SelectType = {
@@ -242,8 +241,7 @@ const TestResult: React.FC<{
     window.URL.revokeObjectURL(objectURL);
     btn.remove();
     setLoading(false);
-  }
-
+  };
 
   useEffect(() => {
     getData();
@@ -272,8 +270,8 @@ const TestResult: React.FC<{
               getData();
             }}
           >
-            <Form.Item label="文件名" name="fileName">
-              <Input placeholder="请输入文件名" />
+            <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
+              <Input placeholder="请输入文件名称" />
             </Form.Item>
             <Form.Item>
               <Space>
@@ -359,7 +357,7 @@ const TestResult: React.FC<{
               ],
               children: (
                 <DatePicker
-                  className='uploadFileTime'
+                  className="uploadFileTime"
                   style={{ width: '100%', color: 'black ! important' }}
                   format="YYYY-MM-DD HH:mm:ss"
                   disabledDate={disabledDate}
@@ -370,7 +368,7 @@ const TestResult: React.FC<{
             },
           ]}
         ></UploadSWithDownload>
-      </div >
+      </div>
     </Scrollbars>
   );
 };

src/pages/Component/Detail/TireDataT/TestData/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/Component/Detail/TireDataT/TestData/index.tsx

@@ -24,7 +24,9 @@ import { range } from 'lodash';
 import { download } from '@/utils/tools';
 import { CloseOutlined } from '@ant-design/icons';
 import PreviewPDF from '@/components/PreviewPDF';
-import { Divider, Typography, Descriptions } from 'antd';
+import { Divider, Typography } from 'antd';
+import styles from './index.css';
+import { Scrollbars } from 'react-custom-scrollbars';
 import { DataType } from './type';
 
 const { Title } = Typography;
@@ -33,38 +35,10 @@ const { Title } = Typography;
 const BasicParam: React.FC<{ tireMessagData?: DataType }> = ({ tireMessagData }) => {
   return (
     <div style={{ marginBottom: '30px' }}>
-      <Title level={4} style={{ color: 'rgb(34,147,202)' }}>
+      <Title level={4} style={{ color: 'white' }}>
         轮胎基本信息
       </Title>
       <Divider />
-      {/* <div>
-        <Descriptions
-          bordered
-          column={6}
-          contentStyle={{ backgroundColor: '#fff', minWidth: '200px', textAlign: 'center' }}
-          labelStyle={{ backgroundColor: '#fafafa', textAlign: 'center' }}
-        >
-          <Descriptions.Item label="前轮胎品牌">前轮胎品牌</Descriptions.Item>
-          <Descriptions.Item label="前轮胎规格">前轮胎规格</Descriptions.Item>
-          <Descriptions.Item label="前轮胎胎压(bar)">前轮胎胎压(bar)</Descriptions.Item>
-          <Descriptions.Item label="后轮胎品牌">后轮胎品牌</Descriptions.Item>
-          <Descriptions.Item label="后轮胎规格">后轮胎规格</Descriptions.Item>
-          <Descriptions.Item label="后轮胎胎压(bar)">后轮胎胎压(bar)</Descriptions.Item>
-        </Descriptions>
-        <Descriptions
-          bordered
-          column={6}
-          contentStyle={{ backgroundColor: '#fff', minWidth: '200px', textAlign: 'center' }}
-          labelStyle={{ backgroundColor: '#fafafa', textAlign: 'center' }}
-        >
-          <Descriptions.Item label="前轮胎品牌">{tireMessagData?.frontTireBrand}</Descriptions.Item>
-          <Descriptions.Item label="前轮胎规格">{tireMessagData?.frontTireSpecifications}</Descriptions.Item>
-          <Descriptions.Item label="前轮胎胎压(bar)">{tireMessagData?.frontTirePressure}</Descriptions.Item>
-          <Descriptions.Item label="后轮胎品牌">{tireMessagData?.rearTireBrand}</Descriptions.Item>
-          <Descriptions.Item label="后轮胎规格">{tireMessagData?.rearTireSpecifications}</Descriptions.Item>
-          <Descriptions.Item label="后轮胎胎压(bar)">{tireMessagData?.rearTirePressure}</Descriptions.Item>
-        </Descriptions>
-      </div> */}
       <div>
         <Row>
           <Col span={4} style={{ textAlign: 'center' }}>
@@ -340,133 +314,138 @@ const TestData: React.FC<{
   }, [page, pageSize]);
 
   return (
-    <div>
-      <Spin spinning={loading1}>
-        <BasicParam tireMessagData={tireMessagData} />
-      </Spin>
-      <Title level={4} style={{ color: 'rgb(34,147,202)' }}>
-        试验数据
-      </Title>
-      <Divider />
+    <Scrollbars
+      // style={{ width: '80vw' }}
+      autoHide
+      autoHideTimeout={1000}
+      autoHideDuration={200}
+      autoWidth
+      autoWidthMin={550}
+      autoWidthMax={550}
+      autoHeight
+      autoHeightMin="60vh"
+      autoHeightMax="60vh"
+    >
       <div>
-        <Form form={form} component={false} autoComplete="off">
-          <Row>
-            <Col span={8}>
-              <Form.Item label="文件名称" colon={false} name="fileName">
-                <Input placeholder="请输入文件名称" />
-              </Form.Item>
-            </Col>
-          </Row>
-          <Row>
-            <Col span={8} offset={16}>
-              <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
-                <Space>
-                  <Button htmlType="button" type="dashed" onClick={getData}>
-                    查询
-                  </Button>
-                  <Button
-                    htmlType="button"
-                    type="dashed"
-                    onClick={() => {
-                      form.resetFields();
-                      getData();
-                    }}
-                  >
-                    重置
-                  </Button>
-                </Space>
-              </Form.Item>
-            </Col>
-          </Row>
-        </Form>
-      </div>
-      <hr />
-      <div style={{ marginBottom: '10px' }}>
-        <Space>
-          <Popconfirm
-            title="是否删除这些数据？"
-            onConfirm={() => {
-              delectHandle(selectedRows.map((item) => item.id as number));
-            }}
-            okText="是"
-            cancelText="否"
-          >
-            <Button type="dashed">批量删除</Button>
-          </Popconfirm>
-          <Button type="dashed" onClick={opeanHandle}>
-            导入数据
-          </Button>
-        </Space>
-      </div>
-      <div>
-        <Spin spinning={loading}>
-          <Table
-            rowSelection={rowSelection}
-            columns={columns}
-            dataSource={dataList}
-            rowKey="id"
-            pagination={pagination}
-          />
+        <Spin spinning={loading1}>
+          <BasicParam tireMessagData={tireMessagData} />
         </Spin>
-      </div>
+        <Title level={4} style={{ color: 'white' }}>
+          试验数据
+        </Title>
+        <Divider />
+        <div>
+          <Form name="basic" layout="inline" autoComplete="off">
+            <Form.Item label="文件名称" colon={false} name="fileName" className={styles.formSelect}>
+              <Input placeholder="请输入文件名称" />
+            </Form.Item>
+            <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
+              <Space>
+                <Button htmlType="button" type="dashed" onClick={getData}>
+                  查询
+                </Button>
+                <Button
+                  htmlType="button"
+                  type="dashed"
+                  onClick={() => {
+                    form.resetFields();
+                    getData();
+                  }}
+                >
+                  重置
+                </Button>
+              </Space>
+            </Form.Item>
+          </Form>
+        </div>
+        <hr />
+        <div style={{ marginBottom: '10px' }}>
+          <Space>
+            <Popconfirm
+              title="是否删除这些数据？"
+              onConfirm={() => {
+                delectHandle(selectedRows.map((item) => item.id as number));
+              }}
+              okText="是"
+              cancelText="否"
+            >
+              <Button type="dashed">批量删除</Button>
+            </Popconfirm>
+            <Button type="dashed" onClick={opeanHandle}>
+              导入数据
+            </Button>
+          </Space>
+        </div>
+        <div>
+          <Spin spinning={loading}>
+            <Table
+              rowSelection={rowSelection}
+              columns={columns}
+              dataSource={dataList}
+              rowKey="id"
+              pagination={pagination}
+            />
+          </Spin>
+        </div>
 
-      <div>
-        <UploadS
-          isOpen={open}
-          cancel={closeHandle}
-          title="上传文件"
-          url="/api/tire/uploadTyreFile"
-          update={getData}
-          name="multipartFile"
-          data={{
-            operId: currentUser?.id,
-            carId: idNumber,
-          }}
-          extraFormData={[
-            {
-              name: 'taskStartTime',
-              label: '开始时间',
-              required: false,
-              rules: [
-                {
-                  validator(_, value) {
-                    if (value && value.isBefore(moment())) {
-                      return Promise.reject('开始时间不能早于当前时间');
-                    }
-                    return Promise.resolve();
+        <div>
+          <UploadS
+            isOpen={open}
+            cancel={closeHandle}
+            title="上传文件"
+            url="/api/tire/uploadTyreFile"
+            update={getData}
+            name="multipartFile"
+            data={{
+              operId: currentUser?.id,
+              carId: idNumber,
+            }}
+            extraFormData={[
+              {
+                name: 'taskStartTime',
+                label: '开始时间',
+                required: false,
+                rules: [
+                  {
+                    validator(_, value) {
+                      if (value && value.isBefore(moment())) {
+                        return Promise.reject('开始时间不能早于当前时间');
+                      }
+                      return Promise.resolve();
+                    },
                   },
+                ],
+                normalize(value, prevValue, allValues) {
+                  value?.add(10, 's');
+                  return value;
                 },
-              ],
-              normalize(value, prevValue, allValues) {
-                value?.add(10, 's');
-                return value;
+                children: (
+                  <DatePicker
+                    style={{ width: '100%' }}
+                    format="YYYY-MM-DD HH:mm:ss"
+                    disabledDate={disabledDate}
+                    disabledTime={disabledDateTime}
+                    showTime={{ secondStep: 10 }}
+                  />
+                ),
               },
-              children: (
-                <DatePicker
-                  style={{ width: '100%' }}
-                  format="YYYY-MM-DD HH:mm:ss"
-                  disabledDate={disabledDate}
-                  disabledTime={disabledDateTime}
-                  showTime={{ secondStep: 10 }}
-                />
-              ),
-            },
-          ]}
-        />
-      </div>
+            ]}
+          />
+        </div>
 
-      <Drawer
-        placement="left"
-        width={'90%'}
-        open={openDrawer}
-        onClose={onClose}
-        title={preFileName}
-        closable={false}
-        extra={<Button type="text" onClick={onClose} icon={<CloseOutlined />} />}
-      >
-        <PreviewPDF url={fileurl} />
-      </Drawer>
-    </div>
+        <Drawer
+          placement="left"
+          width={'90%'}
+          open={openDrawer}
+          onClose={onClose}
+          title={preFileName}
+          closable={false}
+          extra={<Button type="text" onClick={onClose} icon={<CloseOutlined />} />}
+        >
+          <PreviewPDF url={fileurl} />
+        </Drawer>
+      </div>
+    </Scrollbars>
   );
 };
 

src/pages/DrivingPerformance/DataQuery/index.css

@@ -1,14 +1,7 @@
 .form {
-    /* width: 990px; */
     height: 160px;
     border: 1px solid gray;
-    margin-bottom: 10px;
-}
-
-.formItem {
-    margin-left: 20px;
-    margin-top: 20px;
-    margin-bottom: 20px;
+    margin-bottom: 10px !important;
 }
 
 .input {
@@ -22,16 +15,16 @@
 
 .formSelect {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .inputNumber {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .formButtonSY {

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestData/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestData/index.tsx

@@ -1,12 +1,10 @@
 import {
   Button,
-  Col,
   DatePicker,
   Drawer,
   Form,
   Input,
   Popconfirm,
-  Row,
   Space,
   Spin,
   Table,
@@ -24,6 +22,7 @@ import { range } from 'lodash';
 import { download } from '@/utils/tools';
 import { CloseOutlined } from '@ant-design/icons';
 import PreviewPDF from '@/components/PreviewPDF';
+import styles from './index.css';
 
 const TestData: React.FC<{
   idNumber: number;
@@ -235,35 +234,27 @@ const TestData: React.FC<{
   return (
     <div>
       <div>
-        <Form form={form} component={false} autoComplete="off">
-          <Row>
-            <Col span={8}>
-              <Form.Item label="文件名称" colon={false} name="fileName">
-                <Input placeholder="请输入文件名称" />
-              </Form.Item>
-            </Col>
-          </Row>
-          <Row>
-            <Col span={8} offset={16}>
-              <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
-                <Space>
-                  <Button htmlType="button" type="dashed" onClick={getData}>
-                    查询
-                  </Button>
-                  <Button
-                    htmlType="button"
-                    type="dashed"
-                    onClick={() => {
-                      form.resetFields();
-                      getData();
-                    }}
-                  >
-                    重置
-                  </Button>
-                </Space>
-              </Form.Item>
-            </Col>
-          </Row>
+        <Form form={form} autoComplete="off" layout="inline">
+          <Form.Item label="文件名称" colon={false} name="fileName" className={styles.formSelect}>
+            <Input placeholder="请输入文件名称" />
+          </Form.Item>
+          <Form.Item style={{ display: 'flex', justifyContent: 'flex-end' }}>
+            <Space>
+              <Button htmlType="button" type="dashed" onClick={getData}>
+                查询
+              </Button>
+              <Button
+                htmlType="button"
+                type="dashed"
+                onClick={() => {
+                  form.resetFields();
+                  getData();
+                }}
+              >
+                重置
+              </Button>
+            </Space>
+          </Form.Item>
         </Form>
       </div>
       <hr />

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestReport/api.ts

@@ -1,11 +1,11 @@
-import { postData, download } from '@/utils/request';
+import { postData } from '@/utils/request';
 
 /**
  * 获取文件列表
  * @param data
  * @returns
  */
-export async function getDataList(data: TestApplication.ConditionQuery) {
+export async function getDataList(data: any) {
   const result = await postData(`api/barking/queryBarkingFileReportList`, data);
   return result;
 }

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestReport/index copy.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestReport/index.tsx

@@ -1,22 +1,13 @@
 import MyInput from '@/components/MyInput';
 import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
-import {
-  Button,
-  Form,
-  Popconfirm,
-  Select,
-  Space,
-  Spin,
-  Table,
-  TableColumnsType,
-  message,
-} from 'antd';
+import { Button, Form, Popconfirm, Space, Spin, Table, TableColumnsType, message } from 'antd';
 import { useEffect, useState } from 'react';
-import { deleteFile, downloadFile, getDataList } from './api';
+import { deleteFile, getDataList } from './api';
 import { TableRowSelection } from 'antd/lib/table/interface';
 import { download } from '@/utils/tools';
 import TestApplicationType from './type';
 import UploadS from '@/components/UploadS';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -204,20 +195,9 @@ const TestReport: React.FC<{
             getAll(e.fileName);
           }}
         >
-          <Form.Item label="文件名" name="fileName">
-            <MyInput placeholder="请输入文件名" />
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
+            <MyInput placeholder="请输入文件名称" />
           </Form.Item>
-          {/* <Form.Item label="试验类别" name="businessType">
-            <Select
-              allowClear
-              placeholder="请选择试验类别"
-              style={{ width: 200 }}
-              options={[
-                { value: 4, label: '平顺性试验报告' },
-                { value: 9, label: '操作稳定性试验报告' },
-              ]}
-            />
-          </Form.Item> */}
           <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
             <Button type="dashed" htmlType="submit">
               查询
@@ -259,23 +239,23 @@ const TestReport: React.FC<{
           ownerId: idNumber,
           // ownerType: 'car_info',
         }}
-      // extraFormData={[
-      //   {
-      //     name: 'businessType',
-      //     label: '试验类别',
-      //     children: (
-      //       // <Select
-      //       //   allowClear
-      //       //   placeholder="请选择试验类别"
-      //       //   options={[
-      //       //     { value: 4, label: '平顺性试验报告' },
-      //       //     { value: 9, label: '操作稳定性试验报告' },
-      //       //   ]}
-      //       // />
-      //       <></>
-      //     ),
-      //   },
-      // ]}
+        // extraFormData={[
+        //   {
+        //     name: 'businessType',
+        //     label: '试验类别',
+        //     children: (
+        //       // <Select
+        //       //   allowClear
+        //       //   placeholder="请选择试验类别"
+        //       //   options={[
+        //       //     { value: 4, label: '平顺性试验报告' },
+        //       //     { value: 9, label: '操作稳定性试验报告' },
+        //       //   ]}
+        //       // />
+        //       <></>
+        //     ),
+        //   },
+        // ]}
       ></UploadS>
     </div>
   );

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestResult/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/BrakingPerformanceT/TestResult/index.tsx

@@ -3,6 +3,7 @@ import { useEffect, useState } from 'react';
 import { getData, getSelectData } from './api';
 import EChart from '@/components/EChart';
 import drawHelp from '@/components/EChart/drawHelp';
+import styles from './index.css';
 
 const TestResult: React.FC<{
   idNumber: number;
@@ -69,7 +70,12 @@ const TestResult: React.FC<{
           >
             <Row gutter={16}>
               <Col span={8}>
-                <Form.Item label="数据文件" name="attachId" rules={[{ required: true }]}>
+                <Form.Item
+                  label="数据文件"
+                  name="attachId"
+                  rules={[{ required: true }]}
+                  className={styles.formSelect}
+                >
                   <Select placeholder="请选择数据文件" options={selectData} />
                 </Form.Item>
               </Col>
@@ -79,6 +85,7 @@ const TestResult: React.FC<{
                   name="testType"
                   initialValue={0}
                   rules={[{ required: true }]}
+                  className={styles.formSelect}
                 >
                   <Select
                     placeholder="请选择测试方式"
@@ -95,6 +102,7 @@ const TestResult: React.FC<{
                   label="图像名称"
                   name="chartName"
                   initialValue={'径向实心刚度'}
+                  className={styles.formSelect}
                   rules={[{ required: true }]}
                 >
                   <Select
@@ -115,7 +123,12 @@ const TestResult: React.FC<{
             </Row>
             <Row gutter={16}>
               <Col span={8}>
-                <Form.Item label="拟合曲线阶数" name="order" initialValue={1}>
+                <Form.Item
+                  label="拟合曲线阶数"
+                  name="order"
+                  initialValue={1}
+                  className={styles.formSelect}
+                >
                   <InputNumber placeholder="请输入拟合曲线阶数" style={{ width: '100%' }} />
                 </Form.Item>
               </Col>

src/pages/DrivingPerformance/Detail/CenterOfMassT/TestData/index.css

@@ -29,4 +29,8 @@
     width: 100%;
     height: 600px;
     background-color: red;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/DrivingPerformance/Detail/CenterOfMassT/TestData/index.tsx

@@ -1,27 +1,9 @@
-/*
- * @description: Toto
- * @author: zx
- */
-/* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect, useState } from 'react';
-import {
-  Space,
-  Button,
-  message,
-  Row,
-  Col,
-  Table,
-  Modal,
-  Upload,
-  Popconfirm,
-  Spin,
-  DatePicker,
-} from 'antd';
+import { Space, Button, message, Table, Popconfirm, Spin, DatePicker } from 'antd';
 import styles from './index.css';
 import type { TableProps } from 'antd';
-import type { TestDataType, TestDataTypeInfo, delDataLIstInfo, updateListInfo } from './Type';
-import { getTestDataList, deleteDataList, upDataList, downloadFile, queryconditions } from './api';
-import { UploadOutlined } from '@ant-design/icons';
+import type { TestDataType, TestDataTypeInfo, delDataLIstInfo } from './Type';
+import { getTestDataList, deleteDataList, downloadFile } from './api';
 import TableForm from './tableForm/tableForm';
 import { useModel } from 'umi';
 import moment from 'moment';

src/pages/DrivingPerformance/Detail/CenterOfMassT/TestData/tableForm/tableForm.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Form, Input, Space, DatePicker, Row, Col, Select } from 'antd';
+import { Button, Form, Input, Space, DatePicker } from 'antd';
 import styles from '../index.css';
 import type { TestDataTypeInfo } from '../Type';
 
@@ -30,30 +30,19 @@ const TableForm: React.FC<{
   };
   return (
     <>
-      <Form form={form} className={styles.form} onFinish={onFinish}>
-        <Row>
-          <Col span={8}>
-            <Form.Item
-              label="文件名称"
-              colon={false}
-              className={styles.formSelect}
-              name={'fileName'}
-            >
-              <Input placeholder="请输入" />
-            </Form.Item>
-          </Col>
-          <Col span={8}>
-            <Form.Item
-              label="创建时间"
-              colon={false}
-              className={styles.formSelect}
-              name={'creationTime'}
-            >
-              <RangePicker />
-            </Form.Item>
-          </Col>
-        </Row>
-        <Form.Item wrapperCol={{ offset: 20, span: 16 }}>
+      <Form form={form} onFinish={onFinish} layout="inline">
+        <Form.Item label="文件名称" colon={false} className={styles.formSelect} name={'fileName'}>
+          <Input placeholder="请输入" />
+        </Form.Item>
+        <Form.Item
+          label="创建时间"
+          colon={false}
+          className={styles.formSelect}
+          name={'creationTime'}
+        >
+          <RangePicker />
+        </Form.Item>
+        <Form.Item>
           <Space>
             <Button htmlType="submit" type="dashed">
               查询

src/pages/DrivingPerformance/Detail/OperationalStabilityT/ResourceData/index.css

@@ -15,4 +15,12 @@
 .buttomForm {
     margin-top: 10px;
     margin-bottom: 2px;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}
+
+.inputForm :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/DrivingPerformance/Detail/OperationalStabilityT/ResourceData/index.tsx

@@ -1,17 +1,6 @@
 import styles from './index.css';
 import { Scrollbars } from 'react-custom-scrollbars';
-import {
-  Button,
-  Form,
-  Popconfirm,
-  Space,
-  Spin,
-  Table,
-  TableColumnsType,
-  message,
-  Col,
-  Row,
-} from 'antd';
+import { Button, Form, Popconfirm, Space, Spin, Table, TableColumnsType, message } from 'antd';
 import { useEffect, useState } from 'react';
 import { deleteFile, getDataList, getExpTypeList, downloadZipFile } from './api';
 import { TableRowSelection } from 'antd/lib/table/interface';
@@ -113,7 +102,7 @@ const ResourceData: React.FC<{
   idNumber: number;
 }> = ({ idNumber }) => {
   const [dataSource, setDataSource] = useState<ResourceDataType.DataType[]>([]);
-  const [current, setCurrent] = useState<number>(1);
+  const [currentPage, setCurrentPage] = useState<number>(1);
   const [page, setPage] = useState<number>(5);
   const [total, setTotal] = useState<number>(0);
   const [loading, setLoading] = useState<boolean>(false);
@@ -137,7 +126,7 @@ const ResourceData: React.FC<{
     const values = form.getFieldsValue();
     const condition: ResourceDataType.ConditionQuery = {
       ...values,
-      pageNum: current,
+      pageNum: currentPage,
       pageSize: page,
       carId: idNumber,
       parentId: 11,
@@ -155,8 +144,6 @@ const ResourceData: React.FC<{
     }
   };
 
-
-
   const deleteHandle = async () => {
     if (selectedRowKeys.length != 0) {
       const condition: any = {
@@ -174,7 +161,7 @@ const ResourceData: React.FC<{
     }
   };
 
-  // 批量下载  
+  // 批量下载
   const downloadFileList = async () => {
     const values = form.getFieldsValue();
     const condition: ResourceDataType.ConditionQuery = {
@@ -195,10 +182,10 @@ const ResourceData: React.FC<{
     window.URL.revokeObjectURL(objectURL);
     btn.remove();
     setLoading(false);
-  }
+  };
 
   const pagination = {
-    current: current,
+    current: currentPage,
     pageSize: page,
     total: total,
     pageSizeOptions: [5, 10, 20, 50],
@@ -206,7 +193,7 @@ const ResourceData: React.FC<{
     showSizeChanger: true,
     showQuickJumper: true,
     onChange: (cur: number, p: number) => {
-      setCurrent(cur);
+      setCurrentPage(cur);
       setPage(p);
     },
   };
@@ -249,7 +236,7 @@ const ResourceData: React.FC<{
   useEffect(() => {
     getAll();
     getExpData();
-  }, [current, page]);
+  }, [currentPage, page]);
 
   return (
     <Scrollbars
@@ -265,13 +252,8 @@ const ResourceData: React.FC<{
     >
       <div>
         <div>
-          <Form
-            name="basic"
-            form={form}
-            layout="inline"
-            onFinish={getAll}
-          >
-            <Form.Item label="试验类别" name="businessId">
+          <Form name="basic" form={form} layout="inline" onFinish={getAll}>
+            <Form.Item label="试验类别" name="businessId" className={styles.formSelect}>
               <Select
                 allowClear
                 style={{ width: '12vw' }}
@@ -283,7 +265,6 @@ const ResourceData: React.FC<{
               />
             </Form.Item>
             <Form.Item label="数据类型" name="dataType" className={styles.inputForm}>
-
               <Select
                 allowClear
                 style={{ width: '10vw' }}
@@ -453,7 +434,7 @@ const ResourceData: React.FC<{
               ],
               children: (
                 <DatePicker
-                  className='uploadFileTime'
+                  className="uploadFileTime"
                   style={{ width: '100%', color: 'black ! important' }}
                   format="YYYY-MM-DD HH:mm:ss"
                   disabledDate={disabledDate}
@@ -465,7 +446,7 @@ const ResourceData: React.FC<{
           ]}
         ></UploadSWithDownload>
       </div>
-    </Scrollbars >
+    </Scrollbars>
   );
 };
 

src/pages/DrivingPerformance/Detail/OperationalStabilityT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/OperationalStabilityT/TestReport/index.tsx

@@ -20,6 +20,7 @@ import TestReportType from './type';
 import UploadS from '@/components/UploadS';
 import { useModel } from 'umi';
 import PreviewPDF from '@/components/PreviewPDF';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -27,13 +28,11 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const [loading, setLoading] = useState<boolean>(false);
   const [fileurl, setFileUrl] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
   const [preFileName, setPreFileName] = useState<any>();
 
-
   const deleteHandle = async (record: any) => {
     const condition: any = {
       attachIdList: [record.id],
@@ -51,7 +50,6 @@ const SuperTable: React.FC<{
     infoUpdate();
   };
 
-
   //预览
   const previewHandle = async (record: any) => {
     setLoading(true);
@@ -161,7 +159,6 @@ const SuperTable: React.FC<{
         rowSelection={rowSelection}
       />
     </div>
-
   );
 };
 
@@ -189,9 +186,7 @@ const TestReport: React.FC<{
   };
 
   //获取试验报告
-  const getAll = async (
-    fileName: string | undefined = undefined,
-  ) => {
+  const getAll = async (fileName: string | undefined = undefined) => {
     const condition: TestReportType.ConditionQuery = {
       pageNum: current,
       pageSize: page,
@@ -261,7 +256,7 @@ const TestReport: React.FC<{
       autoHeightMax="64vh"
     >
       <div>
-        <div >
+        <div>
           <Form
             name="basic"
             layout="inline"
@@ -271,8 +266,8 @@ const TestReport: React.FC<{
               getAll(e.fileName);
             }}
           >
-            <Form.Item label="文件名" name="fileName">
-              <MyInput placeholder="请输入文件名" />
+            <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
+              <MyInput placeholder="请输入文件名称" />
             </Form.Item>
             <Form.Item>
               <Button type="dashed" htmlType="submit">

src/pages/DrivingPerformance/Detail/OperationalStabilityT/TestResult/index.css

@@ -6,4 +6,8 @@
     border: 1px solid #d9d9d9;
     background: none;
     box-shadow: none;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/DrivingPerformance/Detail/OperationalStabilityT/TestResult/index.tsx

@@ -246,7 +246,7 @@ const TestResult: React.FC<{
     };
   };
 
-  // 批量下载  
+  // 批量下载
   const downloadFileList = async () => {
     const values = form.getFieldsValue();
     const condition: TestResultType.SelectType = {
@@ -269,8 +269,7 @@ const TestResult: React.FC<{
     window.URL.revokeObjectURL(objectURL);
     btn.remove();
     setLoading(false);
-  }
-
+  };
 
   useEffect(() => {
     getExpData();
@@ -300,10 +299,7 @@ const TestResult: React.FC<{
               getData();
             }}
           >
-            {/* <Form.Item label="文件名" name="fileName">
-              <Input placeholder="请输入文件名" />
-            </Form.Item> */}
-            <Form.Item label="试验类别" name="businessType">
+            <Form.Item label="试验类别" name="businessType" className={styles.formSelect}>
               <Select
                 allowClear
                 style={{ width: 200 }}
@@ -329,7 +325,11 @@ const TestResult: React.FC<{
             <Button type="dashed" onClick={() => setOpen(true)}>
               导入数据
             </Button>
-            <Button type="dashed" className={styles.button} onClick={() => setIsAddFilesModal(true)}>
+            <Button
+              type="dashed"
+              className={styles.button}
+              onClick={() => setIsAddFilesModal(true)}
+            >
               批量导入数据
             </Button>
             <Button
@@ -402,7 +402,7 @@ const TestResult: React.FC<{
               ],
               children: (
                 <DatePicker
-                  className='uploadFileTime'
+                  className="uploadFileTime"
                   style={{ width: '100%', color: 'black ! important' }}
                   format="YYYY-MM-DD HH:mm:ss"
                   disabledDate={disabledDate}
@@ -472,7 +472,7 @@ const TestResult: React.FC<{
               ],
               children: (
                 <DatePicker
-                  className='uploadFileTime'
+                  className="uploadFileTime"
                   style={{ width: '100%', color: 'black ! important' }}
                   format="YYYY-MM-DD HH:mm:ss"
                   disabledDate={disabledDate}
@@ -483,7 +483,7 @@ const TestResult: React.FC<{
             },
           ]}
         />
-      </div >
+      </div>
     </Scrollbars>
   );
 };

src/pages/DrivingPerformance/Detail/RideT/ResourceData/index.css

@@ -6,4 +6,8 @@
     border: 1px solid #d9d9d9;
     background: none;
     box-shadow: none;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/DrivingPerformance/Detail/RideT/ResourceData/index.tsx

@@ -1,16 +1,7 @@
 import MyInput from '@/components/MyInput';
 import styles from './index.css';
 import { Scrollbars } from 'react-custom-scrollbars';
-import {
-  Button,
-  Form,
-  Popconfirm,
-  Space,
-  Spin,
-  Table,
-  TableColumnsType,
-  message,
-} from 'antd';
+import { Button, Form, Popconfirm, Space, Spin, Table, TableColumnsType, message } from 'antd';
 import { useEffect, useState } from 'react';
 import { deleteFile, getDataList, downloadZipFile } from './api';
 import { TableRowSelection } from 'antd/lib/table/interface';
@@ -113,7 +104,7 @@ const ResourceData: React.FC<{
   idNumber: number;
 }> = ({ idNumber }) => {
   const [dataSource, setDataSource] = useState<ResourceDataType.DataType[]>([]);
-  const [current, setCurrent] = useState<number>(1);
+  const [currentPage, setCurrentPage] = useState<number>(1);
   const [page, setPage] = useState<number>(5);
   const [total, setTotal] = useState<number>(0);
   const [loading, setLoading] = useState<boolean>(false);
@@ -133,12 +124,11 @@ const ResourceData: React.FC<{
   };
 
   //获取原始数据文件列表
-  const getAll = async (
-  ) => {
+  const getAll = async () => {
     form.validateFields().then(async (values) => {
       const condition: ResourceDataType.ConditionQuery = {
         ...values,
-        pageNum: current,
+        pageNum: currentPage,
         pageSize: page,
         carId: idNumber,
         businessId: 90,
@@ -155,12 +145,11 @@ const ResourceData: React.FC<{
         setLoading(false);
       }
     });
-
   };
 
   useEffect(() => {
     getAll();
-  }, [current, page]);
+  }, [currentPage, page]);
 
   const deleteHandle = async () => {
     if (selectedRowKeys.length != 0) {
@@ -180,7 +169,7 @@ const ResourceData: React.FC<{
   };
 
   const pagination = {
-    current: current,
+    current: currentPage,
     pageSize: page,
     total: total,
     pageSizeOptions: [5, 10, 20, 50],
@@ -188,7 +177,7 @@ const ResourceData: React.FC<{
     showSizeChanger: true,
     showQuickJumper: true,
     onChange: (cur: number, p: number) => {
-      setCurrent(cur);
+      setCurrentPage(cur);
       setPage(p);
     },
   };
@@ -214,7 +203,7 @@ const ResourceData: React.FC<{
     };
   };
 
-  // 批量下载  
+  // 批量下载
   const downloadFileList = async () => {
     const condition: ResourceDataType.ConditionQuery = {
       carId: idNumber,
@@ -232,7 +221,7 @@ const ResourceData: React.FC<{
     window.URL.revokeObjectURL(objectURL);
     btn.remove();
     setLoading(false);
-  }
+  };
 
   return (
     <Scrollbars
@@ -257,10 +246,20 @@ const ResourceData: React.FC<{
               getAll();
             }}
           >
-            <Form.Item label="文件名称" name="fileName" style={{ width: '17vw' }}>
+            <Form.Item
+              label="文件名称"
+              name="fileName"
+              style={{ width: '17vw' }}
+              className={styles.formSelect}
+            >
               <MyInput placeholder="请输入文件名称" />
             </Form.Item>
-            <Form.Item label="数据类型" name="dataType" style={{ width: '17vw' }}>
+            <Form.Item
+              label="数据类型"
+              name="dataType"
+              style={{ width: '17vw' }}
+              className={styles.formSelect}
+            >
               <Select
                 allowClear
                 placeholder="请选择数据类型"
@@ -362,7 +361,7 @@ const ResourceData: React.FC<{
               ],
               children: (
                 <DatePicker
-                  className='uploadFileTime'
+                  className="uploadFileTime"
                   style={{ width: '100%', color: 'black ! important' }}
                   format="YYYY-MM-DD HH:mm:ss"
                   disabledDate={disabledDate}

src/pages/DrivingPerformance/Detail/RideT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/RideT/TestReport/index.tsx

@@ -19,6 +19,7 @@ import TestReportType from './type';
 import UploadS from '@/components/UploadS';
 import { useModel } from 'umi';
 import PreviewPDF from '@/components/PreviewPDF';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -26,13 +27,11 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const [loading, setLoading] = useState<boolean>(false);
   const [fileurl, setFileUrl] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
   const [preFileName, setPreFileName] = useState<any>();
 
-
   const deleteHandle = async (record: any) => {
     const condition: any = {
       attachIdList: [record.id],
@@ -50,7 +49,6 @@ const SuperTable: React.FC<{
     infoUpdate();
   };
 
-
   //预览
   const previewHandle = async (record: any) => {
     setLoading(true);
@@ -160,7 +158,6 @@ const SuperTable: React.FC<{
         rowSelection={rowSelection}
       />
     </div>
-
   );
 };
 
@@ -188,9 +185,7 @@ const TestReport: React.FC<{
   };
 
   //获取试验报告
-  const getAll = async (
-    fileName: string | undefined = undefined,
-  ) => {
+  const getAll = async (fileName: string | undefined = undefined) => {
     const condition: TestReportType.ConditionQuery = {
       pageNum: current,
       pageSize: page,
@@ -249,7 +244,7 @@ const TestReport: React.FC<{
 
   return (
     <div>
-      <div >
+      <div>
         <Form
           name="basic"
           layout="inline"
@@ -259,7 +254,7 @@ const TestReport: React.FC<{
             getAll(e.fileName);
           }}
         >
-          <Form.Item label="文件名" name="fileName">
+          <Form.Item label="文件名" name="fileName" className={styles.formSelect}>
             <MyInput placeholder="请输入文件名" />
           </Form.Item>
           <Form.Item wrapperCol={{ offset: 8, span: 16 }}>

src/pages/DrivingPerformance/Detail/RideT/TestResult/index.css

@@ -39,4 +39,8 @@
     border: 1px solid #d9d9d9;
     background: none;
     box-shadow: none;
+}
+
+.form :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/DrivingPerformance/Detail/RideT/TestResult/tableForm/tableForm.tsx

@@ -15,14 +15,15 @@ const TableForm: React.FC<{
     setTestDataList(values);
   };
 
-  //取消按钮
-  const clear = () => {
-    form.resetFields();
-    onFinish();
-  };
   return (
     <>
-      <Form form={form} layout="inline" autoComplete="off" className={styles.form} onFinish={onFinish}>
+      <Form
+        form={form}
+        layout="inline"
+        autoComplete="off"
+        className={styles.form}
+        onFinish={onFinish}
+      >
         <Form.Item label="试验工况" name="conditionId">
           <Select
             allowClear

src/pages/DrivingPerformance/Detail/SlideT/TestData/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/SlideT/TestData/index.tsx

@@ -1,14 +1,4 @@
-import {
-  Button,
-  Form,
-  Input,
-  Popconfirm,
-  Space,
-  Spin,
-  Table,
-  message,
-  Drawer,
-} from 'antd';
+import { Button, Form, Input, Popconfirm, Space, Spin, Table, message, Drawer } from 'antd';
 import { useEffect, useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
 import { deleteDataList, getSlideDataFileList, getSlideTemplateDataFile, previewData } from './api';
@@ -18,7 +8,7 @@ import { useModel } from 'umi';
 import { download } from '@/utils/tools';
 import PreviewPDF from '@/components/PreviewPDF';
 import { CloseOutlined } from '@ant-design/icons';
-
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -26,7 +16,6 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const [loading, setLoading] = useState<boolean>(false);
   const [fileurl, setFileUrl] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
@@ -130,7 +119,13 @@ const SuperTable: React.FC<{
       render: (_: any, record: any) => (
         <Space size="middle">
           <a onClick={() => previewHandle(record)}>预览</a>
-          <a onClick={() => { downloadHandle(record); }}>下载</a>
+          <a
+            onClick={() => {
+              downloadHandle(record);
+            }}
+          >
+            下载
+          </a>
           <Popconfirm
             title="是否删除此数据？"
             onConfirm={() => delectHandle([record.id])}
@@ -167,7 +162,6 @@ const SuperTable: React.FC<{
         rowSelection={rowSelection}
       />
     </div>
-
   );
 };
 
@@ -284,7 +278,7 @@ const TestData: React.FC<{
             getData();
           }}
         >
-          <Form.Item label="文件名称" name="fileName">
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
             <Input placeholder="请输入文件名称" />
           </Form.Item>
           <Form.Item>
@@ -320,16 +314,12 @@ const TestData: React.FC<{
           >
             <Button type="dashed">批量删除</Button>
           </Popconfirm>
-          <Button
-            type="dashed"
-            onClick={() => downloadTemplate()}
-          >
+          <Button type="dashed" onClick={() => downloadTemplate()}>
             下载模板
           </Button>
           <Button type="dashed" onClick={opeanHandle}>
             导入模板数据
           </Button>
-
         </Space>
       </div>
 
@@ -359,7 +349,7 @@ const TestData: React.FC<{
           }}
         />
       </div>
-    </div >
+    </div>
   );
 };
 

src/pages/DrivingPerformance/Detail/SlideT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/SlideT/TestReport/index.tsx

@@ -20,6 +20,7 @@ import UploadS from '@/components/UploadS';
 import { useModel } from 'umi';
 import PreviewPDF from '@/components/PreviewPDF';
 import { CloseOutlined } from '@ant-design/icons';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -27,7 +28,6 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-
   const [loading, setLoading] = useState<boolean>(false);
   const [fileurl, setFileUrl] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
@@ -81,7 +81,6 @@ const SuperTable: React.FC<{
     setOpenDrawer(false);
   };
 
-
   const columns: TableColumnsType<TestReportType.DataType> = [
     {
       title: '序号',
@@ -156,7 +155,6 @@ const SuperTable: React.FC<{
         rowSelection={rowSelection}
       />
     </div>
-
   );
 };
 
@@ -255,7 +253,7 @@ const TestReport: React.FC<{
             getAll(e.fileName);
           }}
         >
-          <Form.Item label="文件名称" name="fileName">
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
             <MyInput placeholder="请输入文件名称" />
           </Form.Item>
           <Form.Item>

src/pages/DrivingPerformance/Detail/SwerveT/TestData/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/SwerveT/TestData/index.tsx

@@ -1,14 +1,4 @@
-import {
-  Button,
-  Form,
-  Input,
-  Popconfirm,
-  Space,
-  Spin,
-  Table,
-  message,
-  Drawer,
-} from 'antd';
+import { Button, Form, Input, Popconfirm, Space, Spin, Table, message, Drawer } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { Scrollbars } from 'react-custom-scrollbars';
 import { useEffect, useState } from 'react';
@@ -19,6 +9,7 @@ import { useModel } from 'umi';
 import { download } from '@/utils/tools';
 import { CloseOutlined } from '@ant-design/icons';
 import PreviewPDF from '@/components/PreviewPDF';
+import styles from './index.css';
 
 const TestData: React.FC<{
   idNumber: number;
@@ -196,7 +187,13 @@ const TestData: React.FC<{
       render: (_: any, record: any) => (
         <Space size="middle">
           <a onClick={() => previewHandle(record)}>预览</a>
-          <a onClick={() => { downloadHandle(record); }}>下载</a>
+          <a
+            onClick={() => {
+              downloadHandle(record);
+            }}
+          >
+            下载
+          </a>
           <Popconfirm
             title="是否删除此数据？"
             onConfirm={() => delectHandle([record.id])}
@@ -245,7 +242,7 @@ const TestData: React.FC<{
               getData();
             }}
           >
-            <Form.Item label="文件名称" name="fileName">
+            <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
               <Input placeholder="请输入文件名称" />
             </Form.Item>
             <Form.Item>
@@ -280,10 +277,7 @@ const TestData: React.FC<{
             >
               <Button type="dashed">批量删除</Button>
             </Popconfirm>
-            <Button
-              type="dashed"
-              onClick={() => downloadTemplate()}
-            >
+            <Button type="dashed" onClick={() => downloadTemplate()}>
               下载模板
             </Button>
             <Button type="dashed" onClick={opeanHandle}>
@@ -335,4 +329,4 @@ const TestData: React.FC<{
   );
 };
 
-export default TestData;
+export default TestData;

src/pages/DrivingPerformance/Detail/SwerveT/TestReport/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/SwerveT/TestReport/index.tsx

@@ -8,6 +8,7 @@ import { download } from '@/utils/tools';
 import SwerveDataType from './type';
 import UploadS from '@/components/UploadS';
 import { useModel } from 'umi';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -189,8 +190,8 @@ const TestReport: React.FC<{
             getAll(e.fileName);
           }}
         >
-          <Form.Item label="文件名" name="fileName">
-            <MyInput placeholder="请输入文件名" />
+          <Form.Item label="文件名称" name="fileName" className={styles.formSelect}>
+            <MyInput placeholder="请输入文件名称" />
           </Form.Item>
           <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
             <Button type="dashed" htmlType="submit">

src/pages/DrivingPerformance/Detail/SwerveT/TestResult/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/DrivingPerformance/Detail/SwerveT/TestResult/index.tsx

@@ -26,6 +26,7 @@ import { CloseOutlined } from '@ant-design/icons';
 import PreviewPDF from '@/components/PreviewPDF';
 import EChart from '@/components/EChart';
 import drawHelp2 from '@/components/EChart/drawHelp2';
+import styles from './index.css';
 
 //评价曲线
 const ChartData: React.FC<{
@@ -332,7 +333,12 @@ const TestResult: React.FC<{
           <Form form={form} component={false} autoComplete="off">
             <Row>
               <Col>
-                <Form.Item label="文件名称" colon={false} name="fileName">
+                <Form.Item
+                  label="文件名称"
+                  colon={false}
+                  name="fileName"
+                  className={styles.formSelect}
+                >
                   <Input placeholder="请输入文件名称" />
                 </Form.Item>
               </Col>

src/pages/K&C/DataQuery/Table/Table.tsx

@@ -8,7 +8,7 @@ import { history } from 'umi';
 type TableRowSelection<T> = TableProps<T>['rowSelection'];
 
 const detailHandle = (record: DataType) => {
-  window.open(`/K&C/dataQuery/detail/${record.brand + '&' + record.type + '&' + record.id}`);
+  history.push(`/K&C/dataQuery/detail/${record.brand + '&' + record.type + '&' + record.id}`);
 };
 
 const App: React.FC<{
@@ -232,24 +232,6 @@ const App: React.FC<{
           对比
         </Button>
       </Space>
-      {/* <div className='wapper'>
-        <Table
-          rowSelection={rowSelection}
-          columns={columns}
-          dataSource={data}
-          bordered={true}
-          pagination={pagination}
-          size="middle"
-          rowKey="id"
-          onRow={(record) => {
-            return {
-              onClick: () => {
-                detailHandle(record);
-              },
-            };
-          }}
-        />
-      </div> */}
       <Table
         rowSelection={rowSelection}
         columns={columns}

src/pages/K&C/DataQuery/index.css

@@ -1,13 +1,7 @@
 .form {
   height: 160px;
   border: 1px solid gray;
-  margin-bottom: 10px;
-}
-
-.formItem {
-  margin-left: 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
+  margin-bottom: 10px !important;
 }
 
 .input {
@@ -21,16 +15,16 @@
 
 .formSelect {
   width: 85%;
-  margin-top: 10px;
-  margin-bottom: 5px;
-  margin-left: 20px;
+  margin-top: 10px !important;
+  margin-bottom: 5px !important;
+  margin-left: 20px !important;
 }
 
 .inputNumber {
   width: 85%;
-  margin-top: 10px;
-  margin-bottom: 5px;
-  margin-left: 20px;
+  margin-top: 10px !important;
+  margin-bottom: 5px !important;
+  margin-left: 20px !important;
 }
 
 .formButtonSY {

src/pages/K&C/Detail/TestApplication/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/K&C/Detail/TestApplication/index.tsx

@@ -11,6 +11,7 @@ import { useModel } from 'umi';
 
 import UploadSWithDownload from '@/components/UploadSWithDownload';
 import { download } from '@/utils/tools';
+import styles from './index.css';
 
 const SuperTable: React.FC<{
   dataSource: any;
@@ -18,7 +19,6 @@ const SuperTable: React.FC<{
   infoUpdate: any;
   rowSelection: any;
 }> = ({ dataSource, pagination, infoUpdate, rowSelection }) => {
-  const [loading, setLoading] = useState(false); //加载中
   const [fileurl, setFileUrl] = useState<any>();
   const [preFileName, setPreFileName] = useState<any>();
   const [openDrawer, setOpenDrawer] = useState(false);
@@ -55,7 +55,6 @@ const SuperTable: React.FC<{
 
   //预览
   const previewHandle = async (record: any) => {
-    setLoading(true);
     const condoton = {
       id: record.id,
     };
@@ -74,7 +73,6 @@ const SuperTable: React.FC<{
         setFileUrl('data:application/pdf;base64,' + base64.split(',')[1]);
       }
     });
-    setLoading(false);
     setOpenDrawer(true);
   };
 
@@ -256,8 +254,8 @@ const TestApplication: React.FC<{
             setName(e.name);
           }}
         >
-          <Form.Item label="文件名" name="name">
-            <MyInput placeholder="请输入文件名" />
+          <Form.Item label="文件名称" name="name" className={styles.formSelect}>
+            <MyInput placeholder="请输入文件名称" />
           </Form.Item>
           <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
             <Button type="dashed" htmlType="submit">

src/pages/K&C/Detail/TestData/index.css

@@ -53,10 +53,10 @@
     color: black;
 }
 
-:global(.uploadFileTime>.ant-picker-input>.ant-picker-suffix>.anticon-calendar) {
-    color: inherit !important;
-}
-
 .formSelect {
     margin-left: 10px;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/K&C/Detail/TestData/tableForm/index.css

@@ -0,0 +1,3 @@
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
+}

src/pages/K&C/Detail/TestData/tableForm/tableForm.tsx

@@ -34,7 +34,7 @@ const TableForm: React.FC<{
       <Form form={form} className={styles.form} onFinish={onFinish}>
         <Row>
           <Col span={5}>
-            <Form.Item label="文件名称" colon={false} name={'name'}>
+            <Form.Item label="文件名称" colon={false} name={'name'} className={styles.formSelect}>
               <Input placeholder="请输入" />
             </Form.Item>
           </Col>
@@ -65,7 +65,7 @@ const TableForm: React.FC<{
             </Form.Item>
           </Col>
           <Col span={5}>
-            <Form.Item style={{ marginLeft: '50%' }}>
+            <Form.Item style={{ marginLeft: '50%' }} className={styles.formSelect}>
               <Space>
                 <Button htmlType="submit" type="dashed">
                   查询

src/pages/NVH/DataQuery/index.css

@@ -1,16 +1,9 @@
 .form {
     height: 160px;
     border: 1px solid gray;
-    margin-bottom: 10px;
+    margin-bottom: 10px !important;
 }
 
-.formItem {
-    margin-left: 20px;
-    margin-top: 20px;
-    margin-bottom: 20px;
-}
-
-
 .input {
     margin-left: 30px;
     border-color: #464444;
@@ -22,16 +15,16 @@
 
 .formSelect {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .inputNumber {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .formButtonSY {

src/pages/SubjectiveAssessment/DataQuery/index.css

@@ -1,13 +1,7 @@
 .form {
     height: 160px;
     border: 1px solid gray;
-    margin-bottom: 10px;
-}
-
-.formItem {
-    margin-left: 20px;
-    margin-top: 20px;
-    margin-bottom: 20px;
+    margin-bottom: 10px !important;
 }
 
 .input {
@@ -17,16 +11,16 @@
 
 .formSelect {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .inputNumber {
     width: 85%;
-    margin-top: 10px;
-    margin-bottom: 5px;
-    margin-left: 20px;
+    margin-top: 10px !important;
+    margin-bottom: 5px !important;
+    margin-left: 20px !important;
 }
 
 .formButtonSY {

src/pages/SubjectiveAssessment/Detail/IndexData/VariousEvaluations/index.tsx

@@ -140,28 +140,28 @@ const Result: React.FC<{
     col.title === '操作' || col.title === 'Name名称'
       ? col
       : {
-        ...col,
-        onCell: (record: IndexDataType.EvaluationType) => ({
-          record,
-          inputType: col.title === '车型评级' ? 'number' : 'string',
-          dataIndex: col.key,
-          title: col.title,
-          editing: isEditing(record),
-          required: false,
-          rules:
-            col.title === '车型评级'
-              ? [
-                () => ({
-                  validator: (_: any, value: number) => {
-                    if (value > 10.0 || value < 0)
-                      return Promise.reject(new Error('请输入0-10之间的数字'));
-                    return Promise.resolve();
-                  },
-                }),
-              ]
-              : [],
-        }),
-      },
+          ...col,
+          onCell: (record: IndexDataType.EvaluationType) => ({
+            record,
+            inputType: col.title === '车型评级' ? 'number' : 'string',
+            dataIndex: col.key,
+            title: col.title,
+            editing: isEditing(record),
+            required: false,
+            rules:
+              col.title === '车型评级'
+                ? [
+                    () => ({
+                      validator: (_: any, value: number) => {
+                        if (value > 10.0 || value < 0)
+                          return Promise.reject(new Error('请输入0-10之间的数字'));
+                        return Promise.resolve();
+                      },
+                    }),
+                  ]
+                : [],
+          }),
+        },
   );
 
   // 自定义行类名的函数
@@ -410,7 +410,7 @@ const Curve: React.FC<{
         )}
       />
       <div style={{ display: 'flex', justifyContent: 'right', margin: '10px' }}>
-        <Button type="dashed" disabled={curveData.length == 0} onClick={onOpen}>
+        <Button disabled={curveData.length == 0} onClick={onOpen}>
           生成报告
         </Button>
       </div>
@@ -743,7 +743,7 @@ const VariousEvaluations: React.FC<{
       autoHeightMin="64vh"
       autoHeightMax="64vh"
     >
-      <Typography.Title level={3} style={{ color: '#1389fa' }}>
+      <Typography.Title level={3} style={{ color: 'white' }}>
         评价结果
       </Typography.Title>
       <Divider />
@@ -770,11 +770,7 @@ const VariousEvaluations: React.FC<{
           }
         </>
         <div style={{ display: 'flex', justifyContent: 'right', margin: '10px' }}>
-          <Button
-            type="dashed"
-            style={{ marginRight: '1%' }}
-            onClick={() => downloadTemplate()}
-          >
+          <Button type="dashed" style={{ marginRight: '1%' }} onClick={() => downloadTemplate()}>
             下载模板
           </Button>
           <Button type="dashed" onClick={() => setOpen(true)} className={styles.buttoned}>
@@ -795,7 +791,7 @@ const VariousEvaluations: React.FC<{
           }}
         />
       </Spin>
-      <Typography.Title level={3} style={{ color: 'rgb(34,147,202)' }}>
+      <Typography.Title level={3} style={{ color: 'white' }}>
         评价曲线
       </Typography.Title>
       <Divider />
@@ -810,19 +806,17 @@ const VariousEvaluations: React.FC<{
       >
         {fileurl ? <PreviewPDF url={fileurl} /> : null}
       </Drawer>
-      {
-        dataList.length !== 0 ? (
-          <Curve
-            tempData={tempData}
-            dataList={dataList}
-            idNumber={idNumber}
-            legend={[]}
-            reviewType={reviewType}
-            subjectiveData={subjectiveData}
-          />
-        ) : null
-      }
-    </Scrollbars >
+      {dataList.length !== 0 ? (
+        <Curve
+          tempData={tempData}
+          dataList={dataList}
+          idNumber={idNumber}
+          legend={[]}
+          reviewType={reviewType}
+          subjectiveData={subjectiveData}
+        />
+      ) : null}
+    </Scrollbars>
   );
 };
 

src/pages/SubjectiveAssessment/Detail/IndexData/nvhEvaluations/TestData/index.css

@@ -49,4 +49,8 @@
 
 :global(.ant-select .ant-select-arrow) {
     color: #d9d9d9;
+}
+
+.formSelect :global(.ant-form-item-label>label) {
+    color: white;
 }

src/pages/SubjectiveAssessment/Detail/IndexData/nvhEvaluations/TestData/index.tsx

@@ -63,12 +63,7 @@ const TableForm: React.FC<{
       <Form form={form} className={styles.form} onFinish={onFinish}>
         <Row>
           <Col span={6}>
-            <Form.Item
-              label="文件名:"
-              colon={false}
-              className={styles.formSelect}
-              name={'fileName'}
-            >
+            <Form.Item label="文件名称" className={styles.formSelect} name={'fileName'}>
               <Input placeholder="请输入" />
             </Form.Item>
           </Col>
@@ -141,7 +136,7 @@ const TestData: React.FC<{
   idNumber: any;
   carParam: any;
   reviewType: any;
-}> = ({ idNumber, carParam }) => {
+}> = ({ idNumber }) => {
   const [loading, setLoading] = useState(false);
   const [isAddFileModal, setIsAddFileModal] = useState(false);
   const [messageApi, contextHolder] = message.useMessage();
@@ -492,12 +487,7 @@ const TestData: React.FC<{
           maskClosable={false}
         >
           <Form autoComplete="off" form={form}>
-            <Form.Item
-              label="模板名称"
-              className='modelName'
-              colon={false}
-              name="vehicleLoad"
-            >
+            <Form.Item label="模板名称" className="modelName" colon={false} name="vehicleLoad">
               <Select allowClear>
                 {tempAttachment?.map((option: any) => (
                   // eslint-disable-next-line react/jsx-key

src/pages/SystemSettings/ModuleManagement/index.css

@@ -56,6 +56,10 @@
   color: black;
 }
 
+.formSelected :global(.ant-form-item-label>label) {
+  color: white;
+}
+
 .formSelect :global(.ant-form-item-control-input-content, .ant-input) {
   box-sizing: border-box;
   margin: 0;

src/pages/SystemSettings/UserManagement/index.css

@@ -37,6 +37,10 @@
     color: black;
 }
 
+.formSelected :global(.ant-form-item-label>label) {
+    color: white;
+}
+
 .formSelect :global(.ant-form-item-control-input-content, .ant-input) {
     box-sizing: border-box;
     margin: 0;

src/pages/UploadCenter/index.css

@@ -7,6 +7,10 @@
     margin-left: 10px;
 }
 
+.formSelected :global(.ant-form-item-label>label) {
+    color: white;
+}
+
 .form {
     margin-bottom: 10px;
 }

src/pages/VehicleInfo/DataQuery/Table/Table.tsx

@@ -45,6 +45,10 @@ const PushToDrivingPerformance = (path: string, record: VehicleInfo.DataType, ty
   history.push(`${path}/detail/${record.id}&${typeKey}&${record.brand}&${record.type}`);
 };
 
+const PushToComponent = (path: string, record: VehicleInfo.DataType, typeKey: string) => {
+  history.push(`${path}/detail/${record.id}&${typeKey}&${record.brand}&${record.type}`);
+};
+
 const App: React.FC<{
   data: VehicleInfo.DataType[];
   pagination: any;
@@ -246,7 +250,6 @@ const App: React.FC<{
         );
       },
     },
-
     {
       title: 'coast',
       className: 'column-class',
@@ -287,10 +290,11 @@ const App: React.FC<{
         );
       },
     },
+
     {
-      title: 'bushing',
+      title: 'spring',
       className: 'column-class',
-      dataIndex: 'bushingUploadStat',
+      dataIndex: 'springUploadStat',
       align: 'center',
       render: (value, record) => {
         return (
@@ -298,7 +302,7 @@ const App: React.FC<{
             <span
               className={styles['nvh-span']}
               onClick={() => {
-                PushToDrivingPerformance('/drivingPerformance/bushingData', record, '7');
+                PushToComponent('/component/springData', record, '4');
               }}
             >
               {value === 2 ? '✓' : '-'}
@@ -308,9 +312,9 @@ const App: React.FC<{
       },
     },
     {
-      title: 'damper',
+      title: 'tire',
       className: 'column-class',
-      dataIndex: 'damperUploadStat',
+      dataIndex: 'tireUploadStat',
       align: 'center',
       render: (value, record) => {
         return (
@@ -318,7 +322,7 @@ const App: React.FC<{
             <span
               className={styles['nvh-span']}
               onClick={() => {
-                PushToDrivingPerformance('/drivingPerformance/shockAbsorberDebugging', record, '8');
+                PushToComponent('/component/tireData', record, '3');
               }}
             >
               {value === 2 ? '✓' : '-'}
@@ -327,10 +331,31 @@ const App: React.FC<{
         );
       },
     },
+
     {
-      title: 'tire',
+      title: 'bushing',
       className: 'column-class',
-      dataIndex: 'tireUploadStat',
+      dataIndex: 'bushingUploadStat',
+      align: 'center',
+      render: (value, record) => {
+        return (
+          <Space size="middle">
+            <span
+              className={styles['nvh-span']}
+              onClick={() => {
+                PushToComponent('/component/bushingData', record, '1');
+              }}
+            >
+              {value === 2 ? '✓' : '-'}
+            </span>
+          </Space>
+        );
+      },
+    },
+    {
+      title: 'damper',
+      className: 'column-class',
+      dataIndex: 'damperUploadStat',
       align: 'center',
       render: (value, record) => {
         return (
@@ -338,7 +363,7 @@ const App: React.FC<{
             <span
               className={styles['nvh-span']}
               onClick={() => {
-                PushToDrivingPerformance('/drivingPerformance/tireData', record, '9');
+                PushToComponent('/component/shockAbsorberDebugging', record, '2');
               }}
             >
               {value === 2 ? '✓' : '-'}
@@ -347,6 +372,7 @@ const App: React.FC<{
         );
       },
     },
+
     {
       title: 'commercial',
       className: 'column-class',
@@ -769,10 +795,22 @@ const App: React.FC<{
           >
             <Input placeholder="请输入" />
           </Form.Item>
-          <Form.Item label="品牌" colon={false} className={styles.formSelect} name={'brand'} rules={[{ required: true, message: '请输入品牌!' }]}>
+          <Form.Item
+            label="品牌"
+            colon={false}
+            className={styles.formSelect}
+            name={'brand'}
+            rules={[{ required: true, message: '请输入品牌!' }]}
+          >
             <Input placeholder="请输入" className={styles.selected} />
           </Form.Item>
-          <Form.Item label="车型" colon={false} className={styles.formSelect} name={'type'} rules={[{ required: true, message: '请输入车型!' }]}>
+          <Form.Item
+            label="车型"
+            colon={false}
+            className={styles.formSelect}
+            name={'type'}
+            rules={[{ required: true, message: '请输入车型!' }]}
+          >
             <Input placeholder="请输入" />
           </Form.Item>
           <Form.Item label="级别" colon={false} className={styles.formSelect} name={'level'}>
@@ -862,8 +900,8 @@ const App: React.FC<{
         onCancel={() => setIsUpdateModal(false)}
         afterClose={() => updateForm.resetFields()}
         onOk={setFinish}
-      // initialValues={initialValues} // 将初始值对象传递给 Modal
-      // initialValues={initialValues} // 将初始值对象传递给 Modal
+        // initialValues={initialValues} // 将初始值对象传递给 Modal
+        // initialValues={initialValues} // 将初始值对象传递给 Modal
       >
         <Form
           name="updateForm"

src/pages/VehicleInfo/DataQuery/index.css

@@ -1,15 +1,15 @@
 .form {
   height: 160px;
   border: 1px solid gray;
-  margin-bottom: 10px;
+  margin-bottom: 10px !important;
 }
 
 
 .formSelect {
   width: 85%;
-  margin-top: 10px;
-  margin-bottom: 5px;
-  margin-left: 20px;
+  margin-top: 10px !important;
+  margin-bottom: 5px !important;
+  margin-left: 20px !important;
 }
 
 .formSelect :global(.ant-form-item-label>label) {
@@ -22,9 +22,9 @@
 
 .inputNumber {
   width: 85%;
-  margin-top: 10px;
-  margin-bottom: 5px;
-  margin-left: 20px;
+  margin-top: 10px !important;
+  margin-bottom: 5px !important;
+  margin-left: 20px !important;
 }