From 1ef6c31802e0fd7c92c9312994e6bf4f818d5174 Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Tue, 28 Nov 2023 10:28:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9pn=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6=E6=9C=AA=E9=87=8D=E7=BD=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/ant-modification.scss               |   2 +-
 src/components/TableModule/index.jsx               |   9 +-
 .../ParkingAlyDuration/index.scss                  |  13 ++
 .../ParkingAlyDuration/loadable.jsx                |  36 ++--
 .../ParkingAlyOverview/loadable.jsx                |   7 +-
 .../ParkingAlyPeriod/loadable.jsx                  | 186 ++++-----------------
 .../ParkingBusinessAly/echarts.config.js           |   8 +-
 .../ParkingBusinessAly/index.js                    |   7 +-
 8 files changed, 84 insertions(+), 184 deletions(-)

diff --git a/src/assets/css/ant-modification.scss b/src/assets/css/ant-modification.scss
index 4a6f9d9..df9bf21 100644
--- a/src/assets/css/ant-modification.scss
+++ b/src/assets/css/ant-modification.scss
@@ -268,7 +268,7 @@
 .ant-table-fixed-header {
   .ant-table-tbody {
     tr:nth-child(2n + 1) > td {
-      background: var(--table-bg);
+      //background: var(--table-bg);
     }
 
     tr:nth-child(2n) > td {
diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index d7d1420..2e9529a 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -145,9 +145,10 @@ const TableModule = forwardRef((props, ref) => {
   }, [formData])
 
   //查询函数
-  function fetch() {
+  function fetch(pn) {
     // setLoading(true);
-    let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData };
+    let pnno = pn ? { pn: 1 } : {}
+    let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData, ...pnno };
     if (timeFlag) {
       form = {
         ...form,
@@ -481,7 +482,7 @@ const TableModule = forwardRef((props, ref) => {
                         (item.defaultValue && item.defaultValue[1]) || moment()
                       }
                     >
-                      <DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"}  allowClear={false}/>
+                      <DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"} allowClear={false} />
                     </Form.Item>
                     <div style={{ margin: "-20px 0 10px 0" }}>
                       <QuickMenu
@@ -643,7 +644,7 @@ const TableModule = forwardRef((props, ref) => {
             <Button className="reset" onClick={reset}>
               重置
             </Button>
-            <Button type="primary" className="submit" onClick={fetch}>
+            <Button type="primary" className="submit" onClick={() => { fetch(1) }}>
               查询
             </Button>
           </div>
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
index 2ffb766..642842b 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
@@ -142,6 +142,19 @@ $color-primary : var(--color-primary);
           display: inline-block;
           
         }
+        .export-btn {
+          display: inline-block;
+          text-align: center;
+          float: right;
+          width: 68px;
+          height: 34px;
+          line-height: 34px;
+          background: linear-gradient(180deg,#3aa9ff, #59b7ff);
+          border-radius: 4px;
+          margin-right: 15px;
+          margin-top: 10px;
+          cursor: pointer;
+        }
         i {
           border: 1px solid;
           border-radius: 22px;
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
index 07df3ad..86d22b3 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
@@ -212,7 +212,7 @@ function ParkingAlyDuration() {
             end_time: end,
         });
     };
-    //停车场收入概览
+    //停车场收入概览 柱状图
     const getRevenueOption = (data) => {
         console.log(data)
         // data = [
@@ -712,22 +712,22 @@ function ParkingAlyDuration() {
         }
         setDefaultParams({ ...postData, ...pageInfo });
         setTabLoading(true);
-        // ajax.getAppList({ ...postData, ...v, ...pageInfo }).then(
-        //     (res) => {
-        //         if (parseInt(res?.status) === 20000) {
-        //             setResultData(res?.data || {});
-        //         } else {
-        //             message.error(res?.message);
-        //         }
-        //         setLoading(false);
-        //         setTabLoading(false);
-        //     },
-        //     (err) => {
-        //         console.log(err);
-        //         setLoading(false);
-        //         setTabLoading(false);
-        //     }
-        // );
+        ajax.getParkingAlyDurationParkingList({ ...postData, ...v, ...pageInfo }).then(
+            (res) => {
+                if (parseInt(res?.status) === 20000) {
+                    setResultData(res?.data || {});
+                } else {
+                    message.error(res?.message);
+                }
+                setLoading(false);
+                setTabLoading(false);
+            },
+            (err) => {
+                console.log(err);
+                setLoading(false);
+                setTabLoading(false);
+            }
+        );
     };
 
     // 检索数据
@@ -963,6 +963,7 @@ function ParkingAlyDuration() {
                         <div className="duration-box">
                             <div className="result-box duration-left">
                                 <div className="result-box-title">日均泊位周转次数排行榜</div>
+                                <div className="export-btn" onClick={()=>{window.open('/api/ana/dataanalysis/get_turn_times_export')}}>导出</div>
                                 <Tabs
                                     defaultActiveKey="2"
                                     activeKey={tabKey}
@@ -1035,6 +1036,7 @@ function ParkingAlyDuration() {
                             </div>
                             <div className="result-box duration-right">
                                 <div className="result-box-title">平均停车时长排行榜</div>
+                                <div className="export-btn" onClick={()=>{window.open('/get_parking_duration_export')}}>导出</div>
                                 <Table
                                     columns={parkColumns}
                                     dataSource={[]}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
index 4bfe0b1..bb9bf5c 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
@@ -277,7 +277,7 @@ function ParkingAlyOverview() {
 
             };
         });
-        setRevenueData(lineChartOption(areaNames, xAxisData, seriesData));
+        setRevenueData(lineChartOption(areaNames, xAxisData,"停车记录数（个）", seriesData));
     };
 
     //临时停车次数占比,环形图
@@ -506,6 +506,7 @@ function ParkingAlyOverview() {
                                 }
                             />
                         </div>
+
                         <div className="yisa-search">
                             <label>日期
                                 {/* <div className="daf">
@@ -608,6 +609,7 @@ function ParkingAlyOverview() {
                                 }
                             />
                         </div>
+
                         <div className="form-btn">
                             <Button
                                 className="reset"
@@ -723,6 +725,7 @@ function ParkingAlyOverview() {
                                                 bordered
                                                 pagination={false}
                                                 size="middle"
+                                                scroll={{ y: 305 }}
                                             />
                                                 <Pagination {...paginationProps} className="pagination-common" total={tableData?.area_total_records} />
                                             </>,
@@ -744,7 +747,7 @@ function ParkingAlyOverview() {
                                                 bordered
                                                 pagination={false}
                                                 size="middle"
-                                            //scroll={{ y: 305 }}
+                                                scroll={{ y: 305 }}
                                             // scroll={{
                                             //     x: 'calc(700px + 50%)',
                                             //     y: 240,
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
index 5757eb2..36e6c6c 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
@@ -3,6 +3,7 @@ import { ResultFlowResult } from "@/components";
 import { Select, Input, Button, Table, message, Pagination, DatePicker, Modal, Cascader, Tooltip } from "antd";
 import { Icon } from "@/components"
 import { useSessionStorageState } from "ahooks";
+import { lineChartOption, ringChartOption } from "../echarts.config";
 import moment from "moment";
 import ReactEcharts from "echarts-for-react";
 import "./index.scss";
@@ -83,7 +84,8 @@ function ParkingAlyPeriod() {
     const TimeChange = () => {
         let e = formData.date_type;
         let str = "day";
-        let mat = "YYYY-MM-DD";
+        //let mat = "YYYY-MM-DD";
+        let mat = "YYYY-MM-DD HH:mm:ss";
         if (e == 4) {
             str = "year";
             mat = "YYYY";
@@ -121,152 +123,53 @@ function ParkingAlyPeriod() {
         });
     };
     //停车场收入概览
-    const getRevenueOption = (data) => {
+    const getRevenueOption = (data) =>{
         // 获取所有地区名称
         data.sort((a, b) => {
-            return new Date(a.pay_date) - new Date(b.pay_date);
+            return new Date(a.date) - new Date(b.date);
         });
-        console.log(data);
-        const areaNames = [...new Set(data.map((item) => item.area_name))];
+        const areaNames = data[0].name ? [...new Set(data.map((item) => item.name))] : [''];
         // 获取所有日期
-        const dates = [...new Set(data.map((item) => item.pay_date))].sort(
-            (a, b) => a.pay_date - b.pay_date
+        const dates = [...new Set(data.map((item) => item.date))].sort(
+            (a, b) => a.date - b.date
         );
         // 构建数据对象
         const seriesData = areaNames.map((areaName, index) => {
             // 获取该地区的数据
-            const areaData = data.filter((item) => item.area_name === areaName);
+            const areaData = data[0].name ? data.filter((item) => item.name === areaName) : data
             // 构建该地区的数据对象
             return {
-                name: areaName,
+                name: areaNames.length > 1 ? areaName : '',
                 type: "line",
                 itemStyle: {
-                    normal: {
-                        label: {
-                            show: true, //开启显示
-                            position: 'top', //在上方显示
-                            textStyle: { //数值样式
-                                color: 'white',//字体颜色
-                                fontSize: 10//字体大小
-                            }
-                        },
+                    label: {
+                        show: true, //开启显示
+                        position: 'top', //在上方显示
+                        color: 'white',//字体颜色
+                        fontSize: 10//字体大小
                     },
                 },
                 data: dates.map((item) => {
-                    for (const { pay_date, income } of areaData) {
-                        console.log(pay_date, income);
-                        if (pay_date === item) return income;
+                    for (const { date, record_count } of areaData) {
+                        if (date === item) return record_count;
                     }
                     return 0;
                 }),
-                yAxisIndex: index == 1 ? 1 : null,
             };
         });
-        console.log(21, areaNames, seriesData)
         // 构建X轴数据
         const xAxisData = dates.map((date) => {
             return {
                 value: date,
-                textStyle: {
-                    align: "center",
-                    lineStyle: {
-                        color: "#3AA9FF", // 设置线的颜色为天蓝色
-                        shadowBlur: 6,
-                    },
+                align: "center",
+                lineStyle: {
+                    color: "skyblue", // 设置线的颜色为天蓝色
+                    shadowBlur: 6,
                 },
-            };
-        });
 
-        setRevenueData({
-            title: {
-                text: "",
-                textStyle: {
-                    color: "#fff",
-                },
-            },
-            tooltip: {
-                trigger: "axis",
-            },
-            legend: {
-                type: "scroll",
-                top: 0,
-                left: 'center',
-                data: areaNames,
-                itemWidth: 18,
-                itemHeight: 12,
-                width: '40%',
-                textStyle: {
-                    fontSize: 14,
-                    color: 'white',
-                },
-            },
-            xAxis: {
-                data: xAxisData,
-                type: 'category',
-                boundaryGap: false, // 不留白，从原点开始
-                axisLine: {
-                    lineStyle: {
-                        color: "#bbb",
-                    },
-                },
-                axisLabel: {
-                    textStyle: {
-                        color: "#bbb",
-                    },
-                },
-            },
-            yAxis: {
-                type: "value",
-                name: '车次数（次）',
-                min: 0,
-                // /max: 50,
-                interval: 10,
-                splitNumber: 6, //设置坐标轴的分割段数
-                axisLabel: {
-                    //formatter: "{value}元",
-                    textStyle: {
-                        color: "#bbb",
-                    },
-                },
-                splitLine: {
-                    show: true,    // 是否显示分隔线。默认数值轴显示，类目轴不显示
-                    interval: '0',    // 坐标轴刻度标签的显示间隔，在类目轴中有效.0显示所有
-                    lineStyle: {
-                        color: ['#cccccc42'],    // 分隔线颜色，可以设置成单个颜色，也可以设置成颜色数组，分隔线会按数组中颜色的顺序依次循环设置颜色
-                        width: 1.3,    // 分隔线线宽
-                        type: 'dashed',     // 坐标轴线线的类型（'solid'，实线类型；'dashed'，虚线类型；'dotted',点状类型）
-                    },
-                },
-            },
-            color: ["#3AA9FF", "#F997DF"],
-            //series: seriesData,
-            series: [
-                {
-                    "name": "西区",
-                    "type": "line",
-                    "data": [
-                        12,
-                        12,
-                        24
-                    ]
-                },
-                {
-                    "name": "西海岸新区",
-                    "type": "line",
-                    "data": [
-                        9,
-                        4,
-                        4
-                    ]
-                },
-            ],
-            grid: {
-                x: 50,
-                y: 55,
-                x2: 70,
-                y2: 20,
-            },
+            };
         });
+        setRevenueData(lineChartOption(areaNames, xAxisData,"停车记录数（个）", seriesData));
     };
 
     function getParkingIncome() {
@@ -384,9 +287,9 @@ function ParkingAlyPeriod() {
                                     value: "id",
                                     children: "children",
                                 }}
-                                value={formData.region}
+                                value={formData.area_id}
                                 onChange={(v, option) => {
-                                    setFormData({ ...formData, region: v ? v : null });
+                                    setFormData({ ...formData, area_id: v ? v : null });
                                 }}
                             />
                         </div>
@@ -396,9 +299,9 @@ function ParkingAlyPeriod() {
                                 className="form-con"
                                 placeholder="请选择"
                                 options={searchSelectList?.flow_type_list || []}
-                                value={formData.pay_merchant_id}
+                                value={formData.operator_id}
                                 onChange={(v) =>
-                                    setFormData({ ...formData, pay_merchant_id: v })
+                                    setFormData({ ...formData, operator_id: v })
                                 }
                             />
                         </div>
@@ -421,9 +324,9 @@ function ParkingAlyPeriod() {
                                         value: '2',
                                     },
                                 ]}
-                                value={formData.pay_merchant_id}
+                                value={formData.car_parking_type}
                                 onChange={(v) =>
-                                    setFormData({ ...formData, pay_merchant_id: v })
+                                    setFormData({ ...formData, car_parking_type: v })
                                 }
                             />
                         </div>
@@ -432,43 +335,19 @@ function ParkingAlyPeriod() {
                             <Input
                                 className="form-con"
                                 placeholder="请输入"
-                                value={formData?.park}
+                                value={formData?.road_name}
                                 onChange={(e) =>
-                                    setFormData({ ...formData, park: e.target.value })
+                                    setFormData({ ...formData, road_name: e.target.value })
                                 }
                             />
                         </div>
 
                         <div className="yisa-search">
                             <label>日期
-                                <div className="daf">
-                                    <Select
-                                        value={formData.date_type}
-                                        // style={{
-                                        //   width: "100%",
-                                        // }}
-                                        placeholder="请选择"
-                                        options={[
-                                            {
-                                                value: "1",
-                                                label: "日",
-                                            },
-                                            {
-                                                value: "2",
-                                                label: "周",
-                                            },
-                                            {
-                                                value: "3",
-                                                label: "月",
-                                            },
-                                        ]}
-                                        onChange={(e) => SetTimeNow(e)}
-                                    />
-                                </div>
                             </label>
                             <DatePicker
                                 style={{ width: "100%" }}
-                                // showTime
+                                showTime
                                 format={TimeChange().mat}
                                 picker={TimeChange().str}
                                 allowClear={false}
@@ -541,6 +420,7 @@ function ParkingAlyPeriod() {
                                 }
                             />
                         </div>
+
                         <div className="form-btn">
                             <Button
                                 className="reset"
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
index 3e6bfc0..e5cb4e8 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
@@ -1,5 +1,5 @@
 
-const lineChartOption = (areaNames, xAxisData, seriesData) => {
+const lineChartOption = (areaNames, xAxisData, yAxisName, seriesData) => {
     return {
         title: {
             text: "",
@@ -36,7 +36,7 @@ const lineChartOption = (areaNames, xAxisData, seriesData) => {
         },
         yAxis: {
             type: "value",
-            name: '停车记录数（次）',
+            name: yAxisName ? yAxisName : '',
             min: 0,
             // /max: 50,
             interval: 10,
@@ -119,6 +119,6 @@ const ringChartOption = (areaNames, ringData) => {
     }
 };
 export {
-  lineChartOption,
-  ringChartOption,
+    lineChartOption,
+    ringChartOption,
 }
\ No newline at end of file
diff --git a/src/services/DataAnalysisPrediction/ParkingBusinessAly/index.js b/src/services/DataAnalysisPrediction/ParkingBusinessAly/index.js
index f0bc2c8..075434e 100644
--- a/src/services/DataAnalysisPrediction/ParkingBusinessAly/index.js
+++ b/src/services/DataAnalysisPrediction/ParkingBusinessAly/index.js
@@ -57,10 +57,10 @@ const getParkingAlyDurationBerthList = (params) => {
     data: params,
   });
 };
-//停车业务分析-停车时长分析-停车时长
+//停车业务分析-停车时长分析-平均停车时长排行榜
 const getParkingAlyDurationParkingList = (params) => {
   return ajax({
-    url: "",
+    url: "/api/ana/dataanalysis/show_average_parking_duration",
     type: "post",
     data: params,
   });
@@ -75,5 +75,6 @@ export default {
 
   getParkingAlyDurationBar,
   getParkingAlyDurationBerthList,
-
+  getParkingAlyDurationParkingList,
+  
 }

From 19101f4f9568b86d15f0404db227ea406bc5278c Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Tue, 28 Nov 2023 10:54:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix():=E6=9B=B4=E6=94=B9=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E9=A1=B5=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableModule/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index 2e9529a..3ab81c9 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -644,7 +644,7 @@ const TableModule = forwardRef((props, ref) => {
             <Button className="reset" onClick={reset}>
               重置
             </Button>
-            <Button type="primary" className="submit" onClick={() => { fetch(1) }}>
+            <Button type="primary" className="submit" onClick={() => { pageData.pn == 1 ? fetch(1) : setPageData({ ...pageData, pn: 1 }) }}>
               查询
             </Button>
           </div>

From 14792bf9f48a94139227b9e47a7f0d8b5992a27b Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Tue, 28 Nov 2023 11:52:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix():=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParkingBusinessAly/ParkingAlyDuration/loadable.jsx       | 12 ++++++------
 .../ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx         |  7 ++-----
 src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx          |  6 +++---
 src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx |  4 ++--
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
index 86d22b3..4cf1f75 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
@@ -25,7 +25,7 @@ function ParkingAlyDuration() {
     const defaultData = {
         start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD HH:mm:ss"),
         end_time: moment().endOf("day").format("YYYY-MM-DD HH:mm:ss"),
-        date_type: 1,
+        //date_type: 1,
     };
     // 分页数据
     const [pageInfo, setPageInfo] = useState({
@@ -149,14 +149,14 @@ function ParkingAlyDuration() {
                 ...pageInfo,
                 ...{ pn: current, length: size }
             });
-            //setIsAjax(!isAjax)
+            setIsAjax(!isAjax)
             //getListData({})
         },
     }
 
-    useEffect(() => {
-        getData()
-    }, [pageInfo])
+    // useEffect(() => {
+    //     getData()
+    // }, [pageInfo])
     useEffect(() => {
         setSessionTabList({
             ...formData
@@ -652,9 +652,9 @@ function ParkingAlyDuration() {
         });
     };
 
+    //获取柱状图数据
     function getParkingIncome() {
         ajax
-            //.getParkingIncome()
             .getParkingAlyDurationBar()
             .then((res) => {
                 if (res.status === 20000) {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
index 36e6c6c..57a46ef 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
@@ -489,19 +489,16 @@ function ParkingAlyPeriod() {
                                 <Select
                                     className="form-con"
                                     placeholder="请选择"
+                                    defaultValue={'0'}
                                     options={[
                                         {
                                             label: '按时间对比',
                                             value: '0',
                                         },
                                         {
-                                            label: '周',
+                                            label: '按计费类型对比',
                                             value: '1',
                                         },
-                                        {
-                                            label: '月',
-                                            value: '2',
-                                        },
                                     ]}
                                     value={formData.pay_me}
                                     onChange={(v) =>
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index dbb8423..34b9233 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -39,7 +39,7 @@ import {
   SystemSearch,
   ResultPanel,
   FormSliderPicker,
-  SelectLntLat,
+  SelectGaodeLngLat,
   ResultFlow,
   AreaCascader,
   ImgResize,
@@ -1900,7 +1900,7 @@ function ConfigRoad() {
               <Input
                 value={lngLat}
                 addonAfter={
-                  <SelectLntLat
+                  <SelectGaodeLngLat
                     open={() => setLngLatVisible(true)}
                     lngLatVisible={lngLatVisible}
                     getLntLat={(value) => {
@@ -2124,7 +2124,7 @@ function ConfigRoad() {
                   <Input value={lngLatModal.value} />
                 </Col>
                 <Col span={5}>
-                  <SelectLntLat
+                  <SelectGaodeLngLat
                     open={() =>
                       setLngLatModal({ ...lngLatModal, visible: true })
                     }
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
index 6588c5d..866d783 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
@@ -18,7 +18,7 @@ import {
 import ajax from "@/services";
 import moment from "moment";
 import { PlusOutlined } from "@ant-design/icons";
-import { ImgUpload, TreeSelectGroup, SelectLntLat } from "@/components";
+import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat } from "@/components";
 function AddParking(props) {
   const [form] = Form.useForm();
   const {
@@ -482,7 +482,7 @@ function AddParking(props) {
                     <Input value={lngLat} disabled={disabled} />
                   </Col>
                   <Col span={5}>
-                    <SelectLntLat
+                    <SelectGaodeLngLat
                       open={() => setLngLatVisible(true)}
                       lngLatVisible={lngLatVisible}
                       getLntLat={(value) => {

From 13504d2c2b8413764355708a3cd48369eac60d0e Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Tue, 28 Nov 2023 19:03:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat():=20=E8=90=A5=E6=94=B6=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/DataAnalysisPrediction/ParkingIncomeAly/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/DataAnalysisPrediction/ParkingIncomeAly/index.js b/src/services/DataAnalysisPrediction/ParkingIncomeAly/index.js
index b2c22ed..7f2f1a6 100644
--- a/src/services/DataAnalysisPrediction/ParkingIncomeAly/index.js
+++ b/src/services/DataAnalysisPrediction/ParkingIncomeAly/index.js
@@ -66,21 +66,21 @@ export default {
     },
     getArrearPriceData: function(data) {
         return ajax({
-            url: '/api/dataAnalysis/priceAnalysis',
+            url: '/api/ana/arrearage/price_analysis',
             type: 'post',
             data
         })
     },
     getCityRevenueData: function(data) {
         return ajax({
-            url: '/api/dataAnalysis/cityRevenue',
+            url: '/api/ana/arrearage/city_revenue',
             type: 'post',
             data
         })
     },
     getCityRevenueAlyData: function(data) {
         return ajax({
-            url: '/api/dataAnalysis/cityRevenueAnalysis',
+            url: '/api/ana/arrearage/city_revenue_analysis',
             type: 'post',
             data
         })