From df8cbc13ff22895525bb1921c8823cb59a2686c4 Mon Sep 17 00:00:00 2001
From: chenglb <chenglb@yisa.com>
Date: Tue, 20 Feb 2024 10:28:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=AD=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/base.scss                                  |  1 +
 src/assets/css/mixin.scss                                 |  3 +++
 src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx |  6 +++++-
 src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss    |  4 +++-
 src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss           | 12 ++++++++++--
 src/pages/SystemMgm/AreaManage/loadable.jsx               |  5 +++++
 6 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss
index fee3128..a0d1347 100644
--- a/src/assets/css/base.scss
+++ b/src/assets/css/base.scss
@@ -783,3 +783,4 @@ color:var(--color-text) !important;
 .ant-table-cell-scrollbar{
   background-color: #505a6f;
 }
+
diff --git a/src/assets/css/mixin.scss b/src/assets/css/mixin.scss
index aa08548..f0a6ffe 100644
--- a/src/assets/css/mixin.scss
+++ b/src/assets/css/mixin.scss
@@ -100,4 +100,7 @@
   height: 100%;
   display: flex;
   flex-direction: column;
+}
+.ant-picker-time-panel-column:hover{
+  @include scrollBar(#000, #fff)
 }
\ No newline at end of file
diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
index 0087a3f..4b1e146 100644
--- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
@@ -567,6 +567,7 @@ const FormModal = (props) => {
                 allowClear
                 showSearch
                 style={{ width: 200, marginLeft: 10 }}
+                getPopupContainer={(e) => e.parentNode} 
                 optionFilterProp="label"
                 options={getOperationName || []}
                 placeholder="请选择商户名称"
@@ -722,6 +723,7 @@ const FormModal = (props) => {
                                   <DatePicker
                                     placeholder="请选择生效日期"
                                     style={{ marginLeft: 10 }}
+                                    getPopupContainer={(e) => e.parentNode} 
                                     showTime
                                   />
                                 </Form.Item>
@@ -792,7 +794,7 @@ const FormModal = (props) => {
                                                   label="时段"
                                                   className="yisa-label"
                                                 >
-                                                  <TimePicker format={format} allowClear={false} style={{ marginLeft: 10 }}
+                                                  <TimePicker format={format} allowClear={false} style={{ marginLeft: 10 }} getPopupContainer={(e) => e.parentNode} 
                                                     onChange={handleChangeStartTime} />
                                                 </Form.Item>
                                                 <label className="mid">to</label>
@@ -803,6 +805,7 @@ const FormModal = (props) => {
                                                 >
                                                   <TimePicker format={format}
                                                     allowClear={false}
+                                                    getPopupContainer={(e) => e.parentNode} 
                                                     onChange={handleChangeEndTime} />
                                                 </Form.Item>
 
@@ -1309,6 +1312,7 @@ const FormModal = (props) => {
               <Button type="primary" htmlType="submit">
                 提交
               </Button>
+              &emsp;
               <Button
                 onClick={closAddModal}
               >
diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss
index 6e5df07..32318ff 100644
--- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss
+++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss
@@ -243,7 +243,7 @@ margin-top: 20px;
     width: 12px;
   }
   .addRule {
-    max-height: 473px;
+    max-height: 70vh;
     overflow-y: auto;
     .yisa-search {
       margin: 20px 0 0 20px;
@@ -583,3 +583,5 @@ margin-top: 20px;
     }
   }
 }
+
+
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
index 4703297..77100b9 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
@@ -184,8 +184,16 @@ $color-primary: var(--color-primary);
   position: absolute;
   top: 30px;
   left: 100px;
-  max-height: 838px;
-  overflow: auto;
+  // max-height: 838px;
+  // overflow: auto;
+  .ant-modal-close{
+    right: 25px;
+  }
+  .AddRoad{
+    max-height: 83vh;
+    overflow: auto;
+    @include  scrollBar(#000, #fff)
+  }
 }
 .handleCloseDetailModel::-webkit-scrollbar {
   width: 12px;
diff --git a/src/pages/SystemMgm/AreaManage/loadable.jsx b/src/pages/SystemMgm/AreaManage/loadable.jsx
index 82c1d41..447a213 100644
--- a/src/pages/SystemMgm/AreaManage/loadable.jsx
+++ b/src/pages/SystemMgm/AreaManage/loadable.jsx
@@ -70,6 +70,11 @@ function AreaManage() {
         ajax.getAreaTree().then((e) => {
             if (e.status == 20000) {
                 setAreaTree(e.data.filter(item => item.name != '全部'))
+                if(e.data.length){
+                    sessionStorage.setItem('areaTreeStorage', JSON.stringify(e.data))
+                }
+            }else{
+                message.error(e.message)
             }
         })
     }