merge():解决冲突

src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/dataSource.js

@@ -0,0 +1,183 @@
+//用来存储表头的js文件
+import React from "react";
+import { Button } from "antd";
+//支付记录的表头
+export const payRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "订单ID",
+    dataIndex: "order_id",
+    key: "order_id",
+    align: "center",
+  },
+  {
+    title: "入场时间",
+    dataIndex: "admission_time",
+    key: "admission_time",
+    align: "center",
+  },
+  {
+    title: "计费时间",
+    dataIndex: "charging_time",
+    key: "charging_time",
+    align: "center",
+  },
+  {
+    title: "支付时间",
+    dataIndex: "pay_time",
+    key: "pay_time",
+    align: "center",
+  },
+  {
+    title: "应收金额",
+    dataIndex: "receivable_amount",
+    key: "receivable_amount",
+    align: "center",
+  },
+  {
+    title: "优惠金额",
+    dataIndex: "discount_amount",
+    key: "discount_amount",
+    align: "center",
+  },
+  {
+    title: "实付金额",
+    dataIndex: "paid_in_money",
+    key: "paid_in_money",
+    align: "center",
+  },
+  {
+    title: "支付类型",
+    dataIndex: "pay_type_name",
+    key: "pay_type_name",
+    align: "center",
+  },
+  {
+    title: "支付渠道",
+    dataIndex: "payment_channels",
+    key: "payment_channels",
+    align: "center",
+  },
+  {
+    title: "支付设备",
+    dataIndex: "payment_equipment",
+    key: "payment_equipment",
+    align: "center",
+  },
+  {
+    title: "支付人",
+    dataIndex: "pay_person",
+    key: "pay_person",
+    align: "center",
+  },
+  {
+    title: "付款路段",
+    dataIndex: "pay_road",
+    key: "pay_road",
+    align: "center",
+  },
+  {
+    title: "第三方流水ID",
+    dataIndex: "third_party_flow_id",
+    key: "third_party_flow_id",
+    align: "center",
+  },
+];
+//退款订单的表头
+export const refundRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "退款方式",
+    dataIndex: "refund_type",
+    key: "refund_type",
+    align: "center",
+  },
+  {
+    title: "支付渠道",
+    dataIndex: "pay_road",
+    key: "pay_road",
+    align: "center",
+  },
+  {
+    title: "支付设备",
+    dataIndex: "paymentDevice",
+    key: "paymentDevice",
+    align: "center",
+  },
+  {
+    title: "退款原因",
+    dataIndex: "reason",
+    key: "reason",
+    align: "center",
+  },
+  {
+    title: "退款金额",
+    dataIndex: "refund_amount",
+    key: "refund_amount",
+    align: "center",
+  },
+  {
+    title: "申请人",
+    dataIndex: "application_person",
+    key: "application_person",
+    align: "center",
+  },
+  {
+    title: "申请时间",
+    dataIndex: "application_time",
+    key: "application_time",
+    align: "center",
+  },
+  {
+    title: "退款时间",
+    dataIndex: "refund_time",
+    key: "refund_time",
+    align: "center",
+  },
+];
+//操作记录
+export const operatorRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "操作类型",
+    dataIndex: "type",
+    key: "type",
+    align: "center",
+  },
+  {
+    title: "操作来源",
+    dataIndex: "source",
+    key: "source",
+    align: "center",
+  },
+  {
+    title: "操作人/设备",
+    dataIndex: "object",
+    key: "object",
+    align: "center",
+  },
+  {
+    title: "操作时间",
+    dataIndex: "time",
+    key: "time",
+    align: "center",
+  },
+];

src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.jsx

@@ -0,0 +1,6 @@
+import React from "react"
+import loadable from "@loadable/component"
+import { LoadingImg } from "@/components"
+
+const BillingRule = loadable(() => import("./loadable"))
+export default (pros) => <BillingRule {...pros} fallback={<LoadingImg />} />

src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.scss

@@ -0,0 +1,238 @@
+@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);
+
+.ant-tabs {
+  margin-bottom: 16px;
+
+  .ant-tabs-nav {
+    margin-bottom: 0 !important;
+
+    &::before {
+      border-bottom: 1px solid var(--color-card-line) !important;
+    }
+  }
+
+  .ant-tabs-nav-wrap {
+    width: 100%;
+    box-sizing: content-box;
+
+    .ant-tabs-nav-list {
+      width: 340px;
+
+      .ant-tabs-ink-bar {
+        height: 3px;
+        background-color: #00ccff;
+      }
+
+      .ant-tabs-tab {
+        flex: 1;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        padding-bottom: 10px;
+        text-align: center;
+        cursor: pointer;
+        font-size: 14px !important;
+        font-family: MicrosoftYaHei;
+        text-align: center;
+        letter-spacing: 0.7px;
+      }
+
+      .ant-tabs-tab-active {
+        div {
+          color: #00ccff;
+        }
+      }
+    }
+  }
+}
+
+.ant-input::-webkit-input-placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-input::-moz-placeholder {
+  color: var(--color-placeholder);
+}
+.right-list  .ant-btn-primary {
+  width: 68px;
+  height: 30px;
+  background: linear-gradient(180deg, #3aa9ff, #59b7ff);
+  border-radius: 4px;
+}
+.ant-input:-ms-input-placeholder {
+  color: var(--color-placeholder);
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-thead th {
+  background-color: #616b83 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody td {
+  background-color: #3e4557 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody tr:nth-child(even) td {
+  background-color: #3e4557 !important;
+}
+.ant-input::placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-select-selection-placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+  background: var(--color-input-disabled-bg);
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled .ant-select-arrow {
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  background-color: var(--color-input-disabled-bg);
+  color: var(--color-input-disabled-color);
+  cursor: not-allowed;
+}
+
+.ant-select-multiple {
+  .ant-select-selector {
+    .ant-select-selection-item {
+      background-color: var(--color-bg-body);
+      border-color: var(--color-border);
+
+      .ant-select-selection-item-remove {
+        color: var(--color-text);
+      }
+    }
+  }
+}
+
+.ant-select-arrow {
+  color: var(--color-text);
+}
+
+.ant-select-clear {
+  border-radius: 50%;
+}
+
+.ant-select-dropdown-menu {
+  background-color: var(--color-input-bg);
+
+  .ant-select-dropdown-menu-item {
+    color: var(--color-text);
+
+    &.ant-select-dropdown-menu-item-active {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+
+    &.ant-select-dropdown-menu-item-selected {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+
+    &:hover {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+  }
+}
+
+.ant-select-selector {
+  background-color: var(--color-search-list-item-bg) !important;
+  box-shadow: none !important;
+  border-radius: 4px;
+  color: var(--color-search-list-item-value);
+  border-color: var(--color-search-list-item-bd) !important;
+}
+
+.ant-select-selection {
+  background-color: var(--color-input-bg);
+  box-shadow: none;
+  color: var(--color-text);
+  // border-color:var(--checkable-tag-border);
+}
+
+.ant-form-horizontal .ant-form-item-label {
+  label {
+    display: inline-block;
+    word-wrap: break-word;
+    white-space: normal;
+  }
+}
+
+.ant-picker {
+  width: 100%;
+  background-color: var(--color-search-list-item-bg);
+  border-color: var(--color-border);
+}
+
+// .yisa-table {
+//   width: 100%;
+
+//   .ant-table-thead {
+//     th {
+//       background: var(--color-table-header-bg) !important;
+//     }
+//   }
+
+//   .ant-table-tbody {
+//     td {
+//       background: var(--color-table-body-bg) !important;
+//       border-bottom-color: var(--color-table-border-bottom-color);
+//     }
+
+//     tr:nth-child(even) {
+//       td {
+//         background: var(--color-table-body-bg-nth-child-even) !important;
+//       }
+//     }
+
+//     tr:nth-child(odd) {
+//       td {
+//         background: var(--color-table-body-bg-nth-child-even) !important;
+//       }
+//     }
+//   }
+// }
+.totalModal{
+  .ant-modal-footer{
+    display: none;
+  }
+  position: absolute;
+  top: 40px;
+  right: 174px;
+}
+.ltc-item-img {
+  width: 390px;
+  height: 300px;
+  border: 1px solid;
+  background: #6565656b;
+  margin-right: 20px !important;
+  img  {
+    height: 295px;
+    width: 387px;
+    // object-fit: contain;
+  }
+}
+.hanleHistoyModal{
+  max-height: 700px;
+  overflow: auto;
+}
+.hanleHistoyModal::-webkit-scrollbar {
+  width: 5px;
+}
+.hanleHistoyModal::-webkit-scrollbar-thumb {
+  background-color: #9da2ab;
+  border-radius: 10px;
+}
+.modal-img{
+  img{
+    width: 200px;
+    height: 200px;
+  }
+}

src/pages/NewEnergy/RealtimeMonitor/LockMonitor/dataSource.js

@@ -0,0 +1,183 @@
+//用来存储表头的js文件
+import React from "react";
+import { Button } from "antd";
+//支付记录的表头
+export const payRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "订单ID",
+    dataIndex: "order_id",
+    key: "order_id",
+    align: "center",
+  },
+  {
+    title: "入场时间",
+    dataIndex: "admission_time",
+    key: "admission_time",
+    align: "center",
+  },
+  {
+    title: "计费时间",
+    dataIndex: "charging_time",
+    key: "charging_time",
+    align: "center",
+  },
+  {
+    title: "支付时间",
+    dataIndex: "pay_time",
+    key: "pay_time",
+    align: "center",
+  },
+  {
+    title: "应收金额",
+    dataIndex: "receivable_amount",
+    key: "receivable_amount",
+    align: "center",
+  },
+  {
+    title: "优惠金额",
+    dataIndex: "discount_amount",
+    key: "discount_amount",
+    align: "center",
+  },
+  {
+    title: "实付金额",
+    dataIndex: "paid_in_money",
+    key: "paid_in_money",
+    align: "center",
+  },
+  {
+    title: "支付类型",
+    dataIndex: "pay_type_name",
+    key: "pay_type_name",
+    align: "center",
+  },
+  {
+    title: "支付渠道",
+    dataIndex: "payment_channels",
+    key: "payment_channels",
+    align: "center",
+  },
+  {
+    title: "支付设备",
+    dataIndex: "payment_equipment",
+    key: "payment_equipment",
+    align: "center",
+  },
+  {
+    title: "支付人",
+    dataIndex: "pay_person",
+    key: "pay_person",
+    align: "center",
+  },
+  {
+    title: "付款路段",
+    dataIndex: "pay_road",
+    key: "pay_road",
+    align: "center",
+  },
+  {
+    title: "第三方流水ID",
+    dataIndex: "third_party_flow_id",
+    key: "third_party_flow_id",
+    align: "center",
+  },
+];
+//退款订单的表头
+export const refundRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "退款方式",
+    dataIndex: "refund_type",
+    key: "refund_type",
+    align: "center",
+  },
+  {
+    title: "支付渠道",
+    dataIndex: "pay_road",
+    key: "pay_road",
+    align: "center",
+  },
+  {
+    title: "支付设备",
+    dataIndex: "paymentDevice",
+    key: "paymentDevice",
+    align: "center",
+  },
+  {
+    title: "退款原因",
+    dataIndex: "reason",
+    key: "reason",
+    align: "center",
+  },
+  {
+    title: "退款金额",
+    dataIndex: "refund_amount",
+    key: "refund_amount",
+    align: "center",
+  },
+  {
+    title: "申请人",
+    dataIndex: "application_person",
+    key: "application_person",
+    align: "center",
+  },
+  {
+    title: "申请时间",
+    dataIndex: "application_time",
+    key: "application_time",
+    align: "center",
+  },
+  {
+    title: "退款时间",
+    dataIndex: "refund_time",
+    key: "refund_time",
+    align: "center",
+  },
+];
+//操作记录
+export const operatorRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "操作类型",
+    dataIndex: "type",
+    key: "type",
+    align: "center",
+  },
+  {
+    title: "操作来源",
+    dataIndex: "source",
+    key: "source",
+    align: "center",
+  },
+  {
+    title: "操作人/设备",
+    dataIndex: "object",
+    key: "object",
+    align: "center",
+  },
+  {
+    title: "操作时间",
+    dataIndex: "time",
+    key: "time",
+    align: "center",
+  },
+];

src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx

@@ -0,0 +1,6 @@
+import React from "react"
+import loadable from "@loadable/component"
+import { LoadingImg } from "@/components"
+
+const BillingRule = loadable(() => import("./loadable"))
+export default (pros) => <BillingRule {...pros} fallback={<LoadingImg />} />

src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.scss

@@ -0,0 +1,238 @@
+@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);
+
+.ant-tabs {
+  margin-bottom: 16px;
+
+  .ant-tabs-nav {
+    margin-bottom: 0 !important;
+
+    &::before {
+      border-bottom: 1px solid var(--color-card-line) !important;
+    }
+  }
+
+  .ant-tabs-nav-wrap {
+    width: 100%;
+    box-sizing: content-box;
+
+    .ant-tabs-nav-list {
+      width: 340px;
+
+      .ant-tabs-ink-bar {
+        height: 3px;
+        background-color: #00ccff;
+      }
+
+      .ant-tabs-tab {
+        flex: 1;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        padding-bottom: 10px;
+        text-align: center;
+        cursor: pointer;
+        font-size: 14px !important;
+        font-family: MicrosoftYaHei;
+        text-align: center;
+        letter-spacing: 0.7px;
+      }
+
+      .ant-tabs-tab-active {
+        div {
+          color: #00ccff;
+        }
+      }
+    }
+  }
+}
+
+.ant-input::-webkit-input-placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-input::-moz-placeholder {
+  color: var(--color-placeholder);
+}
+.right-list  .ant-btn-primary {
+  width: 68px;
+  height: 30px;
+  background: linear-gradient(180deg, #3aa9ff, #59b7ff);
+  border-radius: 4px;
+}
+.ant-input:-ms-input-placeholder {
+  color: var(--color-placeholder);
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-thead th {
+  background-color: #616b83 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody td {
+  background-color: #3e4557 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody tr:nth-child(even) td {
+  background-color: #3e4557 !important;
+}
+.ant-input::placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-select-selection-placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+  background: var(--color-input-disabled-bg);
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled .ant-select-arrow {
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  background-color: var(--color-input-disabled-bg);
+  color: var(--color-input-disabled-color);
+  cursor: not-allowed;
+}
+
+.ant-select-multiple {
+  .ant-select-selector {
+    .ant-select-selection-item {
+      background-color: var(--color-bg-body);
+      border-color: var(--color-border);
+
+      .ant-select-selection-item-remove {
+        color: var(--color-text);
+      }
+    }
+  }
+}
+
+.ant-select-arrow {
+  color: var(--color-text);
+}
+
+.ant-select-clear {
+  border-radius: 50%;
+}
+
+.ant-select-dropdown-menu {
+  background-color: var(--color-input-bg);
+
+  .ant-select-dropdown-menu-item {
+    color: var(--color-text);
+
+    &.ant-select-dropdown-menu-item-active {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+
+    &.ant-select-dropdown-menu-item-selected {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+
+    &:hover {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+  }
+}
+
+.ant-select-selector {
+  background-color: var(--color-search-list-item-bg) !important;
+  box-shadow: none !important;
+  border-radius: 4px;
+  color: var(--color-search-list-item-value);
+  border-color: var(--color-search-list-item-bd) !important;
+}
+
+.ant-select-selection {
+  background-color: var(--color-input-bg);
+  box-shadow: none;
+  color: var(--color-text);
+  // border-color:var(--checkable-tag-border);
+}
+
+.ant-form-horizontal .ant-form-item-label {
+  label {
+    display: inline-block;
+    word-wrap: break-word;
+    white-space: normal;
+  }
+}
+
+.ant-picker {
+  width: 100%;
+  background-color: var(--color-search-list-item-bg);
+  border-color: var(--color-border);
+}
+
+// .yisa-table {
+//   width: 100%;
+
+//   .ant-table-thead {
+//     th {
+//       background: var(--color-table-header-bg) !important;
+//     }
+//   }
+
+//   .ant-table-tbody {
+//     td {
+//       background: var(--color-table-body-bg) !important;
+//       border-bottom-color: var(--color-table-border-bottom-color);
+//     }
+
+//     tr:nth-child(even) {
+//       td {
+//         background: var(--color-table-body-bg-nth-child-even) !important;
+//       }
+//     }
+
+//     tr:nth-child(odd) {
+//       td {
+//         background: var(--color-table-body-bg-nth-child-even) !important;
+//       }
+//     }
+//   }
+// }
+.totalModal{
+  .ant-modal-footer{
+    display: none;
+  }
+  position: absolute;
+  top: 40px;
+  right: 174px;
+}
+.ltc-item-img {
+  width: 390px;
+  height: 300px;
+  border: 1px solid;
+  background: #6565656b;
+  margin-right: 20px !important;
+  img  {
+    height: 295px;
+    width: 387px;
+    // object-fit: contain;
+  }
+}
+.hanleHistoyModal{
+  max-height: 700px;
+  overflow: auto;
+}
+.hanleHistoyModal::-webkit-scrollbar {
+  width: 5px;
+}
+.hanleHistoyModal::-webkit-scrollbar-thumb {
+  background-color: #9da2ab;
+  border-radius: 10px;
+}
+.modal-img{
+  img{
+    width: 200px;
+    height: 200px;
+  }
+}

src/pages/NewEnergy/RealtimeMonitor/PileMonitor/dataSource.js

@@ -0,0 +1,183 @@
+//用来存储表头的js文件
+import React from "react";
+import { Button } from "antd";
+//支付记录的表头
+export const payRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "订单ID",
+    dataIndex: "order_id",
+    key: "order_id",
+    align: "center",
+  },
+  {
+    title: "入场时间",
+    dataIndex: "admission_time",
+    key: "admission_time",
+    align: "center",
+  },
+  {
+    title: "计费时间",
+    dataIndex: "charging_time",
+    key: "charging_time",
+    align: "center",
+  },
+  {
+    title: "支付时间",
+    dataIndex: "pay_time",
+    key: "pay_time",
+    align: "center",
+  },
+  {
+    title: "应收金额",
+    dataIndex: "receivable_amount",
+    key: "receivable_amount",
+    align: "center",
+  },
+  {
+    title: "优惠金额",
+    dataIndex: "discount_amount",
+    key: "discount_amount",
+    align: "center",
+  },
+  {
+    title: "实付金额",
+    dataIndex: "paid_in_money",
+    key: "paid_in_money",
+    align: "center",
+  },
+  {
+    title: "支付类型",
+    dataIndex: "pay_type_name",
+    key: "pay_type_name",
+    align: "center",
+  },
+  {
+    title: "支付渠道",
+    dataIndex: "payment_channels",
+    key: "payment_channels",
+    align: "center",
+  },
+  {
+    title: "支付设备",
+    dataIndex: "payment_equipment",
+    key: "payment_equipment",
+    align: "center",
+  },
+  {
+    title: "支付人",
+    dataIndex: "pay_person",
+    key: "pay_person",
+    align: "center",
+  },
+  {
+    title: "付款路段",
+    dataIndex: "pay_road",
+    key: "pay_road",
+    align: "center",
+  },
+  {
+    title: "第三方流水ID",
+    dataIndex: "third_party_flow_id",
+    key: "third_party_flow_id",
+    align: "center",
+  },
+];
+//退款订单的表头
+export const refundRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "退款方式",
+    dataIndex: "refund_type",
+    key: "refund_type",
+    align: "center",
+  },
+  {
+    title: "支付渠道",
+    dataIndex: "pay_road",
+    key: "pay_road",
+    align: "center",
+  },
+  {
+    title: "支付设备",
+    dataIndex: "paymentDevice",
+    key: "paymentDevice",
+    align: "center",
+  },
+  {
+    title: "退款原因",
+    dataIndex: "reason",
+    key: "reason",
+    align: "center",
+  },
+  {
+    title: "退款金额",
+    dataIndex: "refund_amount",
+    key: "refund_amount",
+    align: "center",
+  },
+  {
+    title: "申请人",
+    dataIndex: "application_person",
+    key: "application_person",
+    align: "center",
+  },
+  {
+    title: "申请时间",
+    dataIndex: "application_time",
+    key: "application_time",
+    align: "center",
+  },
+  {
+    title: "退款时间",
+    dataIndex: "refund_time",
+    key: "refund_time",
+    align: "center",
+  },
+];
+//操作记录
+export const operatorRecordColumns = [
+  {
+    title: "序号",
+    dataIndex: "id",
+    key: "id",
+    align: "center",
+    render: (text, record, index) => index + 1,
+  },
+  {
+    title: "操作类型",
+    dataIndex: "type",
+    key: "type",
+    align: "center",
+  },
+  {
+    title: "操作来源",
+    dataIndex: "source",
+    key: "source",
+    align: "center",
+  },
+  {
+    title: "操作人/设备",
+    dataIndex: "object",
+    key: "object",
+    align: "center",
+  },
+  {
+    title: "操作时间",
+    dataIndex: "time",
+    key: "time",
+    align: "center",
+  },
+];

src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx

@@ -0,0 +1,6 @@
+import React from "react"
+import loadable from "@loadable/component"
+import { LoadingImg } from "@/components"
+
+const BillingRule = loadable(() => import("./loadable"))
+export default (pros) => <BillingRule {...pros} fallback={<LoadingImg />} />

src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss

@@ -0,0 +1,238 @@
+@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);
+
+.ant-tabs {
+  margin-bottom: 16px;
+
+  .ant-tabs-nav {
+    margin-bottom: 0 !important;
+
+    &::before {
+      border-bottom: 1px solid var(--color-card-line) !important;
+    }
+  }
+
+  .ant-tabs-nav-wrap {
+    width: 100%;
+    box-sizing: content-box;
+
+    .ant-tabs-nav-list {
+      width: 340px;
+
+      .ant-tabs-ink-bar {
+        height: 3px;
+        background-color: #00ccff;
+      }
+
+      .ant-tabs-tab {
+        flex: 1;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        padding-bottom: 10px;
+        text-align: center;
+        cursor: pointer;
+        font-size: 14px !important;
+        font-family: MicrosoftYaHei;
+        text-align: center;
+        letter-spacing: 0.7px;
+      }
+
+      .ant-tabs-tab-active {
+        div {
+          color: #00ccff;
+        }
+      }
+    }
+  }
+}
+
+.ant-input::-webkit-input-placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-input::-moz-placeholder {
+  color: var(--color-placeholder);
+}
+.right-list  .ant-btn-primary {
+  width: 68px;
+  height: 30px;
+  background: linear-gradient(180deg, #3aa9ff, #59b7ff);
+  border-radius: 4px;
+}
+.ant-input:-ms-input-placeholder {
+  color: var(--color-placeholder);
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-thead th {
+  background-color: #616b83 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody td {
+  background-color: #3e4557 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody tr:nth-child(even) td {
+  background-color: #3e4557 !important;
+}
+.ant-input::placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-select-selection-placeholder {
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+  background: var(--color-input-disabled-bg);
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled .ant-select-arrow {
+  color: var(--color-placeholder);
+}
+
+.ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  background-color: var(--color-input-disabled-bg);
+  color: var(--color-input-disabled-color);
+  cursor: not-allowed;
+}
+
+.ant-select-multiple {
+  .ant-select-selector {
+    .ant-select-selection-item {
+      background-color: var(--color-bg-body);
+      border-color: var(--color-border);
+
+      .ant-select-selection-item-remove {
+        color: var(--color-text);
+      }
+    }
+  }
+}
+
+.ant-select-arrow {
+  color: var(--color-text);
+}
+
+.ant-select-clear {
+  border-radius: 50%;
+}
+
+.ant-select-dropdown-menu {
+  background-color: var(--color-input-bg);
+
+  .ant-select-dropdown-menu-item {
+    color: var(--color-text);
+
+    &.ant-select-dropdown-menu-item-active {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+
+    &.ant-select-dropdown-menu-item-selected {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+
+    &:hover {
+      color: #fff;
+      // background-color: var(--radio-button-bg-checked);
+    }
+  }
+}
+
+.ant-select-selector {
+  background-color: var(--color-search-list-item-bg) !important;
+  box-shadow: none !important;
+  border-radius: 4px;
+  color: var(--color-search-list-item-value);
+  border-color: var(--color-search-list-item-bd) !important;
+}
+
+.ant-select-selection {
+  background-color: var(--color-input-bg);
+  box-shadow: none;
+  color: var(--color-text);
+  // border-color:var(--checkable-tag-border);
+}
+
+.ant-form-horizontal .ant-form-item-label {
+  label {
+    display: inline-block;
+    word-wrap: break-word;
+    white-space: normal;
+  }
+}
+
+.ant-picker {
+  width: 100%;
+  background-color: var(--color-search-list-item-bg);
+  border-color: var(--color-border);
+}
+
+// .yisa-table {
+//   width: 100%;
+
+//   .ant-table-thead {
+//     th {
+//       background: var(--color-table-header-bg) !important;
+//     }
+//   }
+
+//   .ant-table-tbody {
+//     td {
+//       background: var(--color-table-body-bg) !important;
+//       border-bottom-color: var(--color-table-border-bottom-color);
+//     }
+
+//     tr:nth-child(even) {
+//       td {
+//         background: var(--color-table-body-bg-nth-child-even) !important;
+//       }
+//     }
+
+//     tr:nth-child(odd) {
+//       td {
+//         background: var(--color-table-body-bg-nth-child-even) !important;
+//       }
+//     }
+//   }
+// }
+.totalModal{
+  .ant-modal-footer{
+    display: none;
+  }
+  position: absolute;
+  top: 40px;
+  right: 174px;
+}
+.ltc-item-img {
+  width: 390px;
+  height: 300px;
+  border: 1px solid;
+  background: #6565656b;
+  margin-right: 20px !important;
+  img  {
+    height: 295px;
+    width: 387px;
+    // object-fit: contain;
+  }
+}
+.hanleHistoyModal{
+  max-height: 700px;
+  overflow: auto;
+}
+.hanleHistoyModal::-webkit-scrollbar {
+  width: 5px;
+}
+.hanleHistoyModal::-webkit-scrollbar-thumb {
+  background-color: #9da2ab;
+  border-radius: 10px;
+}
+.modal-img{
+  img{
+    width: 200px;
+    height: 200px;
+  }
+}

src/pages/NewEnergy/RealtimeMonitor/index.jsx

@@ -0,0 +1,10 @@
+import ChargerMonitor from "./ChargerMonitor"
+import LockMonitor from "./LockMonitor"
+import PileMonitor from "./PileMonitor"
+
+
+export default {
+    ChargerMonitor,
+    LockMonitor,
+    PileMonitor
+}

src/pages/NewEnergy/index.jsx

@@ -1,9 +1,11 @@
 import ChargingMgm from './ChargingMgm'
 import NewEnergyOverview from './NewEnergyOverview'
 import RecordsInquiry from './RecordsInquiry'
+import RealtimeMonitor from './RealtimeMonitor'
 
 export default {
   NewEnergyOverview,
   ...ChargingMgm,
-  ...RecordsInquiry
+  ...RecordsInquiry,
+  RealtimeMonitor
 }

src/router/router.config.js

@@ -1342,6 +1342,24 @@ let routes = [
         name: "appointmentRecord",
         component: pages.AppointmentRecord,
       },
+      {
+        path: "/newEnergy/chargerMonitor",
+        text: "充电监控",
+        name: "chargerMonitor",
+        component: pages.ChargerMonitor,
+      },
+      {
+        path: "/newEnergy/lockMonitor",
+        text: "地锁监控",
+        name: "lockMonitor",
+        component: pages.OrderRuleMgm,
+      },
+      {
+        path: "/newEnergy/pileMonitor",
+        text: "电桩监控",
+        name: "pileMonitor",
+        component: pages.PileMonitor,
+      },
     ],
   },
 ];