From fccf68f7b060765981be89078137c6a6d042a9e9 Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Sun, 22 Oct 2023 20:05:37 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E7=BB=9F=E4=B8=80=E8=B7=AF=E5=A4=96?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutExceptionMgm/LiftUpPoleRecord/index.scss    | 23 ++++++++++++++++++++++
 .../OutExceptionMgm/LiftUpPoleRecord/loadable.jsx  | 21 ++++++++++++++++++--
 .../OutSegmentMgm/OutSegment/loadable.jsx          |  1 +
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/index.scss b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/index.scss
index 8a7a93c..f4a4f68 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/index.scss
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/index.scss
@@ -43,6 +43,24 @@ $color-primary : var(--color-primary);
     .timePicker{
       width: 350px;
       margin-top: 22px;
+        .bottomBox {
+          display: flex;
+          flex-flow: row nowrap;
+          margin-top: 40px;
+          justify-content: space-between;
+          .reset {
+            width: 90px;
+            height: 36px;
+            border-radius: 4px;
+            background: #636d80;
+          }
+          .submit {
+            width: calc(100% - 100px);
+            height: 36px;
+            background: linear-gradient(180deg, #3aa9ff, #59b7ff);
+            border-radius: 4px;
+          }
+        }
         .btnBox{
           display:flex ;
           margin-top: 20px;
@@ -77,6 +95,11 @@ $color-primary : var(--color-primary);
     margin-left: 17px;
     .result{
       padding: 25px;
+      .header-button {
+        display: inline-flex;
+        position: absolute;
+        right: 61px;
+      }
       .font{
         font-family: Microsoft YaHei, Microsoft YaHei-Regular;
         font-weight: 400;
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
index 46658b0..b22e785 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
@@ -163,6 +163,10 @@ function LiftUpPoleRecord(props) {
             console.log(err)
         })
     }
+    //清空
+    const reset = () => {
+        setFormData(parameter)
+    };
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
@@ -231,7 +235,17 @@ function LiftUpPoleRecord(props) {
                         />
                     </Space>
                 </div>
-                <div className="timePicker ">
+                <div className="timePicker">
+                    <div className="bottomBox">
+                        <Button className="reset" onClick={reset}>
+                            重置
+                        </Button>
+                        <Button type="primary" className="yisa-btn submit" onClick={() => { getSearchData() }}>
+                            查询
+                        </Button>
+                    </div>
+                </div>
+                {/* <div className="timePicker ">
                     <div className="btnBox">
                         <Button type="primary" className="yisa-btn" icon={<SearchOutlined />} onClick={() => { getSearchData() }}>
                             搜索
@@ -240,11 +254,14 @@ function LiftUpPoleRecord(props) {
                             导出
                         </Button>
                     </div>
-                </div>
+                </div> */}
             </div>
             <div className="paid-result">
                 <div className="result">
                     <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                    <div className="header-button">
+                        <Button type="primary" onClick={() => { salesData() }}>导出</Button>
+                    </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
index 895118c..f91ab39 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@@ -525,6 +525,7 @@ function OutSegment() {
                 getCommentSetting()
                 setAppraiseModal({ ...appraiseModal, visible: true });
               }}
+              style={{width:'120px'}}
             >
               评价批量配置
             </Button>