From 58c5c1d364dda6472c1cd2be6bd6736ff2609a7e Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Wed, 17 Jan 2024 11:32:08 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E7=89=B9=E6=AE=8A=E6=94=BE=E8=A1=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutExceptionMgm/SpecialReleaseMgm/index.jsx    | 39 +++++++++++-----------
 src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx  | 36 +++++++++++++++-----
 .../ConfigParking/TollCollectorManagement.jsx      |  2 +-
 src/services/OutRoadMgm/OutExceptionMgm/index.js   | 20 +++++++++++
 src/services/OutRoadMgm/OutRoadOverview.js         |  9 +++++
 5 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx
index fca0de6..5459214 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx
@@ -15,7 +15,6 @@ import {
 import moment from "moment";
 import ajax from '@/services'
 import { TableModule } from "@/components";
-import { dictionary } from "@/config/common.js";
 import "./index.scss";
 //specialReleaseMgm
 function SpecialReleaseMgm() {
@@ -42,56 +41,56 @@ function SpecialReleaseMgm() {
         {
             title: "车牌号",
             dataIndex: "plate",
-            key: "plate_old",
+            key: "plate",
             align: "center",
             fixed: "right",
         },
         {
             title: "入场时间",
-            dataIndex: "plate",
-            key: "plate_new",
+            dataIndex: "in_time",
+            key: "in_time",
             align: "center",
             fixed: "right",
         },
         {
             title: "出场时间",
-            dataIndex: "cr",
-            key: "cr",
+            dataIndex: "out_time",
+            key: "out_time",
             align: "center",
             fixed: "right",
         },
         {
             title: "应收金额",
-            dataIndex: "co",
-            key: "co",
+            dataIndex: "shouldPay",
+            key: "shouldPay",
             align: "center",
             fixed: "right",
         },
         {
             title: "通道名称",
-            dataIndex: "op",
-            key: "oe",
+            dataIndex: "parkName",
+            key: "parkName",
             align: "center",
             fixed: "right",
         },
         {
             title: "开闸时间",
-            dataIndex: "o",
-            key: "o",
+            dataIndex: "open_gate_time",
+            key: "open_gate_time",
             align: "center",
             fixed: "right",
         },
         {
             title: "开闸原因",
-            dataIndex: "",
-            key: "o",
+            dataIndex: "reason",
+            key: "reason",
             align: "center",
             fixed: "right",
         },
         {
             title: "操作人",
-            dataIndex: "o",
-            key: "o",
+            dataIndex: "operatename",
+            key: "operatename",
             align: "center",
             fixed: "right",
         },
@@ -106,7 +105,7 @@ function SpecialReleaseMgm() {
                     <Button
                         type="primary"
                         onClick={() => {
-                            getDetailData(record.id)
+                            //getDetailData(record.id)
                         }}
                     >
                         详情
@@ -125,7 +124,7 @@ function SpecialReleaseMgm() {
             placeholder: "请输入车场名称",
         },
         {
-            name: "c",
+            name: "operatename",
             type: "Input",
             label: "操作人",
             placeholder: "请输入操作人",
@@ -141,7 +140,7 @@ function SpecialReleaseMgm() {
 
     //列表数据
     function search(e) {
-        ajax.getPlateChangeList(e).then((res) => {
+        ajax.getSpecialResList(e).then((res) => {
             let { status, data, total } = res
             if (status == 20000) {
                 if (data.list) {
@@ -210,7 +209,7 @@ function SpecialReleaseMgm() {
                 search={search}
                 total={total}
                 rowKey={"road_name"}
-                exportUrl={'/api/bpm/correct/export_lift'}
+                exportUrl={'/api/bpm/special/export_lift'}
                 initFormData={{}}
                 pagename={'plateChangeMgm'}
             />
diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
index f5d535b..dd249d1 100644
--- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
@@ -6,6 +6,7 @@ import { useSelector } from "react-redux";
 import "./index.scss";
 import { VideoPlay } from "@/components";
 import { Select, Tooltip } from "antd";
+var timer = null;
 const OutRoadOverview = () => {
   const skin = useSelector((state) => {
     return state.common.skin;
@@ -303,19 +304,37 @@ const OutRoadOverview = () => {
       });
   }
   //查看监控视频
-  function getOutRoadVideoPlay() {
+  function getOutRoadVideoPlay(e) {
     ajax
-      .getOutRoadVideoPlay()
+      .getOutRoadVideoPlay(e)
       .then((res) => {
         if (res.status === 20000) {
           setVideoPlay(res.data.url);
-          handleFlvPlay(res.data.url)
+          handleFlvPlay(res.data.url);
+          getOutRoadVideoPlaying(e) //轮询
         }
       })
       .catch((err) => {
         console.error(err);
       });
   }
+
+  //轮询
+  function getOutRoadVideoPlaying(e) {
+    timer = setInterval(() => {
+      ajax
+        .getOutRoadVideoPlaying(e)
+        .then((res) => {
+          if (res.status != 20000) {
+            clearInterval(timer);
+          }
+        })
+        .catch((err) => {
+          clearInterval(timer);
+          console.error(err);
+        });
+    }, 5000)
+  }
   //  概览-停车收入top5
   function getIncomeTop5() {
     ajax
@@ -388,9 +407,7 @@ const OutRoadOverview = () => {
   const handleFlvPlay = (e) => {
     videoRef.current.closeVideo()
     setVideoType("mp4")
-    //if(videoPlay){
-      videoRef.current.changeUrl(e)
-    //}
+    videoRef.current.changeUrl(e)
   }
   useEffect(() => {
     getBaseNumber();
@@ -400,9 +417,12 @@ const OutRoadOverview = () => {
     getParkingRecord();
     getPageConfig();
     getOutRoadVideoRoad();
+    return () => {
+      clearInterval(timer)
+    }
   }, []);
   useEffect(() => {
-    if(roadId){
+    if (roadId) {
       getOutRoadVideoDevice(roadId)
     }
   }, [roadId]);
@@ -532,7 +552,7 @@ const OutRoadOverview = () => {
               placeholder="请选择停车场"
               value={roadId}
               options={videoRoad}
-              onChange={(e)=>setRoadId(e)}
+              onChange={(e) => setRoadId(e)}
             />
             <Select
               placeholder="请选择监控设备"
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/TollCollectorManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/TollCollectorManagement.jsx
index e5b0736..1c8028e 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/TollCollectorManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/TollCollectorManagement.jsx
@@ -169,7 +169,7 @@ function TollCollectorManagement({ id: road_id }) {
             </Col>
 
             <Col span="4_8" style={{ width: "30%" }}>
-              <Form.Item label="角色" name="user_account">
+              <Form.Item label="角色" name="role">
                 <Select options={sysConfig.orpMBUserRole} />
               </Form.Item>
             </Col>
diff --git a/src/services/OutRoadMgm/OutExceptionMgm/index.js b/src/services/OutRoadMgm/OutExceptionMgm/index.js
index 496107b..debee84 100644
--- a/src/services/OutRoadMgm/OutExceptionMgm/index.js
+++ b/src/services/OutRoadMgm/OutExceptionMgm/index.js
@@ -26,8 +26,28 @@ const getPlateChangeExport = (params) => {
     data: params,
   });
 };
+
+//异常管理-特殊方行记录-列表
+const getSpecialResList = (params) => {
+  return ajax({
+    url: "/api/bpm/special/get_special_res",
+    type: "post",
+    data: params,
+  });
+};
+
+//异常管理-特殊方行记录-导出
+const getSpecialResExp = (params) => {
+  return ajax({
+    url: "/api/bpm/special/export_lift",
+    type: "post",
+    data: params,
+  });
+};
 export default {
   getPlateChangeList,
   getPlateChangeDetail,
   getPlateChangeExport,
+  getSpecialResList,
+  getSpecialResExp,
 }
diff --git a/src/services/OutRoadMgm/OutRoadOverview.js b/src/services/OutRoadMgm/OutRoadOverview.js
index f1e68c0..2b4dbfa 100644
--- a/src/services/OutRoadMgm/OutRoadOverview.js
+++ b/src/services/OutRoadMgm/OutRoadOverview.js
@@ -65,6 +65,14 @@ const getOutRoadVideoPlay = (params) => {
     data: params,
   });
 };
+///轮询请求正在播放的视频
+const getOutRoadVideoPlaying = (params) => {
+  return ajax({
+    url: "/api/orp/nvr/playing_video",
+    type: "post",
+    data: params,
+  });
+};
 export default {
   getOutRoadBaseInfo,
   getOutRoadParkingTopInfo,
@@ -74,4 +82,5 @@ export default {
   getOutRoadVideoRoad,
   getOutRoadVideoDevice,
   getOutRoadVideoPlay,
+  getOutRoadVideoPlaying,
 };