yanghao há 1 semana atrás
pai
commit
a2312fb723
2 ficheiros alterados com 76 adições e 26 exclusões
  1. 1 1
      config/env.dev.js
  2. 75 25
      pages/ruiHengReport/index.vue

+ 1 - 1
config/env.dev.js

@@ -1,7 +1,7 @@
 // 开发环境配置
 export default {
   // apiUrl: "http://192.168.188.198:48080",
-  apiUrl: "http://192.168.188.86:48080",
+  apiUrl: "https://iot.deepoil.cc:5443",
   // apiUrl: "https://aims.deepoil.cc", //正式
   apiUrlSuffix: "/admin-api",
   // 其他开发环境配置...

+ 75 - 25
pages/ruiHengReport/index.vue

@@ -24,68 +24,118 @@
             </view>
           </view>
 
-          <view class="summary-panel">
+          <view class="metrics-grid">
+            <!-- <view class="metric-item">
+              <text class="metric-label">队伍总数</text>
+              <text class="metric-value">{{
+                formatNumber(item.teamCount)
+              }}</text>
+            </view> -->
+
             <view class="summary-row">
-              <text class="summary-label">日注水量(万方)</text>
+              <text class="summary-label">队伍总数</text>
               <text class="summary-value">
-                {{ formatDecimal(item.waterInjection) }}
+                {{ formatNumber(item.teamCount) }}
               </text>
             </view>
+
+            <!-- <view class="metric-item">
+              <text class="metric-label">施工队伍</text>
+              <text class="metric-value">{{
+                formatNumber(item.sgTeamCount)
+              }}</text>
+            </view> -->
+
             <view class="summary-row">
-              <text class="summary-label">累计注水量(万方)</text>
+              <text class="summary-label">施工队伍</text>
               <text class="summary-value">
-                {{ formatDecimal(item.yearWaterInjection) }}
+                {{ formatNumber(item.sgTeamCount) }}
               </text>
             </view>
+
+            <!-- <view class="metric-item">
+              <text class="metric-label">施工准备</text>
+              <text class="metric-value">{{
+                formatNumber(item.zbTeamCount)
+              }}</text>
+            </view> -->
+
             <view class="summary-row">
-              <text class="summary-label">日注气量(万方)</text>
+              <text class="summary-label">施工准备</text>
               <text class="summary-value">
-                {{ formatDecimal(item.gasInjection) }}
+                {{ formatNumber(item.zbTeamCount) }}
               </text>
             </view>
+
+            <!-- <view class="metric-item">
+              <text class="metric-label">待命</text>
+              <text class="metric-value">{{
+                formatNumber(item.dmTeamCount)
+              }}</text>
+            </view> -->
+
             <view class="summary-row">
-              <text class="summary-label">累计注气量(万方)</text>
+              <text class="summary-label">待命</text>
               <text class="summary-value">
-                {{ formatDecimal(item.yearGasInjection) }}
+                {{ formatNumber(item.dmTeamCount) }}
               </text>
             </view>
-          </view>
 
-          <view class="metrics-grid">
-            <view class="metric-item">
-              <text class="metric-label">队伍总数</text>
+            <!-- <view class="metric-item">
+              <text class="metric-label">当日运行时效</text>
               <text class="metric-value">{{
-                formatNumber(item.teamCount)
+                formatPercent(item.hourUtilizationRate)
               }}</text>
+            </view> -->
+
+            <view class="summary-row">
+              <text class="summary-label">当日运行时效</text>
+              <text class="summary-value">
+                {{ formatPercent(item.hourUtilizationRate) }}
+              </text>
             </view>
-            <view class="metric-item">
-              <text class="metric-label">施工队伍</text>
+
+            <!-- <view class="metric-item">
+              <text class="metric-label">平均运行时效</text>
               <text class="metric-value">{{
-                formatNumber(item.sgTeamCount)
+                formatPercent(item.yearHourUtilizationRate)
               }}</text>
+            </view> -->
+
+            <view class="summary-row">
+              <text class="summary-label">平均运行时效</text>
+              <text class="summary-value">
+                {{ formatPercent(item.yearHourUtilizationRate) }}
+              </text>
             </view>
+          </view>
+
+          <view class="summary-panel">
             <view class="metric-item">
-              <text class="metric-label">施工准备</text>
+              <text class="metric-label">日注气量(万方)</text>
               <text class="metric-value">{{
-                formatNumber(item.zbTeamCount)
+                formatDecimal(item.gasInjection)
               }}</text>
             </view>
+
             <view class="metric-item">
-              <text class="metric-label">待命</text>
+              <text class="metric-label">累计注气量(万方)</text>
               <text class="metric-value">{{
-                formatNumber(item.dmTeamCount)
+                formatDecimal(item.yearGasInjection)
               }}</text>
             </view>
+
             <view class="metric-item">
-              <text class="metric-label">当日运行时效</text>
+              <text class="metric-label">日注水量(万方)</text>
               <text class="metric-value">{{
-                formatPercent(item.hourUtilizationRate)
+                formatDecimal(item.waterInjection)
               }}</text>
             </view>
+
             <view class="metric-item">
-              <text class="metric-label">平均运行时效</text>
+              <text class="metric-label">累计注水量(万方)</text>
               <text class="metric-value">{{
-                formatPercent(item.yearHourUtilizationRate)
+                formatDecimal(item.yearWaterInjection)
               }}</text>
             </view>
           </view>