소스 검색

修改bug

Renxy 1 년 전
부모
커밋
409b3fe42c
3개의 변경된 파일13개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 0
      src/pages/Controller/Device.js
  2. 1 4
      src/pages/SafetyManagement/doorDetail.js
  3. 6 2
      src/pages/SafetyManagement/index.js

+ 6 - 0
src/pages/Controller/Device.js

@@ -44,6 +44,10 @@ function Hardware() {
     return () => clearInterval(timer);
   }, [draw]);
 
+  const onHandleClick = (item) => {
+    UnityAction.sendMsg('SingleDevLocate', JSON.stringify([item]));
+  };
+
   return (
     <PageContent closeable={false}>
       <PageTitle onReturn={() => UnityAction.sendMsg('menuItem', '智能管控')}>
@@ -63,6 +67,8 @@ function Hardware() {
             ></i>
             {item.mobile_device_name}
           </div>
+
+          <div onClick={() => onHandleClick(item)}>定位</div>
         </div>
       ))}
       {/* </Spin> */}

+ 1 - 4
src/pages/SafetyManagement/doorDetail.js

@@ -4,14 +4,12 @@ import ScrollLoading from '@/components/ScrollLoading';
 import { queryGateOpList } from '@/services/safety';
 import { useParams, useRequest } from '@umijs/max';
 import { Table } from 'antd';
-import { useRef, useState } from 'react';
+import { useState } from 'react';
 const DoorDetail = () => {
   const { projectId } = useParams();
   const [list, setList] = useState([]);
   const [curPagination, setCurPagination] = useState({});
 
-  const bottomAreaOfList = useRef();
-
   const { run, loading } = useRequest((data) => queryGateOpList(data), {
     defaultParams: [{ project_id: projectId }],
     onSuccess: (data) => {
@@ -69,7 +67,6 @@ const DoorDetail = () => {
 
       <ScrollLoading
         loading={loading}
-        totalLength={list?.length}
         pagination={curPagination}
         handleLoadData={(current) => run({ project_id: projectId, current })}
       >

+ 6 - 2
src/pages/SafetyManagement/index.js

@@ -196,11 +196,15 @@ const Door = ({ data, dataOver, loading, projectId }) => {
           <div className={`card-box ${styles.cardRight}`}>
             <div className={styles.textContent}>
               <div className={styles.in} />
-              <span className={styles.text}>今日进厂人数:{2}</span>
+              <span className={styles.text}>
+                今日进厂次数:{dataOver?.today_in}
+              </span>
             </div>
             <div className={styles.textContent}>
               <div className={styles.out} />
-              <span className={styles.text}>今日出厂人数:{2}</span>
+              <span className={styles.text}>
+                今日出厂次数:{dataOver?.today_out}
+              </span>
             </div>
             <Button className={styles.btn} onClick={handleClick}>
               门禁日志