From d68d8b8a8c1a0e8d0f15002246a955909252f83f Mon Sep 17 00:00:00 2001
From: Yanko <747575620@qq.com>
Date: Sat, 12 Oct 2024 14:45:13 +0800
Subject: [PATCH] 1

---
 frontend/src/pages/workInfo/index.less |  3 ++
 frontend/src/pages/workInfo/index.tsx  | 43 +++++++++++++++-----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/frontend/src/pages/workInfo/index.less b/frontend/src/pages/workInfo/index.less
index 5239e8e..dd14b99 100644
--- a/frontend/src/pages/workInfo/index.less
+++ b/frontend/src/pages/workInfo/index.less
@@ -2,4 +2,7 @@
     width: 100px;
     margin: auto;
 }
+.rowHeight{
+    padding: 10px;
+}
 
diff --git a/frontend/src/pages/workInfo/index.tsx b/frontend/src/pages/workInfo/index.tsx
index faa29e5..bb48ac3 100644
--- a/frontend/src/pages/workInfo/index.tsx
+++ b/frontend/src/pages/workInfo/index.tsx
@@ -149,9 +149,9 @@ export default () => {
     {
       title: '进度',
       dataIndex: 'status',
-      ellipsis: true,
       width:300,
       hideInSearch: true,
+      align:'center',
       fixed:'right',
       render(_, record) {
         return <ConfigProvider
@@ -167,7 +167,7 @@ export default () => {
           <Steps
             progressDot
             direction='horizontal'
-
+            style={{padding:'18px'}}
             type='default'
             current={record.status}
             size='small'
@@ -297,7 +297,7 @@ export default () => {
                 okText="确认"
                 cancelText="关闭"
               >
-                <Button type="primary" ghost>继续下发</Button>
+                <Button type="primary" size='small' >继续下发</Button>
               </Popconfirm>,
               <Popconfirm
                 key="forcedend"
@@ -317,7 +317,7 @@ export default () => {
                 okText="确认"
                 cancelText="关闭"
               >
-                <Button type="primary" danger ghost>强制结束</Button>
+                <Button type="primary" danger size='small'>强制结束</Button>
               </Popconfirm>]
           case 2:
             return [<Popconfirm
@@ -438,6 +438,7 @@ export default () => {
       title: '操作',
       valueType: 'option',
       key: 'option',
+      fixed:'right',
       render: (_, record) => {
         switch (record.status) {
           case 0:
@@ -446,7 +447,8 @@ export default () => {
               [
                 <Button
                   key="edit"
-                  type="primary" ghost
+                  type="primary" 
+                  size='small'
                   onClick={async () => {
                     // setIsModalOpen(true);
                     // setModelTitle('编辑信息');
@@ -490,7 +492,8 @@ export default () => {
                     okText="确认"
                     cancelText="关闭"
                   >
-                    <Button type="primary" ghost>批次下发</Button>
+                    <Button type="primary" 
+                  size='small'>批次下发</Button>
                   </Popconfirm> : ""
                 ,
                 <Popconfirm
@@ -513,7 +516,8 @@ export default () => {
                   okText="确认"
                   cancelText="关闭"
                 >
-                  <Button type="primary" danger ghost>删除</Button>
+                  <Button type="primary" 
+                  size='small' danger >删除</Button>
                 </Popconfirm>,
               ]
             )
@@ -522,7 +526,8 @@ export default () => {
               [
                 <Button
                   key="edit"
-                  type="primary" ghost
+                  type="primary" 
+                  size='small'
                   onClick={async () => {
                     // setIsModalOpen(true);
                     // setModelTitle('编辑信息');
@@ -561,7 +566,8 @@ export default () => {
                   okText="确认"
                   cancelText="关闭"
                 >
-                  <Button type="primary" ghost>继续下发</Button>
+                  <Button type="primary" 
+                  size='small'>继续下发</Button>
                 </Popconfirm>
                 ,
                 <Popconfirm
@@ -584,7 +590,7 @@ export default () => {
                   okText="确认"
                   cancelText="关闭"
                 >
-                  <Button type="primary" danger ghost>删除</Button>
+                  <Button type="primary" danger size='small'>删除</Button>
                 </Popconfirm>,
               ]
             )
@@ -608,11 +614,11 @@ export default () => {
         setfinalPlan(res.data)
       }
     });
-    ProductLineAPI.selectlist().then((res: MyResponse.Content) => {
-      if (res.statusCode === 200) {
-        setLineData(res.data)
-      }
-    })
+    // ProductLineAPI.f().then((res: MyResponse.Content) => {
+    //   if (res.statusCode === 200) {
+    //     setLineData(res.data)
+    //   }
+    // })
   }, [])
   const UpdateGY = (lineId: string, finalId: string) => {
     productlineInfoStepsAPI.List({ lineId: lineId, finalId: finalId }).then((res: MyResponse.Content) => {
@@ -718,8 +724,9 @@ export default () => {
         actionRef={actionRef}
         cardBordered
         style={{
-          background: "burlywood"
+          background: "burlywood",
         }}
+        rowClassName={styles.rowHeight}
         loading={itemLoading}
         params={itemparams}
         dataSource={res}
@@ -919,7 +926,7 @@ export default () => {
                   typeForm.setFieldValue('finalName', res.data.finalName)
                   typeForm.setFieldValue('quantity',  res.data.quantity)
                   setLineProcessList([])
-                  FinalAPI.LineList(res.data.finalId).then((res: MyResponse.Content) => {
+                  FinalAPI.FinishLineList(res.data.finalId).then((res: MyResponse.Content) => {
                     if (res.statusCode === 200) {
                       setLineData(res.data)
                     }
@@ -985,7 +992,7 @@ export default () => {
                     </div>
                     <Card title='选择设备' size="small" bordered={false} style={{ height: '200px', overflowY: 'auto', overflowX: 'hidden' }} className={styles.gongyi_tag_device}>
 
-                      <Form.Item name={'pro:' + item.id}  >
+                      <Form.Item name={'pro:' + item.id}  rules={[{ required: item.devicesInfo.length > 0, message: '此项为必选项!' }]} >
                         <CheckCard.Group  >
                           {
                             item.devicesInfo.length > 0 ?