fix():修改路内BUG

src/assets/css/base.scss

@@ -63,11 +63,11 @@ a {
   overflow: auto;
 }
 .ant-table-content::-webkit-scrollbar {
-  width: 5px;
+  width: 12px;
 }
 .ant-table-content::-webkit-scrollbar-thumb {
   background-color: #9da2ab;
-  border-radius: 10px;
+  border-radius: 4px;
 }
 .ant-table-thead{
   position: sticky;
@@ -761,12 +761,11 @@ color:var(--color-text) !important;
 
 .yisa-custom-scrollbar{
   &::-webkit-scrollbar{
-    width: 10px;
-    background-color: #3e4557;
+    width: 12px;
     cursor: pointer;
   }
   &::-webkit-scrollbar-thumb{
     background-color: #9da2ab;
-    border-radius: 5px;
+    border-radius: 4px;
   }
 }

src/components/Search/ResultPanel/index.scss

@@ -1,8 +1,8 @@
 @import "@/assets/css/mixin.scss";
-$color-container-bg : var(--color-container-bg);
-$color-user-list-bg : var(--color-user-list-bg);
-$color-text : var(--color-text);
-$color-primary : var(--color-primary);
+$color-container-bg: var(--color-container-bg);
+$color-user-list-bg: var(--color-user-list-bg);
+$color-text: var(--color-text);
+$color-primary: var(--color-primary);
 
 .right-list {
   width: calc(100% - 375px);
@@ -129,7 +129,7 @@ $color-primary : var(--color-primary);
         // overflow: hidden;
         background: var(--car-item-bg);
         border: 1px solid var(--color-card-line);
-        // box-shadow: 0px 3px 8px 0px rgba(0,0,0,0.16); 
+        // box-shadow: 0px 3px 8px 0px rgba(0,0,0,0.16);
         border-radius: 8px;
         // overflow: hidden;
         position: relative;
@@ -142,54 +142,54 @@ $color-primary : var(--color-primary);
           width: 100%;
           height: calc(148px);
           background: var(--img-bg);
-          text-align:center;
+          text-align: center;
           border-radius: 8px;
           // overflow: hidden;
           // text-align: center;
           // display: flex;
           // align-items: center;
           // justify-content: center;
-          img{
+          img {
             // border-radius: 8px 8px 0 0;
-            object-fit:  fill;
+            object-fit: fill;
             // width: 148px;
             // height: 148px;
-
           }
         }
 
         .bottomInfo {
-
           width: 100%;
-           height: calc(275px - 148px);
+          height: calc(275px - 148px);
           // background: var(--car-item-info-bg);
           padding: 10px 10px 10px 10px;
-          // box-shadow: 0px 3px 8px 0px rgba(0,0,0,0.16); 
-          .innerWrap{
+          // box-shadow: 0px 3px 8px 0px rgba(0,0,0,0.16);
+          .innerWrap {
             width: 100%;
             height: 100%;
             overflow-y: auto;
-            .infoItem{
+            .infoItem {
               display: flex;
               align-items: baseline;
               // justify-content: space-between;
               margin: 5px 0;
-              .leftName{
+              .leftName {
                 display: inline-block;
                 font-size: 14px;
-                font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+                font-family:
+                  Microsoft YaHei,
+                  Microsoft YaHei-Regular;
                 font-weight: 400;
                 text-align: left;
                 color: var(--color-text);
                 width: 30%;
               }
-              .rightData{
+              .rightData {
                 display: inline-block;
-                width:70%;
+                width: 70%;
                 text-align: left;
                 @include textEllipsis(two);
 
-                &.plate{
+                &.plate {
                   width: auto;
                   padding: 0 10px;
                   height: 26px;
@@ -198,33 +198,33 @@ $color-primary : var(--color-primary);
                   // border: 1px solid #707070;
                   border-radius: 4px;
                   text-align: center;
-                  background:#1D7FDF;
+                  background: #1d7fdf;
                   color: #ffffff;
-                  box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); 
+                  box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
                 }
                 // 黑色
-                &.plate1{
-                  background:#041526;
+                &.plate1 {
+                  background: #041526;
                   color: #ffffff;
                 }
                 // 白色
-                &.plate2{
-                  background:#ffffff;
+                &.plate2 {
+                  background: #ffffff;
                   color: #333333;
                 }
                 // 蓝色
-                &.plate5{
-                  background:#1D7FDF;
+                &.plate5 {
+                  background: #1d7fdf;
                   color: #ffffff;
                 }
                 // 黄色
-                &.plate6{
-                  background:#FFC833;
+                &.plate6 {
+                  background: #ffc833;
                   color: #333333;
                 }
                 // 绿色
-                &.plate9{
-                  background:linear-gradient(180deg,#ffffff, #0eb132);
+                &.plate9 {
+                  background: linear-gradient(180deg, #ffffff, #0eb132);
                   color: #ffffff;
                 }
               }
@@ -234,12 +234,12 @@ $color-primary : var(--color-primary);
           .innerWrap::-webkit-scrollbar-track-piece {
             background-color: var(--color-scrollbar-trace);
           }
-      
+
           .innerWrap::-webkit-scrollbar {
             width: 0px;
             height: 4px;
           }
-      
+
           .innerWrap::-webkit-scrollbar-thumb {
             background-color: var(--color-scrollbar-thumb);
             background-clip: padding-box;
@@ -258,16 +258,16 @@ $color-primary : var(--color-primary);
           position: relative;
           // float: left;
           margin: 0 10px 10px 0;
-        
+
           .topImg {
             width: 100%;
             height: 148px;
             border-radius: 8px;
             img {
-              object-fit: fill
+              object-fit: fill;
             }
           }
-        
+
           .bottomInfo {
             // position: absolute;
             // bottom: 0;
@@ -277,33 +277,35 @@ $color-primary : var(--color-primary);
             height: 95px;
             // background: var(--car-item-info-bg);
             padding: 10px 10px 10px 10px;
-        
+
             .innerWrap {
               width: 100%;
               height: 100%;
               overflow-y: auto;
-        
+
               .infoItem {
                 display: flex;
                 align-items: baseline;
                 // justify-content: space-between;
                 margin: 5px 0;
-        
+
                 .leftName {
                   display: inline-block;
                   font-size: 14px;
-                  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+                  font-family:
+                    Microsoft YaHei,
+                    Microsoft YaHei-Regular;
                   font-weight: 400;
                   text-align: left;
                   color: var(--color-text);
                   width: 30%;
                 }
-        
+
                 .rightData {
                   display: inline-block;
                   width: 70%;
                   text-align: left;
-        
+
                   &.plate {
                     width: auto;
                     padding: 0 10px;
@@ -313,34 +315,34 @@ $color-primary : var(--color-primary);
                     // border: 1px solid #707070;
                     border-radius: 4px;
                     text-align: center;
-                    background: #1D7FDF;
+                    background: #1d7fdf;
                     color: #ffffff;
                   }
-        
+
                   // 黑色
                   &.plate1 {
                     background: #041526;
                     color: #ffffff;
                   }
-        
+
                   // 白色
                   &.plate2 {
                     background: #ffffff;
                     color: #333333;
                   }
-        
+
                   // 蓝色
                   &.plate5 {
-                    background: #1D7FDF;
+                    background: #1d7fdf;
                     color: #ffffff;
                   }
-        
+
                   // 黄色
                   &.plate6 {
-                    background: #FFC833;
+                    background: #ffc833;
                     color: #333333;
                   }
-        
+
                   // 绿色
                   &.plate9 {
                     background: linear-gradient(180deg, #ffffff, #0eb132);
@@ -349,17 +351,16 @@ $color-primary : var(--color-primary);
                 }
               }
             }
-        
+
             // .innerWrap::-webkit-scrollbar{width:0;}
             .innerWrap::-webkit-scrollbar-track-piece {
               background-color: var(--color-scrollbar-trace);
             }
-        
+
             .innerWrap::-webkit-scrollbar {
-              width: 0px;
-              height: 4px;
+              width: 12px;
             }
-        
+
             .innerWrap::-webkit-scrollbar-thumb {
               background-color: var(--color-scrollbar-thumb);
               background-clip: padding-box;
@@ -375,25 +376,25 @@ $color-primary : var(--color-primary);
         //   margin: 0 10px 10px 0;
         // }
       }
-      
+
       &.car4 {
         .carCard {
           margin: 0 calc((100% - (258px * 4)) / 4) 10px 0;
         }
       }
-      
+
       &.car3 {
         .carCard {
           margin: 0 calc((100% - (258px * 3)) / 3) 10px 0;
         }
       }
-      
+
       &.car2 {
         .carCard {
           margin: 0 calc((100% - (258px * 2)) / 2) 10px 0;
         }
       }
-      
+
       &.car1 {
         .carCard {
           margin: 0 calc((100% - (258px * 1)) / 1) 10px 0;
@@ -406,17 +407,18 @@ $color-primary : var(--color-primary);
     }
 
     .table-wrap::-webkit-scrollbar {
-      width: 5px;
-      height: 5px;
+      width: 12px;
       cursor: pointer;
     }
 
     .table-wrap::-webkit-scrollbar-thumb {
       background-color: #9da2ab;
-      border-radius: 10px;
+      border-radius: 4px;
+    }
+    .table-wrap::-webkit-scrollbar-corner {
+      background: transparent !important;
     }
   }
-
 }
 
 // .popconfirm-common{
@@ -429,4 +431,4 @@ $color-primary : var(--color-primary);
   flex-flow: row nowrap;
 }
 
-// }
+// }

src/components/SystemResult/index.scss

@@ -140,15 +140,13 @@ $color-primary : var(--color-primary);
     }
 
     .table-wrap::-webkit-scrollbar {
-      width: 4px;
-      height: 4px;
+      width: 12px;
+      background: transparent;
     }
 
     .table-wrap::-webkit-scrollbar-thumb {
-      background-color: var(--color-scrollbar-thumb);
-      background-clip: padding-box;
+      background-color: #9da2ab;
       border-radius: 4px;
-      min-height: 28px;
     }
   }
 

src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss

@@ -235,14 +235,12 @@ margin-top: 20px;
 }
 .addRuleModal {
   width: 1000px !important;
-  .addRule::-webkit-scrollbar-track {
-    background: white;
-  }
   .addRule::-webkit-scrollbar-thumb {
-    background: gray;
+    background-color: #9da2ab;
+    border-radius: 4px;
   }
   .addRule::-webkit-scrollbar {
-    width: 3px;
+    width: 12px;
   }
   .addRule {
     max-height: 473px;
@@ -510,10 +508,10 @@ margin-top: 20px;
     overflow-y: auto;
     &::-webkit-scrollbar-thumb {
       background-color: #9da2ab;
-      border-radius: 10px;
+      border-radius: 4px;
   }
   &::-webkit-scrollbar{
-    width: 5px;
+    width: 12px;
   }
   }
   .bindTable {
@@ -581,7 +579,7 @@ margin-top: 20px;
       }
     }
     .content::-webkit-scrollbar {
-      width: 3px;
+      width: 12px;
     }
   }
 }

src/pages/InRoadMgm/BusinessMgm/SpecialRecord/index.scss

@@ -133,18 +133,18 @@ $color-primary: var(--color-primary);
           overflow: auto;
         }
         .ant-table-content::-webkit-scrollbar {
-          width: 5px;
+          width: 12px;
         }
         .ant-table-content::-webkit-scrollbar-thumb {
           background-color: #9da2ab;
-          border-radius: 10px;
-        }
-        .ant-table-content::-webkit-scrollbar-track {
-          /*滚动条里面轨道*/
-          -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-          border-radius: 10px;
-          background: #ffffff;
+          border-radius: 4px;
         }
+        // .ant-table-content::-webkit-scrollbar-track {
+        //   /*滚动条里面轨道*/
+        //   -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        //   border-radius: 10px;
+        //   background: #ffffff;
+        // }
         .ant-table-tbody .ant-table-row .ant-table-cell {
           background-color: #3e4557 !important;
           color: #ffffff !important;

src/pages/InRoadMgm/InRoadOverview/index.scss

@@ -151,10 +151,10 @@ $color-primary: var(--color-primary);
     margin-top: 10px;
   }
   .overFlow::-webkit-scrollbar {
-    width: 5px;
+    width: 12px;
   }
   .overFlow::-webkit-scrollbar-thumb {
     background-color: #9da2ab;
-    border-radius: 10px;
+    border-radius: 4px;
   }
 }

src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/index.scss

@@ -133,11 +133,11 @@ $color-primary: var(--color-primary);
         }
       }
        .ant-table-wrapper::-webkit-scrollbar {
-        width: 5px;
+        width: 12px;
       }
        .ant-table-wrapper::-webkit-scrollbar-thumb {
         background-color: #9da2ab;
-        border-radius: 10px;
+        border-radius: 4px;
       }
       .yisa-table .ant-table-thead .ant-table-cell {
         background-color: #616b83 !important;

src/pages/InRoadMgm/PersonMgm/PersonInfo/index.scss

@@ -52,7 +52,7 @@
     height: calc(100% - 32px - 15px);
     &:hover {
       &::-webkit-scrollbar {
-        width: 8px;
+        width: 12px;
         height: 8px;
       }
     }

src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/index.scss

@@ -286,9 +286,9 @@ $color-primary: var(--color-primary);
   overflow-y: scroll;
 }
 .disableModal::-webkit-scrollbar {
-  width: 5px;
+  width: 12px;
 }
 .disableModal::-webkit-scrollbar-thumb {
   background-color: #9da2ab;
-  border-radius: 10px;
+  border-radius: 4px;
 }

src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx

@@ -605,7 +605,9 @@ function DisabledCarParkRecordTotal() {
       }
     })
   }
+  const [getPartId, setGetPartId] = useState({})
   function conversion(record) {
+    setGetPartId(record.park_id)
     ajax({
       url: "/api/bpm/record/get_change_temporary",
       type: "post",
@@ -633,7 +635,29 @@ function DisabledCarParkRecordTotal() {
       }
     })
   }
+  const [getValue,setGetValue]=useState({})
+
+  function handleSearch(e){
+    let data = {
+      ...ltcData,
+      park_id: getPartId
+    }
+    ajax({ 
+      url: "/api/bpm/record/change_temporary_check",
+      type: "post",
+      data:data,
+    }).then((res) => {
+      let { status, data } = res
+      if (status == 20000) {
+        search(getValue)
+        setLtcVisible(false);
+      } else {
+        message.error(res.message)
+      }
+    })
+  }
   function search(e) {
+    setGetValue(e)
     utils.tableScrollTop("parent-table-scroll")
     if (!e.type) {
       e.type = 1
@@ -684,7 +708,7 @@ function DisabledCarParkRecordTotal() {
         </Descriptions>
         <Descriptions title="入场照片">
           <Descriptions.Item label="车辆照片"><img width={300} height={200} src={params.in_veh_pic} onError={handleImgError} onClick={() => { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} /></Descriptions.Item>
-          <Descriptions.Item label="车牌照片"><img width={300} height={200} src={params.in_plate_pic} onError={handleImgError}  onClick={() => { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} /></Descriptions.Item>
+          <Descriptions.Item label="车牌照片"><img width={300} height={200} src={params.in_plate_pic} onError={handleImgError} onClick={() => { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} /></Descriptions.Item>
         </Descriptions>
       </div>
     );
@@ -760,6 +784,7 @@ function DisabledCarParkRecordTotal() {
         onCancel={() => {
           setLtcVisible(false);
         }}
+        onOk={handleSearch}
       >
         <div className="ltc-box">
           <div className="ltc-title">转为临停车</div>

src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/index.scss

@@ -224,11 +224,11 @@ $color-primary: var(--color-primary);
   overflow: auto;
 }
 .hanleHistoyModal::-webkit-scrollbar {
-  width: 5px;
+  width: 12px;
 }
 .hanleHistoyModal::-webkit-scrollbar-thumb {
   background-color: #9da2ab;
-  border-radius: 10px;
+  border-radius: 4px;
 }
 .modal-img{
   img{

src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss

@@ -173,9 +173,9 @@ $color-primary: var(--color-primary);
   left: 100px;
 }
 .handleCloseDetail::-webkit-scrollbar {
-  width: 5px;
+  width: 12px;
 }
 .handleCloseDetail::-webkit-scrollbar-thumb {
   background-color: #9da2ab;
-  border-radius: 10px;
+  border-radius: 4px;
 }

src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx

@@ -274,6 +274,7 @@ function ModelConf(props) {
             remarks: '',
             model_name: ''
         })
+        setNewGetOperationName([])
     }
     let param = {
         name: '',
@@ -336,6 +337,7 @@ function ModelConf(props) {
                         remarks: '',
                         model_name: ''
                     })
+                    setNewGetOperationName([])
                 }
             })
         }

src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/index.scss

@@ -193,7 +193,7 @@ $color-primary: var(--color-primary);
     }
   }
 }
-.checkMsg {
+.checkMsg-modalTip {
   width: 1500px !important;
   .car-error {
     display: flex;

src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx

@@ -698,7 +698,7 @@ function CallbackSuggestion(props) {
             visible={imgVisible}
             onCancel={imgModal}
             footer={null}
-            className="checkMsg"
+            className="checkMsg-modalTip"
             title='查看详情'
         >
             <div className="car-error">

src/pages/SystemMgm/AdminMgm/loadable.jsx

@@ -124,7 +124,7 @@ function AdminMgm(props) {
 
             })
         } else {
-            setGovernmentStatus(true)
+            // setGovernmentStatus(true)
             setGetAreaStatus(false)
             let arr = v
             let newArr = arr[arr.length - 1];
@@ -135,15 +135,34 @@ function AdminMgm(props) {
             ajax.getOrgDetail(data).then(res => {
                 console.log(res);
                 if (res.status === 20000) {
-                    setAddManage(Object.assign({},addManage,{
+                    setAddManage(Object.assign({}, addManage, {
                         deptName: v,
-                        government_style:res.data.control_type,
-                        government_area:res.data.control_area
+                        government_style: res.data.control_type,
+                        government_area: res.data.control_area
                     }))
+                    if (res.data.control_area.length === 0) {
+                        setGovernmentStatus(false)
+                    } else {
+                        setGovernmentStatus(true)
+                    }
                 } else {
                     message.error(res.message)
                 }
             })
+            let arrSte = v
+            let newArrarrSte = arrSte[arrSte.length - 1];
+            let strarrSte = newArrarrSte.toString()
+            let dataarrSte = {
+                depart_id: strarrSte
+            }
+            ajax.roleList(dataarrSte).then(res => {
+                if (res.status === 20000) {
+                    setGetRoleData(res.data)
+                } else {
+                    message.error(res.message)
+                }
+
+            })
         }
     };
     console.log(addManage);
@@ -691,14 +710,14 @@ function AdminMgm(props) {
                 </div>
                 <div className="timePicker ">
                     <div className="btnBox">
-                        <Button  className="yisa-btn reset"  onClick={() => { getResetData() }}>
+                        <Button className="yisa-btn reset" onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary" className="yisa-btn submit"  onClick={() => { getSearchData() }}>
-                        查询
+                        <Button type="primary" className="yisa-btn submit" onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
-                        
-                        
+
+
                     </div>
                 </div>
             </div>
@@ -707,7 +726,7 @@ function AdminMgm(props) {
                     <div className="result-info-row">
                         <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
                         <Button type="primary" className="yisa-btn" onClick={() => { addAdmin() }}>
-                                添加
+                            添加
                         </Button>
                     </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
@@ -1011,7 +1030,30 @@ function AdminMgm(props) {
                             if (selectedOptions.length === 1) {
                                 setGovernmentStatus(false)
                             } else {
-                                setGovernmentStatus(true)
+                                setGetAreaStatus(false)
+                                let arr = v
+                                let newArr = arr[arr.length - 1];
+                                let str = newArr.toString()
+                                let data = {
+                                    id: str
+                                }
+                                ajax.getOrgDetail(data).then(res => {
+                                    console.log(res);
+                                    if (res.status === 20000) {
+                                        setGetImg(Object.assign({}, getImg, {
+                                            deptName: v,
+                                            government_style: res.data.control_type,
+                                            government_area: res.data.control_area
+                                        }))
+                                        if (res.data.control_area.length === 0) {
+                                            setGovernmentStatus(false)
+                                        } else {
+                                            setGovernmentStatus(true)
+                                        }
+                                    } else {
+                                        message.error(res.message)
+                                    }
+                                })
                             }
                             if (v.length != []) {
                                 setGetImg(
@@ -1064,25 +1106,22 @@ function AdminMgm(props) {
 
                     />
                 </div>
-                {
-                    getAreaStatus ?
-                        <div className="yisa-search">
-                            <label>管辖区域</label>
-                            <Tree
-                                checkable
-                                style={{ width: 260, marginLeft: 14 }}
-                                onCheck={onCheck}
-                                checkedKeys={getImg.government_area}
-                                // onSelect={onSelect}
-                                treeData={getGovernmentArea}
-                                fieldNames={{
-                                    title: 'name',
-                                    key: 'id',
-                                    children: 'children'
-                                }}
-                            />
-                        </div> : ''
-                }
+                <div className="yisa-search">
+                    <label>管辖区域</label>
+                    <Tree
+                        checkable
+                        style={{ width: 260, marginLeft: 14 }}
+                        onCheck={onCheck}
+                        checkedKeys={getImg.government_area}
+                        // onSelect={onSelect}
+                        treeData={getGovernmentArea}
+                        fieldNames={{
+                            title: 'name',
+                            key: 'id',
+                            children: 'children'
+                        }}
+                    />
+                </div>
 
                 <div className="yisa-search">
                     <label>管辖车场接入方式</label>

src/services/InroadMgm/RoadMgm/RoadMgm.js

@@ -85,6 +85,13 @@ const addBerth = (params) => {
     data: params,
   });
 };
+const getTemporary = (params) => {
+  return ajax({
+    url: "/api/bpm/record/change_temporary_check",
+    type: "post",
+    data: params,
+  });
+};
 ///api/bpm/road/get_road_toll_list   收费员管理-获取该路段能添加的收费员列表
 
 const getRoadTollList = (params) => {
@@ -372,6 +379,7 @@ export default {
   importBerth,
   getTollList,
   addBerth,
+  getTemporary,
   editBerth,
   getRoadTollList,
   getRoadInfo,