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

src/pages/EqSelfInspection/components/Detail.js

@@ -1310,13 +1310,25 @@ function PressureGaugeTable(props) {
       },
     },
     {
-      title: '仪表最小数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最小数
+        </>
+      ),
+      width: '1.25rem',
       dataIndex: 'data_min',
     },
     {
-      title: '仪表最大数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最大数
+        </>
+      ),
+      width: '1.25rem',
       dataIndex: 'data_max',
     },
     {
@@ -1417,7 +1429,7 @@ function PressureGaugeCom(props) {
           items={[
             {
               key: '2',
-              label: `异常/警告(${errorData?.length || 0})`,
+              label: `异常/警告(${allData?.length || 0})`,
               children: <div></div>,
             },
           ]}
@@ -1460,13 +1472,25 @@ function WaterQualityTable(props) {
       },
     },
     {
-      title: '仪表最小数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最小数
+        </>
+      ),
+      width: '1.25rem',
       dataIndex: 'data_min',
     },
     {
-      title: '仪表最大数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最大数
+        </>
+      ),
+      width: '1.25rem',
       dataIndex: 'data_max',
     },
     {
@@ -1567,7 +1591,7 @@ function WaterQualityCom(props) {
           items={[
             {
               key: '2',
-              label: `异常/警告(${errorData?.length || 0})`,
+              label: `异常/警告(${allData?.length || 0})`,
               children: <div></div>,
             },
           ]}

src/pages/Home/index.js

@@ -223,6 +223,7 @@ const Medicine = () => {
       return res[0];
     },
   });
+
   return (
     <Box
       title="药耗监测"
@@ -252,7 +253,7 @@ const Scada = () => {
       const pageList = res?.filter((item) => item.hide);
       const urls = pageList.map(
         (item) =>
-          `${domain}smart-water/scada/index.html#/3dview/${projectId}/${item.id}?JWT-TOKEN=${token}&hideTitle=true`,
+          `${domain}smart-water/scada/index.html#/3dview/${projectId}/${item.id}?JWT-TOKEN=${token}&hideTitle=true&pauseLoadRealTimeData=true`,
       );
       return urls.splice(0, 1);
     },

src/pages/SmartOps/index.less

@@ -167,7 +167,14 @@
       margin: 0 0.25rem 0 0.1rem;
     }
     .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
-      height: 0.42rem;
+      height: 0.48rem;
+      .ant-select-selection-search-input {
+        height: 100%;
+      }
+      .ant-select-selection-placeholder,
+      .ant-select-selection-item {
+        line-height: 0.38rem;
+      }
     }
   }
 }

src/pages/TaskManage/Popup/index.less

@@ -5,17 +5,32 @@
   background-color: white;
   border-radius: 0.5rem;
   padding: 0.3rem;
+  height: 100vh;
+  overflow-y: scroll;
   :global {
     .ant-tabs > .ant-tabs-nav,
     .ant-tabs > div > .ant-tabs-nav {
       width: calc(100% - 0.55rem);
     }
   }
+  &::-webkit-scrollbar {
+    display: none;
+  }
+  &::-webkit-scrollbar-thumb {
+    display: none;
+  }
+  &::-webkit-scrollbar-track {
+    display: none;
+  }
+  &::-webkit-scrollbar-thumb:hover {
+    display: none;
+  }
 }
 
 .closeModalBtn {
-  position: absolute;
-  top: 0.4rem;
+  // position: fixed;
+  float: right;
+  top: 0.15rem;
   right: 0.3rem;
 }
 
@@ -24,9 +39,11 @@
 }
 
 .modalTitle {
-  font-size: 0.3rem;
+  width: calc(100% - 1rem);
+  height: 0.68rem;
+  font-size: 0.32rem;
   font-weight: 600;
-  padding: 0.1rem 0;
+  padding: 0.28rem 0 0.06rem 0;
 }
 
 .fontS20 {