@@ -1123,4 +1123,4 @@ function BillingRule() {
);
}
-export default BillingRule;
+export default ChargerMonitor;
diff --git a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx
index 7fbec04..d155dc7 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx
@@ -2,5 +2,5 @@ import React from "react"
import loadable from "@loadable/component"
import { LoadingImg } from "@/components"
-const BillingRule = loadable(() => import("./loadable"))
-export default (pros) =>
} />
\ No newline at end of file
+const LockMonitor = loadable(() => import("./loadable"))
+export default (pros) =>
} />
\ No newline at end of file
diff --git a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx
index cecb221..b2afd6b 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx
@@ -34,7 +34,7 @@ const { TextArea } = Input;
let array = [];
-function BillingRule() {
+function LockMonitor() {
const roadContent = (
出场时间-入场时间的计算金额
@@ -1123,4 +1123,4 @@ function BillingRule() {
);
}
-export default BillingRule;
+export default LockMonitor;
diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx
index 7fbec04..d6150c1 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx
@@ -2,5 +2,5 @@ import React from "react"
import loadable from "@loadable/component"
import { LoadingImg } from "@/components"
-const BillingRule = loadable(() => import("./loadable"))
-export default (pros) =>
} />
\ No newline at end of file
+const PileMonitor = loadable(() => import("./loadable"))
+export default (pros) =>
} />
\ No newline at end of file
diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
index cecb221..6d6811a 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
@@ -23,43 +23,15 @@ import errorImg from '@/assets/images/error-img-new.png'
import { QuestionCircleOutlined } from '@ant-design/icons';
import { TableModule } from "@/components";
import "./index.scss";
-import {
- payRecordColumns,
- refundRecordColumns,
- operatorRecordColumns,
-} from "./dataSource";
+
// import errorImg from "@/assets/images/layout/error.png"
// import { useLocation } from "react-router-dom";
const { TextArea } = Input;
let array = [];
-function BillingRule() {
- const roadContent = (
-
- )
- const receivableContent = (
-
- )
- const discountContent = (
-
- )
- const preferentialContent = (
-
- )
- const refundContent = (
-
- )
+function PileMonitor() {
+
const columns = [
{
title: "序号",
@@ -139,88 +111,8 @@ function BillingRule() {
width: 100,
align: "center",
},
- {
- title:
- 订单金额
-
- ,
- dataIndex: "order_amount",
- key: "order_amount",
- width: 100,
- align: "center",
- // filterDropdown: true,
- // filterIcon:
- //
- //
- //
- },
- {
- title:
- 应收金额
-
- ,
- dataIndex: "receivable_amount",
- key: "receivable_amount",
- width: 100,
- align: "center",
- // filterDropdown: true,
- // filterIcon:
- //
- //
- //
- },
- {
- title:
- 折扣金额
-
- ,
- dataIndex: "discount_amount",
- key: "discount_amount",
- width: 100,
- align: "center",
- // filterDropdown: true,
- // filterIcon:
- //
- //
- //
- },
- {
- title:
- 优惠金额
-
- ,
- dataIndex: "preferential_amount",
- key: "preferential_amount",
- width: 100,
- align: "center",
- // filterDropdown: true,
- // filterIcon:
- //
- //
- //
- },
- {
- title: "实付金额",
- dataIndex: "actual_amount",
- key: "actual_amount",
- width: 100,
- align: "center",
- },
- {
- title:
- 退款总计
-
- ,
- dataIndex: "refund_total",
- key: "refund_total",
- width: 100,
- align: "center",
- // filterDropdown: true,
- // filterIcon:
- //
- //
- //
- },
+
+
{
title: "停车记录ID",
dataIndex: "park_id",
@@ -759,368 +651,8 @@ function BillingRule() {
search={search}
exportUrl="/api/bpm/record/get_record_export"
/>
-
{
- setDetailVisible(false);
- setTabKey("1");
- }}
- destroyOnClose
- >
-
-
- {renderParkRecord(parkingRecordDetail)}
-
-
- {renderModalTable(payRecordColumns, payRecord)}
-
-
- {renderModalTable(refundRecordColumns, refundRecord)}
-
-
- {renderModalTable(operatorRecordColumns, operationRecord)}
-
-
- {renderModalTable(historyProgressColumns, historyProgressRecord)}
-
-
- {
- setHistoryVisible(false);
- }}
- className="hanleHistoyModal"
- footer={null}
- width={1000}
- >
-
-
-
- {historyDataDetail?.road}
-
-
- {historyDataDetail.region}
-
-
- {historyDataDetail.operator}
-
-
- {historyDataDetail.berth_id}
-
-
- {historyDataDetail.road_type}
-
-
-
-
- {historyDataDetail.plate}
-
-
- {historyDataDetail.admission_time}
-
-
- {historyDataDetail.in_time}
-
-
- {historyDataDetail.out_time}
-
-
- {historyDataDetail.in_source}
-
-
- {historyDataDetail.out_source}
-
-
- {
- setPlatePhotoModal(true);
- }}
- >
- 查看
-
-
-
-
-
- {historyDataDetail.order_amount}
-
-
- {historyDataDetail.preferential_total}
-
-
- {historyDataDetail.actual_amount}
-
-
- {historyDataDetail.arrears_mount}
-
-
- {
- setIsShowAll(false);
- }}
- >
- 返回
-
- ) : (
- {
- setIsShowAll(true);
- }}
- >
- 查看全部
-
- )
- }
- >
-
-
-
-
- {isShowAll ? (
-
-
-
-
-
-
-
-
申诉处理审核: 已完成
-
-
{getHistoryData.examine_time}
-
来源:平台
-
操作人:{getHistoryData.dealer}
-
-
-
-
-
-
申诉处理提审
-
-
-
操作项
-
- {getHistoryData?.change_content == 1
- ? "调整出场时间"
- : getHistoryData?.change_content == 2
- ? "变更车牌号"
- : getHistoryData?.change_content == 3
- ? "更改订单金额"
- : getHistoryData?.change_content == 4
- ? "免费该订单"
- : "作废该订单"}
-
-
{getHistoryData.deal_time}
-
-
-
初始值
-
{getHistoryData.initial_value || "--"}
-
来源:平台
-
-
-
变更值
-
{getHistoryData.update_value || "--"}
-
{getHistoryData.dealer}
-
-
-
-
-
-
-
-
- ) : (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {getHistoryData.change_content == 1 ? (
- <>
-
-
-
-
-
-
-
-
-
- >
- ) : getHistoryData.change_content == 2 ? (
-
-
-
-
-
-
-
-
- ) : getHistoryData.change_content == 3 ? (
- <>
-
-
-
-
-
-
-
-
-
- >
- ) : null}
-
-
-
- )}
- {
- setPlatePhotoModal(false);
- }}
- footer={false}
- className="modal-img"
- >
-
-
-
-
>
);
}
-export default BillingRule;
+export default PileMonitor;
diff --git a/src/pages/NewEnergy/index.jsx b/src/pages/NewEnergy/index.jsx
index 7036634..7d43cfc 100644
--- a/src/pages/NewEnergy/index.jsx
+++ b/src/pages/NewEnergy/index.jsx
@@ -5,7 +5,7 @@ import RealtimeMonitor from './RealtimeMonitor'
export default {
NewEnergyOverview,
+ ...RealtimeMonitor,
...ChargingMgm,
...RecordsInquiry,
- RealtimeMonitor
}
\ No newline at end of file
diff --git a/src/router/router.config.js b/src/router/router.config.js
index cccf040..788d3fb 100644
--- a/src/router/router.config.js
+++ b/src/router/router.config.js
@@ -1352,7 +1352,7 @@ let routes = [
path: "/newEnergy/lockMonitor",
text: "地锁监控",
name: "lockMonitor",
- component: pages.OrderRuleMgm,
+ component: pages.LockMonitor,
},
{
path: "/newEnergy/pileMonitor",