修改检验任务列表查询逻辑

pages/work/download/DownloadDetail.uvue

@@ -29,7 +29,7 @@
 						  }" v-if="item.photoTotal > 0">
 							{{item.photoCount}} / {{item.photoTotal}}
 						</text>
-						<text v-if="item.photoCount == 0">暂无数据</text>
+						<text v-if="item.photoTotal == 0">暂无任务</text>
 					</uni-td>
 					
 					<uni-td class="grid-text">{{item.photoTotal > 0 ? item.photoStatus : ''}}</uni-td>
@@ -44,7 +44,7 @@
 						  }" v-if="item.recordTotal > 0">
 							{{item.recordCount}} / {{item.recordTotal}}
 						</text>
-						<text v-if="item.recordTotal == 0">暂无数据</text>
+						<text v-if="item.recordTotal == 0">暂无任务</text>
 					</uni-td>
 					
 					<uni-td class="grid-text"><text :class="{
@@ -61,7 +61,7 @@
 						  }" v-if="item.keyTotal > 0">
 							{{item.keyCount}} / {{item.keyTotal}}
 						</text>
-						<text v-if="item.keyTotal == 0">暂无数据</text>
+						<text v-if="item.keyTotal == 0">暂无任务</text>
 					</uni-td>
 					
 					<uni-td class="grid-text"><text :class="{

pages/work/download/DownloadList.uvue

@@ -59,7 +59,7 @@
 			    'bg-green': ( item.photoStatus +  item.keyStatus + item.recordStatus) == 3,
 			    'bg-yellow': ( item.photoStatus +  item.keyStatus + item.recordStatus) < 3,
 			    'bg-black': ( item.photoStatus +  item.keyStatus + item.recordStatus) == 0
-			  }"> {{ (item.photoStatus +  item.keyStatus + item.recordStatus) }} / 3 </text>
+			  }"> {{ (item.photoStatus +  item.keyStatus + item.recordStatus) }} / {{(item.photoTotal + item.keyTotal + item.recordTotal)}} </text>
 			</view>
 		</view>  
 		
@@ -114,6 +114,9 @@
 	photoStatus : number,
 	keyStatus : number,
 	recordStatus : number,
+	photoTotal: number,
+	keyTotal: number,
+	recordTotal: number,
   }
 
   var initDownloads = [] as Task[]

utils/sqlite.uts

@@ -594,9 +594,12 @@ export function selectLatestInfoData (
  
  	var sql = `SELECT
 					m.*,
-					CASE WHEN COALESCE(p.photoCount,0) = COALESCE(p.photoTotal,0) THEN 1 ELSE 0 END as photoStatus,
-					CASE WHEN COALESCE(k.keyCount,0) = COALESCE(k.keyTotal,0) THEN 1 ELSE 0 END as keyStatus,
-					CASE WHEN COALESCE(i.recordCount,0) = COALESCE(i.recordTotal,0) THEN 1 ELSE 0 END as recordStatus
+					CASE WHEN COALESCE(p.photoTotal, 0) > 0 THEN 1 ELSE 0 END as photoTotal,
+					CASE WHEN COALESCE(k.keyTotal,0) > 0 THEN 1 ELSE 0 END as keyTotal,
+					CASE WHEN COALESCE(i.recordTotal,0) > 0 THEN 1 ELSE 0 END as recordTotal,
+					CASE WHEN p.photoCount = p.photoTotal THEN 1 ELSE 0 END as photoStatus,
+					CASE WHEN k.keyCount = k.keyTotal THEN 1 ELSE 0 END as keyStatus,
+					CASE WHEN i.recordCount = i.recordTotal THEN 1 ELSE 0 END as recordStatus
 				FROM
 				  app_task_info m
 				  LEFT JOIN (