样式

src/global.less

@@ -248,7 +248,9 @@ input[type='reset'] {
   padding-bottom: 0;
 }
 
-.ant-table,
+.ant-table {
+  background: #fff;
+}
 .ant-table-cell,
 .ant-table-placeholder {
   background: transparent !important;
@@ -273,14 +275,21 @@ input[type='reset'] {
   border-radius: 0;
   padding: 0.12rem 0.18rem;
   font-size: 0.28rem;
-  color: #fff;
-  line-height: 1;
+  color: rgba(97, 93, 93, 1);
+  line-height: 0.32rem;
   font-weight: normal;
   vertical-align: middle;
-  border: 0 none !important;
   border-radius: 0 !important;
 }
 
+.ant-table-wrapper .ant-table-thead > tr > th {
+  border: 0 none !important;
+  color: #fff;
+}
+.ant-table-wrapper .ant-table-tbody > tr > td {
+  border-bottom: 1px solid rgba(188, 186, 186, 1);
+}
+
 // .ant-table-tbody > tr:nth-child(even) {
 //   background: rgba(145, 192, 238, 0.16);
 // }

src/pages/Controller/Device.js

@@ -56,7 +56,7 @@ function Hardware() {
       {data?.list?.map((item) => (
         <div
           key={item.id}
-          className={`card-box ${styles.item}`}
+          className={`card-box ${styles.itemLong}`}
           style={{ justifyContent: 'space-between' }}
           onClick={() => onHandleClick(item)}
         >

src/pages/Controller/index.js

@@ -16,18 +16,21 @@ const HardwareController = (props) => {
         onClick={() => UnityAction.sendMsg('innerItem', 'scada')}
       >
         工艺监控
+        <div className={styles.arr}></div>
       </div>
       <div
         className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'sensor')}
       >
         感知监控
+        <div className={styles.arr}></div>
       </div>
       <div
         className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'locate')}
       >
         室内定位
+        <div className={styles.arr}></div>
       </div>
     </PageContent>
   );

src/pages/Controller/index.less

@@ -28,14 +28,30 @@
   justify-content: space-between;
 }
 .itemLong {
-  padding: 0.4rem 0.6rem;
+  padding: 0.6rem 0.4rem 0.6rem 1rem;
   font-size: 0.32rem;
   margin-top: 0.28rem;
   display: flex;
   align-items: center;
+  justify-content: space-between;
+  font-family: Source Han Sans, Source Han Sans;
+  color: #615d5d;
+  line-height: 32px;
+  letter-spacing: 0.04rem;
+  box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
+  .arr {
+    width: 0.14rem;
+    height: 0.22rem;
+    background: url('@/assets/arr-right2.png') no-repeat center;
+    background-size: 100% 100%;
+  }
 }
 .item {
-  .itemLong;
+  padding: 0.4rem 0.6rem;
+  font-size: 0.32rem;
+  margin-top: 0.28rem;
+  display: flex;
+  align-items: center;
   width: 48%;
 }
 .icon {

src/pages/EqSelfInspection/components/Detail.js

@@ -141,6 +141,7 @@ function Detail(props) {
         </Row>
       </div>
       <div style={{ padding: 20, background: '#fff' }}>
+        <ModuleTitle title="设备自检" />
         {/* 设备自检报告 */}
         <ReportCom
           sendMessageToUnity={sendMessageToUnity}
@@ -150,7 +151,7 @@ function Detail(props) {
           key="extend"
           type={'extend'}
           userList={userList}
-          title={<ModuleTitle title="设备自检报告" />}
+          title={'设备自检报告'}
         ></ReportCom>
 
         {/* 液位异常 */}
@@ -161,7 +162,7 @@ function Detail(props) {
           key="liquid"
           type={'liquid'}
           userList={userList}
-          title={<ModuleTitle title="液位异常" />}
+          title={'液位异常'}
         />
         {/* 加药流量校验 */}
         {/* <FlowCom
@@ -185,6 +186,7 @@ function Detail(props) {
         </div>
         {/* 安全隐患自检报告"> */}
         <div className={styles.content}>
+          <ModuleTitle title="安全隐患自检报告" />
           {/* 环境异常 */}
           <ReportCom
             sendMessageToUnity={sendMessageToUnity}
@@ -195,7 +197,7 @@ function Detail(props) {
             key="sensor"
             type={'sensor'}
             userList={userList}
-            title={<ModuleTitle title="环境异常" />}
+            title={'环境异常'}
           ></ReportCom>
           {/* 液位异常 */}
           {/* <LiquidLevelCom
@@ -209,10 +211,7 @@ function Detail(props) {
           /> */}
 
           {/* 安防检测异常 */}
-          <ReportDumCom
-            data={dumuList}
-            title={<ModuleTitle title="安防检测异常" />}
-          />
+          <ReportDumCom data={dumuList} title={'安防检测异常'} />
 
           {/* 电器检测异常 */}
           <ReportCom
@@ -223,7 +222,7 @@ function Detail(props) {
             key="extend"
             type={'extend'}
             userList={userList}
-            title={<ModuleTitle title="电气检测异常" />}
+            title={'电气检测异常'}
           ></ReportCom>
 
           {/* 密闭空间检测异常 */}
@@ -235,7 +234,7 @@ function Detail(props) {
             key="extend"
             type={'extend'}
             userList={userList}
-            title={<ModuleTitle title="密闭空间检测异常" />}
+            title={'密闭空间检测异常'}
           ></ReportCom>
         </div>
       </div>
@@ -1175,7 +1174,7 @@ function ReportDumCom(props) {
     },
   ];
   return (
-    <div>
+    <div style={{ marginBottom: '0.3rem' }}>
       <div className={styles.tabBarExtraContent}>
         <div className={styles.text} style={{ width: '60%' }}>
           {title}

src/pages/EqSelfInspection/components/PatrolReportDetail.less

@@ -23,12 +23,13 @@
   display: inline-block;
 }
 .detailCard {
-  margin: 0.1rem 0 0.1rem 0;
+  // margin: 0.2rem 0;
+  margin-bottom: 0.3rem;
 }
 .text {
-  .tabBarExtraContent;
   font-size: 0.26rem;
-  text-align: center;
+  text-align: left;
+  color: #1755ff;
 }
 .abnormal {
   // margin: 0.1rem 0 0.1rem 0;
@@ -45,6 +46,7 @@
   align-items: center;
   height: 100%;
   position: relative;
+  margin-bottom: 0.1rem;
 }
 .tableTop {
   position: relative;
@@ -52,6 +54,10 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  font-size: 0.28rem;
+  font-family: Source Han Sans, Source Han Sans;
+  color: #1755ff;
+  line-height: 0.3rem;
 }
 .card {
   background: #fff;
@@ -117,14 +123,14 @@
   margin-bottom: 0.1rem;
 }
 .tableStatus {
-  color: #4a90e2;
+  color: #1755ff;
   font-size: 0.28rem;
   position: absolute;
   right: 0.1rem;
+  top: 0;
+  line-height: 1;
 }
 .content {
   margin-top: 0.5rem;
   position: relative;
 }
-:global {
-}

src/pages/EqSelfInspection/index.js

@@ -126,9 +126,9 @@ const EqSelfInspection = (props) => {
         <div className="content-title">
           <div
             className={`${styles.itemMain} card-box`}
-            style={{ padding: '0.15rem 0.24rem', position: 'relative' }}
+            style={{ padding: '0.2rem 0.24rem', position: 'relative' }}
           >
-            <div style={{ fontSize: 28, color: 'rgb(110, 110, 110)' }}>
+            <div style={{ fontSize: "0.28rem", color: 'rgb(110, 110, 110)' }}>
               自检间隔：{autoReport?.RouteInfo?.PlanDur}分钟
             </div>
 
@@ -284,7 +284,7 @@ const Item = (props) => {
   };
   return (
     <div className={`${styles.itemMain} card-box`}>
-      <div className={styles.item} style={{ height: children ? 80 : '' }}>
+      <div className={styles.item} style={{ height: children ? "0.8rem" : '' }}>
         <span className={styles.itemName}>{name}</span>
         {/* <span className={styles.warningText}>{warningText}</span> */}
         {renderRight(status)}

src/pages/EqSelfInspection/index.less

@@ -9,6 +9,7 @@
     height: 0.41rem;
     cursor: pointer;
     background: url('@/assets/iconDiffFilled.png') no-repeat;
+    background-size: 100% 100%;
   }
   .iconFundFilled {
     margin-left: 0.28rem;
@@ -70,7 +71,6 @@
   :global {
     .ant-btn-primary {
       font-size: 0.24rem;
-      width: 1.4rem;
       height: 0.46rem;
       cursor: pointer;
     }
@@ -145,11 +145,9 @@
 .itemMain {
   background-size: 100% 100%;
   border: 0.01rem;
-  border-radius: 0.12rem;
   margin-bottom: 0.2rem;
   margin-top: 0.2rem;
   padding: 0 0.1rem;
-  border-radius: 20px 0 20px 0;
   box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
 }
 .itemMain2 {