样式优化

pages/home/index.vue

@@ -3,16 +3,9 @@
     <view class="page-back"></view>
 
     <view class="page-content flex-col">
-      <uni-row class="row-full">
+      <!-- <uni-row class="row-full">
         <uni-col class="daiban-tixing flex-row align-center justify-between">
-          <!-- 				<view class="dt-title">
-						<view class="todo font-BiaoTiHei">
-							{{ $t('home.todo') }}
-						</view>
-						<view class="remind font-BiaoTiHei">
-							{{ $t('home.remind') }}
-						</view>
-					</view> -->
+        
           <swiper
             class="dt-swiper"
             circular="true"
@@ -32,17 +25,14 @@
                 style="margin-top: 10px"
               >
                 <view class="dt-status green">
-                  <!-- 超时未保养 -->
+                  
                   {{ item1.status }}
                 </view>
                 <view class="dt-content">
-                  <!--  增压机十年使用到期保养  -->
+                 
                   {{ item1.type + "-" + item1.title }}
                 </view>
-                <!--								<view class="dt-time">-->
-                <!--                  &lt;!&ndash;  1小时前  &ndash;&gt;-->
-                <!--                  {{ item1.createTime }}-->
-                <!--								</view>-->
+            
               </view>
               <view
                 v-if="item2"
@@ -50,23 +40,21 @@
                 style="margin-bottom: 10px"
               >
                 <view class="dt-status green">
-                  <!--  超时未保养  -->
+                  
                   {{ item2?.status }}
                 </view>
                 <view class="dt-content">
-                  <!--  增压机十年使用到期保养  -->
+                
                   {{ item2?.type + "-" + item2?.title }}
                 </view>
-                <!--								<view class="dt-time">-->
-                <!--                &lt;!&ndash; 1小时前  &ndash;&gt;-->
-                <!--                  {{ item2?.createTime }}-->
-                <!--								</view>-->
+              
               </view>
             </swiper-item>
           </swiper>
         </uni-col>
-      </uni-row>
+      </uni-row> -->
 
+      <!-- 运行记录、保养工单、设备维修、巡检工单、故障上报 -->
       <uni-row class="row-half flex-row justify-between">
         <!-- 运行记录填报 -->
         <uni-col
@@ -666,7 +654,7 @@ onShow(async () => {
 }
 
 .page-content {
-  margin-top: 0rpx;
+  margin-top: 10rpx;
 }
 
 .report-popup {

pages/ruiHengReport/index.vue

@@ -24,6 +24,33 @@
             </view>
           </view>
 
+          <view class="summary-panel">
+            <view class="summary-row">
+              <text class="summary-label">日注水量(万方)</text>
+              <text class="summary-value">
+                {{ formatDecimal(item.waterInjection) }}
+              </text>
+            </view>
+            <view class="summary-row">
+              <text class="summary-label">累计注水量(万方)</text>
+              <text class="summary-value">
+                {{ formatDecimal(item.yearWaterInjection) }}
+              </text>
+            </view>
+            <view class="summary-row">
+              <text class="summary-label">日注气量(万方)</text>
+              <text class="summary-value">
+                {{ formatDecimal(item.gasInjection) }}
+              </text>
+            </view>
+            <view class="summary-row">
+              <text class="summary-label">累计注气量(万方)</text>
+              <text class="summary-value">
+                {{ formatDecimal(item.yearGasInjection) }}
+              </text>
+            </view>
+          </view>
+
           <view class="metrics-grid">
             <view class="metric-item">
               <text class="metric-label">队伍总数</text>
@@ -63,33 +90,6 @@
             </view>
           </view>
 
-          <view class="summary-panel">
-            <view class="summary-row">
-              <text class="summary-label">日注水量(万方)</text>
-              <text class="summary-value">
-                {{ formatDecimal(item.waterInjection) }}
-              </text>
-            </view>
-            <view class="summary-row">
-              <text class="summary-label">累计注水量(万方)</text>
-              <text class="summary-value">
-                {{ formatDecimal(item.yearWaterInjection) }}
-              </text>
-            </view>
-            <view class="summary-row">
-              <text class="summary-label">日注气量(万方)</text>
-              <text class="summary-value">
-                {{ formatDecimal(item.gasInjection) }}
-              </text>
-            </view>
-            <view class="summary-row">
-              <text class="summary-label">累计注气量(万方)</text>
-              <text class="summary-value">
-                {{ formatDecimal(item.yearGasInjection) }}
-              </text>
-            </view>
-          </view>
-
           <view class="desc-panel">
             <view class="desc-title">生产动态概述</view>
             <text class="desc-text">
@@ -407,6 +407,7 @@ onMounted(() => {
   grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 10px;
   margin-bottom: 14px;
+  margin-top: 14px;
 }
 
 .metric-item {
@@ -434,7 +435,7 @@ onMounted(() => {
   grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 8px 14px;
   padding: 14px 0;
-  border-top: 1px solid #edf2f7;
+  // border-top: 1px solid #edf2f7;
   border-bottom: 1px solid #edf2f7;
 }
 

pages/user/index.vue

@@ -305,7 +305,7 @@ onShow(() => {
 
 .content-section {
   position: relative;
-  margin-top: 90px;
+  margin-top: 100px;
   width: 100%;
   height: calc(100% - 55px - 20px);
   overflow-y: auto;