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

src/components/SelectGaodeLngLat/index.jsx

@@ -18,6 +18,7 @@ function SelectGaodeLngLat(props) {
     onChange = () => { },
     isClickMarker = false // 点击地图添加标记
   } = props;
+  console.log(lngLatVisible);
   const [lnglat, setLnglat] = useState([]);
   const [marker, setMarker] = useState([]);
   const [address, setAddress] = useState("");
@@ -95,7 +96,7 @@ function SelectGaodeLngLat(props) {
       </Button>
       <Modal
         className="map-modal"
-        visible={lngLatVisible}
+        open={lngLatVisible}
         width={1000}
         footer={false}
         onCancel={close}

src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx

@@ -712,7 +712,7 @@ function ExceptionParkReport() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -732,6 +732,8 @@ function ExceptionParkReport() {
                 }}
                 imgno={false}
               />
+            ) : (
+              ""
             )}
           </div>
           <ResultFlow

src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx

@@ -603,7 +603,7 @@ function ParkingAly() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -623,6 +623,8 @@ function ParkingAly() {
                 }}
                 imgno={false}
               />
+            ) : (
+              ""
             )}
           </div>
           <ResultFlow

src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx

@@ -986,7 +986,7 @@ function PayAly() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -1003,7 +1003,7 @@ function PayAly() {
                 isTableModule={true}
                 onOk={ReportPaySummaryReport}
               />
-            )}
+            ):""}
           </div>
           <ResultFlow
             hasLoad={true}

src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx

@@ -809,7 +809,7 @@ function RegisterAly() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -826,7 +826,7 @@ function RegisterAly() {
                 isTableModule={true}
                 onOk={ReportPaySummaryReport}
               />
-            )}
+            ):""}
           </div>
           <ResultFlow
             hasLoad={true}

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx

@@ -53,7 +53,7 @@ function ParkUsageAly() {
     const [tabLoading, setTabLoading] = useState(false);
     // 表格返回数据
     const [resultData, setResultData] = useState({
-        total: 0,
+        total_records: 0,
         list: [],
     });
     //停车场收入概览数据
@@ -239,7 +239,7 @@ function ParkUsageAly() {
                 } else {
                     getRevenueOption([]);
                     setResultData({
-                        total: 0,
+                        total_records: 0,
                         list: [],
                     })
                 }
@@ -586,7 +586,7 @@ function ParkUsageAly() {
                         <ExportBtnNew
                             children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
                             modalType="noImg"
-                            totalRecords={resultData.total}
+                            totalRecords={resultData.total_records}
                             exportUrl="/api/ana/dataanalysis/get_parking_berth_rate_export"
                             //pageName="parkingOverview"
                             postdata={{

src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx

@@ -216,15 +216,15 @@ function ParkingOrderInquiry(props) {
             align: "center",
             render: (text, data) => {
                 if (data.arrearsAmount_new) {
-                  return <div>
-                    <span style={{ "text-decoration": "line-through" }}>{data.arrearsAmount}</span>
-                    <span style={{ "color": "#177ddc", "margin-left": "5px" }}>{data.arrearsAmount_new}</span>
-                  </div>
+                    return <div>
+                        <span style={{ "text-decoration": "line-through" }}>{data.arrearsAmount}</span>
+                        <span style={{ "color": "#177ddc", "margin-left": "5px" }}>{data.arrearsAmount_new}</span>
+                    </div>
                 }
                 else {
-                  return <div>{text}</div>
+                    return <div>{text}</div>
                 }
-              }
+            }
         },
         {
             title: '订单修改时间',
@@ -664,6 +664,7 @@ function ParkingOrderInquiry(props) {
                 }
             } else {
                 setResultData([])
+                setTotal(0)
                 message.error(res.message)
             }
         })
@@ -687,6 +688,7 @@ function ParkingOrderInquiry(props) {
                 }
             } else {
                 setArrearsData([])
+                setTotal(0)
                 message.error(res.message)
             }
         })

src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx

@@ -366,7 +366,7 @@ function ReturnOrderInquiry() {
   }
   //页面渲染
   function renderTable(columns, arr, dataSource, exportUrl) {
-    let initFormData = { flow_id: getUrlSearch("third_party_flow_id") || '', start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().format("YYYY-MM-DD HH:mm:ss")) }
+    let initFormData = { flow_id: getUrlSearch("third_party_flow_id") || '', start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().startOf("day").format("YYYY-MM-DD HH:mm:ss")) }
     return (
       <TableModule
         columns={columns}

src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx

@@ -484,13 +484,13 @@ function ExceptionParkReport(props) {
                     </div>
                     <div className="operatorName">
                         <div className="top">
-                            <div className="name">车牌号:{getDetailId.plateNumber}</div>
+                            <div className="name">车牌号：{getDetailId.plateNumber}</div>
                             <div className="type">异常类型：{getDetailId.exceptDictName}</div>
-                            <div className="time">上报时间:{getDetailId.reportTime}</div>
+                            <div className="time">上报时间：{getDetailId.reportTime}</div>
                         </div>
                         <div className="middle">
                             <div className="type">停车场：{getDetailId.parkName}</div>
-                            <div className="time">入场时间:{getDetailId.entryTime}</div>
+                            <div className="time">入场时间：{getDetailId.entryTime}</div>
                         </div>
                         <div className="bottom">
                             {

src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx

@@ -509,6 +509,7 @@ const FormModal = (props) => {
     }
     const data = options;
     handleOptionsProcessing(i, z, data, type)//统一区间类型下拉数据更新
+    form.setFieldsValue(currentFormValues)
     console.log("表单数据", currentFormValues);
     return true;
   }
@@ -662,7 +663,7 @@ const FormModal = (props) => {
                   </div>
                   <div className="place">
                     <Form.Item
-                      name="disability_time"
+                      name="new_energy_time"
                       label="续停免费分钟"
                       className="yisa-label timeSearch"
                       rules={[{ required: true, message: "请输入${label}" }]}
@@ -711,7 +712,7 @@ const FormModal = (props) => {
                   </div>
                   <div className="place">
                     <Form.Item
-                      name="new_energy_time"
+                      name="disability_time"
                       label="续停免费分钟"
                       className="yisa-label timeSearch"
                       rules={[{ required: true, message: "请输入${label}" }]}

src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx

@@ -489,6 +489,7 @@ const FormModal = (props) => {
     // 校验4.增加时段最高收费金额，当选择按次计费时时段最高收费金额输入框影藏
     const data = options;
     handleOptionsProcessing(i, z, data, type)//统一区间类型下拉数据更新
+    form.setFieldsValue(currentFormValues)
     console.log("表单数据", currentFormValues);
     return true;
   }
@@ -639,7 +640,7 @@ const FormModal = (props) => {
                 </div>
                 <div className="place">
                   <Form.Item
-                    name="disability_time"
+                    name="new_energy_time"
                     label="续停免费分钟"
                     className="yisa-label timeSearch"
                     rules={[{ required: true, message: "请输入${label}" }]}
@@ -687,7 +688,7 @@ const FormModal = (props) => {
                   </div>
                   <div className="place">
                     <Form.Item
-                      name="new_energy_time"
+                      name="disability_time"
                       label="续停免费分钟"
                       className="yisa-label timeSearch"
                       rules={[{ required: true, message: "请输入${label}" }]}

src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx

@@ -299,7 +299,7 @@ function PersonInfo() {
     }
 
     const changeEditOperator = (e) => {
-        setCurrentPersonInfo({ ...currentPersonInfo, operator: e })
+        setCurrentPersonInfo({ ...currentPersonInfo, operator: e , depart_id: ''})
         getDeparts(e)
         getAssets(e)
         setGetPersonId(e)

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

@@ -48,6 +48,11 @@ $color-primary: var(--color-primary);
       }
     }
   }
+  .ant-picker {
+    width: 100%;
+    background-color: var(--color-search-list-item-bg);
+    border-color: var(--color-border);
+  }
 }
 
 .ant-input::-webkit-input-placeholder {
@@ -165,11 +170,7 @@ $color-primary: var(--color-primary);
   }
 }
 
-.ant-picker {
-  width: 100%;
-  background-color: var(--color-search-list-item-bg);
-  border-color: var(--color-border);
-}
+
 
 // .yisa-table {
 //   width: 100%;

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

@@ -19,7 +19,7 @@ import {
 
 import { PlusOutlined } from "@ant-design/icons";
 import { useLocation, useNavigate } from "react-router-dom";
-import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat } from "@/components";
+import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat2 } from "@/components";
 import moment from "moment";
 import "./index.scss";
 import ajax from "@/services";
@@ -50,7 +50,8 @@ function AddRoad(props) {
   ];
   const {
     getDetailList = {},
-    setDetailModel=()=>{}
+    setDetailModel=()=>{},
+    setcheckModel=()=>{},
   } = props
   const navigate = useNavigate();
   const location = useLocation();
@@ -76,7 +77,7 @@ function AddRoad(props) {
   //所属商户
   const [operatorId, setOperatorId] = useState(null);
   //编辑还是新增
-  const [isEdit, setIsEdit] = useState(id !== null);
+  const [isEdit, setIsEdit] = useState(id !== undefined);
   //所属热门商圈
   const [tradingAreaList, setTradingAreaList] = useState({
     left: [],
@@ -154,6 +155,7 @@ function AddRoad(props) {
         if (res.status === 20000) {
           message.success(res.message);
           setDetailModel(false)
+          setcheckModel(false)
         } else {
           message.error(res.message);
         }
@@ -550,7 +552,7 @@ function AddRoad(props) {
                         <Input value={lngLat} />
                       </Col>
                       <Col span={5}>
-                        <SelectGaodeLngLat
+                        <SelectGaodeLngLat2
                           open={() => setLngLatVisible(true)}
                           lngLatVisible={lngLatVisible}
                           getLntLat={(value) => {
@@ -603,7 +605,7 @@ function AddRoad(props) {
               {isEdit ? (
                 <>
                   <Col span={8}>
-                    <Form.Item label="泊位总数" name="berth_num" rules={rules}>
+                    <Form.Item label="泊位总数" name="berth_num" >
                       <Input disabled />
                     </Form.Item>
                   </Col>
@@ -859,6 +861,7 @@ function AddRoad(props) {
             <Button
               onClick={() => {
                 setDetailModel(false)
+                setcheckModel(false)
               }}
               type="primary"
             >

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

@@ -24,6 +24,7 @@ import "./index.scss";
 import ConfigRoad from "../ConfigRoad"
 import AddRoad from "../AddRoad"
 import RoadDetail from "../RoadDetail"
+// import AddRoad from "../AddRoad"
 import AuditModifyModal from "./AuditModifyModal";
 // import errorImg from "@/assets/images/layout/error.png"
 // import {  useLocation } from "react-router-dom";
@@ -184,6 +185,7 @@ function RoadConf() {
   const [handleDetail, setHandleDetail] = useState(false)
   const [detailModel, setDetailModel] = useState(false)
   const [checkDetailModel, setCheckDetailModel] = useState(false)
+  const [checkModel, setcheckModel] = useState(false)
   const [getRecordList, setGetRecordList] = useState({})
   const handleModal = (record) => {
     setGetRecordList(record)
@@ -208,6 +210,9 @@ function RoadConf() {
   const handleCheckDetails=()=>{
     setCheckDetailModel(false)
   }
+  const CheckDetails=()=>{
+    setcheckModel(false)
+  }
   const [loading, setLoading] = useState(false);
   const [resultData, setReusltData] = useSetState({
     // 请求结果
@@ -311,7 +316,7 @@ function RoadConf() {
   };
   //添加路段
   function addRoad(params) {
-    navigate("/inRoad/addRoad");
+    setcheckModel(true)
   }
 
   function cascaderChange(value, options) {
@@ -715,6 +720,19 @@ function RoadConf() {
           >
           </RoadDetail>
         </Modal>
+        <Modal
+          visible={checkModel}
+          onCancel={CheckDetails}
+          footer={false}
+          className="handleCloseDetailModel"
+          destroyOnClose={true}
+        >
+          <AddRoad
+            getCheckDetailList={getCheckDetailList}
+            setcheckModel={setcheckModel}
+          >
+          </AddRoad>
+        </Modal>
       </div>
       {/* <AuditModifyModal
         open={auditModalData.visible}

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

@@ -313,7 +313,7 @@ function StuffMgm(props) {
     //重置数据
     const getResetData = () => {
         setGetOption(['0'])
-
+        getAssetData()
         setFormData({
             ...parameter,
         })

src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx

@@ -111,18 +111,17 @@ function PhysicalPileManagement() {
       message.destroy();
       message.warning(`硬件编码不可为空`);
       return
-    }
-    else if(!reg.test(rowData?.code)){
+    }else if(!reg.test(rowData?.code)){
       message.destroy();
       message.warning(`硬件编码不能包含汉字`);
       return
-    }
-    else if(!rowData.model||rowData.model.match(/^\s+$/)){
+    }else if(!rowData.model||rowData.model.match(/^\s+$/)){
       message.destroy();
       message.warning(`设备型号不可为空`);
       return
     }
-    else if(!reg.test(rowData?.model)){
+    let regs = /^[0-9a-zA-Z]*$/g;
+    if(!regs.test(rowData?.model)){
       message.destroy();
       message.warning(`设备型号不能包含汉字`);
       return

src/pages/NewEnergy/ChargeStationMgm/loadable.jsx

@@ -241,7 +241,7 @@ function Appointment() {
     setDetailVisible(true)
   }
   const handelOk = () => {
-    console.log(addFormData);
+    // console.log(addFormData);
     if (!addFormData.name) {
       message.warn("请输入充电站名称")
       return
@@ -250,11 +250,11 @@ function Appointment() {
       message.warn("请输入充电站编码")
       return
     }
-    if (!addFormData.count) {
+    if (!addFormData.count && addFormData.count != 0) {
       message.warn("请输入车位数量")
       return
     }
-    if (!pattern.test(addFormData.count)) {
+    if (!pattern.test(addFormData.count) || addFormData.count == 0) {
       message.warn("请输入正整数的车位数量")
       return
     }

src/pages/OperationCenter/CarMgm/CarInfo/index.scss

@@ -145,7 +145,7 @@ $color-primary: var(--color-primary);
     width: 600px;
     height: 300px;
     border: 1px solid;
-    background: #6565656b;
+    background: rgb(62 69 87);
     img  {
       width: 100%;
       height: 100%;

src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx

@@ -809,7 +809,7 @@ function CarInfo() {
             <div style={{ padding: '18px' }}>
                 <div className="base-ltc">
                     <div className="ltc-img">
-                        <img src={baseData.car_img || require("../../../../../src/assets/images/error-img.png")} onError={handleImgError} width={600} />
+                        <img src={baseData.car_img || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} width={600} />
                     </div>
                     <div className="ltc-box">
                         <div className="ltc-box-title"><div className="ltc-icon"></div>车辆归属信息</div>

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

@@ -17,7 +17,7 @@ function ErrorCorrection(props) {
         process_url: ""
     })
     const parameter = {
-        areId:['0'], //区域
+        areId: ['0'], //区域
         parkName: '', //车场名称
         correctionType: 0,//报错类型
         pn: 1,
@@ -48,6 +48,7 @@ function ErrorCorrection(props) {
             }
         }
         console.log(res);
+        setFormData({ ...formData, areId:value })
         setAreaSelectedList(res);
     }
     const addChild = (child, res) => {
@@ -121,11 +122,11 @@ function ErrorCorrection(props) {
         setImgVisible(false)
     }
     // 获取列表数据
-    const getData = (data = formData) => {
+    const getData = (data = formData,reset='') => {
         setAjaxLoading(true)
         let dataList = {
             ...data,
-            areId: areaSelectedList
+            areId:!reset ? areaSelectedList :[]
         }
         ajax.getCarErrorList(dataList).then(res => {
             setAjaxLoading(false)
@@ -157,7 +158,7 @@ function ErrorCorrection(props) {
         if (lastFormData.page_size === length) {
             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn, page_size: length }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn , page_size: length})
+            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length })
             getData(Object.assign({}, formData, { pn: pn, page_size: length }))
         }
     }
@@ -172,7 +173,7 @@ function ErrorCorrection(props) {
     const getSearchData = (data = formData) => {
         // getData(data)
         setFormData({ ...formData, pn: 1 })
-        setLastFormData({...formData, pn: 1})
+        setLastFormData({ ...formData, pn: 1 })
         getData(Object.assign({}, formData, { pn: 1 }))
     }
     //重置数据
@@ -180,8 +181,8 @@ function ErrorCorrection(props) {
         setFormData({
             ...parameter
         })
-        setAreaId([])
-        getData({...parameter,pn: 1} )
+        setAreaSelectedList([])
+        getData({ ...parameter, pn: 1 },'reset')
     }
 
     const [getCanCaDer, setGetCanCaDer] = useState([])
@@ -204,7 +205,7 @@ function ErrorCorrection(props) {
                 <div className="yisa-search">
                     <label>区域</label>
                     <Cascader
-                         defaultValue={formData.areId}
+                        value={formData.areId}
                         options={getCanCaDer}
                         allowClear={false}
                         onChange={onChangeList}
@@ -239,13 +240,13 @@ function ErrorCorrection(props) {
                 </div>
                 <div className="timePicker ">
                     <div className="btnBox">
-                       <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
+                        <Button className="yisa-btn" onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
-                        查询
+                        <Button type="primary" className="yisa-btn" onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
-                        
+
                     </div>
                 </div>
             </div>
@@ -320,21 +321,21 @@ function ErrorCorrection(props) {
                     <div className="plate">
                         问题描述：<span className="font">{getImg.description}</span>
                     </div>
-                    <div className="plate" >  
-                    <div>图片：</div>
-                    <div className="plate-content">
+                    <div className="plate" >
+                        <div>图片：</div>
+                        <div className="plate-content">
 
-                        {
-                            getImgList?.map((res, index) => {
-                                return (
-                                    <div className="img-item">
-                                    <Image src={res} />
+                            {
+                                getImgList?.map((res, index) => {
+                                    return (
+                                        <div className="img-item">
+                                            <Image src={res} />
 
-                                    </div>
-                                )
-                            })
-                        }
-                    </div>
+                                        </div>
+                                    )
+                                })
+                            }
+                        </div>
 
 
                     </div>

src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx

@@ -109,7 +109,7 @@ function EffectiveDetail(props) {
         </Descriptions.Item>
         <Descriptions.Item span={2}>
           <Checkbox.Group
-            defaultValue={[record.unitDelay ? 1 : -1, record.unitUp ? 2 : -1]}
+            defaultValue={[...record.unit_fee_type_group]}
             disabled
             options={[
               {