fix():bug修改

src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx

@@ -86,7 +86,7 @@ function CarTypeAly() {
         } else {
             setSessionTabList({
                 ...formData,
-                //show: show.length > 0 ? show : []
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx

@@ -128,6 +128,7 @@ function NightParkStat() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx

@@ -111,6 +111,7 @@ function ParkTurnoverAly() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx

@@ -110,6 +110,7 @@ function ParkUsageAly() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss

@@ -150,7 +150,7 @@ $color-primary : var(--color-primary);
           height: 34px;
           // line-height: 34px;
           line-height: unset !important;
-          background: linear-gradient(180deg,#3aa9ff, #59b7ff);
+          //background: linear-gradient(180deg,#3aa9ff, #59b7ff);
           border-radius: 4px;
           margin-right: 15px;
           margin-top: 10px;

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx

@@ -253,6 +253,7 @@ function ParkingAlyDuration() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])
@@ -920,17 +921,19 @@ function ParkingAlyDuration() {
                             <div className="result-box duration-left">
                                 <div className="result-box-title">日均泊位周转次数排行榜</div>
                                 {/* <div className="export-btn" onClick={handleExport}>导出</div> */}
-                                <ExportBtnNew
-                                    children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
-                                    modalType="noImg"
-                                    totalRecords={500}
-                                    exportUrl="/api/ana/dataanalysis/get_turn_times_export"
-                                    pageName="parkingOverview"
-                                    postdata={{
-                                        formData: { ...defaultParams, ...pageInfo, export_type: 'all', area_id: sessionTabList?.show }
-                                    }}
-                                    imgno={false}
-                                />
+                                <div className="export-btn" >
+                                    <ExportBtnNew
+                                        children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
+                                        modalType="noImg"
+                                        totalRecords={500}
+                                        exportUrl="/api/ana/dataanalysis/get_turn_times_export"
+                                        pageName="parkingOverview"
+                                        postdata={{
+                                            formData: { ...defaultParams, ...pageInfo, export_type: 'all', area_id: sessionTabList?.show }
+                                        }}
+                                        imgno={false}
+                                    />
+                                </div>
                                 <Tabs
                                     defaultActiveKey="2"
                                     activeKey={tabKey}
@@ -1024,17 +1027,19 @@ function ParkingAlyDuration() {
                             <div className="result-box duration-right">
                                 <div className="result-box-title">平均停车时长排行榜</div>
                                 {/* <div className="export-btn" onClick={() => { handleExportCar() }}>导出</div> */}
-                                <ExportBtnNew
-                                    children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
-                                    modalType="noImg"
-                                    totalRecords={500}
-                                    exportUrl="/api/ana/dataanalysis/get_parking_duration_export"
-                                    pageName="parkingOverview"
-                                    postdata={{
-                                        formData: { ...defaultParams, ...pageInfo, export_type: 'all', area_id: sessionTabList?.show }
-                                    }}
-                                    imgno={false}
-                                />
+                                <div className="export-btn" >
+                                    <ExportBtnNew
+                                        children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
+                                        modalType="noImg"
+                                        totalRecords={500}
+                                        exportUrl="/api/ana/dataanalysis/get_parking_duration_export"
+                                        pageName="parkingOverview"
+                                        postdata={{
+                                            formData: { ...defaultParams, ...pageInfo, export_type: 'all', area_id: sessionTabList?.show }
+                                        }}
+                                        imgno={false}
+                                    />
+                                </div>
                                 <Tabs
                                     defaultActiveKey="2"
                                     activeKey={tabCarKey}

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx

@@ -104,6 +104,7 @@ function ParkingAlyOverview() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx

@@ -83,6 +83,7 @@ function ParkingAlyPeriod() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx

@@ -90,6 +90,7 @@ function ParkingAlyReport() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx

@@ -250,9 +250,14 @@ function ParkingFalseAlarms() {
         tooltip = {
             formatter: (params) => {
                 console.log(params)
+                //误报数量：${params[0]?.data?.value}(次)<br/>
+                let str = ''
+                params.map((item) => {
+                    str = str + ("<div style='display:inline-block;width:12px;height:12px;border-radius:10px;background:" + item.color + "'></div>" + item.seriesName + "：" + item.data.value + "(次)<br/>")
+                })
                 return `<div class="tooltip-box">
                             ${params[0].axisValue}<br/>
-                            误报数量：${params[0]?.data?.value}(次)<br/>
+                            ${str}
                             </div>`
             }
         }

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx

@@ -24,8 +24,8 @@ function ParkingLiveData() {
     const [areaList, setAreaList] = useState([]);
     // 默认数据
     const defaultData = {
-        start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
-        end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
+        start_time: moment().startOf('day').format("YYYY-MM-DD"),
+        end_time: moment().endOf("day").format("YYYY-MM-DD"),
         operator_id: '0',
         area_id: '0',
     };
@@ -86,6 +86,7 @@ function ParkingLiveData() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx

@@ -87,6 +87,7 @@ function TemporaryParkStat() {
         } else {
             setSessionTabList({
                 ...formData,
+                show: []
             })
         }
     }, [formData, show])

src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx

@@ -204,7 +204,7 @@ function PlateChangeMgm() {
     </div>
 
     return (
-        <div className="plate-change-mgm">
+        <>
             <TableModule
                 columns={columns}
                 tableData={resultData}
@@ -214,7 +214,7 @@ function PlateChangeMgm() {
                 rowKey={"road_name"}
                 exportUrl={'/api/bpm/correct/export_lift'}
                 initFormData={{}}
-                pagename={'plateChangeMgm'}
+                pageName={'plateChangeMgm'}
             />
             <Modal
                 open={visible}
@@ -232,7 +232,7 @@ function PlateChangeMgm() {
             >
                 {tkddModal}
             </Modal>
-        </div>
+        </>
     );
 }
 

src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx

@@ -201,7 +201,7 @@ function SpecialReleaseMgm() {
     </div>
 
     return (
-        <div className="plate-change-mgm">
+        <>
             <TableModule
                 columns={columns}
                 tableData={resultData}
@@ -211,7 +211,7 @@ function SpecialReleaseMgm() {
                 rowKey={"road_name"}
                 exportUrl={'/api/bpm/special/export_lift'}
                 initFormData={{}}
-                pagename={'plateChangeMgm'}
+                pageName={'plateChangeMgm'}
             />
             <Modal
                 open={visible}
@@ -229,7 +229,7 @@ function SpecialReleaseMgm() {
             >
                 {tkddModal}
             </Modal>
-        </div>
+        </>
     );
 }
 

src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx

@@ -16,13 +16,13 @@ import EffectiveDate from "./EffectiveDate";
 import ajax from "@/services";
 function Detail(props) {
   const { record, visible = false, close = () => { } } = props;
-  const [show ,setShow] = useState(visible)
+  const [show, setShow] = useState(visible)
   const [form] = Form.useForm();
   const [effectiveDateList, setEffectiveDateList] = useState(record.property);
   console.log(effectiveDateList)
   useEffect(() => {
     setEffectiveDateList(record.property);
-    console.log(444455,record);
+    console.log(444455, record);
   }, []);
   return (
     <Modal
@@ -33,7 +33,7 @@ function Detail(props) {
       title="详情"
       footer={null}
     >
-      <div className="yisa-custom-scrollbar" style={{height: '600px', overflowY: 'auto', overflowX: 'hidden'}}>
+      <div className="yisa-custom-scrollbar" style={{ height: '600px', overflowY: 'auto', overflowX: 'hidden' }}>
         <Descriptions column={2}>
           <Descriptions.Item label="规则名称" span={1}>
             {record.feeName}
@@ -100,7 +100,7 @@ function Detail(props) {
 
 function EffectiveDetail(props) {
   const { record } = props;
-  console.log(101,record)
+  console.log(101, record)
   return (
     <div className="el-form">
       <Descriptions column={2}>
@@ -175,6 +175,16 @@ function TimePartDetail(props) {
             )
           }
           {
+            item.type === 2 && index == 1 && (
+              <>
+                <Descriptions.Item span={2}>
+                  {/* <div>{`满：${record.time_before} 分钟后，${record.time_after_money}元/${record.time_after_minute}分钟`}</div> */}
+                  {<div>{`满：${item.segment} 分钟后，${item.unit}元/${item.period}分钟`}</div>}
+                </Descriptions.Item>
+              </>
+            )
+          }
+          {
             record.type === 2 && (
               <Descriptions.Item span={2}>
                 {/* <div>{`${record.time_money}元/${record.time_minute}分钟`}</div> */}

src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx

@@ -99,7 +99,10 @@ function TimePart(props) {
           "threshold": 0,
           "period": all.time_after_minute,
           "unit": all.time_after_money,
-          "segment": all.time_part ? moment(all.time_part[1], "HH:mm:ss").diff(moment(all.time_part[0], "HH:mm:ss"), "minutes") - all.time_before : all.time_before,
+          "segment": all.time_part ?
+            (all.end == '00:00:00' ? moment(all.time_part[1], "HH:mm:ss").diff(moment(all.time_part[0], "HH:mm:ss"), "minutes") - all.time_before :
+              moment('23:59:00', "HH:mm:ss").diff(moment(all.time_part[0], "HH:mm:ss"), "minutes") + 1 - all.time_before)
+            : all.time_before,
         },
       ]
       delete all.type