From 80b81f5ce4e2b73c97244d842022ca87b3ef9598 Mon Sep 17 00:00:00 2001
From: janedididada <105195341+janedididada@users.noreply.github.com>
Date: Thu, 14 Dec 2023 17:58:05 +0800
Subject: [PATCH] =?UTF-8?q?fixed():=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx  | 4 ++++
 src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.scss | 3 +++
 src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx      | 5 +++++
 src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx               | 4 ++++
 src/pages/InRoadMgm/RoadMgm/ParkList/loadable.jsx                 | 4 ++--
 src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx  | 5 ++++-
 src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx             | 6 +++++-
 src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx          | 5 +++++
 src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx        | 1 +
 9 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
index 9acf50f..5c87da3 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
@@ -631,6 +631,7 @@ function ReturnOrderInquiry() {
           <div className="ltc-content">
             <div className="ltc-item ltc-item-img ">
               <img
+              className="class-img"
                 src={
                   ycddData?.in_plate_pic ||
                   require("../../../../../src/assets/images/error-img.png")
@@ -639,6 +640,7 @@ function ReturnOrderInquiry() {
             </div>
             <div className="ltc-item ltc-item-img ">
               <img
+              className="class-img"
                 src={
                   ycddData?.in_veh_pic ||
                   require("../../../../../src/assets/images/error-img.png")
@@ -653,6 +655,7 @@ function ReturnOrderInquiry() {
           <div className="ltc-content">
             <div className="ltc-item ltc-item-img ">
               <img
+              className="class-img"
                 src={
                   ycddData?.out_plate_pic ||
                   require("../../../../../src/assets/images/error-img.png")
@@ -661,6 +664,7 @@ function ReturnOrderInquiry() {
             </div>
             <div className="ltc-item ltc-item-img ">
               <img
+              className="class-img"
                 src={
                   ycddData?.out_veh_pic ||
                   require("../../../../../src/assets/images/error-img.png")
diff --git a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.scss b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.scss
index 84d9602..463ac86 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.scss
+++ b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.scss
@@ -236,6 +236,9 @@ $color-primary: var(--color-primary);
           margin: 6px 12px 6px 0;
           display: inline-flex;
           //width: 470px;
+          .class-img{
+            width: 235px;
+          }
           .new-item {
             display: inline-block;
             width: 120px;
diff --git a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
index cd9ba13..f46e2f9 100644
--- a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
@@ -199,6 +199,11 @@ function PreOrderRecord() {
   const refTable=useRef()
 
   function search(params) {
+    let reg=/^[1-9]\d*$/
+    if(!reg.test(params.parking_duration)&&params.parking_duration){
+      message.warning("停车时长应该为大于0的整数")
+      return false
+    }
     ajax
       .getUnregistered(params)
       .then((res) => {
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index 2ce71bd..d255d28 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -1853,12 +1853,16 @@ function ConfigRoad() {
           setEditBerthModal(false);
         }}
         onOk={() => {
+          let reg=/^[2-9]\d*$|^[1-9]\d+\d*$/
+          console.log(berthForm.getFieldsValue().berth_count);
           if (berthForm.getFieldsValue().berth_code === null) {
             message.error('请填写泊位号')
           } else if (berthForm.getFieldsValue().etc_status === null) {
             message.error('请选择ETC是开开启')
           }  else if (berthForm.getFieldsValue().berth_type === null) {
             message.error('请选择泊位类型')
+          } else if ((!reg.test(berthForm.getFieldsValue().berth_count)&&berthForm.getFieldsValue().berth_count)) {
+            message.error('添加泊位数为大于1的整数')
           } else {
             let arr = berthForm.getFieldsValue().etc_status
             let str = arr.toString()
diff --git a/src/pages/InRoadMgm/RoadMgm/ParkList/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ParkList/loadable.jsx
index 9d9a9d2..19dedc7 100644
--- a/src/pages/InRoadMgm/RoadMgm/ParkList/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ParkList/loadable.jsx
@@ -388,8 +388,8 @@ const reastBtn=()=>{
             {currentParkingItem.region}
           </Descriptions.Item>
           <Descriptions.Item label="入场图像">
-            <Image src={currentParkingItem.in_veh_pic} />
-            <Image src={currentParkingItem.in_plate_pic} />
+            <Image src={currentParkingItem.in_veh_pic} width={250} />
+            <Image src={currentParkingItem.in_plate_pic} width={250} />
           </Descriptions.Item>
         </Descriptions>
       </Modal>
diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
index a5094de..8509dac 100644
--- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
+++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
@@ -16,6 +16,9 @@ import "./index.scss";
 function ArrearsCar() {
     const [parkID, setParkID] = useState()
     const [carId, setCarId] = useState();
+    const initFormData={
+        police:1
+    }
     const columns = [
         {
             title: "车牌号",
@@ -314,7 +317,6 @@ function ArrearsCar() {
     }
     function searchDetail(e) {
         //setResultData([{ index: '1' }])
-        //console.log(carId, e)
         ajax({
             url: "/api/ope/record/get_arrearage_car_info",
             type: "get",
@@ -381,6 +383,7 @@ function ArrearsCar() {
                 search={search}
                 pageName={'arrearsCar'}
                 limitCon={limitCon}
+                initFormData={initFormData}
                 exportUrl={'/api/bpm/record/get_record_export'}
             />
             <Modal
diff --git a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
index 0dcecac..162d203 100644
--- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
+++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
@@ -543,6 +543,7 @@ function CarInfo() {
     const [bigPic, setBigPic] = useState();
     const [total, setTotal] = useState(0);
     const [tabKey, setTabKey] = useState("1");
+    const [stopCarTab,setStopCarTop]=useState("1")
     function openModal(params) {
         setDetailVisible(true);
     }
@@ -1219,10 +1220,13 @@ function CarInfo() {
                 width={1500}
                 onCancel={() => {
                     setDetailVisible(false);
+                    setStopCarTop("1")
                 }}
                 footer={null}
             >
-                <Tabs >
+                <Tabs activeKey={stopCarTab} onChange={(e)=>{
+                    setStopCarTop(e)
+                }}>
                     <Tabs.TabPane tab="停车记录信息" key="1">
                         {/* {renderParkRecord(detailData)} */}
                         {renderParkRecord(ycddData)}
diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx
index 30cbcd3..38ddb7e 100644
--- a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx
@@ -399,6 +399,7 @@ function OutNvrMgm(props) {
   const onFinish = (values) => {
     let pattern = /^([0-9]{1,3}\.){3}[0-9]{1,3}$/;
     let duankou = /^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/;
+    let shiping_duan_kou=/^\+?[1-9][0-9]*$/
     if (!pattern.test(values.ip_address)) {
       message.warning("请输入合理格式的ip地址")
       return false
@@ -406,6 +407,10 @@ function OutNvrMgm(props) {
       message.warning("请输入合适的端口号")
       return false
     }
+    else if (!shiping_duan_kou.test(values.video_port)) {
+      message.warning("请输入合适的端口号")
+      return false
+    }
     console.log(values);
     ajax[values?.id ? "doEditOutNvr" : "doAddOutNvr"](values).then(
       (res) => {
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
index 598640b..fcf1df8 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@@ -70,6 +70,7 @@ function OutSegment() {
       dataIndex: "road_name",
       key: "road_name",
       align: "center",
+      render: (text, record, index) => <div style={{ "max-width": '200px',"overflow":"hidden","white-space":"nowrap","text-overflow":"ellipsis" }} title={text}>{text}</div>
     },
     {
       title: "车场类型",