bug：15718、15762、15731、15719

src/components/CloseReasonModal/index.js

@@ -17,7 +17,8 @@ const CloseReasonModal = (props) => {
         column={1}
         styles={{ label: { width: 200 } }}
         items={[
-          { label: "强制关闭原因", children: props.closeReason },
+          { label: "时间", children: props.closeTime },
+          { label: "强制关闭作业票原因", children: props.closeReason },
         ]}
       />
     </Modal>

src/components/OpinionSign/index.js

@@ -23,7 +23,7 @@ function OpinionSign({
                     {title}
                     ：
                   </span>
-                  <span>{remarks}</span>
+                  <span className="remarks" style={{ display: "inline" }}>{remarks}</span>
                 </div>
                 <div className="right">
                   <div>

src/css/index.less

@@ -22,6 +22,18 @@
 
     .right {
       text-align: right;
+      max-width: 0;
+      min-width: 200px;
+    }
+
+    .remarks {
+      text-align: left;
+      word-wrap: break-word;
+      word-break: break-all;
+      white-space: pre-wrap;
+      overflow-wrap: break-word;
+      display: inline-block;
+      max-width: 100%;
     }
 
     .flex {

src/pages/Container/Enterprise/BlindBoardWork/Homework/List/index.js

@@ -28,6 +28,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -169,6 +170,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -208,9 +210,11 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
               setCloseReason("");
+              setCloseTime("");
             }}
           />
         )

src/pages/Container/Enterprise/ConfinedSpaceWork/Homework/List/index.js

@@ -26,6 +26,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -140,6 +141,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -179,9 +181,11 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
               setCloseReason("");
+              setCloseTime("");
             }}
           />
         )

src/pages/Container/Enterprise/ConfinedSpaceWork/Homework/View/index.js

@@ -217,7 +217,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_14?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_14?.signTime}</div>
-                <div>{info?.info?.step_14?.remarks}</div>
+                <div className="remarks">{info?.info?.step_14?.remarks}</div>
               </td>
               <td className="title">管理单位发包部门意见</td>
               <td className="right" style={{ width: 200 }}>
@@ -226,7 +226,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_15?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_15?.signTime}</div>
-                <div>{info?.info?.step_15?.remarks}</div>
+                <div className="remarks">{info?.info?.step_15?.remarks}</div>
               </td>
               <td className="title">管理单位安监部门意见</td>
               <td className="right" style={{ width: 200 }}>
@@ -235,7 +235,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_16?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_16?.signTime}</div>
-                <div>{info?.info?.step_16?.remarks}</div>
+                <div className="remarks">{info?.info?.step_16?.remarks}</div>
               </td>
             </tr>
           </tbody>

src/pages/Container/Enterprise/CutWork/Homework/List/index.js

@@ -28,6 +28,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -168,6 +169,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -207,9 +209,11 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
               setCloseReason("");
+              setCloseTime("");
             }}
           />
         )

src/pages/Container/Enterprise/DigWork/Homework/List/index.js

@@ -28,6 +28,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -168,6 +169,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -207,9 +209,11 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
               setCloseReason("");
+              setCloseTime("");
             }}
           />
         )

src/pages/Container/Enterprise/ElectricWork/Homework/List/index.js

@@ -28,6 +28,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -168,6 +169,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -207,9 +209,11 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
               setCloseReason("");
+              setCloseTime("");
             }}
           />
         )

src/pages/Container/Enterprise/HighPlaceWork/Homework/List/index.js

@@ -28,6 +28,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -169,6 +170,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -208,9 +210,11 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
               setCloseReason("");
+              setCloseTime("");
             }}
           />
         )

src/pages/Container/Enterprise/HotWork/Homework/List/index.js

@@ -27,6 +27,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -165,6 +166,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -204,9 +206,11 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
               setCloseReason("");
+              setCloseTime("");
             }}
           />
         )

src/pages/Container/Enterprise/HotWork/Homework/View/index.js

@@ -146,7 +146,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_4?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_4?.signTime}</div>
-                <div>{info?.info?.step_4?.remarks}</div>
+                <div className="remarks">{info?.info?.step_4?.remarks}</div>
               </td>
               <td className="title">项目发包单位(部门)人员意见</td>
               <td className="right">
@@ -155,7 +155,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_5?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_5?.signTime}</div>
-                <div>{info?.info?.step_5?.remarks}</div>
+                <div className="remarks">{info?.info?.step_5?.remarks}</div>
               </td>
             </tr>
             <tr>
@@ -166,7 +166,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_6?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_6?.signTime}</div>
-                <div>{info?.info?.step_6?.remarks}</div>
+                <div className="remarks">{info?.info?.step_6?.remarks}</div>
               </td>
               <td className="title">动火许可证签发单位意见</td>
               <td className="right">
@@ -175,7 +175,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_7?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_7?.signTime}</div>
-                <div>{info?.info?.step_7?.remarks}</div>
+                <div className="remarks">{info?.info?.step_7?.remarks}</div>
               </td>
             </tr>
             <tr>
@@ -186,7 +186,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_9?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_9?.signTime}</div>
-                <div>{info?.info?.step_9?.remarks}</div>
+                <div className="remarks">{info?.info?.step_9?.remarks}</div>
               </td>
               <td className="title">动火后管辖单位现场人员验收</td>
               <td className="right">
@@ -195,7 +195,7 @@ function View(props) {
                     && <Image src={getFileUrl() + info?.info?.step_11?.signPath} width={50} height={50} />}
                 </div>
                 <div>{info?.info?.step_11?.signTime}</div>
-                <div>{info?.info?.step_11?.remarks}</div>
+                <div className="remarks">{info?.info?.step_11?.remarks}</div>
               </td>
             </tr>
             <tr>

src/pages/Container/Enterprise/LiftingWork/Homework/List/index.js

@@ -28,6 +28,7 @@ function List(props) {
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [closeReason, setCloseReason] = useState("");
+  const [closeTime, setCloseTime] = useState("");
   const [closeReasonModalOpen, setCloseReasonModalOpen] = useState(false);
 
   const { tableProps, getData } = useTable(props["eightworkList"], {
@@ -169,6 +170,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setCloseReason(record.info.closeReason);
+                      setCloseTime(record.info.closeTime);
                       setCloseReasonModalOpen(true);
                     }}
                   >
@@ -208,8 +210,10 @@ function List(props) {
         closeReasonModalOpen && (
           <CloseReasonModal
             closeReason={closeReason}
+            closeTime={closeTime}
             onCancel={() => {
               setCloseReasonModalOpen(false);
+              setCloseTime("");
               setCloseReason("");
             }}
           />

src/utils/flow.js

@@ -19,6 +19,7 @@ export const getNodeLabel = (flowItem) => {
   return (
     <div style={{ padding: "10px", textAlign: "center" }}>
       <div style={{ fontSize: "16px" }}>{flowItem.stepName}</div>
+      <div style={{ fontSize: "16px" }}>{flowItem.actUserDepartmentName}</div>
       <div style={{ fontSize: "16px" }}>{flowItem.actUserName}</div>
       <div style={{ fontSize: "16px" }}>{flowItem.updateTime}</div>
     </div>
@@ -32,7 +33,7 @@ export const getFlowData = (list) => {
   // 节点尺寸和间距
   const nodeWidth = 300;
   const nodeHeight = 200;
-  const horizontalSpacing = 350;
+  const horizontalSpacing = 500;
   const verticalSpacing = 300;
 
   // 创建 stepId 到 index 的映射
@@ -67,6 +68,8 @@ export const getFlowData = (list) => {
         textAlign: "center",
       },
       position: { x: index * horizontalSpacing, y: 100 },
+      sourcePosition: "right",
+      targetPosition: "left",
     });
 
     // 创建主线边（只有当没有分支汇入时才连接到下一个节点）
@@ -80,7 +83,7 @@ export const getFlowData = (list) => {
         id: `edge-main-${index}`,
         source: `node-${index}`,
         target: `node-${index + 1}`,
-        type: "smoothstep",
+        type: "straight",
         animated: true,
         style: { stroke: "#1890ff", strokeWidth: 3 },
         markerEnd: {
@@ -135,6 +138,8 @@ export const getFlowData = (list) => {
             textAlign: "center",
           },
           position: { x: branchX, y: branchY },
+          sourcePosition: "right",
+          targetPosition: "left",
         });
 
         // 从主节点连接到第一个分支节点
@@ -160,7 +165,7 @@ export const getFlowData = (list) => {
             id: `edge-branch-connection-${index}-${branchIdx}`,
             source: prevBranchNodeId,
             target: branchNodeId,
-            type: "smoothstep",
+            type: "straight",
             animated: true,
             style: { stroke: "#c41a1a", strokeWidth: 3 },
             markerEnd: {
@@ -176,7 +181,7 @@ export const getFlowData = (list) => {
             id: `edge-branch-end-${index}`,
             source: branchNodeId,
             target: `node-${mergeIndex}`,
-            type: "smoothstep",
+            type: "straight",
             animated: true,
             style: { stroke: "#c41a1a", strokeWidth: 3 },
             markerEnd: {