xujunjie 1 年之前
父节点
当前提交
4c93ffbc40
共有 4 个文件被更改,包括 15 次插入10 次删除
  1. 2 5
      src/pages/Home/index.js
  2. 8 0
      src/pages/Home/index.less
  3. 1 1
      src/pages/Smart/OptimizationTasks.js
  4. 4 4
      src/pages/SmartOps/Analysis.js

+ 2 - 5
src/pages/Home/index.js

@@ -243,12 +243,9 @@ const Scada = () => {
     >
       <div className={styles.scada}>
         {data?.map((url) => (
-          <iframe
-            style={{ width: '450px', height: '270px' }}
-            src={url}
-            onClick={() => UnityAction.sendMsg('menuItem', '工艺监控')}
-          />
+          <iframe style={{ width: '450px', height: '270px' }} src={url} />
         ))}
+        <div className={styles.mask}></div>
       </div>
     </Box>
   );

+ 8 - 0
src/pages/Home/index.less

@@ -57,6 +57,14 @@
 }
 .scada {
   padding: 0 10px;
+  position: relative;
+  .mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
 }
 .scadaContent {
   padding: 20px;

+ 1 - 1
src/pages/Smart/OptimizationTasks.js

@@ -113,7 +113,7 @@ const Produce = ({ projectId }) => {
       {!data?.length && (
         <div className={styles.content} style={{ backgroundColor: '#B1D2F3' }}>
           <div className={styles.desc}>
-            当前进水数据稳定,产水数据稳定,暂无调节任务,继续保持哦~
+            当前进水数据稳定,产水数据稳定,暂无调节任务,继续保持哦~
           </div>
         </div>
       )}

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

@@ -103,11 +103,11 @@ const Analysis = (props) => {
     setSelectedRowKeys(e);
     console.log(data);
     const itemIndex = data?.findIndex((item) => item.type == tab);
-    const index = data[itemIndex]?.data?.findIndex(
+    const item = data[itemIndex]?.data?.find(
       (item) => item.DeviceCode == e,
     );
-    if (index !== 0 || index != -1) {
-      const dom = document.querySelector(`tr[data-row-key="${index}"]`);
+    if (item) {
+      const dom = document.querySelector(`tr[data-row-key="${item.index}"]`);
       if (dom) {
         let v = document.getElementsByClassName('ant-table-body')[itemIndex];
         v.scrollTop = dom.offsetTop;
@@ -156,7 +156,7 @@ const Analysis = (props) => {
     // selectedList[0] = index;
     setSelectedRowKeys(index);
     UnityAction.sendMsg('SynDev', record.DeviceCode);
-  };
+      };
 
   const setRowClassName = (record, index) => {
     if (!selectedRowKeys && selectedRowKeys !== 0) return;