From 1bf77dfc919a73bf4f3a099503ddcfeb6cfeae90 Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjian@yisa.com>
Date: Fri, 12 Jan 2024 15:50:44 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E5=BC=80=E9=97=B8=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                       |  2 +-
 .../ConfigParking/GateControlManagement.jsx        | 90 +++++++++++++++-------
 src/services/OutRoadMgm/OutSegment.js              | 11 ++-
 3 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 35a834e..0388401 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "cross-spawn": "^7.0.3",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^3.4.1",
-    "dayjs": "^1.11.7",
+    "dayjs": "^1.11.10",
     "echarts": "^5.4.1",
     "file-loader": "^6.2.0",
     "flv.js": "^1.5.0",
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx
index 9833fbc..26b97e4 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx
@@ -3,6 +3,8 @@ import { Input, Form, Button, Table, Row,Pagination, Col,Modal,Select,TimePicker
 import ajax from "@/services";
 import { DeleteOutlined, UploadOutlined } from "@ant-design/icons";
 import { dictionary, utils } from "@/config/common";
+import { useImperativeHandle } from "react";
+import moment from "moment";
 const {TextArea}=Input
 function GateControlManagement(props) {
   const {id}=props
@@ -97,12 +99,15 @@ function GateControlManagement(props) {
   }
   //编辑
   const operateData=(row)=>{
+    let arr=row.s_e_time?.split(",")
+    let s_e_time=[moment(arr[0],"HH:mm:ss"),moment(arr[1],"HH:mm:ss")]
+    console.log(arr[0],arr[1],s_e_time);
     openForm.setFieldsValue({
       group_id:row.group_id,
       option_id:row.option_id,
       channel_id:row.channel_id,
       note:row.note,
-      // s_e_time:row.s_e_time?.split(",")||null
+      s_e_time:s_e_time
     })
     setOpenId(row.id)
     setOpenVisible(true)
@@ -142,7 +147,7 @@ function GateControlManagement(props) {
   //获取下拉框所有数据
   const getOptionData=()=>{
     ajax
-      .getOpenAllOption()
+      .getOpenAllOption({road_id:id})
       .then((res) => {
         if (res.status === 20000) {
          
@@ -156,34 +161,59 @@ function GateControlManagement(props) {
   const onFinish=(value)=>{
     let s_e_time=""
     value.s_e_time?.map((item,index)=>{
-      let str=item.format("HH-mm-ss");
+      let str=item.format("HH:mm:ss");
       index!=1?s_e_time=str+",":s_e_time+=str;
     })
     let ajaxData={
       ...value,
-      s_e_time:"",
-      id:openId
+      s_e_time:s_e_time,
+      id:openId,
+      road_id:id,
     }
-    ajax.addOpenData(ajaxData).then((res) => {
-      if (res.status === 20000) {
-        message.success(res.message)
-        setOpenVisible(false)
-        openForm.setFieldsValue({
-          group_id:null,
-          option_id:null,
-          channel_id:null,
-          note:"",
-          s_e_time:null
-        })
-        getOpenData()
-        setOpenId("")
-      }else{
-        message.warning(res.message)
-      }
-    })
-    .catch((err) => {
-      console.error(err);
-    });
+    if(!ajaxData.id){
+      ajax.addOpenData(ajaxData).then((res) => {
+        if (res.status === 20000) {
+          message.success(res.message)
+          setOpenVisible(false)
+          openForm.setFieldsValue({
+            group_id:null,
+            option_id:null,
+            channel_id:null,
+            note:"",
+            s_e_time:null
+          })
+          getOpenData()
+          setOpenId("")
+        }else{
+          message.warning(res.message)
+        }
+      })
+      .catch((err) => {
+        console.error(err);
+      });
+    }else{
+      ajax.editOpenData(ajaxData).then((res) => {
+        if (res.status === 20000) {
+          message.success(res.message)
+          setOpenVisible(false)
+          openForm.setFieldsValue({
+            group_id:null,
+            option_id:null,
+            channel_id:null,
+            note:"",
+            s_e_time:null
+          })
+          getOpenData()
+          setOpenId("")
+        }else{
+          message.warning(res.message)
+        }
+      })
+      .catch((err) => {
+        console.error(err);
+      });
+    }
+  
   }
   const onCancel=()=>{
     setOpenVisible(false)
@@ -231,7 +261,15 @@ function GateControlManagement(props) {
   return (
     <div className="open-modal-page">
       <header style={{ margin: "10px 0" }}>
-        <Button type="primary" onClick={()=>{setOpenVisible(true)}}>添加入场开闸流程</Button>
+        <Button type="primary" onClick={()=>{
+          setOpenVisible(true);
+          openForm.setFieldsValue({
+            group_id:null,
+            option_id:null,
+            channel_id:null,
+            note:"",
+            s_e_time:null
+        })}}>添加入场开闸流程</Button>
       </header>
       <main>
         <Table
diff --git a/src/services/OutRoadMgm/OutSegment.js b/src/services/OutRoadMgm/OutSegment.js
index 49170f5..6a3b9c1 100644
--- a/src/services/OutRoadMgm/OutSegment.js
+++ b/src/services/OutRoadMgm/OutSegment.js
@@ -90,6 +90,14 @@ const getOpenData=(params)=>{
     data: params,
   });
 }
+//编辑开闸数据
+const editOpenData=(params)=>{
+  return ajax({
+    url: "/api/orp/road/edit_open",
+    type: "post",
+    data: params,
+  });
+}
 //删除开闸数据
 const deleteOpenData=(params)=>{
   return ajax({
@@ -572,5 +580,6 @@ export default {
   getOpenAllOption,
   addOpenData,
   getOpenData,
-  deleteOpenData
+  deleteOpenData,
+  editOpenData
 };