Renxy 1 rok temu
rodzic
commit
298ef602d3

+ 2 - 2
src/pages/Home/index.less

@@ -190,8 +190,8 @@
     margin-top: 10px;
   }
   .circle {
-    width: 178px;
-    height: 178px;
+    width: 210px;
+    height: 210px;
     text-align: center;
     display: flex;
     flex-direction: column;

+ 6 - 6
src/pages/SmartReport/index.js

@@ -189,7 +189,7 @@ const SmartReport = () => {
     return (
       <div className={styles.longWhiteBox}>
         <div className={styles.longWhiteBoxIn}>
-          {label}
+          <div>{label}</div>
           <span className={styles.value}>
             {value}
             {unit && <span className={styles.unit}>{unit}</span>}
@@ -314,8 +314,8 @@ const SmartReport = () => {
           <div className={styles.scrollContent}>
             <Box title="概览">
               <div className={styles.content}>
-                <TwoBoxItem label="累计进水" value={in_water} />
-                <TwoBoxItem label="累计出水" value={out_water} />
+                <TwoBoxItem label="累计进水" value={in_water} />
+                <TwoBoxItem label="累计出水" value={out_water} />
 
                 <ThreeBoxContent
                   data={[
@@ -334,12 +334,12 @@ const SmartReport = () => {
                 />
 
                 <TwoBoxItem
-                  label="优化建议"
+                  label="优化建议"
                   value={push_optimize_task}
                   unit="条"
                 />
                 <TwoBoxItem
-                  label="任务完成"
+                  label="任务完成"
                   value={push_complete_task}
                   unit="个"
                 />
@@ -417,7 +417,7 @@ const SmartReport = () => {
             <div className={styles.box}>
               <div className={styles.main_in}>
                 <div className={styles.titleContent}>智慧运营</div>
-                <CircleThreeContent
+                <ThreeContent
                   data={[
                     {
                       label: '优化条数',

+ 5 - 5
src/pages/SmartReport/index.less

@@ -137,7 +137,6 @@
     width: 48%;
     white-space: nowrap;
     padding: 0.02rem;
-    height: 1.05rem;
     box-shadow: 0 0.05rem 0.14rem 0 rgba(141, 141, 141, 0.2);
     border-radius: 0.95rem;
     background-image: linear-gradient(
@@ -147,13 +146,14 @@
     );
   }
   .longWhiteBoxIn {
-    padding: 0 0.4rem;
+    text-align: center;
+    padding: 0.2rem 0.4rem 0;
     background: #ffffff;
     border-radius: 1rem;
     font-size: 0.3rem;
     font-family: Helvetica;
     color: #1755ff;
-    line-height: 0.92rem;
+    // line-height: 0.92rem;
   }
   .blueText {
     font-size: 0.3rem;
@@ -205,8 +205,8 @@
     padding: 0.3rem;
     width: 2.54rem;
     height: 2.54rem;
-    background: url('@/assets/center/circle.png') no-repeat center;
-    background-size: 100% 100%;
+    // background: url('@/assets/center/circle.png') no-repeat center;
+    // background-size: 100% 100%;
     .blueText;
   }
   .circleValue {