da

src/components/PopContent/Companys/CompanyLowerList.jsx

@@ -3,18 +3,21 @@ import useAutoTable from '@/hooks/useAutoTable'
 import { dayjsFormat } from '@/utils/utils'
 
 const CompanyLowerList = props => {
-  const { collapsed,log } = props
+  const {
+    log: { log: logs = [], total = 0 },
+    collapsed
+  } = props
   const { TabPane } = Tabs
   const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
   const [x, y] = useAutoTable(collapsed, needSubtractHeight)
   return (
     <div>
       <div className="zh-pd-left-15">
-      <Tabs>
+        <Tabs>
           <TabPane tab="日志" key="日志">
-            <div className="sheet-panel-record" style={{ height:y-310,overflowY:'auto' }}>
+            <div className="sheet-panel-record" style={{ height: y - 250, overflowY: 'auto' }}>
               <List
-                dataSource={log}
+                dataSource={logs}
                 split={false}
                 renderItem={item => (
                   <List.Item>
@@ -23,7 +26,7 @@ const CompanyLowerList = props => {
                       // avatar=
                       // title=
                       // description={ dayjsFormat(item.createTime, 'YYYY-MM-DD')}
-                      description={ dayjsFormat(item.createTime)}
+                      description={dayjsFormat(item.createTime)}
                     />
                   </List.Item>
                 )}

src/components/PopContent/Locks/LockForm.jsx

@@ -1,11 +1,10 @@
-import React,{ useEffect } from 'react'
+import React, { useEffect } from 'react'
 import { Row, Col, Divider } from 'antd'
 // import EditableForm from '@/components/EditableForm'
 
 const LockForm = props => {
   const { longle } = props
-  useEffect(() => {
-  }, [longle])
+  useEffect(() => {}, [longle])
   return (
     <div>
       <Row>
@@ -13,29 +12,29 @@ const LockForm = props => {
           <h2>{longle.keyNum}</h2>
         </Col>
         <Col span={8} className="zh-text-right zh-gray">
-        {longle.staffName} 创建于 {longle.makeDay}
+          {longle.staffName} 创建于 {longle.makeDay}
         </Col>
       </Row>
       <Row>
-        <Divider/>
+        <Divider />
         <Col span={6}>锁号</Col>
         <Col span={18}>{longle.keyNum}</Col>
-        <Divider/>
+        <Divider />
         <Col span={6}>产品</Col>
         <Col span={18}>{longle.product}</Col>
-        <Divider/>
+        <Divider />
         <Col span={6}>期限</Col>
         <Col span={18}>{longle.allotedTime}</Col>
-        <Divider/>
+        <Divider />
         <Col span={6}>使用状态</Col>
         <Col span={18}>{longle.statusT}</Col>
-        <Divider/>
+        <Divider />
         <Col span={6}>负责人</Col>
         <Col span={18}>{longle.responsible}</Col>
-        <Divider/>
+        <Divider />
         <Col span={6}>联系人</Col>
         <Col span={18}>{longle.client}</Col>
-        <Divider/>
+        <Divider />
         <Col span={6}>公司</Col>
         <Col span={18} />
       </Row>

src/components/PopContent/Locks/LockLowerList.jsx

@@ -3,18 +3,21 @@ import useAutoTable from '@/hooks/useAutoTable'
 import { dayjsFormat } from '@/utils/utils'
 
 const LockLowerList = props => {
-  const { collapsed,log } = props
+  const {
+    collapsed,
+    log: { log: logs = [], total = 0 }
+  } = props
   const { TabPane } = Tabs
   const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
   const [x, y] = useAutoTable(collapsed, needSubtractHeight)
   return (
     <div>
       <div className="zh-pd-left-15">
-      <Tabs>
+        <Tabs>
           <TabPane tab="日志" key="日志">
-            <div className="sheet-panel-record" style={{ height:y-310,overflowY:'auto' }}>
+            <div className="sheet-panel-record" style={{ height: y - 310, overflowY: 'auto' }}>
               <List
-                dataSource={log}
+                dataSource={logs}
                 split={false}
                 renderItem={item => (
                   <List.Item>
@@ -23,7 +26,7 @@ const LockLowerList = props => {
                       // avatar=
                       // title=
                       // description={ dayjsFormat(item.createTime, 'YYYY-MM-DD')}
-                      description={ dayjsFormat(item.createTime)}
+                      description={dayjsFormat(item.createTime)}
                     />
                   </List.Item>
                 )}

src/components/PopContent/Locks/index.jsx

@@ -9,24 +9,24 @@ import LockLowerList from '@/components/PopContent/Locks/LockLowerList'
 import LockTabList from '@/components/PopContent/Locks/LockTabList'
 
 const index = props => {
-  const { visible, onClose,collapsed, id = '' } = props
+  const { visible, onClose, collapsed, id = '' } = props
   const needSubtractHeight = 55 // 需要被裁掉的高度
   // const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度
-  const [x,y] = useAutoTable(collapsed, needSubtractHeight)
+  const [x, y] = useAutoTable(collapsed, needSubtractHeight)
   const [clientWidth, setClientWidth] = useState(document.body.clientWidth * 0.75)
   const [state, setState] = useState({
     longle: {},
-    log:[],
+    log: [],
     total: 0,
-    longleLog:[]
+    longleLog: []
   })
   const initData = async () => {
     const {
-      code = -1,
-      data: { longle = {}, log = [], longleLog = [], total = 0 } = { longle: {}, longleLog: [], total: 0 }
+      data: { longle = {}, log = [], longleLog = [] } = { longle: {}, longleLog: [] },
+      code = -1
     } = await apiSoftwareDetail(id)
     if (code === consts.RET_CODE.SUCCESS) {
-      setState({ ...state, data:longle, log, longleLog, total })
+      setState({ ...state, longle, log, longleLog })
     }
   }
   useEffect(() => {
@@ -42,24 +42,24 @@ const index = props => {
   }, [visible])
   return (
     <div>
-      <div className='sheet-box'>
+      <div className="sheet-box">
         <Drawer
-            title="软件锁"
-            placement="right"
-            bodyStyle={{
-              height:y,
-              overflowY:'hidden'
-            }}
-            width={clientWidth}
-            closable
-            onClose={onClose}
-            visible={visible}
-            // mask={false}
-          >
+          title="软件锁"
+          placement="right"
+          bodyStyle={{
+            height: y,
+            overflowY: 'hidden'
+          }}
+          width={clientWidth}
+          closable
+          onClose={onClose}
+          visible={visible}
+          // mask={false}
+        >
           <Row>
-            <Col span={12} className="sheet-box-left" style={{ height:y-25,overflowY:'auto' }}>
+            <Col span={12} className="sheet-box-left" style={{ height: y - 25, overflowY: 'auto' }}>
               <div className="sheet-left-panel zh-pd-right-15">
-                <LockForm longle={state.longle}/>
+                <LockForm longle={state.longle} />
               </div>
             </Col>
             <Col span={12}>