From c3b7ce65a4c188eac9025a68bac54ca5763f02ab Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Mon, 22 Jan 2024 17:00:15 +0800
Subject: [PATCH] =?UTF-8?q?fix():bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx           | 10 +++++-----
 .../ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx         |  4 ++--
 .../NewEnergy/ChargeDeviceMgm/EquipmentSupplier/loadable.jsx   |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
index df85313..475b176 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
@@ -353,7 +353,7 @@ function ParkingAlyPeriod() {
     };
     function getParkingIncome(data) {
         ajax
-            .getParkingAlyPeriodLine({...data, area_id: sessionTabList?.show })
+            .getParkingAlyPeriodLine({ ...data, area_id: sessionTabList?.show })
             .then((res) => {
                 if (res.status === 20000) {
                     getRevenueOption(res.data.list);
@@ -366,17 +366,17 @@ function ParkingAlyPeriod() {
         setLoading(true)
         setHourData({})
         ajax
-            .getParkingAlyPeriodParkLine({...data, area_id: sessionTabList?.show })
+            .getParkingAlyPeriodParkLine({ ...data, area_id: sessionTabList?.show })
             .then((res) => {
                 if (res.status === 20000) {
                     getParkOption(res.data.list?.area_list);
                     setKeyVal(res.data.list?.hour_list.length)
                     //setHourData({})
                     getParkOptionHour(res.data.list?.hour_list);
-                    setLoading(false)
                 }
+                setLoading(false)
             })
-            .catch((err) => console.error(err));
+            .catch((err) => { console.error(err); setLoading(false) });
     }
     // 获取下拉数据
     const getSelectList = () => {
@@ -452,7 +452,7 @@ function ParkingAlyPeriod() {
     const handleExport = () => {
         if (tableData.list.area_list?.length > 0) {
             let { pn, page_size, ...params } = defaultParams;
-            ajax.getParkingAlyDurationParkingExp({...defaultParams, area_id: sessionTabList?.show }).then(
+            ajax.getParkingAlyDurationParkingExp({ ...defaultParams, area_id: sessionTabList?.show }).then(
                 (res) => {
                     if (res) {
                         window.open(res.data.export_url)
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx
index 0ffe3d3..7079a92 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx
@@ -278,10 +278,10 @@ function ParkingFalseAlarms() {
                 if (res.status === 20000) {
                     setLineData(res.data)
                     getParkOption(res.data.device_list);
-                    setLoading(false)
                 }
+                setLoading(false)
             })
-            .catch((err) => console.error(err));
+            .catch((err) => { console.error(err); setLoading(false) });
     }
     // useEffect(() => {
     //     if () {
diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/EquipmentSupplier/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/EquipmentSupplier/loadable.jsx
index 7dd7fc5..e046be4 100644
--- a/src/pages/NewEnergy/ChargeDeviceMgm/EquipmentSupplier/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeDeviceMgm/EquipmentSupplier/loadable.jsx
@@ -175,7 +175,7 @@ function EquipmentSupplier() {
                 exportUrl="/api/bpm/record/get_record_export"
             />
             <Modal
-                title="新增电桩型号"
+                title="新增设备供应商"
                 open={detailVisible}
                 width={500}
                 className="electric-station-modal"
@@ -189,8 +189,8 @@ function EquipmentSupplier() {
                     <div className="row ">
                         <div className="redLogo">*</div>
                         <FormSelect
-                            yisaLabel="设备生产号"
-                            placeholder="请选择设备生产号"
+                            yisaLabel="设备供应商"
+                            placeholder="请选择设备供应商"
                             yisaData={getProducerList}
                             defaultValue={addFormData.supplier_id || null}
                             hasUnlimited={false}