From 5870d773b03ae144b342b561fec6f0d599c9e3f6 Mon Sep 17 00:00:00 2001
From: janedididada <105195341+janedididada@users.noreply.github.com>
Date: Thu, 4 Jan 2024 09:37:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat():=E4=BF=AE=E5=A4=8DLED=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutSegment/ConfigParking/LEDConfiguration.jsx              |  6 +++---
 src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/index.scss       | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx
index dfa45e8..abb6cd9 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx
@@ -170,7 +170,7 @@ function LEDConfiguration({ id }) {
     setDelModal({ visible: false, id: null });
   }
   function getLEDBusiness() {
-    ajax.getLEDBusiness({ road_id: id }).then((res) => {
+    ajax.getLEDBusiness().then((res) => {
       if (res.status == 20000) {
         setBusinessList(res.data)
       } else {
@@ -180,7 +180,7 @@ function LEDConfiguration({ id }) {
     setDelModal({ visible: false, id: null });
   }
   function getModalLEDBusiness() {
-    ajax.getLEDBusiness().then((res) => {
+    ajax.getLEDBusiness({ road_id: id }).then((res) => {
       if (res.status == 20000) {
         setModalBusinessList(res.data)
       } else {
@@ -241,7 +241,7 @@ function LEDConfiguration({ id }) {
             rules={[{ required: true }]}
             name="business_type"
           >
-            <Select options={modalBusinessList|| []} disabled={modalData.status === "edit"} />
+            <Select options={(modalData.status === "add"?modalBusinessList:businessList)|| []} disabled={modalData.status === "edit"} />
           </Form.Item>
           <Form.Item
             label="LED显示文案"
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/index.scss b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/index.scss
index 5cae0a1..5ef7004 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/index.scss
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/index.scss
@@ -279,17 +279,17 @@ $color-primary: var(--color-primary);
     color: red;
 }
 .open_method_modal{
-    .ant-select-selection-placeholder{
-        flex:none
-    }
     .ant-form-item-label{
         label{
             min-width: 85px;
         }
     }
-    .ant-form-item-control-input-content{
-        text-align: center;
+    .submitBtn{
+        .ant-form-item-control-input-content{
+            text-align: center;
+        }
     }
+    
     .ant-btn{
         width: 120px;
         margin-left: 8px;

From 4673d43626b6bc17edf8243bc2b52d20baaea266 Mon Sep 17 00:00:00 2001
From: chenglb <chenglb@yisa.com>
Date: Thu, 4 Jan 2024 09:39:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CouponMgm/CouponDistribute/index.scss          |  1 +
 .../CouponMgm/CouponDistribute/loadable.jsx        | 14 +++++++-----
 .../CouponMgm/CouponRules/index.scss               |  7 ++++--
 .../CouponMgm/CouponRules/loadable.jsx             |  8 +++----
 .../CouponMgm/WriteOffDetail/index.scss            |  2 +-
 .../CouponMgm/WriteOffDetail/loadable.jsx          |  7 +++---
 .../CouponMgm/WriteOffStat/index.scss              |  3 ++-
 .../CouponMgm/WriteOffStat/loadable.jsx            | 19 ++++++++++------
 .../ZombieCarCleanRecord/loadable.jsx              | 26 +++++++++++++---------
 9 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
index fa0f1b5..6831605 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
@@ -42,6 +42,7 @@ $color-primary : var(--color-primary);
       margin-top: 22px;
         .btnBox{
           display:flex ;
+          justify-content: right;
           .yisa-btn{
             margin-left: 40px;
             margin-top: 20px;
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx
index 3a71206..b6e5f8f 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx
@@ -180,7 +180,7 @@ function CouponDistribute(props) {
                 !showEdit ? 
                 <>
                     <div className="coupon-distribute-search">
-                        <label className="search">查询条件</label>
+                        <label className="search" style={{marginBottom: '20px',display:'block'}}>查询条件</label>
                         <FormInput
                             yisaLabel="活动名称"
                             placeholder="输入活动名称"
@@ -194,15 +194,19 @@ function CouponDistribute(props) {
                                 <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
                                     查询
                                 </Button>
-                                <Button type="primary" className="yisa-btn" onClick={() => { setShowEdit(true) ; setHandleStatus('1') }}>
-                                    添加
-                                </Button>
+                                
                             </div>
                         </div>
                     </div>
                     <div className="coupon-distribute-result">
                         <div className="result">
-                            <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                            <div className="result-info-row">
+                                <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                                <Button type="primary" className="yisa-btn" onClick={() => { setShowEdit(true) ; setHandleStatus('1') }}>
+                                    添加
+                                </Button>
+                            </div>
+                            
                             <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.list ? resultData.list : []}>
                                 <Table
                                     bordered
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/index.scss b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/index.scss
index 47f0021..c6c1fd8 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/index.scss
@@ -35,7 +35,7 @@ $color-primary : var(--color-primary);
     }
   }
   .total-row-wrapper{
-    justify-content: flex-start;
+    // justify-content: flex-start;
     align-items: center;
     .export-content{
       width: 68px;
@@ -77,7 +77,10 @@ $color-primary : var(--color-primary);
   }
   .bottomBox{
     display: flex;
-    justify-content: space-between;
+    // .ant-btn-primary{
+    //   min-width: 200px;
+    // }
+    justify-content:right !important;
   }
 }
 .coupon-info{
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
index 5105eb8..84f377f 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
@@ -574,8 +574,8 @@ function CouponRules() {
                                 />
 
                                 <div className="bottomBox">
-                                    <Button type="primary"  onClick={addCoupon }>添加</Button>
-                                    <Button type="primary" loading={loading}  onClick={search}>查询</Button>
+                                    
+                                    <Button type="primary"   onClick={search}>查询</Button>
                                 </div>
                             </div>
                         </div>
@@ -588,13 +588,13 @@ function CouponRules() {
                                 resultData={resultData.list}
                                 message={"暂无数据"}
                             >
-                                <div className="total-row-wrapper">
-                                    {/* <ExportBtn {...exportParams} ><div className="export-content">导出</div></ExportBtn> */}
+                                <div className="total-row-wrapper result-info-row">
                                     <span className="number-wrapper">
                                         <span className="letter">共查询到</span>
                                         <span className="total-number"> {resultData.total} </span>
                                         <span className="letter">条结果</span>
                                     </span>
+                                    <Button type="primary"  onClick={addCoupon }>添加</Button>
                                 </div>
                                 <div className="table-wrap">
                                     <Table
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/index.scss b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/index.scss
index 6519fbb..35d71b6 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/index.scss
@@ -34,7 +34,7 @@ $color-primary : var(--color-primary);
       }
     }
     .total-row-wrapper{
-      justify-content: flex-start;
+      // justify-content: flex-start;
       align-items: center;
       .export-content{
         width: 68px;
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx
index 8a159bc..75edbb2 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx
@@ -338,8 +338,8 @@ function WriteOffDetail() {
                         // ]}
                     />
                     <div className="bottomBox">
-                        <Button type="primary" onClick={exportData} >导出</Button>
-                        <Button type="primary" onClick={reset}>重置</Button>
+                        
+                        <Button  onClick={reset}>重置</Button>
                         <Button type="primary" loading={loading}  onClick={search}>查询</Button>
                     </div>
                 </div>
@@ -350,13 +350,14 @@ function WriteOffDetail() {
                         resultData={resultData.list}
                         message={"暂无数据"}
                     >
-                        <div className="total-row-wrapper">
+                        <div className="total-row-wrapper result-info-row">
                             {/* <ExportBtn {...exportParams} ><div className="export-content">导出</div></ExportBtn> */}
                             <span className="number-wrapper">
                                 <span className="letter">共查询到</span>
                                 <span className="total-number"> {resultData.total} </span>
                                 <span className="letter">条结果</span>
                             </span>
+                            <Button type="primary" onClick={exportData} >导出</Button>
                         </div>
                         <div className="table-wrap">
                             <Table
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/index.scss b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/index.scss
index 70076df..c81581e 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/index.scss
@@ -71,7 +71,8 @@ $color-primary : var(--color-primary);
   }
   .write-off-stat-result{
     width: 100%;
-    height: 800px;
+    // height: 800px;
+    height: 757px;
     background: #505a6f;
     border-radius: 20px;
     margin-left: 17px;
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx
index d3f56f8..c2daefa 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx
@@ -208,21 +208,26 @@ function WriteOffStat(props) {
                         // ]}
                     />
                     <div className="btnBox">
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
-                        查询
-                        </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getResetData() }}>
+                        <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary" className="yisa-btn" onClick={() => { exportData() }}>
-                            导出
+                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
+                        查询
                         </Button>
+                        
+                        
                     </div>
                 </div>
             </div>
             <div className="write-off-stat-result">
                 <div className="result">
-                    <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                    <div className="result-info-row">
+                        <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                        <Button type="primary" className="yisa-btn" onClick={() => { exportData() }}>
+                                导出
+                            </Button>
+                    </div>
+                    
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.list ? resultData.list : []}>
                         <Table
                             bordered
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
index 3836056..32c0c6d 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
@@ -506,24 +506,30 @@ function ZombieCarCleanRecord(props) {
                 </div>
                 <div className="timePicker ">
                     <div className="btnBox">
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
-                        查询
-                        </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getResetData() }}>
+                       
+                        <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary" className="yisa-btn" onClick={() => { setExportModal({ ...exportModal, visible: true }) }}>
-                            导出
-                        </Button>
-                        <Button type="primary" className="yisa-btn" disabled={true} onClick={() => { sameBtn() }}>
-                            同步
+                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
+                        
                     </div>
                 </div>
             </div>
             <div className="paid-result">
                 <div className="result">
-                    <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                    <div className="result-info-row">
+                         <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                        <div>
+                            <Button type="primary" className="yisa-btn" onClick={() => { setExportModal({ ...exportModal, visible: true }) }}>
+                                导出
+                            </Button>&emsp;
+                            <Button type="primary" className="yisa-btn" disabled={true} onClick={() => { sameBtn() }}>
+                                同步
+                            </Button>
+                        </div>
+                    </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered