fix: 错峰共享新页面,

src/components/ResultFlow/index.scss

@@ -10,7 +10,7 @@
   }
   .nodata{
     background: url(./no-data.png) no-repeat;
-    width: 220px;
+    width: 196px;
     height: 220px;
     padding-top: 195px;
     text-align: center;

src/components/ResultFlowResult/index.scss

@@ -10,7 +10,7 @@
   }
   .nodata{
     background: url(./no-data.png) no-repeat;
-    width: 220px;
+    width: 196px;
     height: 220px;
     padding-top: 195px;
     text-align: center;

src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx

@@ -490,15 +490,18 @@ function Fence(props) {
                         <Button type="primary" className="yisa-btn colorBtn"  onClick={() => { getSearchData() }}>
                         查询
                         </Button>
-                        <Button type="primary" className="yisa-btn colorBtn" onClick={() => { setUp() }}>
-                            批量设置
-                        </Button>
+                       
                     </div>
                 </div>
             </div>
             <div className="paid-result">
                 <div className="result">
-                    <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                    <div className="result-info-row">
+                        <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                        <Button type="primary" className="yisa-btn colorBtn" onClick={() => { setUp() }}>
+                            批量设置
+                        </Button>
+                    </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered

src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx

@@ -431,11 +431,11 @@ function WorkerSchedule(props) {
                     />
                 </div>
                 <div className="timePicker ">
-                    <div className="btnBox">
-                        <Button type="primary" className="yisa-btn colorBtn"  onClick={() => { getResetData() }}>
+                    <div className="btnBox bottomBox">
+                        <Button  className="yisa-btn  reset"  onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary " className="yisa-btn colorBtn"  onClick={() => { getSearchData() }}>
+                        <Button type="primary " className="yisa-btn  submit"  onClick={() => { getSearchData() }}>
                             查询
                         </Button>
                         

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

@@ -607,9 +607,9 @@ function PersonInfo() {
                                     }
 
                                     <div className="bottomBox">
-                                        <Button type="primary" className="colorReset" onClick={reset}>重置</Button>
+                                        <Button type="primary" className="colorReset reset" onClick={reset}>重置</Button>
                                         
-                                        <Button type="primary" className="colorBtn" loading={loading} onClick={search}>查询</Button>
+                                        <Button type="primary" className="colorBtn submit" loading={loading} onClick={search}>查询</Button>
                                     </div>
                                 </div>
                             </div>

src/pages/MerchantMgm/InvoiceConf/loadable.jsx

@@ -748,20 +748,25 @@ function InvoiceConf(props) {
                   </Form.Item>
 
                   <Form.Item className="btnBox" layout="inline">
-                    <Button type="primary"   onClick={() => { getSearchData() }}>
-                    查询
-                    </Button>
                     <Button   onClick={() => { getResetData() }}>
-                      条件重置
+                      重置
                     </Button>
-                    <Button type="primary"  onClick={() => { createData() }}>
-                      创建配置
+                    <Button type="primary"   onClick={() => { getSearchData() }}>
+                    查询
                     </Button>
+                    
+                   
                   </Form.Item>
                 </Form>
               </div>
             </div>
             <div className="table-content">
+              <div className="result-info-row">
+                  <div>共检索到 {total} 条数据</div>
+                  <Button type="primary"  onClick={() => { createData() }}>
+                    创建配置
+                  </Button>
+              </div>
               <Table
                 columns={columns}
                 className="table"

src/pages/MerchantMgm/MerchantAdmin/loadable.jsx

@@ -609,20 +609,23 @@ function MerchantAdmin() {
                   <Form.Item
                     className="btnBox"
                   >
-                    <Button type="primary"   onClick={() => { getSearchData() }}>
-                    查询
-                    </Button>
                     <Button onClick={() => { getResetData() }}>
-                      条件重置
+                      重置
                     </Button>
-                    <Button type="primary" onClick={() => { createData() }}>
-                      创建用户
+                    <Button type="primary"   onClick={() => { getSearchData() }}>
+                    查询
                     </Button>
                   </Form.Item>
                 </Form>
               </div>
             </div>
             <div className="table-content">
+              <div className="result-info-row">
+                  <div>共检索到 {total} 条数据</div>
+                  <Button type="primary" onClick={() => { createData() }}>
+                    创建用户
+                  </Button>
+              </div>
               <Table
               columns={columns}
               className="table"

src/pages/MerchantMgm/MerchantInfo/loadable.jsx

@@ -956,20 +956,25 @@ const MerchantInfo = (props) => {
                     className="btnBox"
                     layout="inline"
                   >
-                    <Button type="primary"  onClick={() => { getSearchData() }}>
-                    查询
-                    </Button>
                     <Button onClick={() => { getResetData() }}>
-                      条件重置
+                      重置
                     </Button>
-                    <Button type="primary" onClick={() => { createData() }}>
-                      创建商户
+                    <Button type="primary"  onClick={() => { getSearchData() }}>
+                    查询
                     </Button>
+                    
+                    
                   </Form.Item>
                 </Form>
               </div>
             </div>
             <div className="table-content">
+              <div className="result-info-row">
+                <div>共检索到 {total} 条数据</div>
+                <Button type="primary" onClick={() => { createData() }}>
+                  创建商户
+                </Button>
+              </div>
               <Table
                 columns={columns}
                 className="table"

src/pages/Nav/index.scss

@@ -46,15 +46,15 @@
                 font-size: 16px;
             }
             .line{
-                margin-top: px2vh(50);
+                margin-top: 50px;
             }
             &::after{
                 content: '';
                 display: block;
                 background-color: #3AA9FF;
-                width: 246px;
-                height: px2vh(4);
-                border-radius: px2vh(2);
+                width: 100%;
+                height: 4px;
+                border-radius: 2px;
                 position: absolute;
                 bottom: -20px;
             }

src/pages/OffPeak/OffPeakParkMgm/BookInfo/index.jsx

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

src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx

@@ -0,0 +1,163 @@
+import React, { useState, useRef, useEffect } from "react";
+import { message, Pagination, Table, Space, Modal, Button } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+import ajax from "@/services";
+import { TableModule } from "@/components";
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
+
+function BookInfo() {
+  const columns = [
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
+    // {
+    //   title: "商户名称",
+    //   dataIndex: "merchantName",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.merchantName}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作人",
+    //   dataIndex: "operator",
+    //   key: "operator",
+    //   align: "center",
+    // },
+    // {
+    //   title: "车牌号",
+    //   dataIndex: "licensePlateNumber",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.licensePlateNumber}</div>
+    //   )
+    // },
+    // {
+    //   title: "路段",
+    //   dataIndex: "section",
+    //   key: "section",
+    //   align: "center",
+    // },
+    // {
+    //   title: "泊位号",
+    //   dataIndex: "parkingSpotNumber",
+    //   key: "parkingSpotNumber",
+    //   align: "center",
+    // },
+    // {
+    //   title: "出入场类型",
+    //   dataIndex: "entryExitType",
+    //   align: "center",
+    //   key: "entryExitType",
+    // },
+    // {
+    //   title: "出入场时间",
+    //   dataIndex: "entryExitTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.entryExitTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作时间",
+    //   dataIndex: "operationTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.operationTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "间隔时长",
+    //   dataIndex: "intervalDuration",
+    //   key: "intervalDuration",
+    //   align: "center",
+    // },
+  ];
+
+  const formSearch = [
+    // {
+    //   type: "Select",
+    //   label: "商户名称",
+    //   name: "merchantName",
+    //   placeholder:"请选择商户名称"
+    // },
+    // {
+    //   type: "Input",
+    //   label: "路段",
+    //   placeholder: "请输入路段",
+    //   name: "road_name",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "泊位号",
+    //   placeholder: "请输入泊位号",
+    //   name: "parking_num",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "操作人",
+    //   placeholder: "请输入操作人",
+    //   name: "operator",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "间隔时长大于分钟数",
+    //   placeholder: "请输入内容",
+    //   name: "exceedTime",
+    // },
+    // {
+    //   type: "RangePicker",
+    //   label: "操作时间",
+    //   name: "operationTime",
+    // },
+  ];
+  //搜索参数初始化
+  const initFormData = {
+    merchantName: "0",
+    road_name: "",
+    parking_num: "",
+    operator: "",
+    exceedTime: "",
+  };
+  //搜索的结果
+  const [tableData, setTableData] = useState([]);
+  //搜索的总结果数
+  const [total, setTotal] = useState(0);
+  function search(params) {
+    console.log(ajax, 'ajax')
+    ajax.getBookInfoList(params).then((res) => {
+      if (res.status === 20000) {
+        setTableData(res.data.list);
+        setTotal(res.data.total);
+      }
+    });
+  }
+
+  return (
+    <TableModule
+      columns={columns}
+      tableData={tableData}
+      formSearch={formSearch}
+      search={search}
+      total={total}
+    //   mandatory={'parking_num'}
+    //   mandatory_name={'泊位号'}
+    //   pagename="PDA操作记录"
+      pageName={'bookInfo'}
+      initFormData={initFormData}
+    //   exportUrl="/api/bpm/record/get_pda_export"
+    />
+  );
+}
+
+export default BookInfo;

src/pages/OffPeak/OffPeakParkMgm/BreakInfo/index.jsx

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

src/pages/OffPeak/OffPeakParkMgm/BreakInfo/loadable.jsx

@@ -0,0 +1,162 @@
+import React, { useState, useRef, useEffect } from "react";
+import { message, Pagination, Table, Space, Modal, Button } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+import ajax from "@/services";
+import { TableModule } from "@/components";
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
+
+function BreakInfo() {
+  const columns = [
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
+    // {
+    //   title: "商户名称",
+    //   dataIndex: "merchantName",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.merchantName}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作人",
+    //   dataIndex: "operator",
+    //   key: "operator",
+    //   align: "center",
+    // },
+    // {
+    //   title: "车牌号",
+    //   dataIndex: "licensePlateNumber",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.licensePlateNumber}</div>
+    //   )
+    // },
+    // {
+    //   title: "路段",
+    //   dataIndex: "section",
+    //   key: "section",
+    //   align: "center",
+    // },
+    // {
+    //   title: "泊位号",
+    //   dataIndex: "parkingSpotNumber",
+    //   key: "parkingSpotNumber",
+    //   align: "center",
+    // },
+    // {
+    //   title: "出入场类型",
+    //   dataIndex: "entryExitType",
+    //   align: "center",
+    //   key: "entryExitType",
+    // },
+    // {
+    //   title: "出入场时间",
+    //   dataIndex: "entryExitTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.entryExitTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作时间",
+    //   dataIndex: "operationTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.operationTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "间隔时长",
+    //   dataIndex: "intervalDuration",
+    //   key: "intervalDuration",
+    //   align: "center",
+    // },
+  ];
+
+  const formSearch = [
+    // {
+    //   type: "Select",
+    //   label: "商户名称",
+    //   name: "merchantName",
+    //   placeholder:"请选择商户名称"
+    // },
+    // {
+    //   type: "Input",
+    //   label: "路段",
+    //   placeholder: "请输入路段",
+    //   name: "road_name",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "泊位号",
+    //   placeholder: "请输入泊位号",
+    //   name: "parking_num",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "操作人",
+    //   placeholder: "请输入操作人",
+    //   name: "operator",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "间隔时长大于分钟数",
+    //   placeholder: "请输入内容",
+    //   name: "exceedTime",
+    // },
+    // {
+    //   type: "RangePicker",
+    //   label: "操作时间",
+    //   name: "operationTime",
+    // },
+  ];
+  //搜索参数初始化
+  const initFormData = {
+    merchantName: "0",
+    road_name: "",
+    parking_num: "",
+    operator: "",
+    exceedTime: "",
+  };
+  //搜索的结果
+  const [tableData, setTableData] = useState([]);
+  //搜索的总结果数
+  const [total, setTotal] = useState(0);
+  function search(params) {
+    // ajax.getPDAList(params).then((res) => {
+    //   if (res.status === 20000) {
+    //     setTableData(res.data.list);
+    //     setTotal(res.data.total);
+    //   }
+    // });
+  }
+
+  return (
+    <TableModule
+    //   columns={columns}
+    //   tableData={tableData}
+    //   formSearch={formSearch}
+    //   search={search}
+    //   total={total}
+    //   mandatory={'parking_num'}
+    //   mandatory_name={'泊位号'}
+    //   pagename="PDA操作记录"
+    //   pageName={'entryExitOptPDA'}
+    //   initFormData={initFormData}
+    //   exportUrl="/api/bpm/record/get_pda_export"
+    />
+  );
+}
+
+export default BreakInfo;

src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/index.jsx

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

src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/loadable.jsx

@@ -0,0 +1,162 @@
+import React, { useState, useRef, useEffect } from "react";
+import { message, Pagination, Table, Space, Modal, Button } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+import ajax from "@/services";
+import { TableModule } from "@/components";
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
+
+function OffPeakParkingRecords() {
+  const columns = [
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
+    // {
+    //   title: "商户名称",
+    //   dataIndex: "merchantName",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.merchantName}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作人",
+    //   dataIndex: "operator",
+    //   key: "operator",
+    //   align: "center",
+    // },
+    // {
+    //   title: "车牌号",
+    //   dataIndex: "licensePlateNumber",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.licensePlateNumber}</div>
+    //   )
+    // },
+    // {
+    //   title: "路段",
+    //   dataIndex: "section",
+    //   key: "section",
+    //   align: "center",
+    // },
+    // {
+    //   title: "泊位号",
+    //   dataIndex: "parkingSpotNumber",
+    //   key: "parkingSpotNumber",
+    //   align: "center",
+    // },
+    // {
+    //   title: "出入场类型",
+    //   dataIndex: "entryExitType",
+    //   align: "center",
+    //   key: "entryExitType",
+    // },
+    // {
+    //   title: "出入场时间",
+    //   dataIndex: "entryExitTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.entryExitTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作时间",
+    //   dataIndex: "operationTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.operationTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "间隔时长",
+    //   dataIndex: "intervalDuration",
+    //   key: "intervalDuration",
+    //   align: "center",
+    // },
+  ];
+
+  const formSearch = [
+    // {
+    //   type: "Select",
+    //   label: "商户名称",
+    //   name: "merchantName",
+    //   placeholder:"请选择商户名称"
+    // },
+    // {
+    //   type: "Input",
+    //   label: "路段",
+    //   placeholder: "请输入路段",
+    //   name: "road_name",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "泊位号",
+    //   placeholder: "请输入泊位号",
+    //   name: "parking_num",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "操作人",
+    //   placeholder: "请输入操作人",
+    //   name: "operator",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "间隔时长大于分钟数",
+    //   placeholder: "请输入内容",
+    //   name: "exceedTime",
+    // },
+    // {
+    //   type: "RangePicker",
+    //   label: "操作时间",
+    //   name: "operationTime",
+    // },
+  ];
+  //搜索参数初始化
+  const initFormData = {
+    merchantName: "0",
+    road_name: "",
+    parking_num: "",
+    operator: "",
+    exceedTime: "",
+  };
+  //搜索的结果
+  const [tableData, setTableData] = useState([]);
+  //搜索的总结果数
+  const [total, setTotal] = useState(0);
+  function search(params) {
+    // ajax.getPDAList(params).then((res) => {
+    //   if (res.status === 20000) {
+    //     setTableData(res.data.list);
+    //     setTotal(res.data.total);
+    //   }
+    // });
+  }
+
+  return (
+    <TableModule
+    //   columns={columns}
+    //   tableData={tableData}
+    //   formSearch={formSearch}
+    //   search={search}
+    //   total={total}
+    //   mandatory={'parking_num'}
+    //   mandatory_name={'泊位号'}
+    //   pagename="PDA操作记录"
+    //   pageName={'entryExitOptPDA'}
+    //   initFormData={initFormData}
+    //   exportUrl="/api/bpm/record/get_pda_export"
+    />
+  );
+}
+
+export default OffPeakParkingRecords;

src/pages/OffPeak/OffPeakParkMgm/index.jsx

@@ -0,0 +1,8 @@
+import BookInfo from "./BookInfo"
+import BreakInfo from "./BreakInfo"
+import OffPeakParkingRecords from "./OffPeakParkingRecords"
+export default {
+    BookInfo,
+    BreakInfo,
+    OffPeakParkingRecords
+}

src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/index.jsx

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

src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx

@@ -0,0 +1,162 @@
+import React, { useState, useRef, useEffect } from "react";
+import { message, Pagination, Table, Space, Modal, Button } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+import ajax from "@/services";
+import { TableModule } from "@/components";
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
+
+function ShareParkMgm() {
+  const columns = [
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
+    // {
+    //   title: "商户名称",
+    //   dataIndex: "merchantName",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.merchantName}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作人",
+    //   dataIndex: "operator",
+    //   key: "operator",
+    //   align: "center",
+    // },
+    // {
+    //   title: "车牌号",
+    //   dataIndex: "licensePlateNumber",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.licensePlateNumber}</div>
+    //   )
+    // },
+    // {
+    //   title: "路段",
+    //   dataIndex: "section",
+    //   key: "section",
+    //   align: "center",
+    // },
+    // {
+    //   title: "泊位号",
+    //   dataIndex: "parkingSpotNumber",
+    //   key: "parkingSpotNumber",
+    //   align: "center",
+    // },
+    // {
+    //   title: "出入场类型",
+    //   dataIndex: "entryExitType",
+    //   align: "center",
+    //   key: "entryExitType",
+    // },
+    // {
+    //   title: "出入场时间",
+    //   dataIndex: "entryExitTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.entryExitTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作时间",
+    //   dataIndex: "operationTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.operationTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "间隔时长",
+    //   dataIndex: "intervalDuration",
+    //   key: "intervalDuration",
+    //   align: "center",
+    // },
+  ];
+
+  const formSearch = [
+    // {
+    //   type: "Select",
+    //   label: "商户名称",
+    //   name: "merchantName",
+    //   placeholder:"请选择商户名称"
+    // },
+    // {
+    //   type: "Input",
+    //   label: "路段",
+    //   placeholder: "请输入路段",
+    //   name: "road_name",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "泊位号",
+    //   placeholder: "请输入泊位号",
+    //   name: "parking_num",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "操作人",
+    //   placeholder: "请输入操作人",
+    //   name: "operator",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "间隔时长大于分钟数",
+    //   placeholder: "请输入内容",
+    //   name: "exceedTime",
+    // },
+    // {
+    //   type: "RangePicker",
+    //   label: "操作时间",
+    //   name: "operationTime",
+    // },
+  ];
+  //搜索参数初始化
+  const initFormData = {
+    merchantName: "0",
+    road_name: "",
+    parking_num: "",
+    operator: "",
+    exceedTime: "",
+  };
+  //搜索的结果
+  const [tableData, setTableData] = useState([]);
+  //搜索的总结果数
+  const [total, setTotal] = useState(0);
+  function search(params) {
+    // ajax.getPDAList(params).then((res) => {
+    //   if (res.status === 20000) {
+    //     setTableData(res.data.list);
+    //     setTotal(res.data.total);
+    //   }
+    // });
+  }
+
+  return (
+    <TableModule
+    //   columns={columns}
+    //   tableData={tableData}
+    //   formSearch={formSearch}
+    //   search={search}
+    //   total={total}
+    //   mandatory={'parking_num'}
+    //   mandatory_name={'泊位号'}
+    //   pagename="PDA操作记录"
+    //   pageName={'entryExitOptPDA'}
+    //   initFormData={initFormData}
+    //   exportUrl="/api/bpm/record/get_pda_export"
+    />
+  );
+}
+
+export default ShareParkMgm;

src/pages/OffPeak/OffPeakShareRecords/StallCount/index.jsx

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

src/pages/OffPeak/OffPeakShareRecords/StallCount/loadable.jsx

@@ -0,0 +1,162 @@
+import React, { useState, useRef, useEffect } from "react";
+import { message, Pagination, Table, Space, Modal, Button } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+import ajax from "@/services";
+import { TableModule } from "@/components";
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
+
+function StallCount() {
+  const columns = [
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
+    // {
+    //   title: "商户名称",
+    //   dataIndex: "merchantName",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.merchantName}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作人",
+    //   dataIndex: "operator",
+    //   key: "operator",
+    //   align: "center",
+    // },
+    // {
+    //   title: "车牌号",
+    //   dataIndex: "licensePlateNumber",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.licensePlateNumber}</div>
+    //   )
+    // },
+    // {
+    //   title: "路段",
+    //   dataIndex: "section",
+    //   key: "section",
+    //   align: "center",
+    // },
+    // {
+    //   title: "泊位号",
+    //   dataIndex: "parkingSpotNumber",
+    //   key: "parkingSpotNumber",
+    //   align: "center",
+    // },
+    // {
+    //   title: "出入场类型",
+    //   dataIndex: "entryExitType",
+    //   align: "center",
+    //   key: "entryExitType",
+    // },
+    // {
+    //   title: "出入场时间",
+    //   dataIndex: "entryExitTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.entryExitTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作时间",
+    //   dataIndex: "operationTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.operationTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "间隔时长",
+    //   dataIndex: "intervalDuration",
+    //   key: "intervalDuration",
+    //   align: "center",
+    // },
+  ];
+
+  const formSearch = [
+    // {
+    //   type: "Select",
+    //   label: "商户名称",
+    //   name: "merchantName",
+    //   placeholder:"请选择商户名称"
+    // },
+    // {
+    //   type: "Input",
+    //   label: "路段",
+    //   placeholder: "请输入路段",
+    //   name: "road_name",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "泊位号",
+    //   placeholder: "请输入泊位号",
+    //   name: "parking_num",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "操作人",
+    //   placeholder: "请输入操作人",
+    //   name: "operator",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "间隔时长大于分钟数",
+    //   placeholder: "请输入内容",
+    //   name: "exceedTime",
+    // },
+    // {
+    //   type: "RangePicker",
+    //   label: "操作时间",
+    //   name: "operationTime",
+    // },
+  ];
+  //搜索参数初始化
+  const initFormData = {
+    merchantName: "0",
+    road_name: "",
+    parking_num: "",
+    operator: "",
+    exceedTime: "",
+  };
+  //搜索的结果
+  const [tableData, setTableData] = useState([]);
+  //搜索的总结果数
+  const [total, setTotal] = useState(0);
+  function search(params) {
+    // ajax.getPDAList(params).then((res) => {
+    //   if (res.status === 20000) {
+    //     setTableData(res.data.list);
+    //     setTotal(res.data.total);
+    //   }
+    // });
+  }
+
+  return (
+    <TableModule
+    //   columns={columns}
+    //   tableData={tableData}
+    //   formSearch={formSearch}
+    //   search={search}
+    //   total={total}
+    //   mandatory={'parking_num'}
+    //   mandatory_name={'泊位号'}
+    //   pagename="PDA操作记录"
+    //   pageName={'entryExitOptPDA'}
+    //   initFormData={initFormData}
+    //   exportUrl="/api/bpm/record/get_pda_export"
+    />
+  );
+}
+
+export default StallCount;

src/pages/OffPeak/OffPeakShareRecords/index.jsx

@@ -0,0 +1,6 @@
+import ShareParkMgm from "./ShareParkMgm"
+import StallCount from "./StallCount"
+export default {
+    ShareParkMgm,
+    StallCount
+}

src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/index.jsx

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

src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx

@@ -0,0 +1,162 @@
+import React, { useState, useRef, useEffect } from "react";
+import { message, Pagination, Table, Space, Modal, Button } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+import ajax from "@/services";
+import { TableModule } from "@/components";
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
+
+function RuleDetail() {
+  const columns = [
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
+    // {
+    //   title: "商户名称",
+    //   dataIndex: "merchantName",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.merchantName}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作人",
+    //   dataIndex: "operator",
+    //   key: "operator",
+    //   align: "center",
+    // },
+    // {
+    //   title: "车牌号",
+    //   dataIndex: "licensePlateNumber",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.licensePlateNumber}</div>
+    //   )
+    // },
+    // {
+    //   title: "路段",
+    //   dataIndex: "section",
+    //   key: "section",
+    //   align: "center",
+    // },
+    // {
+    //   title: "泊位号",
+    //   dataIndex: "parkingSpotNumber",
+    //   key: "parkingSpotNumber",
+    //   align: "center",
+    // },
+    // {
+    //   title: "出入场类型",
+    //   dataIndex: "entryExitType",
+    //   align: "center",
+    //   key: "entryExitType",
+    // },
+    // {
+    //   title: "出入场时间",
+    //   dataIndex: "entryExitTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.entryExitTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作时间",
+    //   dataIndex: "operationTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.operationTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "间隔时长",
+    //   dataIndex: "intervalDuration",
+    //   key: "intervalDuration",
+    //   align: "center",
+    // },
+  ];
+
+  const formSearch = [
+    // {
+    //   type: "Select",
+    //   label: "商户名称",
+    //   name: "merchantName",
+    //   placeholder:"请选择商户名称"
+    // },
+    // {
+    //   type: "Input",
+    //   label: "路段",
+    //   placeholder: "请输入路段",
+    //   name: "road_name",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "泊位号",
+    //   placeholder: "请输入泊位号",
+    //   name: "parking_num",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "操作人",
+    //   placeholder: "请输入操作人",
+    //   name: "operator",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "间隔时长大于分钟数",
+    //   placeholder: "请输入内容",
+    //   name: "exceedTime",
+    // },
+    // {
+    //   type: "RangePicker",
+    //   label: "操作时间",
+    //   name: "operationTime",
+    // },
+  ];
+  //搜索参数初始化
+  const initFormData = {
+    merchantName: "0",
+    road_name: "",
+    parking_num: "",
+    operator: "",
+    exceedTime: "",
+  };
+  //搜索的结果
+  const [tableData, setTableData] = useState([]);
+  //搜索的总结果数
+  const [total, setTotal] = useState(0);
+  function search(params) {
+    // ajax.getPDAList(params).then((res) => {
+    //   if (res.status === 20000) {
+    //     setTableData(res.data.list);
+    //     setTotal(res.data.total);
+    //   }
+    // });
+  }
+
+  return (
+    <TableModule
+    //   columns={columns}
+    //   tableData={tableData}
+    //   formSearch={formSearch}
+    //   search={search}
+    //   total={total}
+    //   mandatory={'parking_num'}
+    //   mandatory_name={'泊位号'}
+    //   pagename="PDA操作记录"
+    //   pageName={'entryExitOptPDA'}
+    //   initFormData={initFormData}
+    //   exportUrl="/api/bpm/record/get_pda_export"
+    />
+  );
+}
+
+export default RuleDetail;

src/pages/OffPeak/OffPeakTimeMgm/TimeRule/index.jsx

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

src/pages/OffPeak/OffPeakTimeMgm/TimeRule/loadable.jsx

@@ -0,0 +1,162 @@
+import React, { useState, useRef, useEffect } from "react";
+import { message, Pagination, Table, Space, Modal, Button } from "antd";
+// import { dictionary, utils } from "@/config/common";
+// import moment from 'moment'
+// import {   useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks';
+import ajax from "@/services";
+import { TableModule } from "@/components";
+// import "./index.scss";
+// import errorImg from "@/assets/images/layout/error.png"
+// import {  useLocation } from "react-router-dom";
+
+function TimeRule() {
+  const columns = [
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
+    // {
+    //   title: "商户名称",
+    //   dataIndex: "merchantName",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.merchantName}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作人",
+    //   dataIndex: "operator",
+    //   key: "operator",
+    //   align: "center",
+    // },
+    // {
+    //   title: "车牌号",
+    //   dataIndex: "licensePlateNumber",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "100px", wordBreak: "break-all" }}>{record.licensePlateNumber}</div>
+    //   )
+    // },
+    // {
+    //   title: "路段",
+    //   dataIndex: "section",
+    //   key: "section",
+    //   align: "center",
+    // },
+    // {
+    //   title: "泊位号",
+    //   dataIndex: "parkingSpotNumber",
+    //   key: "parkingSpotNumber",
+    //   align: "center",
+    // },
+    // {
+    //   title: "出入场类型",
+    //   dataIndex: "entryExitType",
+    //   align: "center",
+    //   key: "entryExitType",
+    // },
+    // {
+    //   title: "出入场时间",
+    //   dataIndex: "entryExitTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.entryExitTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "操作时间",
+    //   dataIndex: "operationTime",
+    //   align: "center",
+    //   render: (text, record, index) => (
+    //     <div style={{ width: "130px", wordBreak: "break-all" }}>{record.operationTime}</div>
+    //   )
+    // },
+    // {
+    //   title: "间隔时长",
+    //   dataIndex: "intervalDuration",
+    //   key: "intervalDuration",
+    //   align: "center",
+    // },
+  ];
+
+  const formSearch = [
+    // {
+    //   type: "Select",
+    //   label: "商户名称",
+    //   name: "merchantName",
+    //   placeholder:"请选择商户名称"
+    // },
+    // {
+    //   type: "Input",
+    //   label: "路段",
+    //   placeholder: "请输入路段",
+    //   name: "road_name",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "泊位号",
+    //   placeholder: "请输入泊位号",
+    //   name: "parking_num",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "操作人",
+    //   placeholder: "请输入操作人",
+    //   name: "operator",
+    // },
+    // {
+    //   type: "Input",
+    //   label: "间隔时长大于分钟数",
+    //   placeholder: "请输入内容",
+    //   name: "exceedTime",
+    // },
+    // {
+    //   type: "RangePicker",
+    //   label: "操作时间",
+    //   name: "operationTime",
+    // },
+  ];
+  //搜索参数初始化
+  const initFormData = {
+    merchantName: "0",
+    road_name: "",
+    parking_num: "",
+    operator: "",
+    exceedTime: "",
+  };
+  //搜索的结果
+  const [tableData, setTableData] = useState([]);
+  //搜索的总结果数
+  const [total, setTotal] = useState(0);
+  function search(params) {
+    // ajax.getPDAList(params).then((res) => {
+    //   if (res.status === 20000) {
+    //     setTableData(res.data.list);
+    //     setTotal(res.data.total);
+    //   }
+    // });
+  }
+
+  return (
+    <TableModule
+    //   columns={columns}
+    //   tableData={tableData}
+    //   formSearch={formSearch}
+    //   search={search}
+    //   total={total}
+    //   mandatory={'parking_num'}
+    //   mandatory_name={'泊位号'}
+    //   pagename="PDA操作记录"
+    //   pageName={'entryExitOptPDA'}
+    //   initFormData={initFormData}
+    //   exportUrl="/api/bpm/record/get_pda_export"
+    />
+  );
+}
+
+export default TimeRule;

src/pages/OffPeak/OffPeakTimeMgm/index.jsx

@@ -0,0 +1,6 @@
+import RuleDetail from "./RuleDetail"
+import TimeRule from "./TimeRule"
+export default {
+    RuleDetail,
+    TimeRule
+}

src/pages/OffPeak/index.jsx

@@ -0,0 +1,8 @@
+import OffPeakParkMgm from "./OffPeakParkMgm"
+import OffPeakShareRecords from "./OffPeakShareRecords"
+import OffPeakTimeMgm from "./OffPeakTimeMgm"
+export default {
+    ...OffPeakParkMgm,
+    ...OffPeakShareRecords,
+    ...OffPeakTimeMgm
+}

src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx

@@ -139,7 +139,7 @@ function OutMonitorMgm(props) {
     setDefaultParams({ ...postData, ...pageInfo });
     // console.log(postData);
     setTabLoading(true);
-    ajax.getMonitorList({ ...postData, ...v, ...pageInfo }).then(
+    ajax.getMonitorList({ ...postData, ...v, ...pageInfo , data_source:2}).then( // data_source用于区分路内和路外的请求
       (res) => {
         if (parseInt(res?.status) === 20000) {
           setResultData(res?.data || {});
@@ -202,7 +202,7 @@ function OutMonitorMgm(props) {
     });
   };
   const getNvrList = () => {
-    ajax.getAllNvrList().then(
+    ajax.getAllOutNvrList().then(
       (res) => {
         if (res.status == 20000) {
           setNvrData(res?.data || []);

src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/VideoMonitor.jsx

@@ -10,102 +10,153 @@ import {
   Select,
   Popover,
   message,
+  Dropdown
 } from "antd";
 import ajax from "@/services";
 function VideoMonitor(props) {
   const { id } = props;
   const [form] = Form.useForm();
   const [editform] = Form.useForm();
-  const carTypeList = [
-    { label: "小型车", value: 1 },
-    { label: "大型车", value: 2 },
+  // 操作-下拉
+  const items = [
+    // { key: "1", label: <span>查看监控</span> },
+    { key: "2", label: <span>编辑</span> },
+    { key: "3", label: <span>删除</span> },
   ];
   const columns = [
     {
       title: "设备名称",
-      dataIndex: "device_name",
-      key: "device_name",
+      dataIndex: "name",
+      align: "center",
+    },
+    {
+      title: "区域",
+      dataIndex: "area_name",
+      align: "center",
+    },
+    {
+      title: "所属车场",
+      dataIndex: "road_name",
       align: "center",
     },
     {
       title: "IP地址",
       dataIndex: "ip_address",
-      key: "ip_address",
       align: "center",
     },
     {
       title: "端口号",
-      dataIndex: "port_id",
-      key: "port_id",
+      dataIndex: "port",
       align: "center",
     },
     {
       title: "视频端口号",
-      dataIndex: "video_port_id",
-      key: "video_port_id",
+      width: 110,
+      dataIndex: "video_port",
       align: "center",
     },
     {
       title: "用户名",
       dataIndex: "user_name",
-      key: "user_name",
       align: "center",
     },
     {
       title: "密码",
       dataIndex: "password",
-      key: "password",
       align: "center",
     },
     {
       title: "更新时间",
-      dataIndex: "create_time",
-      key: "create_time",
+      dataIndex: "update_time",
       align: "center",
+      width: 110,
     },
     {
       title: "操作",
-      dataIndex: "action",
-      key: "action",
       align: "center",
-      render: (_, record) => {
+      width: 140,
+      render: (val, row, index) => {
         return (
-          <Popover
-            trigger="hover"
-            content={
-              <div>
-                <div>
-                  <a
-                    onClick={() => {
-                      setModalData({ ...modalData, visible: true });
-                      editform.setFieldsValue({
-                        vehicle_type: record.rule_id,
-                        vehicle_type: record.vehicle_type,
-                        group_ids: +record.group_ids,
-                      });
-                    }}
-                  >
-                    编辑
-                  </a>
-                </div>
-                <div>
-                  <a
-                    onClick={() => {
-                      setDelModal({ id: record.id, visible: true });
-                    }}
-                  >
-                    删除
-                  </a>
-                </div>
-              </div>
-            }
+          <Dropdown
+            arrow
+            placement="bottomLeft"
+            menu={{
+              items,
+              onClick: (key) => {
+                return clickDropDown(key, row);
+              },
+            }}
           >
             <Button type="primary">操作</Button>
-          </Popover>
+          </Dropdown>
         );
       },
-    },
+    }
+    // {
+    //   title: "操作",
+    //   dataIndex: "action",
+    //   key: "action",
+    //   align: "center",
+    //   render: (_, record) => {
+    //     return (
+    //       <Popover
+    //         trigger="hover"
+    //         content={
+    //           <div>
+    //             <div>
+    //               <a
+    //                 onClick={() => {
+    //                   setModalData({ ...modalData, visible: true });
+    //                   editform.setFieldsValue({
+    //                     vehicle_type: record.rule_id,
+    //                     vehicle_type: record.vehicle_type,
+    //                     group_ids: +record.group_ids,
+    //                   });
+    //                 }}
+    //               >
+    //                 编辑
+    //               </a>
+    //             </div>
+    //             <div>
+    //               <a
+    //                 onClick={() => {
+    //                   setDelModal({ id: record.id, visible: true });
+    //                 }}
+    //               >
+    //                 删除
+    //               </a>
+    //             </div>
+    //           </div>
+    //         }
+    //       >
+    //         <Button type="primary">操作</Button>
+    //       </Popover>
+    //     );
+    //   },
+    // },
   ];
+  // 操作
+  const clickDropDown = (param, record) => {
+    // console.log(param.key, record);
+    // setRowData(record);
+    if (param.key == "1") {
+      // 查看监控
+      // handlePlay(record);
+    } else if (param.key == "2") {
+      // 编辑
+      // doEditOutNvr(record);
+      setModalData({ ...modalData, visible: true });
+      editform.setFieldsValue({
+        // vehicle_type: record.rule_id,
+        // vehicle_type: record.vehicle_type,
+        // group_ids: +record.group_ids,
+      });
+    } else {
+      // 删除
+      // doDelOutNvr(record);
+      setDelModal({ id: record.id, visible: true });
+    }
+  };
   const [modalData, setModalData] = useState({
     visible: false,
     status: "add",
@@ -128,15 +179,15 @@ function VideoMonitor(props) {
     visible: false,
     id: "",
   });
-  const addRule = () => {
+  const addNvr = () => {
     setModalData({ ...modalData, visible: true });
   };
 
-  //搜索方法
+  //搜索方法    name: "", // 设备名称   operator_id: "", //运营商   road_id: "", //路段名称
   const search = () => {
     const params = form.getFieldsValue();
     ajax
-      .getRoadBillRuleList({ road_id: id, ...pageData, ...params })
+      .getOutNvrList({ road_id: id, operator_id: '', ...pageData, ...params })
       .then((res) => {
         if (res.status === 20000) {
           setTableData(res.data.list);
@@ -145,26 +196,9 @@ function VideoMonitor(props) {
       });
   };
 
-  //获取计费规则下拉列表
-  const getChargeRuleList = () => {
-    ajax.getRoadBillRule().then((res) => {
-      if (res.status === 20000) {
-        setChargeRuleList(res.data);
-      }
-    });
-  };
-  //获取临时车辆组
-  const getTempGroup = () => {
-    ajax.getRoadTemporaryGroup({ road_id: id }).then((res) => {
-      if (res.status === 20000) {
-        setTempGroup(res.data);
-      }
-    });
-  };
-
   //添加 监控设备  接口
-  const addRoadBillRule = (params) => {
-    ajax.addRoadBillRule(params).then((res) => {
+  const doAddOutNvr = (params) => {
+    ajax.doAddOutNvr(params).then((res) => {
       if (res.status === 20000) {
         message.success("添加成功");
         successSubmit();
@@ -175,8 +209,8 @@ function VideoMonitor(props) {
   };
 
   //编辑计费规则接口
-  const editRoadBullRule = (params) => {
-    ajax.editRoadBullRule(params).then((res) => {
+  const doEditOutNvr = (params) => {
+    ajax.doEditOutNvr(params).then((res) => {
       if (res.status === 20000) {
         message.success("编辑成功");
         successSubmit();
@@ -192,9 +226,9 @@ function VideoMonitor(props) {
       .validateFields()
       .then((values) => {
         if (modalData.status === "add") {
-          addRoadBillRule({ ...values, road_id: id, ...pageData });
+          doAddOutNvr({ ...values, road_id: id, ...pageData });
         } else if (modalData.status === "edit") {
-          editRoadBullRule({ ...values, road_id: id, ...pageData });
+          doEditOutNvr({ ...values, road_id: id, ...pageData });
         }
       })
       .catch((err) => console.error(err));
@@ -208,8 +242,8 @@ function VideoMonitor(props) {
   };
 
   //删除接口
-  const delRoadBillRule = (id) => {
-    ajax.delRoadBillRule({ id }).then((res) => {
+  const doDelOutNvr = (id) => {
+    ajax.doDelOutNvr({ id }).then((res) => {
       if (res.status === 20000) {
         message.success("删除成功");
         setDelModal({ ...delModal, visible: false });
@@ -219,8 +253,7 @@ function VideoMonitor(props) {
   };
 
   useEffect(() => {
-    getChargeRuleList();
-    getTempGroup();
+
   }, []);
   useEffect(() => {
     search();
@@ -238,7 +271,7 @@ function VideoMonitor(props) {
             <Form.Item>
               <div className="bottom-button">
                 <Button type="primary">查询</Button>
-                <Button type="primary" onClick={addRule}>
+                <Button type="primary" onClick={addNvr}>
                   添加
                 </Button>
               </div>
@@ -265,7 +298,7 @@ function VideoMonitor(props) {
         ></Table>
       </main>
       <Modal
-        title="添加计费规则"
+        title="添加监控设备"
         open={modalData.visible}
         onCancel={() => {
           setModalData({ ...modalData, visible: false });
@@ -325,7 +358,7 @@ function VideoMonitor(props) {
         onCancel={() => {
           setDelModal({ ...delModal, visible: false });
         }}
-        onOk={() => delRoadBillRule(delModal.id)}
+        onOk={() => doDelOutNvr(delModal.id)}
       >
         确定要删除这条数据吗？
       </Modal>

src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState, lazy, Suspense } from "react";
+import React, { useState, lazy, Suspense, useEffect } from "react";
 import { Modal, Tabs } from "antd";
 import MSPages from "./MSPages";
 import BusinessParameterConfig from "./BusinessParameterConfig";
@@ -15,7 +15,6 @@ function ConfigParking(props) {
   const { visible = false, close = () => {}, itemData = {} } = props;
   // itemdata.road_type = 0 一级  1 二级  2 三级  ...
   
-
   const createTabs = ()=>{
     if(itemData.road_type == '0' || itemData.road_type == '1'){
       return [
@@ -107,6 +106,12 @@ function ConfigParking(props) {
   const tabsItems = createTabs()
   const [type, setType] = useState("1");
   const tabsOnChange = (value) => setType(value);
+  useEffect(()=>{
+    if(visible){
+      setType('1')
+    }
+  }, [visible])
+
   return (
     <Modal
       width={1500}

src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx

@@ -617,8 +617,13 @@ function OutSegment() {
           visible={checkModal.visible}
           close={checkModal.close}
           itemData={checkModal.record}
-          setConfigModal={() => {
-            setConfigModal({ ...configModal, visible: true, record: recordData  });
+          setConfigModal={(myData) => {
+            console.log(myData, 'myData')
+            if(myData){
+              setConfigModal({...configModal, record: myData, visible: true})
+            }else{
+              setConfigModal({ ...configModal, visible: true, record: recordData  });
+            }
           }}
           setEditModal={(v) => {
             setEditModal({

src/pages/SystemMgm/AdminMgm/loadable.jsx

@@ -690,21 +690,25 @@ function AdminMgm(props) {
                 </div>
                 <div className="timePicker ">
                     <div className="btnBox">
+                        <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
+                            重置
+                        </Button>
                         <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
                         查询
                         </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getResetData() }}>
-                            清除
-                        </Button>
-                        <Button type="primary" className="yisa-btn" onClick={() => { addAdmin() }}>
-                            添加
-                        </Button>
+                        
+                        
                     </div>
                 </div>
             </div>
             <div className="paid-result">
                 <div className="result">
-                    <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                    <div className="result-info-row">
+                        <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                        <Button type="primary" className="yisa-btn" onClick={() => { addAdmin() }}>
+                                添加
+                        </Button>
+                    </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered

src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx

@@ -510,21 +510,23 @@ function BusinessConf(props) {
                 </div>
                 <div className="timePicker ">
                     <div className="btnBox">
+                        <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
+                            重置
+                        </Button>
                         <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
                         查询
                         </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getResetData() }}>
-                            清除
-                        </Button>
-                        <Button type="primary" className="yisa-btn" onClick={() => { addAdmin() }}>
-                        添加
-                        </Button>
                     </div>
                 </div>
             </div>
             <div className="paid-result">
                 <div className="result">
-                    <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                    <div className="result-info-row">
+                       <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                       <Button type="primary" className="yisa-btn" onClick={() => { addAdmin() }}>
+                          添加
+                        </Button>
+                    </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered

src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx

@@ -356,11 +356,13 @@ function HotCbdConf() {
                         <Button  onClick={reset}>重置</Button>&emsp;
                         <Button type="primary"  onClick={()=>{excuteSearch()}}>查询</Button>&emsp;
                        
-                        <Button type="primary" onClick={addConfig} >商圈配置</Button>
                     </div>
                 </div>
                 <div className="right-list">
-                    <span className="font">共检索到&ensp;<span style={{color: '#3B97FF'}}>{total}</span>&ensp;条结果</span>
+                   <div className="result-info-row">
+                        <span className="font">共检索到&ensp;<span style={{color: '#3B97FF'}}>{total}</span>&ensp;条结果</span>
+                        <Button type="primary" onClick={addConfig} >商圈配置</Button>
+                    </div>
                     <div className="table-wrap" >
                         <Table
                             rowKey="id"

src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx

@@ -404,18 +404,12 @@ function ConfMes(props) {
                         <div className="form-btn">
                             <Button
                                 className="reset"
-                                icon={<DeleteFilled/>}
+                                // icon={<DeleteFilled/>}
                                 onClick={handleReset}
                             >
-                                清除
-                            </Button>
-                            <Button
-                                className="add-btn"
-                                type="primary"
-                                onClick={handleAdd}
-                            >
-                                消息配置
+                                重置
                             </Button>
+                            
                             <Button
                                 className="submit"
                                 type="primary"
@@ -433,7 +427,16 @@ function ConfMes(props) {
                         ajaxLoad={loading}
                         resultData={resultData?.list || []}
                     >
-                        <div>共检索到 {resultData.totalRecords} 条数据</div>
+                         <div className="result-info-row">
+                             <div>共检索到 {resultData.totalRecords} 条数据</div>
+                            <Button
+                                className="add-btn"
+                                type="primary"
+                                onClick={handleAdd}
+                            >
+                                消息配置
+                            </Button>
+                         </div>
                         <Table
                             className='sys-table'
                             dataSource={resultData?.list || []}

src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx

@@ -333,10 +333,10 @@ function NotificationMes(props) {
                         <div className="form-btn-alarm">
                             <Button
                                 className="reset"
-                                icon={<DeleteFilled/>}
+                                // icon={<DeleteFilled/>}
                                 onClick={handleReset}
                             >
-                                清除
+                                重置
                             </Button>
                             <Button
                                 className="submit"

src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx

@@ -323,10 +323,10 @@ function MonitorCarAlarmMes(props) {
                         <div className="form-btn-alarm">
                             <Button
                                 className="reset"
-                                icon={<DeleteFilled/>}
+                                // icon={<DeleteFilled/>}
                                 onClick={handleReset}
                             >
-                                清除
+                                重置
                             </Button>
                             <Button
                                 className="submit"

src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx

@@ -448,10 +448,10 @@ function NotificationMes(props) {
                         <div className="form-btn">
                             <Button
                                 className="reset"
-                                icon={<DeleteFilled/>}
+                                // icon={<DeleteFilled/>}
                                 onClick={handleReset}
                             >
-                                清除
+                                重置
                             </Button>
                             <Button
                                 className="submit"
@@ -460,13 +460,7 @@ function NotificationMes(props) {
                             >
                                 查询
                             </Button>
-                            <Button
-                                className="add-btn"
-                                type="primary"
-                                onClick={() => handleRead({infoId: ""}, 1)}
-                            >
-                                全部已读
-                            </Button>
+                            
                         </div>
                     </div>
                 </div>
@@ -477,7 +471,16 @@ function NotificationMes(props) {
                         ajaxLoad={loading}
                         resultData={resultData?.list || []}
                     >
-                        <div>共检索到 {resultData.totalRecords} 条数据</div>
+                        <div className="result-info-row">
+                            <div>共检索到 {resultData.totalRecords} 条数据</div>
+                            <Button
+                                className="add-btn"
+                                type="primary"
+                                onClick={() => handleRead({infoId: ""}, 1)}
+                            >
+                                全部已读
+                            </Button>
+                        </div>
                         <Table
                             className='sys-table'
                             dataSource={resultData?.list || []}

src/pages/SystemMgm/RoleMgm/loadable.jsx

@@ -598,21 +598,23 @@ function RoleMgm(props) {
                 </div>
                 <div className="timePicker ">
                     <div className="btnBox">
+                       <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
+                            重置
+                        </Button>
                         <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
                         查询
-                        </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getResetData() }}>
-                            清除
-                        </Button>
-                        <Button type="primary" className="yisa-btn" onClick={() => { addAdmin() }}>
-                            添加
-                        </Button>
+                        </Button>        
                     </div>
                 </div>
             </div>
             <div className="paid-result">
                 <div className="result">
-                    <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                    <div className="result-info-row">
+                        <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                        <Button type="primary" className="yisa-btn" onClick={() => { addAdmin() }}>
+                            添加
+                        </Button>
+                    </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered

src/pages/SystemMgm/SystemLog/loadable.jsx

@@ -417,10 +417,11 @@ const SystemLog = () => {
             </div>
           </div>
           <div className="form-btn">
+            <Button  onClick={() => setFormData({...defaultData, pn: formData?.pn || 1, page_size: formData?.page_size || dictionary?.pageSizeOptions1[0]})}>
+              重置
+            </Button>
             <Button
               type="primary"
-              loading={loading}
-              // 
               onClick={() => {
                 let _data = {
                   ...formData,
@@ -432,17 +433,18 @@ const SystemLog = () => {
               }}>
                   查询
             </Button>
-            <Button  onClick={() => setFormData({...defaultData, pn: formData?.pn || 1, page_size: formData?.page_size || dictionary?.pageSizeOptions1[0]})}>
-              条件重置
-            </Button>
-            <Button type="primary" icon={<DownloadOutlined />} onClick={() => setModalExport({ ...modalExport, open: true })}>
-              导出
-            </Button>
+            
           </div>
         </div>
       </div>
       <div className="paid-result">
         <div className="result">
+          <div className="result-info-row">
+            <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+            <Button type="primary"  onClick={() => setModalExport({ ...modalExport, open: true })}>
+                导出
+            </Button>
+          </div>
           <div className="result-data">
             <Table
               rowKey={(row) => row.id}

src/pages/index.jsx

@@ -13,6 +13,7 @@ import MerchantMgm  from "./MerchantMgm"
 import OperationCenter  from "./OperationCenter"
 import FinancialMgm  from "./FinancialMgm"
 import SystemMgm  from "./SystemMgm"
+import OffPeak  from "./OffPeak"
 export default {
   _404,
   _403,
@@ -24,5 +25,6 @@ export default {
   ...MerchantMgm,
   ...OperationCenter,
   ...FinancialMgm,
-  ...SystemMgm
+  ...SystemMgm,
+  ...OffPeak
 }

src/router/router.config.js

@@ -1236,6 +1236,49 @@ let routes = [
         name: "outNvrMgm",
         component: pages.OutNvrMgm,
       },
+      {
+        // -------------------------------错时共享
+        path: "/offPeak/bookInfo",
+        text: "预约信息",
+        name: "bookInfo",
+        component: pages.BookInfo,
+      },
+      {
+        path: "/offPeak/breakInfo",
+        text: "违约信息",
+        name: "breakInfo",
+        component: pages.BreakInfo,
+      },
+      {
+        path: "/offPeak/offPeakParkingRecords",
+        text: "错时车辆停车记录",
+        name: "offPeakParkingRecords",
+        component: pages.OffPeakParkingRecords,
+      },
+      {
+        path: "/offPeak/shareParkMgm",
+        text: "共享车场管理",
+        name: "shareParkMgm",
+        component: pages.ShareParkMgm,
+      },
+      {
+        path: "/offPeak/stallCount",
+        text: "车场车位数",
+        name: "stallCount",
+        component: pages.StallCount,
+      },
+      {
+        path: "/offPeak/ruleDetail",
+        text: "规则详情",
+        name: "ruleDetail",
+        component: pages.RuleDetail,
+      },
+      {
+        path: "/offPeak/timeRule",
+        text: "时间规则",
+        name: "timeRule",
+        component: pages.TimeRule,
+      }
     ],
   },
 ];

src/services/OffPeak/index.js

@@ -0,0 +1,11 @@
+import ajax from "@/config/ajax";
+const getBookInfoList =  (params) => {
+    return ajax({
+      url: "/api/off_peak/book_info/get_book_info_list",
+      type: "post",
+      data: params,
+    });
+}
+export default {
+    getBookInfoList
+}

src/services/index.js

@@ -22,6 +22,7 @@ import ElectInvoice from "./ElectInvoice";
 import FinancialMgm from "./FinancialMgm";
 import DataAnalysisPrediction from "./DataAnalysisPrediction";
 import ParkingOverview from "./ParkingOverview";
+import OffPeak from "./OffPeak";
 const api = {};
 export default {
   ...api,
@@ -49,4 +50,5 @@ export default {
   ...FinancialMgm,
   ...DataAnalysisPrediction,
   ParkingOverview,
+  ...OffPeak
 };

src/services/search.js

@@ -805,6 +805,13 @@ const getAllNvrList = (params) => {
     data: params,
   });
 };
+const getAllOutNvrList = (params) => {
+  return ajax({
+    url: "/api/orp/nvr/get_All_NVR",
+    type: "get",
+    data: params,
+  });
+};
 const getAllBrandNameList = (params) => {
   return ajax({
     url: "/api/bpm/device/get_all_brand",
@@ -1246,6 +1253,7 @@ export default {
   getMonitorList,
   getBerthByNvr,
   getAllNvrList,
+  getAllOutNvrList,
   getAllBrandList,
   brandAdd,
   brandEdit,