Merge remote-tracking branch 'origin/master'

src/views/pms/iotrhdailyreport/approval.vue

@@ -294,15 +294,15 @@ function cellStyle(data: {
       }
   }
 
-  const timeFields = ['dailyInjectGasTime', 'dailyInjectWaterTime', 'nonProductionTime']
-  if (timeFields.includes(column.property)) {
-    if (!checkTimeSumEquals24(row)) {
-      return {
-        color: 'orange',
-        fontWeight: 'bold'
-      }
-    }
-  }
+  // const timeFields = ['dailyInjectGasTime', 'dailyInjectWaterTime', 'nonProductionTime']
+  // if (timeFields.includes(column.property)) {
+  //   if (!checkTimeSumEquals24(row)) {
+  //     return {
+  //       color: 'orange',
+  //       fontWeight: 'bold'
+  //     }
+  //   }
+  // }
 
   // 默认返回空对象，不应用特殊样式
   return {}

src/views/pms/iotrhdailyreport/fill.vue

@@ -294,15 +294,15 @@ function cellStyle(data: {
       }
   }
 
-  const timeFields = ['dailyInjectGasTime', 'dailyInjectWaterTime', 'nonProductionTime']
-  if (timeFields.includes(column.property)) {
-    if (!checkTimeSumEquals24(row)) {
-      return {
-        color: 'orange',
-        fontWeight: 'bold'
-      }
-    }
-  }
+  // const timeFields = ['dailyInjectGasTime', 'dailyInjectWaterTime', 'nonProductionTime']
+  // if (timeFields.includes(column.property)) {
+  //   if (!checkTimeSumEquals24(row)) {
+  //     return {
+  //       color: 'orange',
+  //       fontWeight: 'bold'
+  //     }
+  //   }
+  // }
 
   // 默认返回空对象，不应用特殊样式
   return {}

src/views/pms/iotrhdailyreport/index.vue

@@ -122,12 +122,12 @@
               >运行时效=当日注气量/产能&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;超过120%红色预警</span
             >
           </div>
-          <div class="legend-item">
+          <!-- <div class="legend-item">
             <span class="color-indicator orange"></span>
             <span
               >当日注气时间+当日注水时间+非生产时间=24H&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;否则橙色预警</span
             >
-          </div>
+          </div> -->
         </div>
       </ContentWrap>
 
@@ -850,16 +850,16 @@ const cellStyle = ({
   }
 
   // 处理三个时间字段：当日注气时间、当日注水时间、非生产时间
-  const timeFields = ['dailyInjectGasTime', 'dailyInjectWaterTime', 'nonProductionTime']
-  if (timeFields.includes(column.property)) {
-    // 检查三个时间字段之和是否不等于24
-    if (!checkTimeSumEquals24(row)) {
-      return {
-        color: 'orange',
-        fontWeight: 'bold'
-      }
-    }
-  }
+  // const timeFields = ['dailyInjectGasTime', 'dailyInjectWaterTime', 'nonProductionTime']
+  // if (timeFields.includes(column.property)) {
+  //   // 检查三个时间字段之和是否不等于24
+  //   if (!checkTimeSumEquals24(row)) {
+  //     return {
+  //       color: 'orange',
+  //       fontWeight: 'bold'
+  //     }
+  //   }
+  // }
 
   // 默认返回空对象，不应用特殊样式
   return {}