Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/models/eqSelfInspection.js

@@ -198,15 +198,15 @@ export default {
           arr?.filter((item) => item.Status === 1)?.length || 0;
 
         //获取液位检测异常数量
-        const errorNum = data.FluidLevelList?.filter(
-          (item) => item.status == 1,
-        );
+        // const errorNum = data.FluidLevelList?.filter(
+        //   (item) => item.status == 1,
+        // );
         let num = 0;
         if (data?.extendWarningData?.length > 0) num += 1;
         if (data?.sensorWaringNum > 0) num += 1;
         if (data?.dumuList?.length > 0) num += 1;
         if (data?.FaultAnalysis?.length > 0) num += 1;
-        if (errorNum?.length > 0) num += errorNum;
+        // if (errorNum?.length > 0) num += errorNum;
         data.warningTotalNum = num;
 
         if (data.extendWarningNum > 0) {
@@ -222,8 +222,7 @@ export default {
         data.faultAnalysisStatus = data?.FaultAnalysis?.length > 0 ? 1 : 0;
         // data.secureStatus =
         //   data?.dumuList?.length > 0 || data?.sensorWaringNum > 0 ? 1 : 0;
-        data.secureStatus =
-          data?.dumuList?.length > 0 || errorNum?.length > 0 ? 1 : 0;
+        data.secureStatus = data?.dumuList?.length > 0 ? 1 : 0;
         let secureChild = [];
         let dumuStatus = 0;
         if (data?.dumuList?.length > 0) {

src/pages/EqSelfInspection/components/Detail.js

@@ -191,6 +191,16 @@ function Detail(props) {
             userList={userList}
             title={<ModuleTitle title="环境异常" />}
           ></ReportCom>
+          {/* 液位异常 */}
+          {/* <LiquidLevelCom
+            sendMessageToUnity={sendMessageToUnity}
+            select={select}
+            allData={data?.FluidLevelList}
+            key="liquid"
+            type={'liquid'}
+            userList={userList}
+            title={<ModuleTitle title="液位异常" />}
+          /> */}
 
           {/* 安防检测异常 */}
           <ReportDumCom

src/pages/SmartOps/components/VideoAnalysis.js

@@ -15,7 +15,7 @@ const TYPE = {
 };
 
 function VideoAnalysis(props) {
-  const { videoNum, data, videoData, loading } = props;
+  const { videoNum, data, videoData = {}, loading } = props;
   const [tab, setTab] = useState('1');
   const allCount = Object.values(videoData).reduce(
     (total, item) => total + (item?.length || 0),
@@ -36,13 +36,13 @@ function VideoAnalysis(props) {
         .map((item) => {
           return { ...item, type_name: '环境检测', type: TYPE.fill };
         }) || [];
-    const list3 =
-      videoData.fluid_level_list
-        ?.filter((item) => item.status)
-        .map((item) => {
-          return { ...item, type_name: '液位监测', type: TYPE.water };
-        }) || [];
-    return [...list1, ...list2, ...list3];
+    // const list3 =
+    //   videoData.fluid_level_list
+    //     ?.filter((item) => item.status)
+    //     .map((item) => {
+    //       return { ...item, type_name: '液位监测', type: TYPE.water };
+    //     }) || [];
+    return [...list1, ...list2];
   }, [videoData]);
 
   useEffect(() => {
@@ -257,7 +257,7 @@ function AnalysisContent({ errorData, selectedName, setSelectedName }) {
 function AllContent({ videoData = {}, selectedName, setSelectedName }) {
   const {
     environment_list = [],
-    fluid_level_list = [],
+    // fluid_level_list = [],
     dumu_list = [],
   } = videoData;
   // const [selectedRowKeys, setSelectedRowKeys] = useState([]);
@@ -469,7 +469,7 @@ function AllContent({ videoData = {}, selectedName, setSelectedName }) {
           scroll={{ y: 400 }}
         />
       </div>
-      <div className={`card-box ${styles.box}`}>
+      {/* <div className={`card-box ${styles.box}`}>
         <ModuleTitle title="液位检测" />
         <Table
           dataSource={fluid_level_list}
@@ -481,9 +481,9 @@ function AllContent({ videoData = {}, selectedName, setSelectedName }) {
           pagination={false}
           scroll={{ y: 400 }}
         />
-      </div>
+      </div> */}
       <div className={`card-box ${styles.box}`}>
-        <ModuleTitle title="感知检测" />
+        <ModuleTitle title="视频识别" />
         <Table
           dataSource={dumu_list}
           columns={columns3}

src/pages/SmartOps/index.js

@@ -169,25 +169,25 @@ function SmartOps(props) {
         const count1 = data.dumu_list?.length || 0;
         const count2 =
           data.environment_list?.filter((item) => item.status)?.length || 0;
-        const count3 =
-          data.fluid_level_list?.filter((item) => item.status)?.length || 0;
+        // const count3 =
+        //   data.fluid_level_list?.filter((item) => item.status)?.length || 0;
         setVideoNum(count1 + count2 + count3);
         const Cam =
           data.dumu_list?.map((item) => {
             item.key = `dumu_${item.id}`;
             return item.device_name;
           }) || [];
-        const Dev1 =
+        const Dev =
           data.environment_list?.map((item, index) => {
             item.key = `environment_${index}_${item.device_code}`;
             return { DeviceCode: item.device_code, grade_alarm: item.status };
           }) || [];
-        const Dev2 =
-          data.fluid_level_list?.map((item, index) => {
-            item.key = `fluid_${index}_${item.device_code}`;
-            return { DeviceCode: item.device_code, grade_alarm: item.status };
-          }) || [];
-        const params = { Cam, Dev: [...Dev1, ...Dev2] };
+        // const Dev2 =
+        //   data.fluid_level_list?.map((item, index) => {
+        //     item.key = `fluid_${index}_${item.device_code}`;
+        //     return { DeviceCode: item.device_code, grade_alarm: item.status };
+        //   }) || [];
+        const params = { Cam, Dev };
         UnityAction.sendMsg('SensorAnalysis', JSON.stringify(params));
       },
     },

src/pages/TaskManage/index.tsx

@@ -20,6 +20,7 @@ const TaskManage = (props) => {
   const [mandateCount, setMandateCount] = useState<number[]>([0, 0, 0]);
   const [loading, setLoading] = useState(false);
   const [tab, setTab] = useState(localStorage.taskTab || '1');
+  const [UA, setUA] = useState('');
 
   useEffect(() => {
     const requests = [];