From 7918401758672b388368d7d61072058d6834dbbd Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Wed, 10 Jan 2024 16:51:32 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonMgm/Attendance/ScheduleMgm/index.scss    |  3 ++
 .../PersonMgm/Attendance/ScheduleMgm/loadable.jsx  | 46 ++++++++++++----------
 src/pages/InRoadMgm/RoadMgm/ConfigRoad/index.scss  |  4 ++
 .../InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx      |  1 -
 src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss    |  2 -
 src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx  |  1 -
 6 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/index.scss b/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/index.scss
index 41466d4..27dd23d 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/index.scss
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/index.scss
@@ -20,6 +20,9 @@ $color-primary : var(--color-primary);
     border-radius: 4px;
   }
 }
+.time-style{
+  width: 150px;
+}
 .colorReset {
   width: 90px;
   height: 36px;
diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx
index 4404315..83dcd81 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx
@@ -12,7 +12,6 @@ import {
   TimePicker,
 } from "antd";
 import { operator, name, pageSizeOptions } from "@/config/character.config.js";
-import utils from '@/config/utils'
 import "./index.scss";
 import { SearchOutlined } from "@ant-design/icons";
 import ajax from "@/services";
@@ -164,6 +163,8 @@ function ScheduleMgm(props) {
   const translateBtn = (record) => {
     setGetEditId(record);
     setTranslateVisible(true);
+    setGetStartTime(moment(record.onTime))
+    setGetEndTime(moment(record.offTime))
     setEditModal(
       Object.assign({}, editModal, {
         scheduleName: record.scheduleName, //班次名称
@@ -274,8 +275,8 @@ function ScheduleMgm(props) {
     let minutes1 = getStartTime != '' ? getStartTime.hour() * 60 + getStartTime.minute() : '';
     let minutes2 = getEndTime != '' ? getEndTime.hour() * 60 + getEndTime.minute() : '';
     let totalMinutes = minutes2 - minutes1;
-    console.log(minutes1, minutes2);
-    console.log(totalMinutes);
+    console.log(getStartTime);
+    console.log(minutes1,minutes2);
     const reg = /^(?:[1-9]\d?|1[0-7]\d|180|0)$/;
     if (editModal.scheduleName == "") {
       message.error("请输入班次名称");
@@ -333,7 +334,7 @@ function ScheduleMgm(props) {
         setDeleteVisible(false);
         message.success("删除成功");
         getData(formData);
-      }else{
+      } else {
         message.error(res.message)
       }
     });
@@ -399,7 +400,6 @@ function ScheduleMgm(props) {
     setGetStartTime(time);
   };
   const goingEditWork = (time, timeString) => {
-    console.log(time);
     setEditModal({ ...editModal, onTime: timeString });
     setGetStartTime(time);
   };
@@ -413,9 +413,9 @@ function ScheduleMgm(props) {
   };
   //检索数据
   const getSearchData = (data = formData) => {
-    setFormData(Object.assign({}, formData, { pn: 1}))
+    setFormData(Object.assign({}, formData, { pn: 1 }))
     setLastFormData(Object.assign({}, lastFormData, { pn: 1 }))
-    getData({...data, pn: 1})
+    getData({ ...data, pn: 1 })
   };
   const [getOperationName, setGetOperationName] = useState([]);
   const [getNewOperationName, setGetNewOperationName] = useState([]);
@@ -486,14 +486,14 @@ function ScheduleMgm(props) {
               <Button
                 type="primary"
                 className="yisa-btn colorBtn"
-                
+
                 onClick={() => {
                   getSearchData();
                 }}
               >
                 查询
               </Button>
-              
+
             </div>
           </div>
         </div>
@@ -504,16 +504,16 @@ function ScheduleMgm(props) {
                 共检索到<em>{resultData.total_records}</em>条结果
               </span>
               <Button
-                  type="primary"
-                  className="yisa-btn colorBtn"
-                  onClick={() => {
-                    addClasses();
-                  }}
-                >
-                  添加班次
-                </Button>
+                type="primary"
+                className="yisa-btn colorBtn"
+                onClick={() => {
+                  addClasses();
+                }}
+              >
+                添加班次
+              </Button>
             </div>
-            
+
             <ResultFlowResult
               ajaxLoad={ajaxLoading}
               resultData={resultData.data ? resultData.data : []}
@@ -521,9 +521,9 @@ function ScheduleMgm(props) {
               <Table
                 bordered
                 // className='yisa-table'
-                className="yisa-table-scroll"
-                scroll={{ y: "calc(100% - 50px)" }}
                 dataSource={resultData.data}
+                className="yisa-table-scroll"
+                scroll={{ y: "calc(100%-50px)" }}
                 columns={handleColumns()}
                 // rowKey={record => record.cap_id + "_" + record.bk_id}
                 pagination={false}
@@ -612,6 +612,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={goingWork}
               format={format}
+              className="time-style"
               allowClear={false}
               // value={moment("00:00", "HH:mm")}
               style={{ marginLeft: 30 }}
@@ -623,6 +624,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={leavingWork}
               format={format}
+              className="time-style"
               allowClear={false}
               // value={moment("00:00", "HH:mm")}
               style={{ marginLeft: 30 }}
@@ -737,6 +739,7 @@ function ScheduleMgm(props) {
               onChange={goingWork}
               disabled
               allowClear={false}
+              className="time-style"
               format={format}
               value={moment(getDetail.onTime, "HH:mm")}
               style={{ marginLeft: 30 }}
@@ -748,6 +751,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={leavingWork}
               disabled
+              className="time-style"
               allowClear={false}
               format={format}
               value={moment(getDetail.offTime, "HH:mm")}
@@ -859,6 +863,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={goingEditWork}
               format={format}
+              className="time-style"
               allowClear={false}
               value={moment(editModal.onTime, "HH:mm")}
               style={{ marginLeft: 30, width: 100 }}
@@ -871,6 +876,7 @@ function ScheduleMgm(props) {
               onChange={leavingEditWork}
               format={format}
               allowClear={false}
+              className="time-style"
               value={moment(editModal.offTime, "HH:mm")}
               style={{ marginLeft: 30, width: 100 }}
             />
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/index.scss b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/index.scss
index f526e86..2420b02 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/index.scss
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/index.scss
@@ -180,4 +180,8 @@ $color-primary: var(--color-primary);
     color: var(--color-text);
     // border-color:var(--checkable-tag-border);
   }
+  .right-list .cc-result-flow{
+    overflow: auto;
+    height: 662px;
+  }
 }
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index 5a43ef3..87bca96 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -159,7 +159,6 @@ const ConfigRoad = (props) => {
           return (
             <>
               <Popover
-                trigger="click"
                 content={
                   <>
                     <div>
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
index f9c6726..f38531b 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
@@ -170,8 +170,6 @@ $color-primary: var(--color-primary);
   position: absolute;
   top: 30px;
   left: 100px;
-  max-height: 850px;
-  overflow: auto;
 }
 .handleCloseDetail::-webkit-scrollbar {
   width: 5px;
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
index e142aec..3ef4e46 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
@@ -154,7 +154,6 @@ function RoadConf() {
               </a>
             </div>
           }
-          trigger="click"
         >
           <Button type="primary">操作</Button>
         </Popover>