feature_20260108_陈列奖励案任务合并

src/views/deviceWithin/taskPhotoTaking.vue

@@ -84,7 +84,6 @@
       custom-class="identifyResultdialog">
       <!-- 识别结果 -->
       <div class="identifyResult" v-if="taskPhotoRecognitionResult" style="padding: 0 10px">
-        <div style="font-weight: bold; padding: 10px; font-size: 16px">识别结果：</div>
         <div class="resultContent">
           <el-table
             :data="taskPhotoRecognitionResult"
@@ -258,40 +257,45 @@ export default {
 }
 </style>
 <style lang="scss">
-.taskPhotoTaking {
-  .identifyResultdialog {
-    width: vw(690) !important;
-    margin-top: 1vh !important;
-    border-radius: 8px !important;
-    font-size: vw(32) !important;
-    .el-dialog__headerbtn {
-      width: vw(44);
-      height: vw(44);
-      background-color: #e1e1e1;
-      border-radius: 50%;
-      margin-top: -3px;
-    }
+.identifyResultdialog {
+  width: vw(690) !important;
+  margin-top: 1vh !important;
+  border-radius: 8px !important;
+  font-size: vw(32) !important;
+  height: 70% !important;
+  display: flex;
+  flex-direction: column;
+  .el-dialog__headerbtn {
+    width: vw(44);
+    height: vw(44);
+    background-color: #e1e1e1;
+    border-radius: 50%;
+    margin-top: -3px;
   }
-  .table-headermd1 {
-    font-size: 14px;
-    text-align: center;
-    position: initial;
-    width: 98% !important;
-    margin: 0 auto;
-    border-right: 0;
-    border-radius: 8px;
-    th {
-      color: #000;
-      font-weight: bold;
-    }
-    td {
-      color: #000;
-    }
-    .el-table__cell {
-      padding: 6px 0 !important;
-      .cell {
-        padding: 0;
-      }
+  .el-dialog__body {
+    flex: 1;
+    overflow-y: auto;
+  }
+}
+.table-headermd1 {
+  font-size: 14px;
+  text-align: center;
+  position: initial;
+  width: 98% !important;
+  margin: 0 auto;
+  border-right: 0;
+  border-radius: 8px;
+  th {
+    color: #000;
+    font-weight: bold;
+  }
+  td {
+    color: #000;
+  }
+  .el-table__cell {
+    padding: 6px 0 !important;
+    .cell {
+      padding: 0;
     }
   }
 }

src/views/historicalVisit/historicalDetails.vue

@@ -451,6 +451,7 @@ export default {
         let taskType5 = {
           ...list[taskType5Index],
           taskIds: taskIds,
+          taskPhotoConditionPassed: null,
         };
         taskType5.taskName = '生动化陈列任务拍照';
         taskTypeArr.splice(taskType5Index, 0, taskType5);