Renxy 1 жил өмнө
parent
commit
8c0c28991b

+ 30 - 30
src/pages/SmartOps/Analysis.js

@@ -104,9 +104,7 @@ const Analysis = (props) => {
     console.log(data);
     // alert(e)
     const itemIndex = data?.findIndex((item) => item.type == tab);
-    const item = data[itemIndex]?.data?.find(
-      (item) => item.DeviceCode == e,
-    );
+    const item = data[itemIndex]?.data?.find((item) => item.DeviceCode == e);
     if (item) {
       const dom = document.querySelector(`tr[data-row-key="${item.index}"]`);
       if (dom) {
@@ -157,7 +155,7 @@ const Analysis = (props) => {
     // selectedList[0] = index;
     setSelectedRowKeys(index);
     UnityAction.sendMsg('SynDev', record.DeviceCode);
-      };
+  };
 
   const setRowClassName = (record, index) => {
     if (!selectedRowKeys && selectedRowKeys !== 0) return;
@@ -168,32 +166,34 @@ const Analysis = (props) => {
 
   return (
     <Spin spinning={loading}>
-      <TabsContent
-        small={true}
-        center={false}
-        defaultActiveKey="1"
-        items={data?.map((item) => {
-          return {
-            label: `${item.name}(${item.data?.length || 0})`,
-            key: item.type,
-            children: (
-              <Table
-                dataSource={item.data}
-                columns={columns}
-                rowKey={'index'}
-                // rowSelection={rowSelection}
-                rowClassName={setRowClassName}
-                onRow={(record, index) => ({
-                  onClick: () => onSelectRow(record, index),
-                })}
-                pagination={false}
-                scroll={{ y: document.body.clientHeight - 730 }}
-              />
-            ),
-          };
-        })}
-        onChange={onTabChange}
-      />
+      <div style={{ height: 'calc(100vh - 5.6rem)', overflow: 'auto' }}>
+        <TabsContent
+          small={true}
+          center={false}
+          defaultActiveKey="1"
+          items={data?.map((item) => {
+            return {
+              label: `${item.name}(${item.data?.length || 0})`,
+              key: item.type,
+              children: (
+                <Table
+                  dataSource={item.data}
+                  columns={columns}
+                  rowKey={'index'}
+                  // rowSelection={rowSelection}
+                  rowClassName={setRowClassName}
+                  onRow={(record, index) => ({
+                    onClick: () => onSelectRow(record, index),
+                  })}
+                  pagination={false}
+                  scroll={{ y: document.body.clientHeight - 730 }}
+                />
+              ),
+            };
+          })}
+          onChange={onTabChange}
+        />
+      </div>
     </Spin>
   );
 };

+ 1 - 1
src/pages/SmartOps/components/DeviceAnalysis.js

@@ -168,7 +168,7 @@ const DeviceAnalysis = (props) => {
 
   return (
     <Spin spinning={loading}>
-      <div>
+      <div style={{ height: 'calc(100vh - 5.6rem)', overflow: 'auto' }}>
         <TabsContent
           small={true}
           center={false}

+ 32 - 30
src/pages/SmartOps/components/VideoAnalysis.js

@@ -72,36 +72,38 @@ function VideoAnalysis(props) {
 
   return (
     <Spin spinning={loading}>
-      <TabsContent
-        small={true}
-        center={false}
-        defaultActiveKey="1"
-        items={[
-          {
-            label: `异常(${videoNum})`,
-            key: '1',
-            children: (
-              <AnalysisContent
-                errorData={errorData}
-                selectedName={selectedName}
-                setSelectedName={setSelectedName}
-              />
-            ),
-          },
-          {
-            label: `全部(${allCount})`,
-            key: '2',
-            children: (
-              <AllContent
-                videoData={videoData}
-                selectedName={selectedName}
-                setSelectedName={setSelectedName}
-              />
-            ),
-          },
-        ]}
-        onChange={onTabChange}
-      />
+      <div style={{ height: 'calc(100vh - 5.6rem)', overflow: 'auto' }}>
+        <TabsContent
+          small={true}
+          center={false}
+          defaultActiveKey="1"
+          items={[
+            {
+              label: `异常(${videoNum})`,
+              key: '1',
+              children: (
+                <AnalysisContent
+                  errorData={errorData}
+                  selectedName={selectedName}
+                  setSelectedName={setSelectedName}
+                />
+              ),
+            },
+            {
+              label: `全部(${allCount})`,
+              key: '2',
+              children: (
+                <AllContent
+                  videoData={videoData}
+                  selectedName={selectedName}
+                  setSelectedName={setSelectedName}
+                />
+              ),
+            },
+          ]}
+          onChange={onTabChange}
+        />
+      </div>
     </Spin>
   );
 }