From 47cfa8a728ed3f0b3b5ddc63be7898c56a4674ab Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Mon, 23 Oct 2023 11:11:25 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx     |  2 +-
 .../EquipmentMgm/EquipmentBrand/loadable.jsx       |  2 +-
 .../EquipmentMgm/EquipmentStatus/Device/index.jsx  |  4 +-
 .../EquipmentMgm/EquipmentStatus/Offline/index.jsx |  2 +-
 .../EquipmentMgm/EquipmentStatus/Road/index.jsx    |  2 +-
 .../EquipmentMgm/MonitorEquipment/loadable.jsx     |  2 +-
 .../InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx     | 44 +++++++++++++++++-----
 .../InRoadMgm/RoadMgm/RoadDetail/loadable.jsx      | 16 +++-----
 src/pages/MerchantMgm/InvoiceConf/loadable.jsx     |  3 +-
 src/pages/MerchantMgm/MerchantInfo/loadable.jsx    |  3 +-
 10 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
index 8e19996..ed22847 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
@@ -411,7 +411,7 @@ function Fence(props) {
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered
-                            // className='yisa-table'
+                             className='yisa-table'
                             dataSource={resultData.data}
                             columns={
                                 handleColumns()
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
index eca7303..dbae790 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
@@ -337,7 +337,7 @@ function Fence(props) {
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered
-                            // className='yisa-table'
+                             className='yisa-table'
                             dataSource={resultData.data}
                             columns={
                                 handleColumns()
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
index 3a45fef..6eac38d 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
@@ -166,7 +166,7 @@ function Road(props) {
         render: (text, record, index) => {
             return <>
                 <div className="action-wrapper">
-                    <Button type="primary" className="colorBtn" shape="circle" s size="middle" icon={<InfoCircleOutlined />} onClick={() => handleEdit(record)}/>
+                    <Button type="primary" shape="circle" s size="middle" icon={<InfoCircleOutlined />} onClick={() => handleEdit(record)}/>
                 </div>
             </>
         }
@@ -406,7 +406,7 @@ useEffect(() => {
                 <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                     <Table
                         bordered
-                        // className='yisa-table'
+                         className='yisa-table'
                         dataSource={resultData.data}
                         columns={
                             handleColumns()
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx
index 5eac09d..0a52b8e 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx
@@ -322,7 +322,7 @@ function Road(props) {
                 <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                     <Table
                         bordered
-                        // className='yisa-table'
+                     className='yisa-table'
                         dataSource={resultData.data}
                         columns={
                             handleColumns()
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx
index ac2297e..cc427a1 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx
@@ -388,7 +388,7 @@ function Road(props) {
                         <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                             <Table
                                 bordered
-                                // className='yisa-table'
+                                 className='yisa-table'
                                 dataSource={resultData.data}
                                 columns={
                                     handleColumns()
diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
index 42d77fe..65154de 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
@@ -364,7 +364,7 @@ function Fence(props) {
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered
-                            // className='yisa-table'
+                             className='yisa-table'
                             dataSource={resultData.data}
                             columns={
                                 handleColumns()
diff --git a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
index d5b2fab..323342b 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
@@ -276,14 +276,6 @@ function Fence(props) {
         getData({ ...parameter })
     }
 
-    const getCascaderList = () => {
-        ajax.cascaderList().then(res => {
-            if (res.status === 20000) {
-                setGetCanCaDer(res.data)
-            }
-        })
-    }
-
   
     const handleEditFinish = () => {
         console.log('form finish')
@@ -323,6 +315,7 @@ function Fence(props) {
             }
         })
     }
+    const [roadData, setRoadData] = useState([]);
     const handleOperaChange = (id) => {
         // let roadSelect = document.querySelectorAll('.fenceModal .road-selector .ant-select-selection-item')
         // if (roadSelect.length) {
@@ -371,9 +364,40 @@ function Fence(props) {
             ...formData
         })
     }, [formData])
+      // 获取下拉菜单
+  const getSelectList = () => {
+    // 商户名称
+    ajax.getOperator().then(
+      (res) => {
+        if (parseInt(res?.status) === 20000) {
+          setStoreData(res?.data || []);
+        } else {
+          message.error(res?.message);
+        }
+      },
+      (err) => {
+        console.log(err);
+      }
+    );
+  };
+  const getAllRoad = (id, setData) => {
+    ajax.getAllRoadByOperatort({ operator: id }).then(
+      (res) => {
+        setData(res?.data || []);
+      },
+      (err) => {
+        console.log(err);
+      }
+    );
+  };
+    useEffect(() => {
+        getSelectList();
+        if (formData?.operator) {
+          getAllRoad(formData?.operator, setRoadData);
+        }
+      }, []);
     useEffect(() => {
         getData()
-        getCascaderList()
         getOperatorData()
         getDeviceType()
     }, [])
@@ -439,7 +463,7 @@ function Fence(props) {
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered
-                            // className='yisa-table'
+                             className='yisa-table'
                             dataSource={resultData.data}
                             columns={
                                 handleColumns()
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
index d606d77..f0dc418 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
@@ -54,7 +54,7 @@ function RoadDetail(props) {
                     {resultData.berth_num}
                   </Descriptions.Item>
                   <Descriptions.Item label="区域">
-                    {resultData.area}
+                    {resultData.area_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="经纬度">
                     {resultData.lng_lat}
@@ -77,23 +77,19 @@ function RoadDetail(props) {
                     {resultData.operator_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="是否商业车场">
-                    {resultData.business === 1 ? "是" : "否"}
+                    {resultData.operator_status_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="合作模式">
-                    {resultData.cooperation_model}
+                    {resultData.cooperation_model_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="支付方式">
-                    {resultData.pay_type === 1
-                      ? "全部"
-                      : resultData.pay_type === 2
-                      ? "电子支付"
-                      : "现金支付"}
+                    {resultData.pay_type_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="商用状态">
                     {resultData.operator_status_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="车场状态">
-                    {resultData.road_status}
+                    {resultData.road_status_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="计费类型">
                     {resultData.charge_type === 1
@@ -103,7 +99,7 @@ function RoadDetail(props) {
                       : "三类区"}
                   </Descriptions.Item>
                   <Descriptions.Item label="扩展支付场景">
-                    {resultData.extended_payment}
+                    {resultData.extended_payment_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="自主停车">
                     {resultData.parking}
diff --git a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
index 8b14ae5..46166a0 100644
--- a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
+++ b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
@@ -553,7 +553,7 @@ function InvoiceConf() {
       getTaxRatePull()
       getTaxTypePull()
       getInvoiceItemPull()
-      getTable()
+      // getTable()
     }, []
   )
 
@@ -573,6 +573,7 @@ function InvoiceConf() {
       }
     } else {
       //console.log(2222224333, searchForm.getFieldsValue())
+      getTable()
     }
   }, [])
 
diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
index 7d893a5..9e808d4 100644
--- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
@@ -772,7 +772,7 @@ function MerchantInfo() {
       getTenantTypePull()
       getBusinessTypePull()
       getStatusPull()
-      getTable()
+      // getTable()
     }, []
   )
   useEffect(() => {
@@ -791,6 +791,7 @@ function MerchantInfo() {
       }
     } else {
       //console.log(2222224333, searchForm.getFieldsValue())
+      getTable()
     }
   }, [])
   useEffect(() => {