Browse Source

修改正式版

fengxiang 2 years ago
parent
commit
cfb204a651
100 changed files with 1618 additions and 270 deletions
  1. 2 1
      src/components/dictSelect.jsx
  2. 12 6
      src/index.jsx
  3. 1 0
      src/pages/MaintenanceStatisticsChild/basicMaintenanceInfomation/basicMaintenanceInfomation.jsx
  4. 4 4
      src/pages/MaintenanceStatisticsChild/basicMaintenanceInfomation/components/modal.jsx
  5. 1 1
      src/pages/MaintenanceStatisticsChild/distance/components/modal.jsx
  6. 1 0
      src/pages/MaintenanceStatisticsChild/distance/distance.jsx
  7. 1 1
      src/pages/MaintenanceStatisticsChild/distributionOfPassengerFlowRoutes/components/modal.jsx
  8. 1 0
      src/pages/MaintenanceStatisticsChild/distributionOfPassengerFlowRoutes/distributionOfPassengerFlowRoutes.jsx
  9. 1 1
      src/pages/MaintenanceStatisticsChild/mainConsumPtionType/components/modal.jsx
  10. 1 0
      src/pages/MaintenanceStatisticsChild/mainConsumPtionType/mainConsumPtionType.jsx
  11. 133 0
      src/pages/MaintenanceStatisticsChild/mainMapElement/components/modal.jsx
  12. 9 0
      src/pages/MaintenanceStatisticsChild/mainMapElement/components/modal.scss
  13. 141 0
      src/pages/MaintenanceStatisticsChild/mainMapElement/mainMapElement.jsx
  14. 31 0
      src/pages/MaintenanceStatisticsChild/mainMapElement/mainMapElement.scss
  15. 1 1
      src/pages/MaintenanceStatisticsChild/maintenanceExecution/components/modal.jsx
  16. 1 0
      src/pages/MaintenanceStatisticsChild/maintenanceExecution/maintenanceExecution.jsx
  17. 1 1
      src/pages/MaintenanceStatisticsChild/maintenanceStatistics/components/modal.jsx
  18. 1 0
      src/pages/MaintenanceStatisticsChild/maintenanceStatistics/maintenanceStatistics.jsx
  19. 1 1
      src/pages/MaintenanceStatisticsChild/maintenanceStatus/components/modal.jsx
  20. 1 0
      src/pages/MaintenanceStatisticsChild/maintenanceStatus/maintenanceStatus.jsx
  21. 1 1
      src/pages/MaintenanceStatisticsChild/physicalExaminationIssues/components/modal.jsx
  22. 1 0
      src/pages/MaintenanceStatisticsChild/physicalExaminationIssues/physicalExaminationIssues.jsx
  23. 1 1
      src/pages/MaintenanceStatisticsChild/statusClassification/components/modal.jsx
  24. 1 0
      src/pages/MaintenanceStatisticsChild/statusClassification/statusClassification.jsx
  25. 1 1
      src/pages/MaintenanceStatisticsChild/vehiclesTotalNumber/components/modal.jsx
  26. 1 0
      src/pages/MaintenanceStatisticsChild/vehiclesTotalNumber/vehiclesTotalNumber.jsx
  27. 3 3
      src/pages/facilityManagementChild/carWasher/components/modal.jsx
  28. 3 3
      src/pages/facilityManagementChild/chargingStation/components/modal.jsx
  29. 2 2
      src/pages/facilityManagementChild/electronicLicensePlate/components/modal.jsx
  30. 146 0
      src/pages/facilityManagementChild/facMapElement/components/modal.jsx
  31. 9 0
      src/pages/facilityManagementChild/facMapElement/components/modal.scss
  32. 143 0
      src/pages/facilityManagementChild/facMapElement/facMapElement.jsx
  33. 31 0
      src/pages/facilityManagementChild/facMapElement/facMapElement.scss
  34. 6 6
      src/pages/facilityManagementChild/informationOfFacilities/components/modal.jsx
  35. 2 2
      src/pages/facilityManagementChild/vehiclesComponents/components/modal.jsx
  36. 2 2
      src/pages/facilityManagementChild/vehiclesModelDisplay/components/modal.jsx
  37. 9 3
      src/pages/home/home.jsx
  38. 1 1
      src/pages/home/home.scss
  39. 5 5
      src/pages/homePageChild/carCompletionRate/carCompletionRate.jsx
  40. 2 2
      src/pages/homePageChild/carCompletionRate/components/modal.jsx
  41. 6 8
      src/pages/homePageChild/classCompletionRate/classCompletionRate.jsx
  42. 12 9
      src/pages/homePageChild/classCompletionRate/components/modal.jsx
  43. 9 9
      src/pages/homePageChild/classPunctualitRate/classPunctualitRate.jsx
  44. 36 23
      src/pages/homePageChild/consumptionProportion/components/modal.jsx
  45. 8 5
      src/pages/homePageChild/consumptionProportion/consumptionProportion.jsx
  46. 35 22
      src/pages/homePageChild/flowRanking/components/modal.jsx
  47. 6 5
      src/pages/homePageChild/flowRanking/flowRanking.jsx
  48. 116 0
      src/pages/homePageChild/getClassesPercentRate/components/modal.jsx
  49. 9 0
      src/pages/homePageChild/getClassesPercentRate/components/modal.scss
  50. 116 0
      src/pages/homePageChild/getClassesPercentRate/getClassesPercentRate.jsx
  51. 26 0
      src/pages/homePageChild/getClassesPercentRate/getClassesPercentRate.scss
  52. 38 21
      src/pages/homePageChild/lineFlowRanking/components/modal.jsx
  53. 6 5
      src/pages/homePageChild/lineFlowRanking/lineFlowRanking.jsx
  54. 2 2
      src/pages/homePageChild/mapElement/components/modal.jsx
  55. 1 1
      src/pages/homePageChild/mapElement/mapElement.jsx
  56. 5 4
      src/pages/homePageChild/passengerVolumeData/passengerVolumeData.jsx
  57. 21 17
      src/pages/homePageChild/publicOpinion/publicOpinion.jsx
  58. 16 14
      src/pages/homePageChild/stationEquipment/stationEquipment.jsx
  59. 8 7
      src/pages/homePageChild/statisticsData/components/modal.jsx
  60. 4 2
      src/pages/homePageChild/statisticsData/statisticsData.jsx
  61. 6 6
      src/pages/lineAnalysisChild/lineAnalysisDetails/components/modal.jsx
  62. 7 6
      src/pages/lineAnalysisChild/lineAnalysisDetails/lineAnalysisDetails.jsx
  63. 1 0
      src/pages/lineAnalysisChild/lineLength/lineLength.jsx
  64. 134 0
      src/pages/lineAnalysisChild/lineMapElement/components/modal.jsx
  65. 9 0
      src/pages/lineAnalysisChild/lineMapElement/components/modal.scss
  66. 142 0
      src/pages/lineAnalysisChild/lineMapElement/lineMapElement.jsx
  67. 31 0
      src/pages/lineAnalysisChild/lineMapElement/lineMapElement.scss
  68. 3 3
      src/pages/lineAnalysisChild/lineSpeed/components/modal.jsx
  69. 1 0
      src/pages/lineAnalysisChild/lineSpeed/lineSpeed.jsx
  70. 1 1
      src/pages/lineAnalysisChild/lineType/components/modal.jsx
  71. 1 0
      src/pages/lineAnalysisChild/lineType/lineType.jsx
  72. 1 1
      src/pages/lineAnalysisChild/regionalMileage/components/modal.jsx
  73. 1 0
      src/pages/lineAnalysisChild/regionalMileage/regionalMileage.jsx
  74. 1 1
      src/pages/lineAnalysisChild/stationPassengerFlow/components/modal.jsx
  75. 1 0
      src/pages/lineAnalysisChild/stationPassengerFlow/stationPassengerFlow.jsx
  76. 1 0
      src/pages/lineAnalysisChild/stationSpacingDistribution/stationSpacingDistribution.jsx
  77. 11 5
      src/pages/linePageChild/basicInfomationOfTheLine/basicInfomationOfTheLine.jsx
  78. 28 12
      src/pages/linePageChild/basicInfomationOfTheLine/components/modal.jsx
  79. 2 2
      src/pages/linePageChild/lineDispatch/components/modal.jsx
  80. 1 1
      src/pages/linePageChild/numberOfDrivers/components/modal.jsx
  81. 2 1
      src/pages/linePageChild/numberOfDrivers/numberOfDrivers.jsx
  82. 2 2
      src/pages/linePageChild/numberOfTransit/components/modal.jsx
  83. 1 0
      src/pages/linePageChild/numberOfTransit/numberOfTransit.jsx
  84. 1 1
      src/pages/linePageChild/passengerType/components/modal.jsx
  85. 1 0
      src/pages/linePageChild/passengerType/passengerType.jsx
  86. 7 7
      src/pages/linePageChild/summaryData/components/modal.jsx
  87. 1 0
      src/pages/linePageChild/summaryData/summaryData.jsx
  88. 1 0
      src/pages/linePageChild/vehicleMonitoring/vehicleMonitoring.jsx
  89. 9 9
      src/pages/linePageChild/vehicleStatus/components/modal.jsx
  90. 1 0
      src/pages/linePageChild/vehicleStatus/vehicleStatus.jsx
  91. 1 0
      src/pages/passengerFlowAnalysis/commutingTime/commutingTime.jsx
  92. 1 1
      src/pages/passengerFlowAnalysis/commutingTime/components/modal.jsx
  93. 1 1
      src/pages/passengerFlowAnalysis/consumptionType/components/modal.jsx
  94. 1 0
      src/pages/passengerFlowAnalysis/consumptionType/consumptionType.jsx
  95. 1 1
      src/pages/passengerFlowAnalysis/distribution/components/modal.jsx
  96. 1 0
      src/pages/passengerFlowAnalysis/distribution/distribution.jsx
  97. 1 1
      src/pages/passengerFlowAnalysis/passengerFlowRoutes/components/modal.jsx
  98. 1 0
      src/pages/passengerFlowAnalysis/passengerFlowRoutes/passengerFlowRoutes.jsx
  99. 5 5
      src/pages/passengerFlowAnalysis/passengerInfomation/components/modal.jsx
  100. 1 0
      src/pages/passengerFlowAnalysis/passengerInfomation/passengerInfomation.jsx

+ 2 - 1
src/components/dictSelect.jsx

@@ -20,6 +20,7 @@ export default function DictSelect({dictType, outSelectVal}) {
                 // 默认选中第一个
                 // 默认选中第一个
                 if (!selectVal) {
                 if (!selectVal) {
                     setSelectVal(dictTypeElement.valueList[0].val)
                     setSelectVal(dictTypeElement.valueList[0].val)
+                    outSelectVal(dictTypeElement.valueList[0].val)
                 }
                 }
             }
             }
         }
         }
@@ -37,7 +38,7 @@ export default function DictSelect({dictType, outSelectVal}) {
 
 
     useEffect(() => {
     useEffect(() => {
         getSelect()
         getSelect()
-    }, []);
+    }, [dictData]);
     return (
     return (
         <Select options={option} fieldNames={{label: 'name', value: 'val',}} style={{width: '150px'}}
         <Select options={option} fieldNames={{label: 'name', value: 'val',}} style={{width: '150px'}}
                 value={selectVal} onSelect={SelectBrul}></Select>
                 value={selectVal} onSelect={SelectBrul}></Select>

+ 12 - 6
src/index.jsx

@@ -10,7 +10,6 @@ import zhCN from 'antd/locale/zh_CN';
 import {ConfigProvider} from 'antd';
 import {ConfigProvider} from 'antd';
 import 'dayjs/locale/zh-cn';
 import 'dayjs/locale/zh-cn';
 import User from "@/pages/settingPageChild/user/user.jsx";
 import User from "@/pages/settingPageChild/user/user.jsx";
-import Dict from "@/pages/settingPageChild/dict/dict.jsx";
 import StatisticsData from "@/pages/homePageChild/statisticsData/statisticsData.jsx";
 import StatisticsData from "@/pages/homePageChild/statisticsData/statisticsData.jsx";
 import ConsumptionProportion from "@/pages/homePageChild/consumptionProportion/consumptionProportion.jsx";
 import ConsumptionProportion from "@/pages/homePageChild/consumptionProportion/consumptionProportion.jsx";
 import FlowRanking from "@/pages/homePageChild/flowRanking/flowRanking.jsx";
 import FlowRanking from "@/pages/homePageChild/flowRanking/flowRanking.jsx";
@@ -66,7 +65,6 @@ import SiteOwnership from "@/pages/stationManagementInformation/siteOwnership/si
 import RegionalDistribution from "@/pages/stationManagementInformation/regionalDistribution/regionalDistribution.jsx";
 import RegionalDistribution from "@/pages/stationManagementInformation/regionalDistribution/regionalDistribution.jsx";
 import TypeDistribution from "@/pages/stationManagementInformation/typeDistribution/typeDistribution.jsx";
 import TypeDistribution from "@/pages/stationManagementInformation/typeDistribution/typeDistribution.jsx";
 import Usage from "@/pages/stationManagementInformation/usage/usage.jsx";
 import Usage from "@/pages/stationManagementInformation/usage/usage.jsx";
-import MaintenanceDetails from "@/pages/MaintenanceStatisticsChild/maintenanceDetails/maintenanceDetails.jsx";
 import InstalledCapacity from "@/pages/stationManagementInformation/InstalledCapacity/InstalledCapacity.jsx";
 import InstalledCapacity from "@/pages/stationManagementInformation/InstalledCapacity/InstalledCapacity.jsx";
 import StationOperate from "@/pages/stationManagementInformation/stationOperate/stationOperate.jsx";
 import StationOperate from "@/pages/stationManagementInformation/stationOperate/stationOperate.jsx";
 import ChageTrends from "@/pages/stationManagementInformation/chageTrends/chageTrends.jsx";
 import ChageTrends from "@/pages/stationManagementInformation/chageTrends/chageTrends.jsx";
@@ -82,7 +80,11 @@ import StationSpacingDistribution
     from "@/pages/lineAnalysisChild/stationSpacingDistribution/stationSpacingDistribution.jsx";
     from "@/pages/lineAnalysisChild/stationSpacingDistribution/stationSpacingDistribution.jsx";
 import LineType from "@/pages/lineAnalysisChild/lineType/lineType.jsx";
 import LineType from "@/pages/lineAnalysisChild/lineType/lineType.jsx";
 import LineAnalysisDetails from "@/pages/lineAnalysisChild/lineAnalysisDetails/lineAnalysisDetails.jsx";
 import LineAnalysisDetails from "@/pages/lineAnalysisChild/lineAnalysisDetails/lineAnalysisDetails.jsx";
-import MapElement from "@/pages/homePageChild/mapElement/mapElement.jsx";
+import MapElement from "@/pages/stationManagementInformation/mapElement/mapElement.jsx";
+import FacMapElement from "@/pages/facilityManagementChild/facMapElement/facMapElement.jsx";
+import MainMapElement from "@/pages/MaintenanceStatisticsChild/mainMapElement/mainMapElement.jsx";
+import Dict from "@/pages/settingPageChild/dict/dict.jsx";
+import GetClassesPercentRate from "@/pages/homePageChild/getClassesPercentRate/getClassesPercentRate.jsx";
 
 
 
 
 ReactDOM.createRoot(document.getElementById("root")).render(
 ReactDOM.createRoot(document.getElementById("root")).render(
@@ -111,7 +113,9 @@ ReactDOM.createRoot(document.getElementById("root")).render(
                             <Route path="classPunctualitRate"
                             <Route path="classPunctualitRate"
                                    element={<ClassPunctualitRate></ClassPunctualitRate>}></Route>
                                    element={<ClassPunctualitRate></ClassPunctualitRate>}></Route>
                             <Route path="carCompletionRate" element={<CarCompletionRate></CarCompletionRate>}></Route>
                             <Route path="carCompletionRate" element={<CarCompletionRate></CarCompletionRate>}></Route>
-                            <Route path="mapElement" element={<MapElement></MapElement>}></Route>
+                            <Route path="getClassesPercentRate"
+                                   element={<GetClassesPercentRate></GetClassesPercentRate>}></Route>
+
                             {/*    线路运营路由*/}
                             {/*    线路运营路由*/}
                             <Route path="basicInfomationOfTheLine"
                             <Route path="basicInfomationOfTheLine"
                                    element={<BasicInfomationOfTheLine></BasicInfomationOfTheLine>}></Route>
                                    element={<BasicInfomationOfTheLine></BasicInfomationOfTheLine>}></Route>
@@ -137,13 +141,13 @@ ReactDOM.createRoot(document.getElementById("root")).render(
                             <Route path='physicalExaminationIssues' element={<PhysicalExaminationIssues/>}></Route>
                             <Route path='physicalExaminationIssues' element={<PhysicalExaminationIssues/>}></Route>
                             <Route path='distance' element={<Distance/>}></Route>
                             <Route path='distance' element={<Distance/>}></Route>
                             <Route path='distributionOfPassengerFlowRoutes'
                             <Route path='distributionOfPassengerFlowRoutes'
-                                   element={<DistributionOfPassengerFlowRoutes/>}></Route>
+                                   element={<DistributionOfPassengerFlowRoutes/>}></Route>Route
                             <Route path='basicMaintenanceInfomation' element={<BasicMaintenanceInfomation/>}></Route>
                             <Route path='basicMaintenanceInfomation' element={<BasicMaintenanceInfomation/>}></Route>
                             <Route path='maintenanceExecution' element={<MaintenanceExecution/>}></Route>
                             <Route path='maintenanceExecution' element={<MaintenanceExecution/>}></Route>
                             <Route path='statusClassification' element={<StatusClassification/>}></Route>
                             <Route path='statusClassification' element={<StatusClassification/>}></Route>
                             <Route path='maintenanceStatus' element={<MaintenanceStatus/>}></Route>
                             <Route path='maintenanceStatus' element={<MaintenanceStatus/>}></Route>
                             <Route path='mainConsumPtionType' element={<MainConsumPtionType/>}></Route>
                             <Route path='mainConsumPtionType' element={<MainConsumPtionType/>}></Route>
-                            <Route path='maintenanceDetails' element={<MaintenanceDetails/>}></Route>
+                            <Route path='mainMapElement' element={<MainMapElement/>}></Route>
                             {/*  设施管理  */}
                             {/*  设施管理  */}
                             <Route path='vehiclesComponents' element={<VehiclesComponents/>}></Route>
                             <Route path='vehiclesComponents' element={<VehiclesComponents/>}></Route>
                             <Route path='chargingStation' element={<ChargingStation/>}></Route>
                             <Route path='chargingStation' element={<ChargingStation/>}></Route>
@@ -151,6 +155,7 @@ ReactDOM.createRoot(document.getElementById("root")).render(
                             <Route path='electronicLicensePlate' element={<ElectronicLicensePlate/>}></Route>
                             <Route path='electronicLicensePlate' element={<ElectronicLicensePlate/>}></Route>
                             <Route path='vehiclesModelDisplay' element={<VehiclesModelDisplay/>}></Route>
                             <Route path='vehiclesModelDisplay' element={<VehiclesModelDisplay/>}></Route>
                             <Route path='carWasher' element={<CarWasher/>}></Route>
                             <Route path='carWasher' element={<CarWasher/>}></Route>
+                            <Route path='facMapElement' element={<FacMapElement/>}></Route>
                             {/*    站场管理*/}
                             {/*    站场管理*/}
                             <Route path='stationBasicInformation' element={<StationBasicInformation/>}></Route>
                             <Route path='stationBasicInformation' element={<StationBasicInformation/>}></Route>
                             <Route path='areaDistrbution' element={<AreaDistrbution/>}></Route>
                             <Route path='areaDistrbution' element={<AreaDistrbution/>}></Route>
@@ -165,6 +170,7 @@ ReactDOM.createRoot(document.getElementById("root")).render(
                             <Route path='chageService' element={<ChageService/>}></Route>
                             <Route path='chageService' element={<ChageService/>}></Route>
                             <Route path='nowChargeStatistics' element={<NowChargeStatistics/>}></Route>
                             <Route path='nowChargeStatistics' element={<NowChargeStatistics/>}></Route>
                             <Route path='resourceUsage' element={<ResourceUsage/>}></Route>
                             <Route path='resourceUsage' element={<ResourceUsage/>}></Route>
+                            <Route path="mapElement" element={<MapElement></MapElement>}></Route>
                             {/*    线路分析*/}
                             {/*    线路分析*/}
                             <Route path='regionalMileage' element={<RegionalMileage/>}></Route>
                             <Route path='regionalMileage' element={<RegionalMileage/>}></Route>
                             <Route path='lineSpeed' element={<LineSpeed/>}></Route>
                             <Route path='lineSpeed' element={<LineSpeed/>}></Route>

+ 1 - 0
src/pages/MaintenanceStatisticsChild/basicMaintenanceInfomation/basicMaintenanceInfomation.jsx

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

+ 4 - 4
src/pages/MaintenanceStatisticsChild/basicMaintenanceInfomation/components/modal.jsx

@@ -89,7 +89,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="维保场"
                         label="维保场"
@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="已保养"
                         label="已保养"
@@ -115,7 +115,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="已维修"
                         label="已维修"
@@ -128,7 +128,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 1
src/pages/MaintenanceStatisticsChild/distance/components/modal.jsx

@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/distance/distance.jsx

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

+ 1 - 1
src/pages/MaintenanceStatisticsChild/distributionOfPassengerFlowRoutes/components/modal.jsx

@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/distributionOfPassengerFlowRoutes/distributionOfPassengerFlowRoutes.jsx

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

+ 1 - 1
src/pages/MaintenanceStatisticsChild/mainConsumPtionType/components/modal.jsx

@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/mainConsumPtionType/mainConsumPtionType.jsx

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

+ 133 - 0
src/pages/MaintenanceStatisticsChild/mainMapElement/components/modal.jsx

@@ -0,0 +1,133 @@
+import {Form, Input, InputNumber, message, Modal,} from 'antd';
+import axios from '@/utils/axios.js'
+import {useEffect, useRef} from 'react'
+import './modal.scss'
+import {useSelector} from "react-redux";
+import {getChild} from "@/utils/getDict.js";
+
+
+export default function ModalHooks({isModalOpen, closeModal, row, inputVal}) {
+    const [messageApi, contextHolder] = message.useMessage();
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
+    // 表单
+    const [form] = Form.useForm();
+    // 下拉框数值
+    let option = useRef([])
+    //状态下拉框
+    const status = [
+        {value: 1, label: '运营'},
+        {value: 2, label: '非运营'},
+    ]
+
+    /**
+     *确定时候的回调
+     */
+    function handleOk() {
+        // 验证表单
+        form.validateFields().then(async () => {
+            let formData = JSON.parse(JSON.stringify(form.getFieldsValue()))
+            // 新增类型
+            formData.type = inputVal
+            if (row?.id) {
+                // 修改数据
+                formData.id = row.id
+            }
+            let {code, message} = await axios.post('/homePageEdit/editMapElement', formData)
+            if (code === 200) {
+                messageApi.success(message)
+                handleCancel()
+            } else {
+                messageApi.error(message)
+            }
+        })
+    }
+
+    // 关闭页面
+    const handleCancel = () => {
+        closeModal(false);
+        form.resetFields()
+    };
+    // 表单
+    useEffect(() => {
+        if (row.id) {
+            let formData = JSON.parse(JSON.stringify(row))
+            form.setFieldsValue(formData)
+
+        }
+    }, [row])
+    useEffect(() => {
+        option.current = getChild(dictData, inputVal)
+    }, [inputVal]);
+
+    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="name"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+
+                            },
+                        ]}
+
+                    >
+                        <Input></Input>
+                    </Form.Item>
+
+                    <Form.Item
+                        label="经度"
+                        name="lon"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+                    <Form.Item
+                        label="维度"
+                        name="lat"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+
+                </Form>
+
+            </Modal>
+        </div>
+    )
+
+
+}

+ 9 - 0
src/pages/MaintenanceStatisticsChild/mainMapElement/components/modal.scss

@@ -0,0 +1,9 @@
+#statics {
+  .ant-form-item{
+    width: 45%;
+    margin-bottom: 10px;
+    .ant-form-item-label{
+      width: 120px;
+    }
+  }
+}

+ 141 - 0
src/pages/MaintenanceStatisticsChild/mainMapElement/mainMapElement.jsx

@@ -0,0 +1,141 @@
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
+import ModalHooks from "./components/modal.jsx";
+import "./mainMapElement.scss";
+import axios from "@/utils/axios.js";
+import DeleteButton from "@/components/delete.jsx";
+import DictSelect from "@/components/dictSelect.jsx";
+import {useSelector} from "react-redux";
+
+const {Column} = Table;
+
+export default function MainMapElement() {
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
+    const [inputVal, setInputVal] = useState("");
+    // 页面数据
+    const [data, setData] = useState([]);
+    // 是否展示弹框
+    const [isModalOpen, setIsModalOpen] = useState(false);
+    const [row, setRow] = useState({});
+    // 当前页数
+    const [current, setCurrent] = useState(1)
+    // 每页条数
+    const pageSize = 10
+    // 总条数
+    let [total, setTotal] = useState(0)
+
+    // 新增用户页面
+    function addUser() {
+        setRow([]);
+        setIsModalOpen(true);
+    }
+
+    // 关闭页面
+    function closeModal() {
+        setIsModalOpen(false);
+        getData()
+    }
+
+    // 点击修改的回调
+    function modify(data) {
+        setRow(data);
+        setIsModalOpen(true);
+    }
+
+    // 获取数据
+    async function getData() {
+        let {data} = await axios.get("/homePage/getMapElement", {
+            params: {
+                pageSize,
+                pageNum: current,
+                type: inputVal ? inputVal : null
+            }
+        });
+        setData(data.list);
+        setTotal(data.total)
+    }
+
+    /**
+     * 删除页面
+     * @param data 删除每一条数据
+     * @returns {Promise<void>}
+     */
+    async function deleteRow(data) {
+        let {code} = await axios.get('/sys/delete', {params: {id: data.id}})
+        if (code === 200) {
+            await getData()
+        }
+    }
+
+    // 修改页面
+    function changeSize(e) {
+        setCurrent(e)
+
+    }
+
+    /**
+     * 下拉框改变时候同时请求数据
+     */
+    function getSelectVal(val) {
+        setCurrent(1)
+        setInputVal(val)
+    }
+
+    useEffect(() => {
+        if (!inputVal) return
+        getData();
+    }, [inputVal, current]);
+
+    return (
+        <div className="map">
+            <div className="top">
+                <div className="input">
+                    <DictSelect dictType='maintenanceDynamics' outSelectVal={getSelectVal}></DictSelect>
+                </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="name"/>
+                <Column title="经度" dataIndex="lon" key="id"/>
+                <Column title="维度" dataIndex="lat" key="id"/>
+
+                <Column
+                    title="操作"
+                    width="170px"
+                    dataIndex="id"
+                    key="id"
+                    render={(text, record) => (
+                        <div className="btn">
+                            <Button type="primary" onClick={() => modify(record)}>
+                                修改
+                            </Button>
+                            <DeleteButton url='/homePageEdit/delMapElement' id={text}
+                                          getData={getData}></DeleteButton>
+                        </div>
+                    )}
+                />
+            </Table>
+            <ModalHooks
+                isModalOpen={isModalOpen}
+                closeModal={closeModal}
+                row={row}
+                inputVal={inputVal}
+            ></ModalHooks>
+        </div>
+    );
+}

+ 31 - 0
src/pages/MaintenanceStatisticsChild/mainMapElement/mainMapElement.scss

@@ -0,0 +1,31 @@
+.map {
+  width: 100%;
+  height: 100%;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 5px;
+
+    .input {
+      display: flex;
+
+      button {
+        margin-left: 10px;
+      }
+    }
+  }
+
+  .btn {
+    display: flex;
+    justify-content: space-between;
+  }
+
+}
+
+#basic {
+
+  .ant-form-item {
+    margin-bottom: 20px;
+  }
+}

+ 1 - 1
src/pages/MaintenanceStatisticsChild/maintenanceExecution/components/modal.jsx

@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/maintenanceExecution/maintenanceExecution.jsx

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

+ 1 - 1
src/pages/MaintenanceStatisticsChild/maintenanceStatistics/components/modal.jsx

@@ -108,7 +108,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/maintenanceStatistics/maintenanceStatistics.jsx

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

+ 1 - 1
src/pages/MaintenanceStatisticsChild/maintenanceStatus/components/modal.jsx

@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/maintenanceStatus/maintenanceStatus.jsx

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

+ 1 - 1
src/pages/MaintenanceStatisticsChild/physicalExaminationIssues/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/physicalExaminationIssues/physicalExaminationIssues.jsx

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

+ 1 - 1
src/pages/MaintenanceStatisticsChild/statusClassification/components/modal.jsx

@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/statusClassification/statusClassification.jsx

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

+ 1 - 1
src/pages/MaintenanceStatisticsChild/vehiclesTotalNumber/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/MaintenanceStatisticsChild/vehiclesTotalNumber/vehiclesTotalNumber.jsx

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

+ 3 - 3
src/pages/facilityManagementChild/carWasher/components/modal.jsx

@@ -105,7 +105,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="累计洗车次数"
                         label="累计洗车次数"
@@ -118,7 +118,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="损坏程度"
                         label="损坏程度"
@@ -130,7 +130,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                 </Form>
                 </Form>
 
 

+ 3 - 3
src/pages/facilityManagementChild/chargingStation/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="数量"
                         label="数量"
@@ -117,7 +117,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="损坏程度"
                         label="损坏程度"
@@ -129,7 +129,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 2 - 2
src/pages/facilityManagementChild/electronicLicensePlate/components/modal.jsx

@@ -105,7 +105,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="损坏程度"
                         label="损坏程度"
@@ -117,7 +117,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 146 - 0
src/pages/facilityManagementChild/facMapElement/components/modal.jsx

@@ -0,0 +1,146 @@
+import {Form, Input, InputNumber, message, Modal, Select,} from 'antd';
+import {useEffect, useRef} from 'react'
+import './modal.scss'
+import {useSelector} from "react-redux";
+import {getChild} from "@/utils/getDict.js";
+import axios from "@/utils/axios.js";
+
+
+export default function ModalHooks({isModalOpen, closeModal, row, inputVal}) {
+    const [messageApi, contextHolder] = message.useMessage();
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
+    // 表单
+    const [form] = Form.useForm();
+    // 下拉框数值
+    let option = useRef([])
+    //状态下拉框
+    const status = [
+        {value: 1, label: '运营'},
+        {value: 2, label: '非运营'},
+    ]
+
+    /**
+     *确定时候的回调
+     */
+    function handleOk() {
+        // 验证表单
+        form.validateFields().then(async () => {
+            let formData = JSON.parse(JSON.stringify(form.getFieldsValue()))
+            if (row?.id) {
+                // 修改数据
+                formData.id = row.id
+            }
+            formData.modelType = inputVal
+
+            let {code, message} = await axios.post('/homePageEdit/editMapElement', formData)
+            if (code === 200) {
+                messageApi.success(message)
+                handleCancel()
+            } else {
+                messageApi.error(message)
+            }
+        })
+    }
+
+    // 关闭页面
+    const handleCancel = () => {
+        closeModal(false);
+        form.resetFields()
+    };
+    // 表单
+    useEffect(() => {
+        if (row.id) {
+            let formData = JSON.parse(JSON.stringify(row))
+
+            form.setFieldsValue(formData)
+
+        }
+    }, [row])
+    useEffect(() => {
+        option.current = getChild(dictData, inputVal)
+    }, [inputVal]);
+
+    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="type"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <Select options={option.current} fieldNames={{label: 'name', value: 'val',}}></Select>
+                    </Form.Item>
+                    <Form.Item
+                        label="元素名称"
+                        name="name"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+
+                            },
+                        ]}
+
+                    >
+                        <Input></Input>
+                    </Form.Item>
+                    <Form.Item
+                        label="经度"
+                        name="lon"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+                    <Form.Item
+                        label="维度"
+                        name="lat"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+
+                </Form>
+
+            </Modal>
+        </div>
+    )
+
+
+}

+ 9 - 0
src/pages/facilityManagementChild/facMapElement/components/modal.scss

@@ -0,0 +1,9 @@
+#statics {
+  .ant-form-item{
+    width: 45%;
+    margin-bottom: 10px;
+    .ant-form-item-label{
+      width: 120px;
+    }
+  }
+}

+ 143 - 0
src/pages/facilityManagementChild/facMapElement/facMapElement.jsx

@@ -0,0 +1,143 @@
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
+import ModalHooks from "./components/modal.jsx";
+import "./facMapElement.scss";
+import axios from "@/utils/axios.js";
+import DeleteButton from "@/components/delete.jsx";
+import DictSelect from "@/components/dictSelect.jsx";
+import {useSelector} from "react-redux";
+import {findDictValue} from "@/utils/getDict.js";
+
+const {Column} = Table;
+
+export default function FacMapElement() {
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
+    const [inputVal, setInputVal] = useState("");
+    // 页面数据
+    const [data, setData] = useState([]);
+    // 是否展示弹框
+    const [isModalOpen, setIsModalOpen] = useState(false);
+    const [row, setRow] = useState({});
+    // 当前页数
+    const [current, setCurrent] = useState(1)
+    // 每页条数
+    const pageSize = 10
+    // 总条数
+    let [total, setTotal] = useState(0)
+
+    // 新增用户页面
+    function addUser() {
+        setRow([]);
+        setIsModalOpen(true);
+    }
+
+    // 关闭页面
+    function closeModal() {
+        setIsModalOpen(false);
+        getData()
+    }
+
+    // 点击修改的回调
+    function modify(data) {
+        setRow(data);
+        setIsModalOpen(true);
+    }
+
+    // 获取数据
+    async function getData() {
+        let {data} = await axios.get("/homePage/getMapElement", {
+            params: {
+                pageSize,
+                pageNum: current,
+                modelType: inputVal ? inputVal : null
+            }
+        });
+        setData(data.list);
+        setTotal(data.total)
+    }
+
+    /**
+     * 删除页面
+     * @param data 删除每一条数据
+     * @returns {Promise<void>}
+     */
+    async function deleteRow(data) {
+        let {code} = await axios.get('/sys/delete', {params: {id: data.id}})
+        if (code === 200) {
+            await getData()
+        }
+    }
+
+    // 修改页面
+    function changeSize(e) {
+        setCurrent(e)
+
+    }
+
+    /**
+     * 下拉框改变时候同时请求数据
+     */
+    function getSelectVal(val) {
+        setCurrent(1)
+        setInputVal(val)
+    }
+
+    useEffect(() => {
+        if (!inputVal) return
+        getData();
+    }, [inputVal, current]);
+
+    return (
+        <div className="map">
+            <div className="top">
+                <div className="input">
+                    <DictSelect dictType='facilityManagement' outSelectVal={getSelectVal}></DictSelect>
+                </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="type" key="id" render={(text) => findDictValue(dictData, text)}/>
+                <Column title="元素名称" dataIndex="name"/>
+                <Column title="经度" dataIndex="lon" key="id"/>
+                <Column title="维度" dataIndex="lat" key="id"/>
+
+                <Column
+                    title="操作"
+                    width="170px"
+                    dataIndex="id"
+                    key="id"
+                    render={(text, record) => (
+                        <div className="btn">
+                            <Button type="primary" onClick={() => modify(record)}>
+                                修改
+                            </Button>
+                            <DeleteButton url='/homePageEdit/delMapElement' id={text}
+                                          getData={getData}></DeleteButton>
+                        </div>
+                    )}
+                />
+            </Table>
+            <ModalHooks
+                isModalOpen={isModalOpen}
+                closeModal={closeModal}
+                row={row}
+                inputVal={inputVal}
+            ></ModalHooks>
+        </div>
+    );
+}

+ 31 - 0
src/pages/facilityManagementChild/facMapElement/facMapElement.scss

@@ -0,0 +1,31 @@
+.map {
+  width: 100%;
+  height: 100%;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 5px;
+
+    .input {
+      display: flex;
+
+      button {
+        margin-left: 10px;
+      }
+    }
+  }
+
+  .btn {
+    display: flex;
+    justify-content: space-between;
+  }
+
+}
+
+#basic {
+
+  .ant-form-item {
+    margin-bottom: 20px;
+  }
+}

+ 6 - 6
src/pages/facilityManagementChild/informationOfFacilities/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="电子站牌"
                         label="电子站牌"
@@ -117,7 +117,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="车辆"
                         label="车辆"
@@ -130,7 +130,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="车载部件"
                         label="车载部件"
@@ -143,7 +143,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="洗车机"
                         label="洗车机"
@@ -156,7 +156,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="充电桩"
                         label="充电桩"
@@ -169,7 +169,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                 </Form>
                 </Form>
 
 

+ 2 - 2
src/pages/facilityManagementChild/vehiclesComponents/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="损坏数量"
                         label="损坏数量"
@@ -117,7 +117,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 2 - 2
src/pages/facilityManagementChild/vehiclesModelDisplay/components/modal.jsx

@@ -105,7 +105,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="损坏程度"
                         label="损坏程度"
@@ -117,7 +117,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 9 - 3
src/pages/home/home.jsx

@@ -34,8 +34,8 @@ export default function Home() {
         }, {
         }, {
             label: '发车准点率', key: 'carCompletionRate', icon: <AreaChartOutlined/>,
             label: '发车准点率', key: 'carCompletionRate', icon: <AreaChartOutlined/>,
         }, {
         }, {
-            label: '地图元素配置', key: 'mapElement', icon: <AreaChartOutlined/>,
-        }]
+            label: '班次完成率百分比', key: 'getClassesPercentRate', icon: <AreaChartOutlined/>,
+        },]
     }, {
     }, {
         label: '线路运营配置', key: 'lineConfiguration', icon: <SettingOutlined/>, children: [{
         label: '线路运营配置', key: 'lineConfiguration', icon: <SettingOutlined/>, children: [{
             label: '线路基本情况', key: 'basicInfomationOfTheLine', icon: <AreaChartOutlined/>,
             label: '线路基本情况', key: 'basicInfomationOfTheLine', icon: <AreaChartOutlined/>,
@@ -93,6 +93,8 @@ export default function Home() {
             label: '消费类型', key: 'mainConsumPtionType', icon: <FileDoneOutlined/>,
             label: '消费类型', key: 'mainConsumPtionType', icon: <FileDoneOutlined/>,
         }, {
         }, {
             label: '维保明细', key: 'maintenanceDetails', icon: <FileDoneOutlined/>,
             label: '维保明细', key: 'maintenanceDetails', icon: <FileDoneOutlined/>,
+        }, {
+            label: '地图元素配置', key: 'mainMapElement', icon: <AreaChartOutlined/>,
         },]
         },]
     }, {
     }, {
         label: '设施管理', key: 'facilityManagementChild', icon: <DesktopOutlined/>, children: [{
         label: '设施管理', key: 'facilityManagementChild', icon: <DesktopOutlined/>, children: [{
@@ -107,6 +109,8 @@ export default function Home() {
             label: '车型展示', key: 'vehiclesModelDisplay', icon: <AreaChartOutlined/>,
             label: '车型展示', key: 'vehiclesModelDisplay', icon: <AreaChartOutlined/>,
         }, {
         }, {
             label: '洗车机', key: 'carWasher', icon: <AreaChartOutlined/>,
             label: '洗车机', key: 'carWasher', icon: <AreaChartOutlined/>,
+        }, {
+            label: '地图元素配置', key: 'facMapElement', icon: <AreaChartOutlined/>,
         },]
         },]
     },
     },
         {
         {
@@ -136,7 +140,9 @@ export default function Home() {
                 label: '今日充电统计', key: 'nowChargeStatistics', icon: <AreaChartOutlined/>,
                 label: '今日充电统计', key: 'nowChargeStatistics', icon: <AreaChartOutlined/>,
             }, {
             }, {
                 label: '资源使用率', key: 'resourceUsage', icon: <AreaChartOutlined/>,
                 label: '资源使用率', key: 'resourceUsage', icon: <AreaChartOutlined/>,
-            },]
+            }, {
+                label: '地图元素配置', key: 'mapElement', icon: <AreaChartOutlined/>,
+            }]
         }, {
         }, {
             label: '线路分析', key: 'lineAnalysis', icon: <SettingOutlined/>, children: [{
             label: '线路分析', key: 'lineAnalysis', icon: <SettingOutlined/>, children: [{
                 label: '区域里程', key: 'regionalMileage', icon: <UserOutlined/>,
                 label: '区域里程', key: 'regionalMileage', icon: <UserOutlined/>,

+ 1 - 1
src/pages/home/home.scss

@@ -32,7 +32,7 @@
     overflow: hidden;
     overflow: hidden;
 
 
     .menu {
     .menu {
-      width: 200px;
+      width: 220px;
       height: 100%;
       height: 100%;
       overflow: auto;
       overflow: auto;
 
 

+ 5 - 5
src/pages/homePageChild/carCompletionRate/carCompletionRate.jsx

@@ -3,6 +3,7 @@ import {useEffect, useState} from "react";
 import ModalHooks from "./components/modal.jsx";
 import ModalHooks from "./components/modal.jsx";
 import "./carCompletionRate.scss";
 import "./carCompletionRate.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
+import DeleteButton from "@/components/delete.jsx";
 
 
 const {Column} = Table;
 const {Column} = Table;
 
 
@@ -84,10 +85,8 @@ export default function CarCompletionRate() {
                 dataSource={data}
                 dataSource={data}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
-                pagination={{
-                    current: 1, // 当前页数
-                    pageSize: 12, // 每页显示的数量
-                }}
+                pagination={false}
+                scroll={{y: 900}}
             >
             >
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="跑法" dataIndex="modelId" key="id" render={(text) =>
                 <Column title="跑法" dataIndex="modelId" key="id" render={(text) =>
@@ -108,7 +107,8 @@ export default function CarCompletionRate() {
                             <Button type="primary" onClick={() => modify(record)}>
                             <Button type="primary" onClick={() => modify(record)}>
                                 修改
                                 修改
                             </Button>
                             </Button>
-
+                            <DeleteButton url='/homePageEdit/delDepartPunctualityRate' id={text}
+                                          getData={getData}></DeleteButton>
                         </div>
                         </div>
                     )}
                     )}
                 />
                 />

+ 2 - 2
src/pages/homePageChild/carCompletionRate/components/modal.jsx

@@ -126,7 +126,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -141,7 +141,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 6 - 8
src/pages/homePageChild/classCompletionRate/classCompletionRate.jsx

@@ -3,6 +3,7 @@ import {useEffect, useState} from "react";
 import ModalHooks from "./components/modal.jsx";
 import ModalHooks from "./components/modal.jsx";
 import "./classCompletionRate.scss";
 import "./classCompletionRate.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
+import DeleteButton from "@/components/delete.jsx";
 
 
 const {Column} = Table;
 const {Column} = Table;
 
 
@@ -85,16 +86,12 @@ export default function ClassCompletionRate() {
                 dataSource={data}
                 dataSource={data}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
-                pagination={{
-
-                    current: 1, // 当前页数
-                    pageSize: 12, // 每页显示的数量
-
-                }}
+                pagination={false}
+                scroll={{y: 900}}
             >
             >
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="跑法" dataIndex="modelId" key="id" render={(text) =>
                 <Column title="跑法" dataIndex="modelId" key="id" render={(text) =>
-                    !text ? '正跑' : '反跑'
+                    !text ? '上行' : '下行'
                 }/>
                 }/>
                 <Column title="计划" dataIndex="planClasses" key="id"/>
                 <Column title="计划" dataIndex="planClasses" key="id"/>
                 <Column title="实际" dataIndex="realityClasses" key="id"/>
                 <Column title="实际" dataIndex="realityClasses" key="id"/>
@@ -111,7 +108,8 @@ export default function ClassCompletionRate() {
                             <Button type="primary" onClick={() => modify(record)}>
                             <Button type="primary" onClick={() => modify(record)}>
                                 修改
                                 修改
                             </Button>
                             </Button>
-
+                            <DeleteButton url='/homePageEdit/delClassesCompletionRate' id={text}
+                                          getData={getData}></DeleteButton>
                         </div>
                         </div>
                     )}
                     )}
                 />
                 />

+ 12 - 9
src/pages/homePageChild/classCompletionRate/components/modal.jsx

@@ -1,8 +1,7 @@
-import {Modal, Form, Input, Select, message, InputNumber,TimePicker } from 'antd';
+import {Form, Input, InputNumber, message, Modal, Select} from 'antd';
 import axios from '@/utils/axios.js'
 import axios from '@/utils/axios.js'
-import {useEffect, useState} from 'react'
+import {useEffect} from 'react'
 import './modal.scss'
 import './modal.scss'
-import dayjs from "dayjs";
 
 
 export default function ModalHooks({isModalOpen, closeModal, row, lineList, option}) {
 export default function ModalHooks({isModalOpen, closeModal, row, lineList, option}) {
     const [messageApi, contextHolder] = message.useMessage();
     const [messageApi, contextHolder] = message.useMessage();
@@ -51,8 +50,11 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
         let i = lineList.find(item => item.lineId === id)
         let i = lineList.find(item => item.lineId === id)
         // 站点数据
         // 站点数据
         let stationList = i.lineModeList[0].modeStationsList
         let stationList = i.lineModeList[0].modeStationsList
-        form.setFieldValue('startStation', stationList[0].stationName)
-        form.setFieldValue('endStation', stationList[stationList.length - 1].stationName)
+        console.log(stationList)
+
+        form.setFieldValue('startStation', stationList.find(item => item.direction === 1).stationName)
+
+        form.setFieldValue('endStation', stationList.reverse().find(item => item.direction === 1).stationName)
     }
     }
 
 
 
 
@@ -71,7 +73,8 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
         <div className="form">
         <div className="form">
 
 
             {contextHolder}
             {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="确定">
                    cancelText="取消" okText="确定">
                 <Form
                 <Form
                     name="statics"
                     name="statics"
@@ -128,7 +131,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber  style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -143,7 +146,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber  style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
 
 
@@ -185,7 +188,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <Input style={{width: '100%'}} />
+                        <Input style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 9 - 9
src/pages/homePageChild/classPunctualitRate/classPunctualitRate.jsx

@@ -3,6 +3,7 @@ import {useEffect, useState} from "react";
 import ModalHooks from "./components/modal.jsx";
 import ModalHooks from "./components/modal.jsx";
 import "./classPunctualitRate.scss";
 import "./classPunctualitRate.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
+import DeleteButton from "@/components/delete.jsx";
 
 
 const {Column} = Table;
 const {Column} = Table;
 
 
@@ -86,17 +87,15 @@ export default function ClassPunctualitRate() {
 
 
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
-                pagination={{
-                    current: 1, // 当前页数
-                    pageSize: 12, // 每页显示的数量
-                }}
+                pagination={false}
+                scroll={{y: 900}}
             >
             >
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
                 <Column title="线路名称" dataIndex="lineName" key="id"></Column>
-                <Column title="跑法" dataIndex="modelId" key="id" render={(text) =>
-                    !text ? '上行' : '下行'
+                <Column title="跑法" dataIndex="type" key="id" render={(text) =>
+                    text ? '上行' : '下行'
                 }/>
                 }/>
-                <Column title="计划班次" dataIndex="planTime" key="id"/>
-                <Column title="实际班次" dataIndex="realityTime" key="id"/>
+                <Column title="计划时间" dataIndex="planTime" key="id"/>
+                <Column title="实际时间" dataIndex="realityTime" key="id"/>
                 <Column title="状态" dataIndex="status" key="id" render={(text) => (
                 <Column title="状态" dataIndex="status" key="id" render={(text) => (
                     text === 0 ? '正常' : text === 1 ? "超出" : '异常'
                     text === 0 ? '正常' : text === 1 ? "超出" : '异常'
                 )}/>
                 )}/>
@@ -114,7 +113,8 @@ export default function ClassPunctualitRate() {
                             <Button type="primary" onClick={() => modify(record)}>
                             <Button type="primary" onClick={() => modify(record)}>
                                 修改
                                 修改
                             </Button>
                             </Button>
-
+                            <DeleteButton url='/homePageEdit/delClassesPunctualityRate' id={text}
+                                          getData={getData}></DeleteButton>
                         </div>
                         </div>
                     )}
                     )}
                 />
                 />

+ 36 - 23
src/pages/homePageChild/consumptionProportion/components/modal.jsx

@@ -1,14 +1,16 @@
-import {Modal, Input, Select, message, Table, Button} from 'antd';
-import axios from '@/utils/axios.js'
+import {Button, InputNumber, message, Modal, Select, Table} from 'antd';
 import {useEffect, useState} from 'react'
 import {useEffect, useState} from 'react'
 import './modal.scss'
 import './modal.scss'
 import {getChild} from '@/utils/getDict.js'
 import {getChild} from '@/utils/getDict.js'
 import {useSelector} from "react-redux";
 import {useSelector} from "react-redux";
-export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
+import {snowflakeGenerator} from "snowflake-id-js";
+
+export default function ModalHooks({isModalOpen, closeModal, row, submitValue}) {
     const [messageApi, contextHolder] = message.useMessage();
     const [messageApi, contextHolder] = message.useMessage();
     const [tableData, setTableData] = useState([])
     const [tableData, setTableData] = useState([])
     let dict = useSelector((state) => state.counter.dictData);
     let dict = useSelector((state) => state.counter.dictData);
-    const options = getChild(dict,'consumptionProportion')
+    const options = getChild(dict, 'consumptionProportion')
+
     // const options = []
     // const options = []
     /**
     /**
      *确定时候的回调
      *确定时候的回调
@@ -16,7 +18,7 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
     function handleOk() {
     function handleOk() {
         // 验证表单
         // 验证表单
         for (const item of tableData) {
         for (const item of tableData) {
-            if(!item.name|| !item.value){
+            if (!item.name || !item.value) {
                 messageApi.error('未填写完整,无法提交')
                 messageApi.error('未填写完整,无法提交')
                 return
                 return
             }
             }
@@ -33,12 +35,13 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
      * @param index 下标
      * @param index 下标
      * @param dataName 名称
      * @param dataName 名称
      */
      */
-    function setValue(value,index,dataName){
+    function setValue(value, index, dataName) {
         let newData = JSON.parse(JSON.stringify(tableData))
         let newData = JSON.parse(JSON.stringify(tableData))
-        newData[index][dataName]=value
+        newData[index][dataName] = value
         setTableData(newData)
         setTableData(newData)
 
 
     }
     }
+
     // 关闭页面
     // 关闭页面
     const handleCancel = () => {
     const handleCancel = () => {
         closeModal(false);
         closeModal(false);
@@ -50,26 +53,27 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
         render: (text, record, index) => (
         render: (text, record, index) => (
             <Select
             <Select
                 value={text}
                 value={text}
-                onChange={(val)=>setValue(val,index,'name')}
+                onChange={(val) => setValue(val, index, 'name')}
                 options={options}
                 options={options}
-                style={{width:'80px'}}
+                style={{width: '150px'}}
                 fieldNames={{
                 fieldNames={{
-                    label:'name',
-                    value:'name'
+                    label: 'name',
+                    value: 'name'
                 }}
                 }}
             />
             />
         )
         )
     }, {
     }, {
-        title: '占比次数',
+        title: '数',
         dataIndex: 'value',
         dataIndex: 'value',
-        render: (text, record,index) => <Input value={text} onChange={(e)=>setValue(e.target.value,index,'value')}></Input>,
+        render: (text, record, index) => <InputNumber value={text} style={{width: '100%'}} min={0}
+                                                      onChange={(e) => setValue(e, index, 'value')}></InputNumber>,
     },
     },
-    {
-        title: '操作',
-        render: (text, record, index) => (
-            <Button danger onClick={() => removeRowList(index)}>删除</Button>
-        )
-    }
+        {
+            title: '操作',
+            render: (text, record, index) => (
+                <Button danger onClick={() => removeRowList(index)}>删除</Button>
+            )
+        }
     ]
     ]
 
 
     /**
     /**
@@ -81,17 +85,25 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
         newData.splice(index, 1)
         newData.splice(index, 1)
         setTableData(newData)
         setTableData(newData)
     }
     }
-    function add(){
+
+    function add() {
         let newData = JSON.parse(JSON.stringify(tableData))
         let newData = JSON.parse(JSON.stringify(tableData))
+        const generator = snowflakeGenerator(512);
         newData.push({
         newData.push({
-            name:null,
-            value:''
+            name: null,
+            value: '',
+            id: generator.next().value
         })
         })
         setTableData(newData)
         setTableData(newData)
     }
     }
+
     // 表单请求
     // 表单请求
     useEffect(() => {
     useEffect(() => {
         let newData = JSON.parse(JSON.stringify(row))
         let newData = JSON.parse(JSON.stringify(row))
+        const generator = snowflakeGenerator(512);
+        newData.forEach((item, index) => {
+            item.id = generator.next().value
+        })
         setTableData(newData)
         setTableData(newData)
 
 
 
 
@@ -109,8 +121,9 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
                     dataSource={tableData}
                     dataSource={tableData}
                     pagination={false}
                     pagination={false}
                     bordered={true}
                     bordered={true}
-                    rowKey="name"
+                    rowKey="id"
                     columns={columns}
                     columns={columns}
+                    scroll={{y: 400}}
                 >
                 >
 
 
                 </Table>
                 </Table>

+ 8 - 5
src/pages/homePageChild/consumptionProportion/consumptionProportion.jsx

@@ -1,5 +1,5 @@
-import {Table, Button,} from "antd";
-import {useState, useEffect} from "react";
+import {Button, Table,} from "antd";
+import {useEffect, useState} from "react";
 import ModalHooks from "./components/modal.jsx";
 import ModalHooks from "./components/modal.jsx";
 import "./consumptionProportion.scss";
 import "./consumptionProportion.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
@@ -73,10 +73,13 @@ export default function ConsumptionProportion() {
                 dataSource={data}
                 dataSource={data}
                 pagination={false}
                 pagination={false}
                 bordered={true}
                 bordered={true}
-                rowKey="name"
+                scroll={{
+                    y: 900
+                }}
+                rowKey="id"
             >
             >
-                <Column title="占比次数" dataIndex="name" key="name"/>
-                <Column title="数值" dataIndex="value" key="name"/>
+                <Column title="占比次数" dataIndex="name" key="id"/>
+                <Column title="数值" dataIndex="value" key="id"/>
 
 
                 <Column
                 <Column
                     title="操作"
                     title="操作"

+ 35 - 22
src/pages/homePageChild/flowRanking/components/modal.jsx

@@ -1,14 +1,16 @@
-import {Modal, Input, Select, message, Table, Button} from 'antd';
-import axios from '@/utils/axios.js'
+import {Button, InputNumber, message, Modal, Select, Table} from 'antd';
 import {useEffect, useState} from 'react'
 import {useEffect, useState} from 'react'
 import './modal.scss'
 import './modal.scss'
 import {getChild} from '@/utils/getDict.js'
 import {getChild} from '@/utils/getDict.js'
 import {useSelector} from "react-redux";
 import {useSelector} from "react-redux";
-export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
+import {snowflakeGenerator} from "snowflake-id-js";
+
+export default function ModalHooks({isModalOpen, closeModal, row, submitValue}) {
     const [messageApi, contextHolder] = message.useMessage();
     const [messageApi, contextHolder] = message.useMessage();
     const [tableData, setTableData] = useState([])
     const [tableData, setTableData] = useState([])
     let dict = useSelector((state) => state.counter.dictData);
     let dict = useSelector((state) => state.counter.dictData);
-    const options = getChild(dict,'flowRanking')
+    const options = getChild(dict, 'flowRanking')
+
     // const options = []
     // const options = []
     /**
     /**
      *确定时候的回调
      *确定时候的回调
@@ -16,7 +18,7 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
     function handleOk() {
     function handleOk() {
         // 验证表单
         // 验证表单
         for (const item of tableData) {
         for (const item of tableData) {
-            if(!item.name|| !item.value){
+            if (!item.name || !item.value) {
                 messageApi.error('未填写完整,无法提交')
                 messageApi.error('未填写完整,无法提交')
                 return
                 return
             }
             }
@@ -33,12 +35,13 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
      * @param index 下标
      * @param index 下标
      * @param dataName 名称
      * @param dataName 名称
      */
      */
-    function setValue(value,index,dataName){
+    function setValue(value, index, dataName) {
         let newData = JSON.parse(JSON.stringify(tableData))
         let newData = JSON.parse(JSON.stringify(tableData))
-        newData[index][dataName]=value
+        newData[index][dataName] = value
         setTableData(newData)
         setTableData(newData)
 
 
     }
     }
+
     // 关闭页面
     // 关闭页面
     const handleCancel = () => {
     const handleCancel = () => {
         closeModal(false);
         closeModal(false);
@@ -50,26 +53,27 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
         render: (text, record, index) => (
         render: (text, record, index) => (
             <Select
             <Select
                 value={text}
                 value={text}
-                onChange={(val)=>setValue(val,index,'name')}
+                onChange={(val) => setValue(val, index, 'name')}
                 options={options}
                 options={options}
-                style={{width:'120px'}}
+                style={{width: '120px'}}
                 fieldNames={{
                 fieldNames={{
-                    label:'name',
-                    value:'name'
+                    label: 'name',
+                    value: 'name'
                 }}
                 }}
             />
             />
         )
         )
     }, {
     }, {
         title: '占比次数',
         title: '占比次数',
         dataIndex: 'value',
         dataIndex: 'value',
-        render: (text, record,index) => <Input value={text} onChange={(e)=>setValue(e.target.value,index,'value')}></Input>,
+        render: (text, record, index) => <InputNumber value={text} style={{width: '100%'}} min={0}
+                                                      onChange={(e) => setValue(e, index, 'value')}></InputNumber>,
     },
     },
-    {
-        title: '操作',
-        render: (text, record, index) => (
-            <Button danger onClick={() => removeRowList(index)}>删除</Button>
-        )
-    }
+        {
+            title: '操作',
+            render: (text, record, index) => (
+                <Button danger onClick={() => removeRowList(index)}>删除</Button>
+            )
+        }
     ]
     ]
 
 
     /**
     /**
@@ -81,17 +85,25 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
         newData.splice(index, 1)
         newData.splice(index, 1)
         setTableData(newData)
         setTableData(newData)
     }
     }
-    function add(){
+
+    function add() {
         let newData = JSON.parse(JSON.stringify(tableData))
         let newData = JSON.parse(JSON.stringify(tableData))
+        const generator = snowflakeGenerator(512);
         newData.push({
         newData.push({
-            name:null,
-            value:''
+            name: null,
+            value: '',
+            id: generator.next().value
         })
         })
         setTableData(newData)
         setTableData(newData)
     }
     }
+
     // 表单请求
     // 表单请求
     useEffect(() => {
     useEffect(() => {
         let newData = JSON.parse(JSON.stringify(row))
         let newData = JSON.parse(JSON.stringify(row))
+        const generator = snowflakeGenerator(512);
+        newData.forEach((item, index) => {
+            item.id = generator.next().value
+        })
         setTableData(newData)
         setTableData(newData)
 
 
 
 
@@ -109,8 +121,9 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
                     dataSource={tableData}
                     dataSource={tableData}
                     pagination={false}
                     pagination={false}
                     bordered={true}
                     bordered={true}
-                    rowKey="name"
+                    rowKey="id"
                     columns={columns}
                     columns={columns}
+                    scroll={{y: 400}}
                 >
                 >
 
 
                 </Table>
                 </Table>

+ 6 - 5
src/pages/homePageChild/flowRanking/flowRanking.jsx

@@ -1,5 +1,5 @@
-import {Table, Button,} from "antd";
-import {useState, useEffect} from "react";
+import {Button, Table,} from "antd";
+import {useEffect, useState} from "react";
 import ModalHooks from "./components/modal.jsx";
 import ModalHooks from "./components/modal.jsx";
 import "./flowRanking.scss";
 import "./flowRanking.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
@@ -73,11 +73,12 @@ export default function FlowRanking() {
             <Table
             <Table
                 dataSource={data}
                 dataSource={data}
                 pagination={false}
                 pagination={false}
+                scroll={{y: 900}}
                 bordered={true}
                 bordered={true}
-                rowKey="name"
+                rowKey="id"
             >
             >
-                <Column title="占比次数" dataIndex="name" key="name"/>
-                <Column title="数值" dataIndex="value" key="name"/>
+                <Column title="占比次数" dataIndex="name" key="id"/>
+                <Column title="占比次数" dataIndex="value" key="id"/>
 
 
                 <Column
                 <Column
                     title="操作"
                     title="操作"

+ 116 - 0
src/pages/homePageChild/getClassesPercentRate/components/modal.jsx

@@ -0,0 +1,116 @@
+import {Form, InputNumber, message, Modal,} from 'antd';
+import axios from '@/utils/axios.js'
+import {useEffect} from 'react'
+import './modal.scss'
+
+
+export default function ModalHooks({isModalOpen, closeModal, row}) {
+    const [messageApi, contextHolder] = message.useMessage();
+    // 表单
+    const [form] = Form.useForm();
+    // 下拉框数值
+    let passengerOption = [
+        {value: '保养', label: '保养'},
+        {value: '维修', label: '维修'}
+    ]
+    //状态下拉框
+    const status = [
+        {value: 1, label: '运营'},
+        {value: 2, label: '非运营'},
+    ]
+
+    /**
+     *确定时候的回调
+     */
+    function handleOk() {
+        // 验证表单
+        form.validateFields().then(async () => {
+            let formData = JSON.parse(JSON.stringify(form.getFieldsValue()))
+
+            if (row?.id) {
+                // 修改数据
+                formData.id = row.id
+            }
+            let {code, message} = await axios.post('/homePageEdit/editClassesPercentRate', formData)
+            if (code === 200) {
+                messageApi.success(message)
+                handleCancel()
+            } else {
+                messageApi.error(message)
+            }
+        })
+    }
+
+    // 关闭页面
+    const handleCancel = () => {
+        closeModal(false);
+        form.resetFields()
+    };
+    // 表单
+    useEffect(() => {
+        if (row.id) {
+            let formData = JSON.parse(JSON.stringify(row))
+
+            form.setFieldsValue(formData)
+
+        }
+    }, [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="middleRate"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+                    <Form.Item
+                        label="昨日末班准点率"
+                        name="endRate"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+
+
+                </Form>
+
+            </Modal>
+        </div>
+    )
+
+
+}

+ 9 - 0
src/pages/homePageChild/getClassesPercentRate/components/modal.scss

@@ -0,0 +1,9 @@
+#statics {
+  .ant-form-item{
+    width: 45%;
+    margin-bottom: 10px;
+    .ant-form-item-label{
+      width: 120px;
+    }
+  }
+}

+ 116 - 0
src/pages/homePageChild/getClassesPercentRate/getClassesPercentRate.jsx

@@ -0,0 +1,116 @@
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
+import ModalHooks from "./components/modal.jsx";
+import "./getClassesPercentRate.scss";
+import axios from "@/utils/axios.js";
+
+const {Column} = Table;
+
+export default function GetClassesPercentRate() {
+    // 页面数据
+    const [data, setData] = useState([]);
+    // 是否展示弹框
+    const [isModalOpen, setIsModalOpen] = useState(false);
+    // 一行的数据
+
+    const [row, setRow] = useState({});
+    // 设置下拉框绑定的值
+    const [val, setVal] = useState('')
+
+
+    // 新增用户页面
+    function addUser() {
+        setRow([]);
+        setIsModalOpen(true);
+    }
+
+    // 关闭页面
+    function closeModal() {
+        setIsModalOpen(false);
+        getData()
+    }
+
+    // 点击修改的回调
+    function modify(data) {
+        setRow(data);
+        setIsModalOpen(true);
+
+    }
+
+
+    // 获取数据
+    async function getData() {
+
+        let {data} = await axios.get("/homePage/getClassesPercentRate");
+        if (!data) return
+
+        setData([data]);
+
+    }
+
+    // 设置类型文字
+    function setType(text) {
+        switch (text) {
+            case 1:
+                return "行驶中";
+            case 2:
+                return "维保";
+            case 3:
+                return "固定包车";
+            case 4:
+                return "临时包车";
+            case 5:
+                return "充电";
+            case 6:
+                return "公务";
+
+        }
+    }
+
+    useEffect(() => {
+        getData()
+    }, [])
+    return (
+        <div className="passenger">
+            <div className="top">
+
+                {/*<div className="button">*/}
+                {/*    <Button type="primary" onClick={addUser}>*/}
+                {/*        新增班次完成准点率*/}
+                {/*    </Button>*/}
+                {/*</div>*/}
+            </div>
+            <Table
+                dataSource={data}
+                bordered={true}
+                rowKey="id"
+                pagination={false}
+                scroll={{y: 900}}
+            >
+                <Column title="昨日中途准点率" dataIndex="middleRate" key="id"></Column>
+                <Column title="昨日末班准点率" dataIndex="endRate" key="id"></Column>
+                <Column
+                    title="操作"
+                    width="170px"
+                    dataIndex="id"
+                    key="id"
+                    render={(text, record) => (
+                        <div className="btn">
+                            <Button type="primary" onClick={() => modify(record)}>
+                                修改
+                            </Button>
+
+                        </div>
+                    )}
+                />
+            </Table>
+            <ModalHooks
+                isModalOpen={isModalOpen}
+                closeModal={closeModal}
+                row={row}
+
+                val={val}
+            ></ModalHooks>
+        </div>
+    );
+}

+ 26 - 0
src/pages/homePageChild/getClassesPercentRate/getClassesPercentRate.scss

@@ -0,0 +1,26 @@
+.passenger{
+  width: 100%;
+  height: 100%;
+  .top{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 5px;
+    .input{
+      display: flex;
+      button{
+        margin-left: 10px;
+      }
+    }
+  }
+  .btn{
+    display: flex;
+    justify-content: space-between;
+  }
+
+}
+#basic{
+
+.ant-form-item{
+  margin-bottom: 20px;
+}
+}

+ 38 - 21
src/pages/homePageChild/lineFlowRanking/components/modal.jsx

@@ -1,13 +1,16 @@
-import {Modal, Input, Select, message, Table, Button} from 'antd';
+import {Button, InputNumber, message, Modal, Select, Table} from 'antd';
 import {useEffect, useState} from 'react'
 import {useEffect, useState} from 'react'
 import './modal.scss'
 import './modal.scss'
 import {getChild} from '@/utils/getDict.js'
 import {getChild} from '@/utils/getDict.js'
 import {useSelector} from "react-redux";
 import {useSelector} from "react-redux";
-export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
+import {snowflakeGenerator} from "snowflake-id-js";
+
+export default function ModalHooks({isModalOpen, closeModal, row, submitValue}) {
     const [messageApi, contextHolder] = message.useMessage();
     const [messageApi, contextHolder] = message.useMessage();
     const [tableData, setTableData] = useState([])
     const [tableData, setTableData] = useState([])
     let dict = useSelector((state) => state.counter.dictData);
     let dict = useSelector((state) => state.counter.dictData);
-    const options = getChild(dict,'lineFlowRanking')
+    const options = getChild(dict, 'lineFlowRanking')
+
     // const options = []
     // const options = []
     /**
     /**
      *确定时候的回调
      *确定时候的回调
@@ -15,7 +18,7 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
     function handleOk() {
     function handleOk() {
         // 验证表单
         // 验证表单
         for (const item of tableData) {
         for (const item of tableData) {
-            if(!item.name|| !item.value){
+            if (!item.name || !item.value) {
                 messageApi.error('未填写完整,无法提交')
                 messageApi.error('未填写完整,无法提交')
                 return
                 return
             }
             }
@@ -32,12 +35,13 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
      * @param index 下标
      * @param index 下标
      * @param dataName 名称
      * @param dataName 名称
      */
      */
-    function setValue(value,index,dataName){
+    function setValue(value, index, dataName) {
         let newData = JSON.parse(JSON.stringify(tableData))
         let newData = JSON.parse(JSON.stringify(tableData))
-        newData[index][dataName]=value
+        newData[index][dataName] = value
         setTableData(newData)
         setTableData(newData)
 
 
     }
     }
+
     // 关闭页面
     // 关闭页面
     const handleCancel = () => {
     const handleCancel = () => {
         closeModal(false);
         closeModal(false);
@@ -49,26 +53,28 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
         render: (text, record, index) => (
         render: (text, record, index) => (
             <Select
             <Select
                 value={text}
                 value={text}
-                style={{width:'80px'}}
-                onChange={(val)=>setValue(val,index,'name')}
+                style={{width: '80px'}}
+                onChange={(val) => setValue(val, index, 'name')}
                 options={options}
                 options={options}
                 fieldNames={{
                 fieldNames={{
-                    label:'name',
-                    value:'name'
+                    label: 'name',
+                    value: 'name'
                 }}
                 }}
             />
             />
         )
         )
     }, {
     }, {
         title: '占比次数',
         title: '占比次数',
         dataIndex: 'value',
         dataIndex: 'value',
-        render: (text, record,index) => <Input value={text} onChange={(e)=>setValue(e.target.value,index,'value')}></Input>,
+        render: (text, record, index) => <InputNumber value={text} min={0}
+                                                      onChange={(e) => setValue(e, index, 'value')}
+                                                      style={{width: '100%'}}></InputNumber>,
     },
     },
-    {
-        title: '操作',
-        render: (text, record, index) => (
-            <Button danger onClick={() => removeRowList(index)}>删除</Button>
-        )
-    }
+        {
+            title: '操作',
+            render: (text, record, index) => (
+                <Button danger onClick={() => removeRowList(index)}>删除</Button>
+            )
+        }
     ]
     ]
 
 
     /**
     /**
@@ -80,17 +86,27 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
         newData.splice(index, 1)
         newData.splice(index, 1)
         setTableData(newData)
         setTableData(newData)
     }
     }
-    function add(){
+
+    function add() {
         let newData = JSON.parse(JSON.stringify(tableData))
         let newData = JSON.parse(JSON.stringify(tableData))
+        const generator = snowflakeGenerator(512);
         newData.push({
         newData.push({
-            name:null,
-            value:''
+            name: null,
+            value: '',
+            id: generator.next().value
+
         })
         })
+
         setTableData(newData)
         setTableData(newData)
     }
     }
+
     // 表单请求
     // 表单请求
     useEffect(() => {
     useEffect(() => {
         let newData = JSON.parse(JSON.stringify(row))
         let newData = JSON.parse(JSON.stringify(row))
+        const generator = snowflakeGenerator(512);
+        newData.forEach((item, index) => {
+            item.id = generator.next().value
+        })
         setTableData(newData)
         setTableData(newData)
 
 
 
 
@@ -108,8 +124,9 @@ export default function ModalHooks({isModalOpen, closeModal, row,submitValue}) {
                     dataSource={tableData}
                     dataSource={tableData}
                     pagination={false}
                     pagination={false}
                     bordered={true}
                     bordered={true}
-                    rowKey="name"
+                    rowKey="id"
                     columns={columns}
                     columns={columns}
+                    scroll={{y: 400}}
                 >
                 >
 
 
                 </Table>
                 </Table>

+ 6 - 5
src/pages/homePageChild/lineFlowRanking/lineFlowRanking.jsx

@@ -1,5 +1,5 @@
-import {Table, Button,} from "antd";
-import {useState, useEffect} from "react";
+import {Button, Table,} from "antd";
+import {useEffect, useState} from "react";
 import ModalHooks from "./components/modal.jsx";
 import ModalHooks from "./components/modal.jsx";
 import "./lineFlowRanking.scss";
 import "./lineFlowRanking.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
@@ -72,11 +72,12 @@ export default function LineFlowRanking() {
             <Table
             <Table
                 dataSource={data}
                 dataSource={data}
                 pagination={false}
                 pagination={false}
+                scroll={{y: 900}}
                 bordered={true}
                 bordered={true}
-                rowKey="name"
+                rowKey="id"
             >
             >
-                <Column title="占比次数" dataIndex="name" key="name"/>
-                <Column title="数值" dataIndex="value" key="name"/>
+                <Column title="占比次数" dataIndex="name"/>
+                <Column title="数值" dataIndex="value"/>
 
 
                 <Column
                 <Column
                     title="操作"
                     title="操作"

+ 2 - 2
src/pages/homePageChild/mapElement/components/modal.jsx

@@ -105,7 +105,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, inputVal}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="维度"
                         label="维度"
@@ -118,7 +118,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, inputVal}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 1 - 1
src/pages/homePageChild/mapElement/mapElement.jsx

@@ -87,7 +87,7 @@ export default function MapElement() {
         <div className="map">
         <div className="map">
             <div className="top">
             <div className="top">
                 <div className="input">
                 <div className="input">
-                    <DictSelect dictType='dictElement' outSelectVal={getSelectVal}></DictSelect>
+                    <DictSelect dictType='stationManagement' outSelectVal={getSelectVal}></DictSelect>
                 </div>
                 </div>
                 <div className="button">
                 <div className="button">
                     <Button type="primary" onClick={addUser}>
                     <Button type="primary" onClick={addUser}>

+ 5 - 4
src/pages/homePageChild/passengerVolumeData/passengerVolumeData.jsx

@@ -1,5 +1,5 @@
-import {Table, Button, Select} from "antd";
-import {useState, useEffect} from "react";
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
 import ModalHooks from "./components/passengerVolumeDataModal.jsx";
 import ModalHooks from "./components/passengerVolumeDataModal.jsx";
 import "./passengerVolumeData.scss";
 import "./passengerVolumeData.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
@@ -47,7 +47,7 @@ export default function PassengerVolumeData() {
 
 
     // 获取数据
     // 获取数据
     async function getData() {
     async function getData() {
-        let {data} = await axios.get("/homePage/getBusTrafficVolume",{params:{type:selectData}});
+        let {data} = await axios.get("/homePage/getBusTrafficVolume", {params: {type: selectData}});
         setData(data);
         setData(data);
 
 
     }
     }
@@ -115,7 +115,8 @@ export default function PassengerVolumeData() {
             </div>
             </div>
             <Table
             <Table
                 dataSource={data}
                 dataSource={data}
-                pagination={{position: ["bottomRight"]}}
+                pagination={false}
+                scroll={{y: 900}}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
                 columns={columns}
                 columns={columns}

+ 21 - 17
src/pages/homePageChild/publicOpinion/publicOpinion.jsx

@@ -1,10 +1,11 @@
-import {Table, Button, Input, Popconfirm} from "antd";
-import {useState, useEffect} from "react";
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
 import ModalHooks from "./components/publicOpinionModal.jsx";
 import ModalHooks from "./components/publicOpinionModal.jsx";
 import "./publicOpinion.scss";
 import "./publicOpinion.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
-import {  useDispatch } from 'react-redux';
-import {  setDictData } from '@/store/reducer.js';
+import {useDispatch} from 'react-redux';
+import {setDictData} from '@/store/reducer.js';
+
 const {Column} = Table;
 const {Column} = Table;
 
 
 export default function PublicOpinion() {
 export default function PublicOpinion() {
@@ -39,16 +40,18 @@ export default function PublicOpinion() {
         setIsModalOpen(true);
         setIsModalOpen(true);
 
 
     }
     }
+
     // reduce状态
     // reduce状态
     const dispatch = useDispatch();
     const dispatch = useDispatch();
+
     // 获取数据
     // 获取数据
     async function getData() {
     async function getData() {
-        let {data} = await axios.get("/homePage/getBusWarning",{params:{type:inputVal,name:keyVal}});
-        data.warningSummary= JSON.parse(data.warningSummary)
+        let {data} = await axios.get("/homePage/getBusWarning", {params: {type: inputVal, name: keyVal}});
+        data.warningSummary = JSON.parse(data.warningSummary)
 
 
-        for (const item of data.warningSummary ) {
+        for (const item of data.warningSummary) {
 
 
-            data[Object.keys(item)[0]]=item[Object.keys(item)[0]]
+            data[Object.keys(item)[0]] = item[Object.keys(item)[0]]
         }
         }
         console.log(data)
         console.log(data)
         setData([data]);
         setData([data]);
@@ -135,14 +138,14 @@ export default function PublicOpinion() {
         },
         },
         {
         {
             title: '操作',
             title: '操作',
-           render:(text, record)=>(
-               <div className="btn">
-                   <Button type="primary" onClick={() => modify(record)}>
-                       修改
-                   </Button>
-
-               </div>
-           )
+            render: (text, record) => (
+                <div className="btn">
+                    <Button type="primary" onClick={() => modify(record)}>
+                        修改
+                    </Button>
+
+                </div>
+            )
         },
         },
 
 
     ];
     ];
@@ -154,7 +157,8 @@ export default function PublicOpinion() {
 
 
             <Table
             <Table
                 dataSource={data}
                 dataSource={data}
-                pagination={{position: ["bottomRight"]}}
+                pagination={false}
+                scroll={{y: 900}}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
                 columns={columns}
                 columns={columns}

+ 16 - 14
src/pages/homePageChild/stationEquipment/stationEquipment.jsx

@@ -1,11 +1,10 @@
-import {Table, Button, Input, Popconfirm} from "antd";
-import {useState, useEffect} from "react";
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
 import ModalHooks from "./components/stationEquipmentModal.jsx";
 import ModalHooks from "./components/stationEquipmentModal.jsx";
 import "./stationEquipment.scss";
 import "./stationEquipment.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
-import {  useDispatch } from 'react-redux';
-import {  setDictData } from '@/store/reducer.js';
-const {Column} = Table;
+import {useDispatch} from 'react-redux';
+import {setDictData} from '@/store/reducer.js';
 
 
 export default function StationEquipment() {
 export default function StationEquipment() {
 
 
@@ -35,8 +34,10 @@ export default function StationEquipment() {
         setIsModalOpen(true);
         setIsModalOpen(true);
 
 
     }
     }
+
     // reduce状态
     // reduce状态
     const dispatch = useDispatch();
     const dispatch = useDispatch();
+
     // 获取数据
     // 获取数据
     async function getData() {
     async function getData() {
         let {data} = await axios.get("/homePage/getBusTotal");
         let {data} = await axios.get("/homePage/getBusTotal");
@@ -84,14 +85,14 @@ export default function StationEquipment() {
 
 
         {
         {
             title: '操作',
             title: '操作',
-           render:(text, record)=>(
-               <div className="btn">
-                   <Button type="primary" onClick={() => modify(record)}>
-                       修改
-                   </Button>
-
-               </div>
-           )
+            render: (text, record) => (
+                <div className="btn">
+                    <Button type="primary" onClick={() => modify(record)}>
+                        修改
+                    </Button>
+
+                </div>
+            )
         },
         },
 
 
     ];
     ];
@@ -103,7 +104,8 @@ export default function StationEquipment() {
 
 
             <Table
             <Table
                 dataSource={data}
                 dataSource={data}
-                pagination={{position: ["bottomRight"]}}
+                pagination={false}
+                scroll={{y: 900}}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
                 columns={columns}
                 columns={columns}

+ 8 - 7
src/pages/homePageChild/statisticsData/components/modal.jsx

@@ -1,7 +1,8 @@
-import {Modal, Form, Input, Select, message,InputNumber } from 'antd';
+import {Modal, Form, Input, Select, message, InputNumber} from 'antd';
 import axios from '@/utils/axios.js'
 import axios from '@/utils/axios.js'
 import {useEffect} from 'react'
 import {useEffect} from 'react'
 import './modal.scss'
 import './modal.scss'
+
 export default function ModalHooks({isModalOpen, closeModal, row}) {
 export default function ModalHooks({isModalOpen, closeModal, row}) {
     const [messageApi, contextHolder] = message.useMessage();
     const [messageApi, contextHolder] = message.useMessage();
     // 表单
     // 表单
@@ -82,7 +83,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber   style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -96,7 +97,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber   style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -109,7 +110,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber   style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -124,7 +125,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber   style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
 
 
@@ -139,7 +140,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber   style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -153,7 +154,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber   style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 4 - 2
src/pages/homePageChild/statisticsData/statisticsData.jsx

@@ -1,5 +1,5 @@
-import {Table, Button, Input, Popconfirm} from "antd";
-import {useState, useEffect} from "react";
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
 import ModalHooks from "./components/modal.jsx";
 import ModalHooks from "./components/modal.jsx";
 import "./statisticsData.scss";
 import "./statisticsData.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
@@ -38,6 +38,7 @@ export default function StatisticsData() {
         // console.log(data)
         // console.log(data)
         setData([data]);
         setData([data]);
     }
     }
+
     useEffect(() => {
     useEffect(() => {
         getData();
         getData();
     }, []);
     }, []);
@@ -47,6 +48,7 @@ export default function StatisticsData() {
             <Table
             <Table
                 dataSource={data}
                 dataSource={data}
                 pagination={false}
                 pagination={false}
+                scroll={{y: 900}}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
             >
             >

+ 6 - 6
src/pages/lineAnalysisChild/lineAnalysisDetails/components/modal.jsx

@@ -89,7 +89,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="线路重复数量"
                         label="线路重复数量"
@@ -102,7 +102,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="线路数量"
                         label="线路数量"
@@ -115,7 +115,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="线路密度"
                         label="线路密度"
@@ -128,7 +128,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="线路长度"
                         label="线路长度"
@@ -141,7 +141,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="线路覆盖率"
                         label="线路覆盖率"
@@ -154,7 +154,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                 </Form>
                 </Form>
 
 

+ 7 - 6
src/pages/lineAnalysisChild/lineAnalysisDetails/lineAnalysisDetails.jsx

@@ -42,7 +42,7 @@ export default function LineAnalysisDetails() {
     async function getData() {
     async function getData() {
 
 
         let {data} = await axios.get("/getAnalysisLineStatistics");
         let {data} = await axios.get("/getAnalysisLineStatistics");
-
+        if (!data) return
         setData([data]);
         setData([data]);
 
 
     }
     }
@@ -73,17 +73,18 @@ export default function LineAnalysisDetails() {
         <div className="passenger">
         <div className="passenger">
             <div className="top">
             <div className="top">
 
 
-                {/*<div className="button">*/}
-                {/*    <Button type="primary" onClick={addUser}>*/}
-                {/*        新增线路类型*/}
-                {/*    </Button>*/}
-                {/*</div>*/}
+                <div className="button">
+                    <Button type="primary" onClick={addUser}>
+                        新增线路类型基本信息
+                    </Button>
+                </div>
             </div>
             </div>
             <Table
             <Table
                 dataSource={data}
                 dataSource={data}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
                 pagination={false}
                 pagination={false}
+                scroll={{y: 900}}
             >
             >
                 <Column title="站点数量" dataIndex="stationNum" key="id"></Column>
                 <Column title="站点数量" dataIndex="stationNum" key="id"></Column>
                 <Column title="线路重复数量" dataIndex="lineRepetition" key="id"></Column>
                 <Column title="线路重复数量" dataIndex="lineRepetition" key="id"></Column>

+ 1 - 0
src/pages/lineAnalysisChild/lineLength/lineLength.jsx

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

+ 134 - 0
src/pages/lineAnalysisChild/lineMapElement/components/modal.jsx

@@ -0,0 +1,134 @@
+import {Form, InputNumber, message, Modal, Select,} from 'antd';
+import axios from '@/utils/axios.js'
+import {useEffect, useRef} from 'react'
+import './modal.scss'
+import {useSelector} from "react-redux";
+import {getChild} from "@/utils/getDict.js";
+
+
+export default function ModalHooks({isModalOpen, closeModal, row, inputVal}) {
+    const [messageApi, contextHolder] = message.useMessage();
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
+    // 表单
+    const [form] = Form.useForm();
+    // 下拉框数值
+    let option = useRef([])
+    //状态下拉框
+    const status = [
+        {value: 1, label: '运营'},
+        {value: 2, label: '非运营'},
+    ]
+
+    /**
+     *确定时候的回调
+     */
+    function handleOk() {
+        // 验证表单
+        form.validateFields().then(async () => {
+            let formData = JSON.parse(JSON.stringify(form.getFieldsValue()))
+            // 新增类型
+            formData.type = inputVal
+            if (row?.id) {
+                // 修改数据
+                formData.id = row.id
+            }
+            let {code, message} = await axios.post('/homePageEdit/editMapElement', formData)
+            if (code === 200) {
+                messageApi.success(message)
+                handleCancel()
+            } else {
+                messageApi.error(message)
+            }
+        })
+    }
+
+    // 关闭页面
+    const handleCancel = () => {
+        closeModal(false);
+        form.resetFields()
+    };
+    // 表单
+    useEffect(() => {
+        if (row.id) {
+            let formData = JSON.parse(JSON.stringify(row))
+
+            form.setFieldsValue(formData)
+
+        }
+    }, [row])
+    useEffect(() => {
+        option.current = getChild(dictData, inputVal)
+    }, [inputVal]);
+
+    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="name"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+
+                            },
+                        ]}
+
+                    >
+                        <Select options={option.current} fieldNames={{label: 'name', value: 'val',}}></Select>
+                    </Form.Item>
+
+                    <Form.Item
+                        label="经度"
+                        name="lon"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+                    <Form.Item
+                        label="维度"
+                        name="lat"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请输入',
+                            },
+                        ]}
+
+                    >
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
+                    </Form.Item>
+
+                </Form>
+
+            </Modal>
+        </div>
+    )
+
+
+}

+ 9 - 0
src/pages/lineAnalysisChild/lineMapElement/components/modal.scss

@@ -0,0 +1,9 @@
+#statics {
+  .ant-form-item{
+    width: 45%;
+    margin-bottom: 10px;
+    .ant-form-item-label{
+      width: 120px;
+    }
+  }
+}

+ 142 - 0
src/pages/lineAnalysisChild/lineMapElement/lineMapElement.jsx

@@ -0,0 +1,142 @@
+import {Button, Table} from "antd";
+import {useEffect, useState} from "react";
+import ModalHooks from "./components/modal.jsx";
+import "./lineMapElement.scss";
+import axios from "@/utils/axios.js";
+import DeleteButton from "@/components/delete.jsx";
+import DictSelect from "@/components/dictSelect.jsx";
+import {useSelector} from "react-redux";
+import {findDictValue} from "@/utils/getDict.js";
+
+const {Column} = Table;
+
+export default function LineMapElement() {
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
+    const [inputVal, setInputVal] = useState("");
+    // 页面数据
+    const [data, setData] = useState([]);
+    // 是否展示弹框
+    const [isModalOpen, setIsModalOpen] = useState(false);
+    const [row, setRow] = useState({});
+    // 当前页数
+    const [current, setCurrent] = useState(1)
+    // 每页条数
+    const pageSize = 10
+    // 总条数
+    let [total, setTotal] = useState(0)
+
+    // 新增用户页面
+    function addUser() {
+        setRow([]);
+        setIsModalOpen(true);
+    }
+
+    // 关闭页面
+    function closeModal() {
+        setIsModalOpen(false);
+        getData()
+    }
+
+    // 点击修改的回调
+    function modify(data) {
+        setRow(data);
+        setIsModalOpen(true);
+    }
+
+    // 获取数据
+    async function getData() {
+        let {data} = await axios.get("/homePage/getMapElement", {
+            params: {
+                pageSize,
+                pageNum: current,
+                type: inputVal ? inputVal : null
+            }
+        });
+        setData(data.list);
+        setTotal(data.total)
+    }
+
+    /**
+     * 删除页面
+     * @param data 删除每一条数据
+     * @returns {Promise<void>}
+     */
+    async function deleteRow(data) {
+        let {code} = await axios.get('/sys/delete', {params: {id: data.id}})
+        if (code === 200) {
+            await getData()
+        }
+    }
+
+    // 修改页面
+    function changeSize(e) {
+        setCurrent(e)
+
+    }
+
+    /**
+     * 下拉框改变时候同时请求数据
+     */
+    function getSelectVal(val) {
+        setCurrent(1)
+        setInputVal(val)
+    }
+
+    useEffect(() => {
+        if (!inputVal) return
+        getData();
+    }, [inputVal, current]);
+
+    return (
+        <div className="map">
+            <div className="top">
+                <div className="input">
+                    <DictSelect dictType='stationManagement' outSelectVal={getSelectVal}></DictSelect>
+                </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="name" key="id" render={(text) => findDictValue(dictData, text)}/>
+                <Column title="经度" dataIndex="lon" key="id"/>
+                <Column title="维度" dataIndex="lat" key="id"/>
+
+                <Column
+                    title="操作"
+                    width="170px"
+                    dataIndex="id"
+                    key="id"
+                    render={(text, record) => (
+                        <div className="btn">
+                            <Button type="primary" onClick={() => modify(record)}>
+                                修改
+                            </Button>
+                            <DeleteButton url='/homePageEdit/delMapElement' id={text}
+                                          getData={getData}></DeleteButton>
+                        </div>
+                    )}
+                />
+            </Table>
+            <ModalHooks
+                isModalOpen={isModalOpen}
+                closeModal={closeModal}
+                row={row}
+                inputVal={inputVal}
+            ></ModalHooks>
+        </div>
+    );
+}

+ 31 - 0
src/pages/lineAnalysisChild/lineMapElement/lineMapElement.scss

@@ -0,0 +1,31 @@
+.map {
+  width: 100%;
+  height: 100%;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 5px;
+
+    .input {
+      display: flex;
+
+      button {
+        margin-left: 10px;
+      }
+    }
+  }
+
+  .btn {
+    display: flex;
+    justify-content: space-between;
+  }
+
+}
+
+#basic {
+
+  .ant-form-item {
+    margin-bottom: 20px;
+  }
+}

+ 3 - 3
src/pages/lineAnalysisChild/lineSpeed/components/modal.jsx

@@ -106,7 +106,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="常规线路"
                         label="常规线路"
@@ -119,7 +119,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item> <Form.Item
                     </Form.Item> <Form.Item
                     label="快线"
                     label="快线"
                     name="expressLine"
                     name="expressLine"
@@ -131,7 +131,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                     ]}
                     ]}
 
 
                 >
                 >
-                    <InputNumber style={{width: '100%'}}></InputNumber>
+                    <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                 </Form.Item>
                 </Form.Item>
 
 
                 </Form>
                 </Form>

+ 1 - 0
src/pages/lineAnalysisChild/lineSpeed/lineSpeed.jsx

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

+ 1 - 1
src/pages/lineAnalysisChild/lineType/components/modal.jsx

@@ -103,7 +103,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/lineAnalysisChild/lineType/lineType.jsx

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

+ 1 - 1
src/pages/lineAnalysisChild/regionalMileage/components/modal.jsx

@@ -103,7 +103,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/lineAnalysisChild/regionalMileage/regionalMileage.jsx

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

+ 1 - 1
src/pages/lineAnalysisChild/stationPassengerFlow/components/modal.jsx

@@ -119,7 +119,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                 </Form>
                 </Form>

+ 1 - 0
src/pages/lineAnalysisChild/stationPassengerFlow/stationPassengerFlow.jsx

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

+ 1 - 0
src/pages/lineAnalysisChild/stationSpacingDistribution/stationSpacingDistribution.jsx

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

+ 11 - 5
src/pages/linePageChild/basicInfomationOfTheLine/basicInfomationOfTheLine.jsx

@@ -4,6 +4,8 @@ import ModalHooks from "./components/modal.jsx";
 import "./basicInfomationOfTheLine.scss";
 import "./basicInfomationOfTheLine.scss";
 import axios from "@/utils/axios.js";
 import axios from "@/utils/axios.js";
 import DeleteButton from "@/components/delete.jsx";
 import DeleteButton from "@/components/delete.jsx";
+import {useSelector} from "react-redux";
+import {findDictValue} from "@/utils/getDict.js";
 
 
 const {Column} = Table;
 const {Column} = Table;
 
 
@@ -16,6 +18,8 @@ export default function BasicInfomationOfTheLine() {
     const [row, setRow] = useState({});
     const [row, setRow] = useState({});
     // 设置下拉框绑定的值
     // 设置下拉框绑定的值
     const [val, setVal] = useState('')
     const [val, setVal] = useState('')
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
 
 
     // 新增用户页面
     // 新增用户页面
     function addUser() {
     function addUser() {
@@ -116,18 +120,20 @@ export default function BasicInfomationOfTheLine() {
                 dataSource={data}
                 dataSource={data}
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
-                pagination={{
-                    current: 1, // 当前页数
-                    pageSize: 12, // 每页显示的数量
-                }}
+                pagination={false}
+                scroll={{y: 900}}
             >
             >
                 <Column title="线路名称" dataIndex="lineId" key="id" render={(text) => (
                 <Column title="线路名称" dataIndex="lineId" key="id" render={(text) => (
                     setText(text)
                     setText(text)
                 )
                 )
                 }></Column>
                 }></Column>
-                <Column title="线路类型" dataIndex="type" key="id" render={(text) =>
+                <Column title="类型" dataIndex="type" key="id" render={(text) =>
                     text === 1 ? '主线公交' : '干线公交'
                     text === 1 ? '主线公交' : '干线公交'
                 }/>
                 }/>
+                <Column title="线路类型" dataIndex="lineType" key="id" render={(text) =>
+                    findDictValue(dictData, text)
+
+                }/>
                 <Column title="上行起点站" dataIndex="upStartStation" key="id"/>
                 <Column title="上行起点站" dataIndex="upStartStation" key="id"/>
                 <Column title="上行终点站" dataIndex="upEndStation" key="id"/>
                 <Column title="上行终点站" dataIndex="upEndStation" key="id"/>
                 <Column title="下行起点站" dataIndex="downStartStation" key="id"/>
                 <Column title="下行起点站" dataIndex="downStartStation" key="id"/>

+ 28 - 12
src/pages/linePageChild/basicInfomationOfTheLine/components/modal.jsx

@@ -1,18 +1,23 @@
 import {Form, Input, InputNumber, message, Modal, Select, TimePicker} from 'antd';
 import {Form, Input, InputNumber, message, Modal, Select, TimePicker} from 'antd';
 import axios from '@/utils/axios.js'
 import axios from '@/utils/axios.js'
-import {useEffect} from 'react'
+import {useEffect, useState} from 'react'
 import './modal.scss'
 import './modal.scss'
 import dayjs from "dayjs";
 import dayjs from "dayjs";
 import customParseFormat from 'dayjs/plugin/customParseFormat'
 import customParseFormat from 'dayjs/plugin/customParseFormat'
+import {useSelector} from "react-redux";
+import {getChild} from "@/utils/getDict.js";
 
 
 export default function ModalHooks({isModalOpen, closeModal, row, lineList, option, val}) {
 export default function ModalHooks({isModalOpen, closeModal, row, lineList, option, val}) {
     const [messageApi, contextHolder] = message.useMessage();
     const [messageApi, contextHolder] = message.useMessage();
     // 表单
     // 表单
     const [form] = Form.useForm();
     const [form] = Form.useForm();
+    // 获取store的数据
+    const dictData = useSelector((state) => state.counter.dictData);
     const typeOption = [
     const typeOption = [
         {value: 0, label: '干线公交'},
         {value: 0, label: '干线公交'},
         {value: 1, label: '主线公交'}
         {value: 1, label: '主线公交'}
     ]
     ]
+    let [lineTypeOption, useLineType] = useState([])
 
 
     /**
     /**
      *确定时候的回调
      *确定时候的回调
@@ -91,6 +96,9 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
             formData.downEndTime = dayjs(formData.downEndTime, 'HH:mm')
             formData.downEndTime = dayjs(formData.downEndTime, 'HH:mm')
             form.setFieldsValue(formData)
             form.setFieldsValue(formData)
         }
         }
+        useLineType(getChild(dictData, 'lineType'))
+
+
     }, [row])
     }, [row])
 
 
     return (
     return (
@@ -123,7 +131,6 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
 
 
                             },
                             },
                         ]}
                         ]}
-
                     >
                     >
                         <Select options={option} style={{width: '100%'}} disabled></Select>
                         <Select options={option} style={{width: '100%'}} disabled></Select>
                     </Form.Item>
                     </Form.Item>
@@ -135,16 +142,14 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             {
                             {
                                 required: true,
                                 required: true,
                                 message: '请输入',
                                 message: '请输入',
-
                             },
                             },
                         ]}
                         ]}
-
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
-                        label="线路类型"
+                        label="类型"
                         name="type"
                         name="type"
                         rules={[
                         rules={[
                             {
                             {
@@ -155,7 +160,18 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                     >
                     >
                         <Select options={typeOption}></Select>
                         <Select options={typeOption}></Select>
                     </Form.Item>
                     </Form.Item>
-
+                    <Form.Item
+                        label="线路类型"
+                        name="lineType"
+                        rules={[
+                            {
+                                required: true,
+                                message: '请选择',
+                            },
+                        ]}
+                    >
+                        <Select options={lineTypeOption} fieldNames={{label: 'name', value: 'val',}}></Select>
+                    </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="车辆总数"
                         label="车辆总数"
                         name="totalCar"
                         name="totalCar"
@@ -166,7 +182,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -179,7 +195,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
 
 
 
 
@@ -193,7 +209,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}/>
+                        <InputNumber min={0} style={{width: '100%'}}/>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="上行里程"
                         label="上行里程"
@@ -205,7 +221,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="上行起点时间"
                         label="上行起点时间"
@@ -268,7 +284,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="下行起点时间"
                         label="下行起点时间"

+ 2 - 2
src/pages/linePageChild/lineDispatch/components/modal.jsx

@@ -113,7 +113,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
                     <Form.Item
                     <Form.Item
@@ -180,7 +180,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, lineList, opti
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="上/下行"
                         label="上/下行"

+ 1 - 1
src/pages/linePageChild/numberOfDrivers/components/modal.jsx

@@ -114,7 +114,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, option, val})
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 2 - 1
src/pages/linePageChild/numberOfDrivers/numberOfDrivers.jsx

@@ -76,7 +76,7 @@ export default function NumberOfDrivers() {
      */
      */
     async function getLineData() {
     async function getLineData() {
 
 
-        let {data} = await await axios.get("/busLine/getList", { params: { hasModel :1}})
+        let {data} = await await axios.get("/busLine/getList", {params: {hasModel: 1}})
         setLineList(data)
         setLineList(data)
         let option = data.map(item => {
         let option = data.map(item => {
             return {
             return {
@@ -129,6 +129,7 @@ export default function NumberOfDrivers() {
                 bordered={true}
                 bordered={true}
                 rowKey="id"
                 rowKey="id"
                 pagination={false}
                 pagination={false}
+                scroll={{y: 900}}
             >
             >
                 <Column title="星级" dataIndex="starType" key="id" render={(text) => setType(text)}></Column>
                 <Column title="星级" dataIndex="starType" key="id" render={(text) => setType(text)}></Column>
                 <Column title="数量" dataIndex="total" key="id"/>
                 <Column title="数量" dataIndex="total" key="id"/>

+ 2 - 2
src/pages/linePageChild/numberOfTransit/components/modal.jsx

@@ -100,7 +100,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, option, val})
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 
@@ -114,7 +114,7 @@ export default function ModalHooks({isModalOpen, closeModal, row, option, val})
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/linePageChild/numberOfTransit/numberOfTransit.jsx

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

+ 1 - 1
src/pages/linePageChild/passengerType/components/modal.jsx

@@ -99,7 +99,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/linePageChild/passengerType/passengerType.jsx

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

+ 7 - 7
src/pages/linePageChild/summaryData/components/modal.jsx

@@ -85,7 +85,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="空驶率"
                         label="空驶率"
@@ -97,7 +97,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="今日客流"
                         label="今日客流"
@@ -109,7 +109,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="计划里程"
                         label="计划里程"
@@ -121,7 +121,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="塌班"
                         label="塌班"
@@ -133,7 +133,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="计划班次"
                         label="计划班次"
@@ -145,7 +145,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="已发班次"
                         label="已发班次"
@@ -157,7 +157,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/linePageChild/summaryData/summaryData.jsx

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

+ 1 - 0
src/pages/linePageChild/vehicleMonitoring/vehicleMonitoring.jsx

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

+ 9 - 9
src/pages/linePageChild/vehicleStatus/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="最小间距"
                         label="最小间距"
@@ -116,7 +116,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="最大间距"
                         label="最大间距"
@@ -128,7 +128,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="平峰平均时间"
                         label="平峰平均时间"
@@ -140,7 +140,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="单程平均时间"
                         label="单程平均时间"
@@ -152,7 +152,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="高峰平均时间"
                         label="高峰平均时间"
@@ -164,7 +164,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="最大车速"
                         label="最大车速"
@@ -176,7 +176,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="最小车速"
                         label="最小车速"
@@ -188,7 +188,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="平均车速"
                         label="平均车速"
@@ -200,7 +200,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                 </Form>
                 </Form>
 
 

+ 1 - 0
src/pages/linePageChild/vehicleStatus/vehicleStatus.jsx

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

+ 1 - 0
src/pages/passengerFlowAnalysis/commutingTime/commutingTime.jsx

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

+ 1 - 1
src/pages/passengerFlowAnalysis/commutingTime/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 1
src/pages/passengerFlowAnalysis/consumptionType/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/passengerFlowAnalysis/consumptionType/consumptionType.jsx

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

+ 1 - 1
src/pages/passengerFlowAnalysis/distribution/components/modal.jsx

@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/passengerFlowAnalysis/distribution/distribution.jsx

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

+ 1 - 1
src/pages/passengerFlowAnalysis/passengerFlowRoutes/components/modal.jsx

@@ -103,7 +103,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/passengerFlowAnalysis/passengerFlowRoutes/passengerFlowRoutes.jsx

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

+ 5 - 5
src/pages/passengerFlowAnalysis/passengerInfomation/components/modal.jsx

@@ -91,7 +91,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="满载率"
                         label="满载率"
@@ -104,7 +104,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                         ]}
                         ]}
 
 
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="客运量"
                         label="客运量"
@@ -116,7 +116,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="免费换乘"
                         label="免费换乘"
@@ -128,7 +128,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
                     <Form.Item
                     <Form.Item
                         label="分担率"
                         label="分担率"
@@ -140,7 +140,7 @@ export default function ModalHooks({isModalOpen, closeModal, row}) {
                             },
                             },
                         ]}
                         ]}
                     >
                     >
-                        <InputNumber style={{width: '100%'}}></InputNumber>
+                        <InputNumber min={0} style={{width: '100%'}}></InputNumber>
                     </Form.Item>
                     </Form.Item>
 
 
 
 

+ 1 - 0
src/pages/passengerFlowAnalysis/passengerInfomation/passengerInfomation.jsx

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

Some files were not shown because too many files changed in this diff