fix():修改路内表格样式

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

@@ -509,6 +509,12 @@ $color-primary: var(--color-primary);
 }
 .examineModal {
   width: 700px !important;
+  .yisa-search{
+    display: flex;
+    .redLogo{
+      line-height: 55px;  
+    }
+  }
   .check-special {
     .car-message {
       .message {

src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx

@@ -564,7 +564,9 @@ function CollectorWorkStat(props) {
     const changeApplyModal = () => {
         setChangeApplyVisible(false)
     }
-    const [getOpinion, setGetOpinion] = useState({})
+    const [getOpinion, setGetOpinion] = useState({
+        content: ''
+    })
     const handleOpinion = (v) => {
         setGetOpinion({ content: v.target.value })
     }
@@ -575,12 +577,17 @@ function CollectorWorkStat(props) {
             audit_status: 3,
             white_id: getCheckData.id
         }
-        ajax.modifyPass(data).then(res => {
-            if (res.status === 20000) {
-                setExamineVisible(false)
-                getDeployData(formData)
-            }
-        })
+        if (getOpinion.content == '') {
+            message.error('请填写审核意见')
+        } else {
+            ajax.modifyPass(data).then(res => {
+                if (res.status === 20000) {
+                    setExamineVisible(false)
+                    getDeployData(formData)
+                }
+            })
+        }
+
     }
     //白名单审核-驳回
     const examineFailModal = () => {
@@ -589,12 +596,17 @@ function CollectorWorkStat(props) {
             audit_status: 2,
             white_id: getCheckData.id
         }
-        ajax.modifyPass(data).then(res => {
-            if (res.status === 20000) {
-                setExamineVisible(false)
-                getDeployData(formData)
-            }
-        })
+        if (getOpinion.content == '') {
+            message.error('请填写审核意见')
+        } else {
+            ajax.modifyPass(data).then(res => {
+                if (res.status === 20000) {
+                    setExamineVisible(false)
+                    getDeployData(formData)
+                }
+            })
+        }
+
     }
     // 获取列表数据
     const getData = (data = formData) => {
@@ -694,7 +706,7 @@ function CollectorWorkStat(props) {
             setFormData(Object.assign({}, formData, { pn: pn, size: length }))
             setApproveFormData(Object.assign({}, approveFormData, { pn: pn }))
             approveFormDataRef.current = Object.assign({}, approveFormData, { pn: pn })
-            getApproveData(Object.assign({}, formData, { pn: pn, page_size: length  }))
+            getApproveData(Object.assign({}, formData, { pn: pn, page_size: length }))
         }
     }
     const changePnDeploy = (pn, length) => {
@@ -702,7 +714,7 @@ function CollectorWorkStat(props) {
             setFormData(Object.assign({}, formData, { pn: pn, size: length }))
             setDeployFormData(Object.assign({}, deployFormData, { pn: pn }))
             deployFormDataRef.current = Object.assign({}, deployFormData, { pn: pn })
-            getDeployData(Object.assign({}, formData, { pn: pn, page_size: length  }))
+            getDeployData(Object.assign({}, formData, { pn: pn, page_size: length }))
         }
     }
     //切换分页
@@ -711,7 +723,7 @@ function CollectorWorkStat(props) {
             setFormData(Object.assign({}, formData, { pn: pn, size: length }))
             setLastColumnList(Object.assign({}, lastColumnList, { pn: pn }))
             lastColumn.current = Object.assign({}, lastColumnList, { pn: pn })
-            getTable(Object.assign({}, formData, { pn: pn, page_size: length  }))
+            getTable(Object.assign({}, formData, { pn: pn, page_size: length }))
         }
     }
     //切换分页
@@ -1999,6 +2011,7 @@ function CollectorWorkStat(props) {
                         <span className="font">审核信息</span>
                     </div>
                     <div className="yisa-search">
+                        <div className="redLogo">*</div>
                         <label className="line">审核意见</label>
                         <TextArea
                             placeholder="请输入"

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

@@ -116,7 +116,7 @@ function ParkRecordTotal() {
       dataIndex: "out_time",
       align: "center",
       render: (text, record, index) => (
-        <div style={{ width: "130px", wordBreak: "break-all" }}>{record.in_time}</div>
+        <div style={{ width: "130px", wordBreak: "break-all" }}>{record.out_time}</div>
       )
     },
     {

src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx

@@ -117,8 +117,8 @@ function AddRoad() {
               ...res,
               ...res3,
               lng_lat: lngLat,
-              business_area: targetKeys,
-              berth_ids: EtctargetKeys,
+              business_area:isEdit ?getleftData: targetKeys,
+              berth_ids: isEdit ?getEtcRightData:EtctargetKeys,
               img_url: imgList,
               type: isEdit ? "edit" : "add",
               road_id: id,
@@ -225,22 +225,19 @@ function AddRoad() {
       }
     });
   }
+  const [getleftData, setGetLeftData] = useState([])
   //路段配置-新增或修改路段时获取热门商圈
   function getTradingArea(id) {
     const params = id !== null ? { id } : {};
     ajax.getTradingArea(params).then(
       (res) => {
         if (res.status === 20000) {
-          let _data = [...res.data].map((item) => {
+          let _data = res.data.left.map((item) => {
             item.key = item.value;
             return item;
           });
-          // let _right = [...res.data.right].map((item) => {
-          //   item.key = item.value;
-          //   return item.key;
-          // });
           setTransferSouceData(_data);
-          // setTargetKeys(_right);
+          setGetLeftData(res.data.right);
         }
       },
       (err) => {
@@ -248,23 +245,19 @@ function AddRoad() {
       }
     );
   }
-
+  const [getEtcRightData,setGetEtcRightData]=useState([])
   const getEtcStatus = (id) => {
     let road_id = id
     const params = road_id !== null ? { road_id } : {};
     ajax.getEtcData(params).then(
       (res) => {
         if (res.status === 20000) {
-          let _data = [...res.data].map((item) => {
+          let _data = res.data.left.map((item) => {
             item.key = item.value;
             return item;
           });
-          // let _right = [...res.data.right].map((item) => {
-          //   item.key = item.value;
-          //   return item.key;
-          // });
           setGetEtcList(_data);
-          // setEtcTargetKeys(_right);
+           setGetEtcRightData(res.data.right);
         }
       },
       (err) => {
@@ -374,7 +367,7 @@ function AddRoad() {
     <div className="AddRoad">
       <div className="content">
         <div className="header">
-          <h3>添加路段</h3>
+          <h3>{isEdit ? '编辑路段' : '添加路段'}</h3>
         </div>
         <div className="first-form">
           <Form
@@ -723,9 +716,9 @@ function AddRoad() {
                   <Transfer
                     dataSource={transferSouceData}
                     titles={["未选择", "已选择"]}
-                    targetKeys={targetKeys}
+                    targetKeys={isEdit ?getleftData:targetKeys}
                     onChange={transferChange}
-                    selectedKeys={selectedKeys}
+                    selectedKeys={isEdit ?getleftData:selectedKeys}
                     onSelectChange={onSelectChange}
                     render={(item) => item.label}
                   />
@@ -769,9 +762,9 @@ function AddRoad() {
                   <Transfer
                     dataSource={getEtcList}
                     titles={["未选择", "已选择"]}
-                    targetKeys={EtctargetKeys}
+                    targetKeys={isEdit ?getEtcRightData:EtctargetKeys}
                     onChange={transferEtcChange}
-                    selectedKeys={selectedEtcKeys}
+                    selectedKeys={isEdit ?getEtcRightData:selectedEtcKeys}
                     onSelectChange={onSelectEtcChange}
                     render={(item) => item.label}
                   />

src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx

@@ -107,16 +107,18 @@ function StaggeredMgm(props) {
     //查看弹窗
     const [getRecordData, setGetRecordData] = useState({})
     const CheckBtn = (record) => {
-        let data = {
-            id: record.id
-        }
-        ajax.getCheckStaggered(data).then(res => {
-            if (res.status === 20000) {
-                setCheckVisible(true)
-                setGetRecordData(res.data)
-                setGetSaleMsg(res.data.info)
+        setGetRecordData(record)
+        let str = record.info
+        let newArr = []
+
+        str.forEach(item => {
+            newArr.push(item)
+            for (let i = 0; i < newArr.length; i++) {
+                newArr[i].disabled = true;
             }
         })
+        setGetSaleMsg(newArr);
+        setCheckVisible(true)
     }
     const checkModal = () => {
         setCheckVisible(false)
@@ -130,11 +132,9 @@ function StaggeredMgm(props) {
     //编辑弹窗
     const [getEditData, setGetEditData] = useState({})
     const translateBtn = (record) => {
-        console.log(record);
         setGetRecord(record.id)
         setEditVisible(true)
         let str = record.info
-        // setGetSaleMsg(record.info)
         let newArr = []
 
         str.forEach(item => {
@@ -195,7 +195,7 @@ function StaggeredMgm(props) {
             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, formData, { pn: pn , page_size: length }))
+            getData(Object.assign({}, formData, { pn: pn, page_size: length }))
         }
     }
     //切换每页条数
@@ -263,13 +263,13 @@ function StaggeredMgm(props) {
                 if (currentValue === value) {
                     const data = res.data.map((item) => ({
                         value: item.value,
-                        text: item.text,
+                        text: item.label,
                     }));
                     callback(data);
                 }
             })
         };
-        timeout = setTimeout(fake, 300);
+        timeout = setTimeout(fake, 1000);
     };
     const handleSearch = (newValue) => {
         if (newValue) {
@@ -541,8 +541,9 @@ function StaggeredMgm(props) {
                 </div>
             </div>
 
-            {getSaleMsg.length &&
+            {getSaleMsg.length ?
                 getSaleMsg?.map((item, index) => {
+                    console.log(item);
                     return (
                         <>
                             <div className="carTitle">
@@ -567,7 +568,7 @@ function StaggeredMgm(props) {
                                         <label>错峰时间</label>
                                         <TimePicker.RangePicker
                                             disabled={true}
-                                            defaultValue={[moment(item.start_time), moment(item.end_time)]}
+                                            value={[moment(item.start_time), moment(item.end_time)]}
                                             style={{ width: 250, marginLeft: 20 }}
                                             onChange={(time, timeString) => handleChangeTime(
                                                 time, timeString, index
@@ -648,7 +649,7 @@ function StaggeredMgm(props) {
                             </div>
                         </>
                     )
-                })
+                }) : ''
             }
             <div className="submitBtn">
                 <Button type="primary" className="cancel colorReset" onClick={() => { checkStaggeredBtn() }}>
@@ -703,7 +704,7 @@ function StaggeredMgm(props) {
                 </div>
             </div>
 
-            {getSaleMsg.length &&
+            {getSaleMsg.length ?
                 getSaleMsg?.map((item, index) => {
                     return (
                         <>
@@ -809,7 +810,7 @@ function StaggeredMgm(props) {
                             </div>
                         </>
                     )
-                })
+                }) : ''
             }
 
             <div className="submitBtn">
@@ -871,7 +872,7 @@ function StaggeredMgm(props) {
                 </div>
             </div>
 
-            {getSaleMsg.length &&
+            {getSaleMsg.length ?
                 getSaleMsg?.map((item, index) => {
                     return (
                         <>
@@ -983,7 +984,7 @@ function StaggeredMgm(props) {
                             </div>
                         </>
                     )
-                })
+                }) : ''
             }
             <div className="submitBtn">
                 <Button type="primary" className="submit colorBtn" onClick={() => { editStageredBtn() }}>

src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx

@@ -112,16 +112,18 @@ function AddParking(props) {
       }
     });
   };
+  const [getEtcRightData,setGetEtcRightData]=useState([])
   //获取商圈数据
   const getTradingArea = () => {
     ajax.getTradingArea().then((res) => {
       if (res.status === 20000) {
         setTradingArea(
-          res.data.map((item) => {
+          res.data.left.map((item) => {
             item.key = item.value;
             return item;
           })
         );
+        setGetEtcRightData(res.data.right)
       }
     });
   };
@@ -453,7 +455,7 @@ function AddParking(props) {
                 dataSource={tradingArea}
                 titles={["未选择", "已选择"]}
                 showSearch={true}
-                targetKeys={targetKeys}
+                targetKeys={ status === "edit"?getEtcRightData:targetKeys}
                 onChange={transferChange}
                 render={(item) => item.label}
                 disabled={disabled}