Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

src/assets/css/base.scss

@@ -783,3 +783,4 @@ color:var(--color-text) !important;
 .ant-table-cell-scrollbar{
   background-color: #505a6f;
 }
+

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)
 }

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}
               >

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;
     }
   }
 }
+
+

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;

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)
             }
         })
     }