新增修改

src/components/delete.jsx

@@ -1,16 +1,30 @@
-import {Button} from "antd";
+import {Button, Popconfirm} from "antd";
 import axios from "@/utils/axios.js";
 
 export default function DeleteButton({url, id, getData}) {
     async function removeItem() {
-        console.log(url)
+
         let {code} = await axios.get(url, {params: {id}})
         if (code === 200) {
             getData()
         }
     }
 
-    return (
-        <Button type='primary' danger onClick={removeItem}>删除</Button>
+    return (<Popconfirm
+            title="删除数据"
+            description="是否删除本条数据?"
+            onConfirm={() => removeItem()}
+            okText="删除"
+            cancelText="取消"
+        >
+
+            <Button type='primary' danger>删除</Button>
+
+
+        </Popconfirm>
+
     )
-}
+}
+
+
+

src/pages/MaintenanceStatisticsChild/basicMaintenanceInfomation/basicMaintenanceInfomation.jsx

@@ -87,7 +87,7 @@ export default function BasicMaintenanceInfomation() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="运维驿站" dataIndex="maintenanceStation" key="id"></Column>
                 <Column title="维保场" dataIndex="maintenanceSite" key="id"></Column>

src/pages/MaintenanceStatisticsChild/distance/distance.jsx

@@ -85,7 +85,7 @@ export default function Distance() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="乘距类型" dataIndex="distanceType" key="id"></Column>
                 <Column title="次数" dataIndex="number" key="id"></Column>

src/pages/MaintenanceStatisticsChild/distributionOfPassengerFlowRoutes/distributionOfPassengerFlowRoutes.jsx

@@ -85,7 +85,7 @@ export default function DistributionOfPassengerFlowRoutes() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="场地" dataIndex="location" key="id"></Column>
                 <Column title="次数" dataIndex="number" key="id"></Column>

src/pages/MaintenanceStatisticsChild/mainConsumPtionType/mainConsumPtionType.jsx

@@ -85,7 +85,7 @@ export default function MainConsumPtionType() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="消费类型" dataIndex="consumptionType" key="id"></Column>
                 <Column title="次数" dataIndex="number" key="id"></Column>

src/pages/MaintenanceStatisticsChild/maintenanceExecution/maintenanceExecution.jsx

@@ -85,7 +85,7 @@ export default function MaintenanceExecution() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="执行数量" dataIndex="executeType" key="id"></Column>
                 <Column title="次数" dataIndex="number" key="id"></Column>

src/pages/MaintenanceStatisticsChild/maintenanceStatistics/maintenanceStatistics.jsx

@@ -85,7 +85,7 @@ export default function MaintenanceStatistics() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="时间" dataIndex="time" key="id"></Column>
                 <Column title="维修车次" dataIndex="carNumber" key="id"></Column>

src/pages/MaintenanceStatisticsChild/maintenanceStatus/maintenanceStatus.jsx

@@ -85,7 +85,7 @@ export default function MaintenanceStatus() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="车辆维保状态" dataIndex="maintenanceStatus" key="id"></Column>
                 <Column title="次数" dataIndex="number" key="id"></Column>

src/pages/MaintenanceStatisticsChild/physicalExaminationIssues/physicalExaminationIssues.jsx

@@ -85,7 +85,7 @@ export default function PhysicalExaminationIssues() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="问题类型" dataIndex="problemType" key="id"></Column>
                 <Column title="次数" dataIndex="number" key="id"></Column>

src/pages/MaintenanceStatisticsChild/statusClassification/statusClassification.jsx

@@ -85,7 +85,7 @@ export default function StatusClassification() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="车辆状态" dataIndex="carStatus" key="id"></Column>
                 <Column title="次数" dataIndex="number" key="id"></Column>

src/pages/MaintenanceStatisticsChild/vehiclesTotalNumber/vehiclesTotalNumber.jsx

@@ -85,7 +85,7 @@ export default function VehiclesTotalNumber() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="区域" dataIndex="commutingType" key="id"></Column>
                 <Column title="人次（万人)" dataIndex="number" key="id"></Column>

src/pages/facilityManagementChild/facMapElement/facMapElement.jsx

@@ -111,6 +111,8 @@ export default function FacMapElement() {
                 bordered={true}
                 rowKey="id"
             >
+
+
                 <Column title="类型" dataIndex="type" key="id"
                         render={(text) => findDictValue(dictData, inputVal, text)}/>
                 <Column title="元素名称" dataIndex="name"/>

src/pages/homePageChild/carCompletionRate/carCompletionRate.jsx

@@ -86,7 +86,7 @@ export default function CarCompletionRate() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="跑法" dataIndex="modelId" key="id" render={(text) =>

src/pages/homePageChild/classCompletionRate/classCompletionRate.jsx

@@ -87,7 +87,7 @@ export default function ClassCompletionRate() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="跑法" dataIndex="modelId" key="id" render={(text) =>

src/pages/homePageChild/classPunctualitRate/classPunctualitRate.jsx

@@ -88,7 +88,7 @@ export default function ClassPunctualitRate() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="跑法" dataIndex="type" key="id" render={(text) =>

src/pages/homePageChild/flowRanking/flowRanking.jsx

@@ -73,7 +73,7 @@ export default function FlowRanking() {
             <Table
                 dataSource={data}
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
                 bordered={true}
                 rowKey="id"
             >

src/pages/homePageChild/getClassesPercentRate/getClassesPercentRate.jsx

@@ -85,7 +85,7 @@ export default function GetClassesPercentRate() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="昨日中途准点率" dataIndex="middleRate" key="id"></Column>
                 <Column title="昨日末班准点率" dataIndex="endRate" key="id"></Column>

src/pages/homePageChild/lineFlowRanking/lineFlowRanking.jsx

@@ -72,7 +72,7 @@ export default function LineFlowRanking() {
             <Table
                 dataSource={data}
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
                 bordered={true}
                 rowKey="id"
             >

src/pages/homePageChild/passengerVolumeData/passengerVolumeData.jsx

@@ -116,7 +116,7 @@ export default function PassengerVolumeData() {
             <Table
                 dataSource={data}
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
                 bordered={true}
                 rowKey="id"
                 columns={columns}

src/pages/homePageChild/publicOpinion/publicOpinion.jsx

@@ -158,7 +158,7 @@ export default function PublicOpinion() {
             <Table
                 dataSource={data}
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
                 bordered={true}
                 rowKey="id"
                 columns={columns}

src/pages/homePageChild/stationEquipment/stationEquipment.jsx

@@ -105,7 +105,7 @@ export default function StationEquipment() {
             <Table
                 dataSource={data}
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
                 bordered={true}
                 rowKey="id"
                 columns={columns}

src/pages/homePageChild/statisticsData/statisticsData.jsx

@@ -48,7 +48,7 @@ export default function StatisticsData() {
             <Table
                 dataSource={data}
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
                 bordered={true}
                 rowKey="id"
             >

src/pages/lineAnalysisChild/lineAnalysisDetails/lineAnalysisDetails.jsx

@@ -84,7 +84,7 @@ export default function LineAnalysisDetails() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="站点数量" dataIndex="stationNum" key="id"></Column>
                 <Column title="线路重复数量" dataIndex="lineRepetition" key="id"></Column>

src/pages/lineAnalysisChild/lineLength/components/modal.jsx

@@ -1,4 +1,4 @@
-import {Form, Input, message, Modal,} from 'antd';
+import {Form, Input, message, Modal,InputNumber} from 'antd';
 import axios from '@/utils/axios.js'
 import {useEffect} from 'react'
 import './modal.scss'
@@ -103,7 +103,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
 
                     >
-                        <Input style={{width: '100%'}}></Input>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
 
 

src/pages/lineAnalysisChild/lineLength/lineLength.jsx

@@ -83,7 +83,7 @@ export default function LineLength() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="长度类型" dataIndex="lengthType" key="id"></Column>
                 <Column title="占比" dataIndex="proportion" key="id"></Column>

src/pages/lineAnalysisChild/lineSpeed/lineSpeed.jsx

@@ -85,7 +85,7 @@ export default function LineSpeed() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="时间" dataIndex="time" key="id"></Column>
                 <Column title="特色线路" dataIndex="characteristicLine" key="id"></Column>

src/pages/lineAnalysisChild/lineType/lineType.jsx

@@ -85,7 +85,7 @@ export default function LineType() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="线路类型" dataIndex="type" key="id"></Column>
                 <Column title="数量" dataIndex="number" key="id"></Column>

src/pages/lineAnalysisChild/regionalMileage/regionalMileage.jsx

@@ -85,7 +85,7 @@ export default function RegionalMileage() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="区域名称" dataIndex="region" key="id"></Column>
                 <Column title="客流量" dataIndex="flow" key="id"></Column>

src/pages/lineAnalysisChild/stationPassengerFlow/stationPassengerFlow.jsx

@@ -85,7 +85,7 @@ export default function StationPassengerFlow() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="站点名称" dataIndex="stationName" key="id"></Column>
                 <Column title="时间" dataIndex="time" key="id"></Column>

src/pages/lineAnalysisChild/stationSpacingDistribution/components/modal.jsx

@@ -1,4 +1,4 @@
-import {Form, Input, message, Modal,} from 'antd';
+import {Form, Input, message, Modal,InputNumber} from 'antd';
 import axios from '@/utils/axios.js'
 import {useEffect} from 'react'
 import './modal.scss'
@@ -61,57 +61,55 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
 
 
     return (
-        <div className="form">
-
-            {contextHolder}
-            <Modal title={row?.id ? '修改数据' : '新增数据'} open={isModalOpen} onOk={handleOk} onCancel={handleCancel}
-                   width={900}
-                   cancelText="取消" okText="确定">
-                <Form
-                    name="statics"
-                    form={form}
-                    wrapperCol={
-                        {span: 30, offset: 0}
-                    }
-                    layout='inline'
-                    initialValues={{
-                        remember: true,
-                    }}
-
-                    autoComplete="off"
-                >
-                    <Form.Item
-                        label="站距类型"
-                        name="distanceType"
-                        rules={[
-                            {
-                                required: true,
-                                message: '请输入',
-                            },
-                        ]}
-                    >
-                        <Input style={{width: '100%'}}></Input>
-                    </Form.Item>
-                    <Form.Item
-                        label="占比"
-                        name="proportion"
-                        rules={[
-                            {
-                                required: true,
-                                message: '请输入',
-                            },
-                        ]}
-
-                    >
-                        <Input style={{width: '100%'}}></Input>
-                    </Form.Item>
-
-
-                </Form>
-
-            </Modal>
-        </div>
-    )
+      <div className="form">
+        {contextHolder}
+        <Modal
+          title={row?.id ? "修改数据" : "新增数据"}
+          open={isModalOpen}
+          onOk={handleOk}
+          onCancel={handleCancel}
+          width={900}
+          cancelText="取消"
+          okText="确定"
+        >
+          <Form
+            name="statics"
+            form={form}
+            wrapperCol={{ span: 30, offset: 0 }}
+            layout="inline"
+            initialValues={{
+              remember: true,
+            }}
+            autoComplete="off"
+          >
+            <Form.Item
+              label="站距类型"
+              name="distanceType"
+              rules={[
+                {
+                  required: true,
+                  message: "请输入",
+                },
+              ]}
+            >
+              <Input style={{ width: "100%" }}></Input>
+            </Form.Item>
+            <Form.Item
+              label="占比"
+              name="proportion"
+              rules={[
+                {
+                  required: true,
+                  message: "请输入",
+                },
+              ]}
+            >
+              <InputNumber min={0} style={{ width: "100%" }}></InputNumber>
+            </Form.Item>
+          </Form>
+        </Modal>
+      </div>
+    );
 
 
 }

src/pages/lineAnalysisChild/stationSpacingDistribution/stationSpacingDistribution.jsx

@@ -85,7 +85,7 @@ export default function StationSpacingDistribution() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="站距类型" dataIndex="distanceType" key="id"></Column>
                 <Column title="占比" dataIndex="proportion" key="id"></Column>

src/pages/linePageChild/basicInfomationOfTheLine/basicInfomationOfTheLine.jsx

@@ -121,14 +121,14 @@ export default function BasicInfomationOfTheLine() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="线路名称" dataIndex="lineId" key="id" render={(text) => (
                     setText(text)
                 )
                 }></Column>
                 <Column title="类型" dataIndex="type" key="id" render={(text) =>
-                    text === 1 ? '主线公交' : '干线公交'
+                    text === '1' ? '主线公交' : '干线公交'
                 }/>
                 <Column title="线路类型" dataIndex="lineType" key="id" render={(text) =>
                     findDictValue(dictData, 'lineType', text)

src/pages/linePageChild/basicInfomationOfTheLine/components/modal.jsx

@@ -14,8 +14,8 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
     // 获取store的数据
     const dictData = useSelector((state) => state.counter.dictData);
     const typeOption = [
-        {value: 0, label: '干线公交'},
-        {value: 1, label: '主线公交'}
+        {value: '0', label: '干线公交'},
+        {value: '1', label: '主线公交'}
     ]
     let [lineTypeOption, useLineType] = useState([])
 

src/pages/linePageChild/numberOfDrivers/numberOfDrivers.jsx

@@ -129,7 +129,7 @@ export default function NumberOfDrivers() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="星级" dataIndex="starType" key="id" render={(text) => setType(text)}></Column>
                 <Column title="数量" dataIndex="total" key="id"/>

src/pages/linePageChild/numberOfTransit/numberOfTransit.jsx

@@ -127,7 +127,7 @@ export default function NumberOfTransit() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="年份" dataIndex="year" key="id"></Column>
                 <Column title="数量" dataIndex="total" key="id"/>

src/pages/linePageChild/passengerType/passengerType.jsx

@@ -83,7 +83,7 @@ export default function PassengerType() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="乘客类型" dataIndex="passengerType" key="id" render={(text) => setType(text)}></Column>
                 <Column title="数值" dataIndex="percent" key="id"/>

src/pages/linePageChild/summaryData/summaryData.jsx

@@ -82,7 +82,7 @@ export default function SummaryData() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="当前里程" dataIndex="currentMileage"></Column>
                 <Column title="空驶率" dataIndex="unloadedRatio" key="id"/>

src/pages/linePageChild/vehicleMonitoring/vehicleMonitoring.jsx

@@ -85,7 +85,7 @@ export default function VehicleMonitoring() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="情景" dataIndex="carScene" key="id" render={(text) => setType(text)}></Column>
                 <Column title="状态" dataIndex="carStatus" key="id"

src/pages/linePageChild/vehicleStatus/vehicleStatus.jsx

@@ -85,7 +85,7 @@ export default function VehicleStatus() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="方向" dataIndex="direction" key="id"
                         render={(text) => text === 1 ? '上行' : '下行'}></Column>

src/pages/passengerFlowAnalysis/commutingTime/commutingTime.jsx

@@ -85,7 +85,7 @@ export default function CommutingTime() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="区域" dataIndex="commutingType" key="id"></Column>
                 <Column title="人次（万人)" dataIndex="number" key="id"></Column>

src/pages/passengerFlowAnalysis/consumptionType/consumptionType.jsx

@@ -85,7 +85,7 @@ export default function ConsumptionType() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="消费类型" dataIndex="consumeType" key="id"></Column>
                 <Column title="消费人次（万人)" dataIndex="number" key="id"></Column>

src/pages/passengerFlowAnalysis/distribution/distribution.jsx

@@ -85,7 +85,7 @@ export default function Distribution() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="乘距类型" dataIndex="ridingDistance" key="id"></Column>
                 <Column title="人次（万人)" dataIndex="number" key="id"></Column>

src/pages/passengerFlowAnalysis/passengerFlowRoutes/passengerFlowRoutes.jsx

@@ -85,7 +85,7 @@ export default function PassengerFlowRoutes() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="线路类型" dataIndex="lineType" key="id"></Column>
                 <Column title="线路条数" dataIndex="number" key="id"></Column>

src/pages/passengerFlowAnalysis/passengerInfomation/passengerInfomation.jsx

@@ -84,7 +84,7 @@ export default function PassengerInfomation() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="平均乘距" dataIndex="avgRidingDistance" key="id"></Column>
                 <Column title="满载率" dataIndex="fullLoad" key="id"

src/pages/passengerFlowAnalysis/rankingOfPassengerVolume/rankingOfPassengerVolume.jsx

@@ -106,7 +106,7 @@ export default function RankingOfPassengerVolume() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="线路" dataIndex="lineName" key="id"></Column>
                 <Column title="客运量（万人)" dataIndex="trafficVolume" key="id"></Column>

src/pages/passengerFlowAnalysis/regionalPassengerFlow/regionalPassengerFlow.jsx

@@ -85,7 +85,7 @@ export default function RegionalPassengerFlow() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="区域" dataIndex="area" key="id"></Column>
                 <Column title="总数（万人）" dataIndex="total" key="id"></Column>

src/pages/passengerFlowAnalysis/replacementFrequency/replacementFrequency.jsx

@@ -85,7 +85,7 @@ export default function ReplacementFrequency() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="换乘次数类型" dataIndex="transferType" key="id"></Column>
                 <Column title="人次（万人)" dataIndex="number" key="id"></Column>

src/pages/settingPageChild/dict/dict.jsx

@@ -128,7 +128,7 @@ export default function Dict() {
             <Table
                 dataSource={data}
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
                 bordered={true}
                 rowKey="id"
                 expandable={{

src/pages/settingPageChild/user/components/modal.jsx

@@ -1,4 +1,4 @@
-import {Modal, Form, Input, Select, message} from 'antd';
+import {Form, Input, message, Modal, Select} from 'antd';
 import axios from '@/utils/axios.js'
 import {useEffect} from 'react'
 
@@ -53,7 +53,8 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
         <div className="form">
 
             {contextHolder}
-            <Modal title={row?.id?'修改用户':'新增用户'} open={isModalOpen} onOk={handleOk} onCancel={handleCancel} width={900}
+            <Modal title={row?.id ? '修改用户' : '新增用户'} open={isModalOpen} onOk={handleOk} onCancel={handleCancel}
+                   width={900}
                    cancelText="取消" okText="确定">
                 <Form
                     name="basic"
@@ -134,7 +135,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         rules={[
                             {
                                 required: true,
-                                message: '请输入手机号',
+                                message: '请输入类型',
 
                             },
                         ]}
@@ -150,7 +151,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         rules={[
                             {
                                 required: false,
-                                message: '请输入表单',
+                                message: '请输入备注',
 
                             },
                         ]}

src/pages/settingPageChild/user/user.jsx

@@ -8,6 +8,7 @@ const {Column} = Table;
 
 export default function User() {
     const [inputVal, setInputVal] = useState("");
+    const [phone, setPhone] = useState("");
     // 页面数据
     const [data, setData] = useState([]);
     // 是否展示弹框
@@ -31,7 +32,14 @@ export default function User() {
         setIsModalOpen(false);
         getData()
     }
-
+    /**
+     * @description: 获取数据
+     * @return {*}
+     */    
+    function serchData() {
+        setCurrent(1)
+        getData()
+    }
     // 点击修改的回调
     function modify(data) {
         setRow(data);
@@ -44,6 +52,8 @@ export default function User() {
             params: {
                 pageSize,
                 pageNum: current,
+                name: inputVal,
+                phone
 
             }
         });
@@ -74,77 +84,84 @@ export default function User() {
         getData();
     }, [current]);
     return (
-        <div className="user">
-            <div className="top">
-                <div className="input">
-                    <Input
-                        value={inputVal}
-                        onChange={(e) => setInputVal(e.target.value)}
-                    />{" "}
-                    <Button type="primary">搜索</Button>
-                </div>
-                <div className="button">
-                    <Button type="primary" onClick={addUser}>
-                        添加用户
-                    </Button>
-                </div>
-            </div>
-            <Table
-                dataSource={data}
-                pagination={{
-                    total: total, // 数据的总数
-                    current: current, // 当前页数
-                    pageSize: pageSize, // 每页显示的数量
-                    onChange: changeSize
-                }}
-                bordered={true}
-                rowKey="id"
-            >
-                <Column title="用户名" dataIndex="account" key="id" width="200px"/>
-                <Column title="姓名" dataIndex="name" key="id"/>
-                <Column title="手机号" dataIndex="phone" key="id"/>
-                <Column
-                    title="类型"
-                    dataIndex="type"
-                    key="id"
-                    render={(type) => (
-                        <>
-                            <span>{type === 0 ? "管理员" : "游客"}</span>
-                        </>
-                    )}
-                ></Column>
-                <Column title="备注" dataIndex="remark" key="id"/>
-                <Column
-                    title="操作"
-                    width="170px"
-                    dataIndex="id"
-                    key="id"
-                    render={(text, record) => (
-                        <div className="btn">
-                            <Button type="primary" onClick={() => modify(record)}>
-                                修改
-                            </Button>
-                            <Popconfirm
-                                title="删除数据"
-                                description="是否删除本条数据?"
-                                onConfirm={() => deleteRow(record)}
-                                okText="删除"
-                                cancelText="取消"
-                            >
-
-                                <Button type="primary" danger>
-                                    删除
-                                </Button>
-                            </Popconfirm>
-                        </div>
-                    )}
-                />
-            </Table>
-            <ModalHooks
-                isModalOpen={isModalOpen}
-                closeModal={closeModal}
-                row={row}
-            ></ModalHooks>
+      <div className="user">
+        <div className="top">
+          <div className="input">
+            <p>姓名:</p>
+            <Input
+              value={inputVal}
+              onChange={(e) => setInputVal(e.target.value)}
+              style={{ width: "200px" }}
+            />
+            <p>手机号:</p>{" "}
+            <Input
+              value={phone}
+              onChange={(e) => setPhone(e.target.value)}
+              style={{ width: "200px" }}
+            />
+            <Button type="primary" onClick={()=> serchData()}>搜索</Button>
+          </div>
+          <div className="button">
+            <Button type="primary" onClick={addUser}>
+              添加用户
+            </Button>
+          </div>
         </div>
+        <Table
+          dataSource={data}
+          pagination={{
+            total: total, // 数据的总数
+            current: current, // 当前页数
+            pageSize: pageSize, // 每页显示的数量
+            onChange: changeSize,
+          }}
+          bordered={true}
+          rowKey="id"
+        >
+          <Column title="用户名" dataIndex="account" key="id" width="200px" />
+          <Column title="姓名" dataIndex="name" key="id" />
+          <Column title="手机号" dataIndex="phone" key="id" />
+          <Column
+            title="类型"
+            dataIndex="type"
+            key="id"
+            render={(type) => (
+              <>
+                <span>{type === 0 ? "管理员" : "游客"}</span>
+              </>
+            )}
+          ></Column>
+          <Column title="备注" dataIndex="remark" key="id" />
+          <Column
+            title="操作"
+            width="170px"
+            dataIndex="id"
+            key="id"
+            render={(text, record) => (
+              <div className="btn">
+                <Button type="primary" onClick={() => modify(record)}>
+                  修改
+                </Button>
+                <Popconfirm
+                  title="删除数据"
+                  description="是否删除本条数据?"
+                  onConfirm={() => deleteRow(record)}
+                  okText="删除"
+                  cancelText="取消"
+                >
+                  <Button type="primary" danger>
+                    删除
+                  </Button>
+                </Popconfirm>
+              </div>
+            )}
+          />
+        </Table>
+        <ModalHooks
+          isModalOpen={isModalOpen}
+          closeModal={closeModal}
+          row={row}
+        ></ModalHooks>
+      </div>
     );
 }

src/pages/settingPageChild/user/user.scss

@@ -4,9 +4,16 @@
   .top{
     display: flex;
     justify-content: space-between;
+    align-items: center;
     margin-bottom: 5px;
+
     .input{
       display: flex;
+         align-items: center;
+      p{
+        width: 73px;
+        text-align: center;
+      }
       button{
         margin-left: 10px;
       }

src/pages/stationManagementInformation/InstalledCapacity/InstalledCapacity.jsx

@@ -85,7 +85,7 @@ export default function InstalledCapacity() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="装机容量类型" dataIndex="type" key="id"></Column>
                 <Column title="数量" dataIndex="number" key="id"></Column>

src/pages/stationManagementInformation/areaDistrbution/areaDistrbution.jsx

@@ -85,7 +85,7 @@ export default function AreaDistrbution() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="面积类型" dataIndex="areaType" key="id"></Column>
                 <Column title="人次（万人)" dataIndex="number" key="id"></Column>

src/pages/stationManagementInformation/chageService/chageService.jsx

@@ -85,7 +85,7 @@ export default function ChageService() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="充电桩状态" dataIndex="chargingStatus" key="id"></Column>
                 <Column title="数量" dataIndex="number" key="id"></Column>

src/pages/stationManagementInformation/chageTrends/chageTrends.jsx

@@ -85,7 +85,7 @@ export default function ChageTrends() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="时间" dataIndex="time" key="id"></Column>
                 <Column title="数量" dataIndex="number" key="id"></Column>

src/pages/stationManagementInformation/nowChargeStatistics/nowChargeStatistics.jsx

@@ -84,7 +84,7 @@ export default function NowChargeStatistics() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="今日充电次数" dataIndex="chargingNum" key="id"></Column>
                 <Column title="今日充电车次总数" dataIndex="totalChargingNum" key="id"></Column>

src/pages/stationManagementInformation/regionalDistribution/regionalDistribution.jsx

@@ -85,7 +85,7 @@ export default function RegionalDistribution() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="区域" dataIndex="region" key="id"></Column>
                 <Column title="客流量" dataIndex="passengerFlow" key="id"></Column>

src/pages/stationManagementInformation/resourceUsage/resourceUsage.jsx

@@ -85,7 +85,7 @@ export default function ResourceUsage() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="站场名称" dataIndex="stationName" key="id"></Column>
                 <Column title="充电量" dataIndex="chargingCapacity" key="id"></Column>

src/pages/stationManagementInformation/siteConstructionTime/siteConstructionTime.jsx

@@ -85,7 +85,7 @@ export default function SiteConstructionTime() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="建设情况" dataIndex="constructSituation" key="id"></Column>
                 <Column title="人次（万人)" dataIndex="number" key="id"></Column>

src/pages/stationManagementInformation/siteOwnership/siteOwnership.jsx

@@ -85,7 +85,7 @@ export default function SiteOwnership() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="权属情况" dataIndex="ownership" key="id"></Column>
                 <Column title="人次（万人)" dataIndex="number" key="id"></Column>

src/pages/stationManagementInformation/stationBasicInformation/stationBasicInformation.jsx

@@ -87,7 +87,7 @@ export default function StationBasicInformation() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="维保(辆)" dataIndex="maintenanceNum" key="id"></Column>
                 <Column title="充电站（个）" dataIndex="chargingNum" key="id"></Column>

src/pages/stationManagementInformation/stationOperate/stationOperate.jsx

@@ -84,7 +84,7 @@ export default function StationOperate() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="车辆类型" dataIndex="type" key="id"
                         render={(text) => text ? '运营车辆' : '非运营车辆'}></Column>

src/pages/stationManagementInformation/typeDistribution/typeDistribution.jsx

@@ -85,7 +85,7 @@ export default function TypeDistribution() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="类型" dataIndex="type" key="id"></Column>
                 <Column title="数量" dataIndex="number" key="id"></Column>

src/pages/stationManagementInformation/usage/usage.jsx

@@ -85,7 +85,7 @@ export default function Usage() {
                 bordered={true}
                 rowKey="id"
                 pagination={false}
-                scroll={{y: 900}}
+                scroll={{y: 700}}
             >
                 <Column title="使用情况" dataIndex="useType" key="id"></Column>
                 <Column title="数量" dataIndex="number" key="id"></Column>