merge():合并冲突

1 year ago · 6b34aa619f
54 changed files with 259 additions and 126 deletions
--- a/src/components/Export/ExportBtnNew/index.jsx
+++ b/src/components/Export/ExportBtnNew/index.jsx
@ -126,6 +126,7 @@ const ExportBtn = forwardRef((props, ref) => {
              key="max"
              min={1}
              value={max}
+              max={totalRecords}
              onChange={(e) => handleChangeNum(e, "max")}
            />
          </div>
@ -167,17 +168,17 @@ const ExportBtn = forwardRef((props, ref) => {
    }
    //当前页
    else if (checkedType == 1) {
-      const { pn, length, page_size } = postdata.formData
+      const { pn, length, page_size, size } = postdata.formData
      if (isTableModule) {
-        onOk((pn - 1) * (length || page_size) + 1, pn * (length || page_size))
+        onOk((pn - 1) * (length || page_size || size) + 1, pn * (length || page_size || size))
      } else {
-        startExport((pn - 1) * (length || page_size) + 1, pn * (length || page_size) , exportType == "hasImg" ? 1 : 0)
+        startExport((pn - 1) * (length || page_size || size) + 1, pn * (length || page_size || size) , exportType == "hasImg" ? 1 : 0)
      }
    }
    //全部
    else {
      if (isTableModule) {
-        onOk(1, totalRecords)
+        onOk(1, totalRecords, undefined, 1)
      } else {
        startExport(1, totalRecords, exportType == "hasImg" ? 1 : 0)
      }
@ -199,11 +200,12 @@ const ExportBtn = forwardRef((props, ref) => {
          return
        }
        if (res.status === 20000) {
-          if (end - start > 500) {
-            message.info('当前导出任务, 已加入导出任务列表')
-          } else {
+          // if (end - start > 500) {
+          //   message.info('当前导出任务, 已加入导出任务列表')
+          // } else {
+          // }
+          message.info(res.message)
          downloadFile(res.data.url || res.data.export_url)
-          }
          handleCancel()
          // 成功 res.data.task_url
          // setInProcess("2");
@ -227,11 +229,12 @@ const ExportBtn = forwardRef((props, ref) => {
          return
        }
        if (res.status === 20000) {
-          if (end - start > 500) {
-            message.info('当前导出任务, 已加入导出任务列表')
-          } else {
+          // if (end - start > 500) {
+          //   message.info('当前导出任务, 已加入导出任务列表')
+          // } else {
+          // }
+          message.info(res.message)
          downloadFile(res.data.url || res.data.export_url)
-          }
          handleCancel()
          // setInProcess("2");
          // setProcess(res.data?.task_url)
@ -250,6 +253,7 @@ const ExportBtn = forwardRef((props, ref) => {

  // 执行下载
  const downloadFile = (url) => {
+    if (!url) return
    var link = document.createElement("a");
    link.setAttribute("target", "_blank");
    link.style.display = "none";
@ -279,6 +283,7 @@ const ExportBtn = forwardRef((props, ref) => {
    setInProcess("1");
    setProcess(0);
    setMaxExportNum(modalType === "hasImg" ? 10000 : 100000);
+    setBtnLoading(false)
  };

  //导出进度
@ -335,7 +340,7 @@ const ExportBtn = forwardRef((props, ref) => {
    handleError
  }));

-  return (
+  return totalRecords ? <>
    <div className='root_gfkk'>
      <div onClick={() => {
        setIsExportOpen(true)
@ -482,7 +487,7 @@ const ExportBtn = forwardRef((props, ref) => {
        )}
      </Modal>
    </div>
-  );
+  </> : <></>
 })

 export default ExportBtn;
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@ -92,9 +92,10 @@ const TableModule = forwardRef((props, ref) => {
    maxLength: 50,
    showCount: true,
  };
-
  const areaName = formSearch.filter((item) => item.type === "TreeSelect")[0]?.name || null;
-  // console.log(areaName);
+  const roadNameType = formSearch.filter((item) => item.type === "SearchSelect")[0]?.roadName || null;
+  const areaNameType = formSearch.filter((item) => item.type === "TreeSelect")[0]?.areaName || null;
+  const operatorNameType = formSearch.filter((item) => item.type === "Select")[0]?.operatorName || null;
  const [loading, setLoading] = useState(false);
  //区域的下拉数据
  const [areaList, setAreaList] = useState([]);
@ -567,6 +568,7 @@ const TableModule = forwardRef((props, ref) => {
    }
  };

+
  //查询部分
  function renderSearch(params) {
    return (
@ -598,6 +600,7 @@ const TableModule = forwardRef((props, ref) => {
      >
        <Row>
          {formSearch.map((item) => {
+
            let children = null;
            switch (item.type) {
              case "Input":
@ -886,6 +889,8 @@ const TableModule = forwardRef((props, ref) => {
    ajax.getAllOperator().then((res) => {
      if (res.status === 20000) {
        setOperatorList(res.data);
+      }else{
+        message.error(res.message)
      }
    });
  }
@ -949,14 +954,10 @@ const TableModule = forwardRef((props, ref) => {
        })
          .then((res) => {
            if (res.status === 20000) {
-              if (pageName === "charge") { //特殊情况，充电记录导出
-                message.success(res.message)
-              } else {
-                const link = document.createElement("a");
-                link.href = res.data.url || res.data.export_url;
-                link.target = "_blank"; // 打开新页面
-                link.click();
-              }
+              // const link = document.createElement("a");
+              // link.href = res.data.url || res.data.export_url;
+              // link.target = "_blank"; // 打开新页面
+              // link.click();
              setTipModal({
                ...tipModal, visible: false,
                filename:
@ -965,6 +966,7 @@ const TableModule = forwardRef((props, ref) => {
                  new Date().getDate(),
              });
              tipForm.setFieldsValue({ filename: pagename + (new Date().getMonth() + 1).toString().padStart(2, "0") + new Date().getDate(), })
+              message.success(res.message)
              resolved()
            } else {
              message.error(res.message);
@ -1009,17 +1011,20 @@ const TableModule = forwardRef((props, ref) => {
  }, [pageData]);

  useEffect(() => {
+    if(operatorNameType===1){
      getAllOperator();
-  }, []);
+    }
+  }, [operatorNameType]);

  useEffect(() => {
-    // 也许多发的这一次请求,就是压垮服务器的最后一根稻草
-    if(formSearch.find(item=>  item.type == 'TreeSelect')){
+    if (areaNameType === 1) {
      ajax
        .getAreaTree()
        .then((res) => {
          if (res.status === 20000) {
            setAreaList(res.data);
+          } else {
+            res.message(res.data)
          }
        })
        .catch((err) => {
@ -1027,14 +1032,19 @@ const TableModule = forwardRef((props, ref) => {
        });
    }

-  }, [formSearch]);
+  }, [areaNameType]);
  const [getRoadList, setGetRoadList] = useState([])
-
  useEffect(() => {
+    if (roadNameType === 1) {
      ajax.getNewRoadSearch().then((res) => {
+        if (res.status === 20000) {
          setGetRoadList(res.data);
+        } else {
+          message.error(res.message)
+        }
      })
-  }, [])
+    }
+  }, [roadNameType])
  return (
    <div className={`TableModule ${className}`}>
      <div className="left-search">
--- a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
@ -607,7 +607,8 @@ function OperationReport() {
    }).then(
      (res) => {
        if (parseInt(res?.status) === 20000) {
-          Daownload(res?.data?.url);
+          // Daownload(res?.data?.url);
+          message.success(res.message)
          exportRef.current.handleCancel()
        } else {
          message.error(res?.message);
--- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
@ -314,7 +314,8 @@ function ParkCardReport() {
    }).then(
      (res) => {
        if (parseInt(res?.status) === 20000) {
-          Daownload(res?.data?.url);
+          // Daownload(res?.data?.url);
+          message.success(res.message)
          exportRef.current.handleCancel()
        } else {
          message.error(res?.message);
--- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
@ -550,7 +550,8 @@ function ParkingIncomeReport() {
    }).then(
      (res) => {
        if (parseInt(res?.status) === 20000) {
-          Daownload(res?.data?.url);
+          // Daownload(res?.data?.url);
+          message.success(res.message)
          exportRef.current.handleCancel()
        } else {
          message.error(res?.message);
--- a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
@ -384,7 +384,8 @@ function PaySummaryReport() {
    }).then(
      (res) => {
        if (parseInt(res?.status) === 20000) {
-          Daownload(res?.data?.url);
+          // Daownload(res?.data?.url);
+          message.success(res.message)
          exportRef.current.handleCancel()
        } else {
          message.error(res?.message);
--- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
@ -344,7 +344,8 @@ function PdaStat() {
    }).then(
      (res) => {
        if (parseInt(res?.status) === 20000) {
-          Daownload(res?.data?.url);
+          // Daownload(res?.data?.url);
+          message.success(res.message)
          exportRef.current.handleCancel()
        } else {
          message.error(res?.message);
--- a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
@ -349,7 +349,8 @@ function PreOrderReport() {
    }).then(
      (res) => {
        if (parseInt(res?.status) === 20000) {
-          Daownload(res?.data?.url);
+          // Daownload(res?.data?.url);
+          message.success(res.message)
          exportRef.current.handleCancel()
        } else {
          message.error(res?.message);
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@ -299,12 +299,14 @@ function ParkingOrderInquiry(props) {
            name: "region",
            type: "TreeSelect",
            label: "区域",
+            areaName:1
        },
        {//2
            name: "operator",
            type: "Select",
            label: "商户名称",
            options: dictionary.MerchantName,
+            operatorName:1
        },
        {//3
            name: "road",
@ -857,7 +859,7 @@ function ParkingOrderInquiry(props) {
                    </div>
                </div>
                <div className="ltc-box-title"><div className="text">停车订单:{ycddData.park_record_id}</div><div className="line"></div></div>
-                <div className="ltc-box-title"><div className="text">车场详情</div></div>
+                <div className="ltc-box-title"><div className="text">车厂详情</div></div>
                <div className="ltc-content">
                    <div className="ltc-item">
                        <div className="new-item">平台商户</div><div className="new-value">{ycddData.payment_operator_name}</div>
--- a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx
+++ b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx
@ -284,11 +284,11 @@ function PayRecordTotal(props) {
  const handleExport = (start, end) => {
    if (resultData.list?.length > 0) {
      let { pn, page_size, ...params } = defaultParams;
-      ajax.getPayRecordTotalListExport(params).then(
+      ajax.getPayRecordTotalListExport({...params, start: start, end: end}).then(
        (res) => {
          if (parseInt(res?.status) === 20000) {
            //window.location.href = res.data?.url
-            window.open(res.data?.url)
+            // window.open(res.data?.url)
            message.success(res?.message);
            exportRef.current.handleCancel()
          } else {
--- a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
+++ b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
@ -422,7 +422,8 @@ function PayRepeat() {
    }).then(
      (res) => {
        if (parseInt(res?.status) === 20000) {
-          Daownload(res?.data?.url);
+          // Daownload(res?.data?.url);
+          message.success(res?.message);
          exportRef.current.handleCancel()
        } else {
          message.error(res?.message);
--- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
@ -927,7 +927,8 @@ function CollectorWorkStat(props) {
                end: end
            }
            ajax.specialExport(data).then(res => {
-                window.open(res.data.url)
+                // window.open(res.data.url)
+                message.success(res?.message);
                resolved()
            }).catch(err => {
                rejected(err)
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
@ -250,9 +250,10 @@ function Road(props) {
  }

  const handleExport = (start, end) => {
-    ajax.deviceDimensionExport({...form, start: start, end: end}).then(e => {
+    ajax.deviceDimensionExport({...formData, start: start, end: end}).then(e => {
        if (e.status == 20000) {
-            window.open(e.data.url)
+            // window.open(e.data.url)
+            message.success(res?.message);
            exportRef.current.handleCancel()
        } else {
            exportRef.current.handleError()
--- a/src/pages/InRoadMgm/EquipmentOpe/faultReport/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentOpe/faultReport/loadable.jsx
@ -70,7 +70,8 @@ function faultReport(props) {
                end: end
            }
            ajax.getFaultReportExport(data).then(res => {
-                window.open(res.data.export_url)
+                // window.open(res.data.export_url)
+                message.success(res?.message);
                resolved()
            }).catch(err => {
                rejected(err)
--- a/src/pages/InRoadMgm/EquipmentOpe/patrolStatistics/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentOpe/patrolStatistics/loadable.jsx
@ -70,7 +70,8 @@ function patrolStatistics(props) {
                end: end
            }
            ajax.getBerthWarningListExport(data).then(res => {
-                window.open(res.data.export_url)
+                // window.open(res.data.export_url)
+                message.success(res?.message);
                resolved()
            }).catch(err => {
                rejected(err)
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx
@ -332,7 +332,8 @@ function WorkerAttendance (props) {
                end: end
            }
            ajax.attendanceExport(data).then(res => {
-                window.open(res.data.url)
+                // window.open(res.data.url)
+                message.success(res?.message);
                resolved()
            }).catch(err => {
                rejected()
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
@ -292,7 +292,8 @@ function WorkerSchedule(props) {
                end: end
            }
            ajax.scheduleExport(data).then(res => {
-                window.open(res.data.url)
+                // window.open(res.data.url)
+                message.success(res?.message);
                resolved()
            }).catch(err => {
                rejected()
--- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
@ -23,8 +23,8 @@ function SalesStat(props) {
  })
  const parameter = {
    name: '',//登录名
-    start: moment().format('YYYY-MM-DD 00:00:00'),
-    end: moment().format("YYYY-MM-DD 23:59:59"),
+    start_time: moment().format('YYYY-MM-DD 00:00:00'),
+    end_time: moment().format("YYYY-MM-DD 23:59:59"),
    pn: 1,
    length: Number(pageSizeOptions[0]),  // 每页条数
  }
@ -58,8 +58,8 @@ function SalesStat(props) {
    setGetTime(v)
    setFormData({
      ...formData,
-      start: v.startDateTime,
-      end: v.endDateTime,
+      start_time: v.startDateTime,
+      end_time: v.endDateTime,
      time: v.time
    })
    setTabData({
@ -249,15 +249,6 @@ function SalesStat(props) {
      getData(Object.assign({}, formData, { pn: pn, length: length }))
    }
  }
-  const changeTabPn = (pn, length) => {
-    if (lastTotalData.length === length) {
-      setTabData(Object.assign({}, tabData, { pn: pn, length: length }))
-      setLastTotalData(Object.assign({}, lastTotalData, { pn: pn, length: length }))
-      lastTabDataRef.current = Object.assign({}, lastTotalData, { pn: pn, length: length })
-      getDetailData(Object.assign({}, tabData, { pn: pn, length: length, ...getDetailId }))
-    }
-  }
-  console.log(tabData);
  //切换每页条数
  const changeLength = (pn, length) => {
    setFormData(Object.assign({}, formData, { pn: 1, length: length }))
@ -265,12 +256,6 @@ function SalesStat(props) {
    lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
    getData(Object.assign({}, formData, { pn: 1, length: length }))
  }
-  const changeTabLength = (pn, length) => {
-    setTabData(Object.assign({}, tabData, { pn: 1, length: length }))
-    setLastTotalData(Object.assign({}, lastTotalData, { pn: 1, length: length }))
-    lastTabDataRef.current = Object.assign({}, lastTotalData, { pn: 1, length: length })
-    getDetailData(Object.assign({}, tabData, { pn: 1, length: length }))
-  }
  //检索数据
  const getSearchData = (data = formData) => {
    setFormData(Object.assign({}, formData, { pn: 1 }))
@ -281,10 +266,6 @@ function SalesStat(props) {
  const exportModal = () => {
    setExportVisible(false)
  }
-  //导出
-  const salesData = () => {
-    setExportVisible(true)
-  }
  const exportNow = (start, end) => {
    let data = {
      ...formData,
@ -293,7 +274,8 @@ function SalesStat(props) {
      end: end
    }
    ajax.salesExport(data).then(res => {
-      window.open(res.data.url)
+      // window.open(res.data.url)
+      message.success(res.message)
      setExportVisible(false)
    })
  }
@ -304,7 +286,8 @@ function SalesStat(props) {
      export_type: "all"
    }
    ajax.salesExport(data).then(res => {
-      window.open(res.data.url)
+      // window.open(res.data.url)
+      message.success(res.message)
      setExportVisible(false)
    })
  }
@ -356,8 +339,8 @@ const [getTextValue,setGetTextValue]=useState({})
        <div className="timePicker yisa-search">
          <FormSliderPicker
            yisaLabel='时间范围'
-            defaultStartDateTime={moment(formData.start)}
-            defaultEndDateTime={moment(formData.end)}
+            defaultStartDateTime={moment(formData.start_time)}
+            defaultEndDateTime={moment(formData.end_time)}
            yisaOnChange={onHandleDateChange}
            limit={730}
            dropdownData={[
--- a/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx
@ -27,8 +27,8 @@ function WorkerStat(props) {
        username: '',//登录名
        user_id: '0',//姓名
        job_status: '1',//在职状态
-        start: moment().subtract(1, 'days').format('YYYY-MM-DD'),
-        end: moment().subtract(1, 'days').format('YYYY-MM-DD'),
+        start_time: moment().subtract(1, 'days').format('YYYY-MM-DD'),
+        end_time: moment().subtract(1, 'days').format('YYYY-MM-DD'),
        pn: 1,
        page_size: Number(pageSizeOptions[0]),  // 每页条数
    }
@ -57,8 +57,8 @@ function WorkerStat(props) {
    const onHandleDateChange = (v) => {
        setFormData({
            ...formData,
-            start: v.startDateTime,
-            end: v.endDateTime,
+            start_time: v.startDateTime,
+            end_time: v.endDateTime,
            time: v.time
        })
    }
@ -149,7 +149,8 @@ function WorkerStat(props) {
                end: end
            }
            ajax.statExport(data).then(res => {
-                window.open(res.data.url)
+                // window.open(res.data.url)
+                message.success(res.message)
                resolved()
            }).catch(err => {
                rejected()
@ -237,8 +238,8 @@ function WorkerStat(props) {
                <div className="timePicker yisa-search">
                    <FormSliderPicker
                        yisaLabel='时间范围'
-                        defaultStartDateTime={moment(formData.start)}
-                        defaultEndDateTime={moment(formData.end)}
+                        defaultStartDateTime={moment(formData.start_time)}
+                        defaultEndDateTime={moment(formData.end_time)}
                        yisaOnChange={onHandleDateChange}
                        limit={730}
                        isShowTime={false}
--- a/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx
@ -65,7 +65,8 @@ function ReportMsg(props) {
                end: end
            }
            ajax.getReportExport(data).then(res => {
-                window.open(res.data.url)
+                // window.open(res.data.url)
+                message.success(res.message)
                resolved()
            }).catch(err => {
                rejected(err)
--- a/src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx
@ -105,6 +105,7 @@ function ArrearsEtcInquiries() {
      type: "Select",
      label: "商户名称",
      placeholder: "请输入商户名称",
+      operatorName:1
    },
    {
      name: "road",
@ -155,6 +156,8 @@ function ArrearsEtcInquiries() {
      if (res.status === 20000) {
        setTableData(res.data.list);
        setTotal(res.data.total);
+      } else {
+        message.error(res.message)
      }
    });
  };
--- a/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx
@ -105,6 +105,7 @@ function ArrearsInquiries() {
      type: "Select",
      label: "商户名称",
      placeholder: "请输入商户名称",
+      operatorName:1
    },
    {
      name: "road",
@ -155,6 +156,8 @@ function ArrearsInquiries() {
      if (res.status === 20000) {
        setTableData(res.data.list);
        setTotal(res.data.total);
+      } else {
+        message.error(res.message)
      }
    });
  };
--- a/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
@ -73,18 +73,21 @@ function ArrearsRecordTotal() {
      name: "region",
      type: "TreeSelect",
      label: "区域",
+      areaName:1
    },
    {
      name: "operator",
      type: "Select",
      label: "商户名称",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "road",
      type: "SearchSelect",
      label: "路段名称",
      placeholder: "请输入路段名称",
+      roadName:1
    },
    {
      name: "plate_color",
@ -149,6 +152,8 @@ function ArrearsRecordTotal() {
      if (res.status === 20000) {
        setTableData(res.data.list);
        setTotal(res.data.total);
+      } else {
+        message.error(res.message)
      }
    });
  }
--- a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
@ -359,6 +359,7 @@ function DisabledCarParkRecordTotal() {
      name: "region",
      type: "TreeSelect",
      label: "区域",
+      areaName:1,
      defaultValue: ["0"],
      //options: [],
    },
@ -368,6 +369,7 @@ function DisabledCarParkRecordTotal() {
      label: "商户名称",
      defaultValue: "0",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "road",
@ -375,6 +377,7 @@ function DisabledCarParkRecordTotal() {
      label: "路段名称",
      defaultValue: "0",
      placeholder: "请输入路段名称",
+      roadName:1
    },
    {
      name: "road_type",
--- a/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx
@ -91,7 +91,8 @@ function EntryExitOptPDA() {
      type: "Select",
      label: "商户名称",
      name: "merchantName",
-      placeholder:"请选择商户名称"
+      placeholder:"请选择商户名称",
+      operatorName:1
    },
    {
      type: "Input",
@ -141,6 +142,8 @@ function EntryExitOptPDA() {
      if (res.status === 20000) {
        setTableData(res.data.list);
        setTotal(res.data.total);
+      } else {
+        message.error(res.message)
      }
    });
  }
--- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
@ -289,6 +289,7 @@ function ParkRecordTotal() {
      name: "region",
      type: "TreeSelect",
      label: "区域",
+      areaName:1
    },
    {
      name: "operator",
@ -296,12 +297,14 @@ function ParkRecordTotal() {
      label: "商户名称",
      defaultValue: "0",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "road",
      type: "SearchSelect",
      label: "路段名称",
      placeholder: "请输入路段名称",
+      roadName:1
    },
    {
      name: "road_type",
@ -739,6 +742,8 @@ function ParkRecordTotal() {
    ajax.getPaymentRecord({ park_record_id: park_id }).then((res) => {
      if (res.status === 20000) {
        setPayRecord(res.data.list);
+      } else {
+        message.error(res.message)
      }
    });
  }
@ -747,6 +752,8 @@ function ParkRecordTotal() {
    ajax.getRefundRecord({ park_id }).then((res) => {
      if (res.status === 20000) {
        setRefundRecord(res.data.list);
+      } else {
+        message.error(res.message)
      }
    });
  }
@ -755,6 +762,8 @@ function ParkRecordTotal() {
    ajax.getOperateRecord({ park_record_id: park_id }).then((res) => {
      if (res.status === 20000) {
        setOperatorRecord(res.data.list);
+      } else {
+        message.error(res.message)
      }
    });
  }
@ -765,6 +774,8 @@ function ParkRecordTotal() {
        // res.data.list.map(res=>{
          setHistoryProgressRecord(res.data.list);
        // })
+      } else {
+        message.error(res.message)
      }
    });
  }
--- a/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx
@ -105,6 +105,7 @@ function ParkRecordTotal() {
      type: "SearchSelect",
      label: "路段名称",
      placeholder: "请输入路段名称",
+      roadName:1
    },
    {
      name: "plate",
@ -134,6 +135,7 @@ function ParkRecordTotal() {
      name: "operator",
      type: "Select",
      label: "所属商户",
+      operatorName:1
    },
    {
      name: "berth_id",
@ -169,6 +171,8 @@ function ParkRecordTotal() {
      if (res.status === 20000) {
        setTableData(res.data.list);
        setTotal(res.data.total);
+      } else {
+        message.error(res.message)
      }
    });
  }
--- a/src/pages/InRoadMgm/RecordInquiry/PreOrderRecord/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/PreOrderRecord/loadable.jsx
@ -143,6 +143,8 @@ function PreOrderRecord() {
      if (res.status === 20000) {
        setTableData(res.data.list);
        setTotal(res.data.total);
+      } else {
+        message.error(res.message)
      }
    });
  }
@ -151,6 +153,8 @@ function PreOrderRecord() {
    ajax.getAllOperator().then((res) => {
      if (res.status === 20000) {
        setOperatorList(res.data);
+      } else {
+        message.error(res.message)
      }
    });
  }
--- a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
@ -127,6 +127,7 @@ function PreOrderRecord() {
      type: "TreeSelect",
      label: "区域",
      defaultValue: ["0"],
+      areaName:1
      //options: [],
    },
    {
@ -135,6 +136,7 @@ function PreOrderRecord() {
      label: "商户名称",
      defaultValue: "0",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "road",
@ -237,6 +239,8 @@ function PreOrderRecord() {
        if (res.status === 20000) {
          setTotal(res.data.total);
          setTableData(res.data.list);
+        } else {
+          message.error(res.message)
        }
      })
      .catch((err) => {
@ -278,6 +282,8 @@ function EffectCheckBox(props) {
          if (res.status === 20000) {
            setTollmanList(res.data);
            setEffectiveModal(true);
+          } else {
+            message.error(res.message)
          }
        })
        .catch((err) => {
@ -290,6 +296,8 @@ function EffectCheckBox(props) {
            message.success(res.message);
            setChecked(!checked);
            getData()
+          } else {
+            message.error(res.message)
          }
        },
        (reject) => {
@ -306,6 +314,8 @@ function EffectCheckBox(props) {
          setChecked(!checked);
          setEffectiveModal(false);
          getData()
+        } else {
+          message.error(res.message)
        }
      },
      (reject) => {
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
@ -445,10 +445,11 @@ function RoadConf() {
        .exportRoadList({...result, start: start, end: end})
        .then((res) => {
          if (res.status === 20000) {
-            const link = document.createElement("a");
-            link.href = res.data.export_url;
-            link.target = "_blank"; // 打开新页面
-            link.click();
+            // const link = document.createElement("a");
+            // link.href = res.data.export_url;
+            // link.target = "_blank"; // 打开新页面
+            // link.click();
+            message.success(res.message)
            resolved()
          }
        })
--- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
@ -151,6 +151,7 @@ function Appointment() {
      label: "商户名称",
      defaultValue: "0",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
  ];

--- a/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx
+++ b/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx
@ -149,6 +149,7 @@ function Appointment() {
      label: "商户名称",
      defaultValue: "0",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "pre_time",
--- a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx
+++ b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx
@ -68,7 +68,8 @@ function ShareParkMgm() {
      type: "Select",
      label: "商户名称",
      name: "merchantName",
-      placeholder:"请选择商户名称"
+      placeholder:"请选择商户名称",
+      operatorName:1
    },
    {
      type: "SearchSelect",
--- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
+++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
@ -343,6 +343,7 @@ function CarInfo() {
            name: "region",
            type: "TreeSelect",
            label: "区域",
+            areaName:1
        },
        {//2
            name: "operator",
--- a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
@ -523,7 +523,8 @@ function CallbackSuggestion(props) {
            end: end
        }
        ajax.exportDataList(data).then(res => {
-            window.open(res.data.export_url)
+            // window.open(res.data.export_url)
+            message.success(res.message)
            exportRef.current.handleCancel()
        }).catch(err => {
            exportRef.current.handleError()
--- a/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx
@ -245,7 +245,8 @@ function ComplainManage(props) {
    let data = { ...holdData, ...pageInfo, start: start, end: end };
    ajax.getComplainExport(data).then((res) => {
      if (res?.data?.url) {
-        window.open(res.data.url);
+        // window.open(res.data.url);
+        message.success(res.message)
        exportRef.current.handleCancel()
      } else {
        message.error("导出异常");
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx
@ -251,7 +251,8 @@ function WriteOffDetail() {
            end: end
        }
        ajax.handleOffExport(data).then(res => {
-            window.open(res.data.url)
+            // window.open(res.data.url)
+            message.success(res.message)
            exportRef.current.handleCancel()           
        }).catch(err => {
            exportRef.current.handleError()
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx
@ -154,7 +154,8 @@ function WriteOffStat(props) {
            end: end
        }
        ajax.handleCountExport(data).then(res => {
-            window.open(res.data.url)
+            // window.open(res.data.url)
+            message.success(res.message)
            exportRef.current.handleCancel()
        }).catch(err => {
            exportRef.current.handleError()
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
@ -300,7 +300,8 @@ function ParkingCardOrder() {
        }
        ajax.exportOrder({...formData, start: start, end: end}).then(res => {
            if (parseInt(res?.status) === 20000){
-                Donwload(res.data?.url)
+                // Donwload(res.data?.url)
+                message.success(res.message)
                exportRef.current.handleCancel()
            } 
            else {
--- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredOrder/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredOrder/loadable.jsx
@ -77,7 +77,8 @@ function StaggeredOrder(props) {
            end: end
        }
        ajax.getExportOrder(data).then(res => {
-            window.open(res.data.url)
+            // window.open(res.data.url)
+            message.success(res.message)
            exportRef.current.handleCancel()
        }).catch(err => {
            exportRef.current.handleError()
--- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx
@ -58,7 +58,8 @@ function StaggeredStat(props) {
            end: end
        }
        ajax.getStaggeredStatExport(data).then(res => {
-            window.open(res.data.url)
+            // window.open(res.data.url)
+            message.success(res.message)
            exportRef.current.handleCancel()
        }).catch(err => {
            exportRef.current.handleError()
--- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
+++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
@ -486,6 +486,7 @@ function UserInfo() {
            name: "region",
            type: "TreeSelect",
            label: "区域",
+            areaName:1
        },
        {//2
            name: "operator",
--- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx
@ -89,12 +89,14 @@ function OutParkingArrearsOrders() {
      name: "region",
      type: "TreeSelect",
      label: "区域",
+      areaName:1
    },
    {
      name: "operator",
      type: "Select",
      label: "商户名称",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "parking_lot",
--- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx
@ -135,12 +135,14 @@ function OutParkingRecordInquiry() {
      name: "region",
      type: "TreeSelect",
      label: "区域",
+      areaName:1
    },
    {
      name: "operator",
      type: "Select",
      label: "商户名称",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "road",
--- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from "react";
-import { ResultFlowResult } from "@/components"
+import { ResultFlowResult, ExportBtnNew } from "@/components"
 import { Button, Table, message, Pagination, Input, Modal, Image, DatePicker, Space } from 'antd'
 import {
    pageSizeOptions
@ -27,6 +27,7 @@ function LiftUpPoleRecord(props) {
        pn: 1,
        page_size: Number(pageSizeOptions[0]),  // 每页条数
    }
+    const exportRef = useRef(null)
    const [formData, setFormData] = useState(parameter)
    const [lastFormData, setLastFormData] = useState(formData)
    const lastFormDataRef = useRef(formData)
@ -198,15 +199,20 @@ function LiftUpPoleRecord(props) {
        getData({...data, pn: 1})
    }
    //导出
-    const salesData = () => {
+    const salesData = (start, end) => {
        let data = {
-            ...formData
+            ...formData,
+            start: start,
+            end: end
        }
        ajax.poleExport(data).then(res => {
            if (res.status == 20000) {
-                window.open(res.data.url || res.data.export_url)
+                // window.open(res.data.url || res.data.export_url)
+                message.success(res.message)
+                exportRef.current.handleCancel()
            } else {
                message.error(res.message)
+                exportRef.current.handleError()
            }
        })
    }
@ -276,7 +282,19 @@ function LiftUpPoleRecord(props) {
                <div className="result">
                    <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
                    <div className="header-button">
-                        <Button type="primary" onClick={() => { salesData() }}>导出</Button>
+                        {/* <Button type="primary" onClick={() => { salesData() }}>导出</Button> */}
+                        <ExportBtnNew
+                            children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
+                            modalType="noImg"
+                            ref={exportRef}
+                            totalRecords={resultData.total_records}
+                            imgno={false}
+                            postdata={{
+                                formData: formData
+                            }}
+                            isTableModule={true}
+                            onOk={salesData}
+                        />
                    </div>
                    <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                        <Table
--- a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from "react";
-import { ResultFlowResult } from "@/components"
+import { ResultFlowResult, ExportBtnNew } from "@/components"
 import { Button, Table, message, Pagination, Input, Modal, Image, DatePicker, Space, Tabs, Form, Radio } from 'antd'
 import {
    pageSizeOptions
@ -14,6 +14,7 @@ const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
 function ZombieCarCleanRecord(props) {
    const [ajaxLoading, setAjaxLoading] = useState(false)
+    const exportRef = useRef(null)
    const [resultData, setResultData] = useState({
        data: [],
        total_records: 0,
@ -450,6 +451,26 @@ function ZombieCarCleanRecord(props) {
    // useEffect(() => {
    //     getData()
    // }, [])
+
+    const exportOk = (start, end, type, isAll) => {
+        let data = {
+            ...formData,
+            start: start,
+            end: end,
+            export_type: isAll == 1 ? 'all' : ''
+        }
+        ajax.zombieExport(data).then(res => {
+            if (res.status == 20000) {
+                // window.open(res.data?.url || res.data?.export_url)
+                message.success(res.message)
+                exportRef.current.handleCancel()
+            } else {
+                message.error(res.message)
+                exportRef.current.handleError()
+            }
+        }) 
+    }
+
    function handleOk() {
        let data = {
            ...formData,
@ -533,10 +554,22 @@ function ZombieCarCleanRecord(props) {
                <div className="result">
                    <div className="result-info-row">
                         <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
-                        <div>
-                            <Button type="primary" className="yisa-btn" onClick={() => { setExportModal({ ...exportModal, visible: true }) }}>
+                        <div style={{display: "flex"}}>
+                            {/* <Button type="primary" className="yisa-btn" onClick={() => { setExportModal({ ...exportModal, visible: true }) }}>
                                导出
-                            </Button>&emsp;
+                            </Button>&emsp; */}
+                            <ExportBtnNew
+                                children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
+                                modalType="noImg"
+                                ref={exportRef}
+                                totalRecords={resultData.total_records}
+                                imgno={false}
+                                postdata={{
+                                    formData: formData
+                                }}
+                                isTableModule={true}
+                                onOk={exportOk}
+                            />
                            <Button type="primary" className="yisa-btn" disabled={true} onClick={() => { sameBtn() }}>
                                同步
                            </Button>
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
@ -124,6 +124,7 @@ function ChargeRulesMgm() {
      type: "Select",
      label: "商户名称",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
  ];
  //搜索参数初始化
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@ -412,7 +412,8 @@ function OutSegment() {
      }).then(
        (res) => {
          if (res) {
-            window.open(res.data.export_url)
+            // window.open(res.data.export_url)
+            message.success(res.message)
            tableRef.current.handleCancel()
          } else {
            message.error(res?.message);
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx
@ -91,12 +91,14 @@ function ZombieCarMgm() {
      type: "TreeSelect",
      label: "区域",
      defaultValue: ['0'],
+      areaName:1
    },
    {
      name: "operator",
      type: "Select",
      label: "商户名称",
      placeholder: "请选择商户名称",
+      operatorName:1
    },
    {
      name: "road",
--- a/src/services/InroadMgm/InRoadOverview/index.js
+++ b/src/services/InroadMgm/InRoadOverview/index.js
@ -21,7 +21,7 @@ const getIncomeTop5 = (params) => {
 // /api/bpm/home/parking_records_top5    概览-停车记录top5
 const getParkingRecordTop5 = (params) => {
  return ajax({
-    url: "/api/bpm/home/parking_records_top5 ",
+    url: "/api/bpm/home/parking_records_top5",
    type: "get",
    data: params,
  });
@ -36,7 +36,7 @@ const getParkingPayTop5 = (params) => {
 // /api/bpm/home/parking_income    概览-停车收入概览
 const getParkingIncome = (params) => {
  return ajax({
-    url: "/api/bpm/home/parking_income ",
+    url: "/api/bpm/home/parking_income",
    type: "get",
    data: params,
  });
--- a/src/services/OutRoadMgm/OutParkingArrearsOrders.js
+++ b/src/services/OutRoadMgm/OutParkingArrearsOrders.js
@ -2,7 +2,7 @@ import ajax from "@/config/ajax";
 // 停车记录查询/欠费订单-列表
 const getOutParkingArrearsList = (params) => {
  return ajax({
-    url: "/api/orp/business/get_record_arrears_list ",
+    url: "/api/orp/business/get_record_arrears_list",
    type: "post",
    data: params,
  });
--- a/src/services/OutRoadMgm/OutParkingRecordInquiry.js
+++ b/src/services/OutRoadMgm/OutParkingRecordInquiry.js
@ -2,7 +2,7 @@ import ajax from "@/config/ajax";
 ///api/orp/business/get_record_list    停车记录查询/欠费订单-列表
 const getOutParkingRecordList = (params) => {
  return ajax({
-    url: "/api/orp/business/get_record_list ",
+    url: "/api/orp/business/get_record_list",
    type: "post",
    data: params,
  });
--- a/src/services/OutRoadMgm/ZombieCarMgm.js
+++ b/src/services/OutRoadMgm/ZombieCarMgm.js
@ -26,7 +26,7 @@ const showStopList = (params) => {
 ///api/bpm/offroad/show_pay_list  查看支付记录
 const showPayList = (params) => {
  return ajax({
-    url: "/api/bpm/offroad/show_pay_list ",
+    url: "/api/bpm/offroad/show_pay_list",
    type: "post",
    data: params,
  });
--- a/src/services/search.js
+++ b/src/services/search.js
@ -342,7 +342,7 @@ const monitorAdd = (params) => {
 };
 const monitorOutAdd = (params) => {
  return ajax({
-    url: "/api/orp/nvr/add_monitor_device ",
+    url: "/api/orp/nvr/add_monitor_device",
    type: "post",
    data: params,
  });