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

src/pages/NewEnergy/ChargeStationMgm/loadable.jsx

@@ -33,7 +33,8 @@ function Appointment() {
     address: "",
     site_type: "",
     area: "",
-    operator: ""
+    operator: "",
+    count: ""
   }
   const [addFormData, setAddFormData] = useSetState(initAdd);
   const [formData, setFormData] = useSetState({});
@@ -58,14 +59,14 @@ function Appointment() {
     },
     {
       title: "站点类型",
-      dataIndex: "site_type",
-      key: "site_type",
+      dataIndex: "site_type_name",
+      key: "site_type_name",
       align: "center",
     },
     {
       title: "所属区域",
-      dataIndex: "area",
-      key: "area",
+      dataIndex: "area_name",
+      key: "area_name",
       align: "center",
     },
     {
@@ -82,14 +83,14 @@ function Appointment() {
     },
     {
       title: "商户名称",
-      dataIndex: "operator",
-      key: "operator",
+      dataIndex: "operator_name",
+      key: "operator_name",
       align: "center",
     },
     {
       title: "站点状态",
-      dataIndex: "site_status",
-      key: "site_status",
+      dataIndex: "site_status_name",
+      key: "site_status_name",
       align: "center",
     },
     {
@@ -291,6 +292,15 @@ function Appointment() {
           </div>
           <div className="row">
             <FormInput
+              yisaLabel="车位数量"
+              placeholder="请输入车位数量"
+              isShowAfterIcon={false}
+              value={addFormData.count}
+              onChange={e => { setAddFormData({ count: e.target.value }) }}
+            />
+          </div>
+          <div className="row">
+            <FormInput
               yisaLabel="详细地址"
               placeholder="请输入详细地址"
               isShowAfterIcon={false}

src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx

@@ -6,6 +6,7 @@ import {
 } from "antd";
 import ajax from "@/services";
 import { TableModule } from "@/components";
+import moment from 'moment'
 import "./index.scss";
 
 
@@ -18,10 +19,16 @@ function Appointment() {
   const [total, setTotal] = useState(0);
   // 详情数据
   const [detailData, setDetailData] = useState({});
+  const startTime = moment().subtract(0, 'days').startOf('day').format('YYYY-MM-DD')
+  const endTime = moment().format('YYYY-MM-DD')
   // 初始搜索条件
   const initFormData = {
+    phone: "",
+    plate: "",
+    station: "",
     operator: "0",
-    rule_name: "",
+    pre_time: [moment(startTime), moment(endTime)],
+    end_time: [moment(startTime), moment(endTime)],
   };
 
   const columns = [
@@ -52,13 +59,13 @@ function Appointment() {
     {
       title: "预约开始时间",
       dataIndex: "pre_start_time",
-      key: "start_time",
+      key: "pre_start_time",
       align: "center",
     },
     {
       title: "预约截至时间",
       dataIndex: "pre_end_time",
-      key: "end_time",
+      key: "pre_end_time",
       align: "center",
     },
     {
@@ -147,11 +154,13 @@ function Appointment() {
       name: "pre_time",
       type: "DateRangePicker",
       label: "预约开始时间",
+      defaultValue: initFormData.pre_time
     },
     {
-      name: "end_time",
+      name: "finish_time",
       type: "DateRangePicker",
       label: "订单完结时间",
+      defaultValue: initFormData.end_time
     },
   ];
 
@@ -163,6 +172,12 @@ function Appointment() {
 
   // 检索
   const search = (params) => {
+    if (params.pre_time?.length) {
+      params.pre_time = params.pre_time[0].format('YYYY-MM-DD') + ',' + params.pre_time[1].format('YYYY-MM-DD')
+    }
+    if (params.finish_time?.length) {
+      params.finish_time = params.finish_time[0].format('YYYY-MM-DD') + ',' + params.finish_time[1].format('YYYY-MM-DD')
+    }
     ajax.recordsInquiry.getAppointmentList(params).then((res) => {
       if (res.status === 20000) {
         setTableData(res.data);

src/pages/NewEnergy/RecordsInquiry/Charge/loadable.jsx

@@ -2,10 +2,10 @@ import React, { useState, useRef, useEffect } from "react";
 import {
   message,
   Modal,
-  Button,
 } from "antd";
 import ajax from "@/services";
 import { TableModule } from "@/components";
+import moment from 'moment'
 import "./index.scss";
 
 
@@ -18,10 +18,13 @@ function Charge() {
   const [total, setTotal] = useState(0);
   // 详情数据
   const [detailData, setDetailData] = useState({});
+  const startTime = moment().subtract(0, 'days').startOf('day').format('YYYY-MM-DD')
+  const endTime = moment().format('YYYY-MM-DD')
   // 初始搜索条件
   const initFormData = {
-    operator: "0",
-    rule_name: "",
+    name: "",
+    order_id: "",
+    start_time: [moment(startTime), moment(endTime)],
   };
 
   const columns = [
@@ -116,6 +119,7 @@ function Charge() {
       name: "start_time",
       type: "DateRangePicker",
       label: "充电开始时间",
+      defaultValue: initFormData.start_time
     },
   ];
 
@@ -127,6 +131,9 @@ function Charge() {
 
   // 检索
   const search = (params) => {
+    if(params.start_time?.length){
+      params.start_time = params.start_time[0].format('YYYY-MM-DD') + ',' + params.start_time[1].format('YYYY-MM-DD')
+    }
     ajax.recordsInquiry.getChargeList(params).then((res) => {
       if (res.status === 20000) {
         setTableData(res.data);

src/pages/NewEnergy/RecordsInquiry/Violation/loadable.jsx

@@ -6,6 +6,7 @@ import {
 } from "antd";
 import ajax from "@/services";
 import { TableModule } from "@/components";
+import moment from 'moment'
 import "./index.scss";
 
 
@@ -20,10 +21,15 @@ function Violation() {
   const [total, setTotal] = useState(0);
   // 详情数据
   const [detailData, setDetailData] = useState({});
+  const startTime = moment().subtract(0, 'days').startOf('day').format('YYYY-MM-DD')
+  const endTime = moment().format('YYYY-MM-DD')
   // 初始搜索条件
   const initFormData = {
-    operator: "0",
-    rule_name: "",
+    phone: "",
+    plate: "",
+    name: "",
+    type: "0",
+    create_time: [moment(startTime), moment(endTime)],
   };
 
   const columns = [
@@ -108,6 +114,7 @@ function Violation() {
       name: "create_time",
       type: "DateRangePicker",
       label: "记录创建时间",
+      defaultValue: initFormData.create_time
     },
   ];
 
@@ -133,6 +140,9 @@ function Violation() {
 
   // 检索
   const search = (params) => {
+    if(params.create_time?.length){
+      params.create_time = params.create_time[0].format('YYYY-MM-DD') + ',' + params.create_time[1].format('YYYY-MM-DD')
+    }
     ajax.recordsInquiry.getViolationList(params).then((res) => {
       if (res.status === 20000) {
         setTableData(res.data);

src/services/NewEnergy/ChargeStationMgm.js

@@ -3,7 +3,7 @@ import ajax from "@/config/ajax"
 // 获取列表数据
 const getStationList = (params) => {
   return ajax({
-    url: "/api/fin/charge_station/get_list",
+    url: "/api/nes/station/get_list",
     type: "post",
     data: params,
   });
@@ -11,7 +11,7 @@ const getStationList = (params) => {
 // 获取站点状态
 const getSiteStatus = (params) => {
   return ajax({
-    url: "/api/fin/charge_station/site_status",
+    url: "/api/nes/station/site_status",
     type: "get",
     data: params,
   });
@@ -19,7 +19,7 @@ const getSiteStatus = (params) => {
 // 新增充电站
 const addStation = (params) => {
   return ajax({
-    url: "/api/fin/charge_station/add_station",
+    url: "/api/nes/station/add_station",
     type: "post",
     data: params,
   });