Merge branch 'feature_20251205_图片识别任务通过条件配置' into uat(dev)

src/views/historicalVisit/historicalDetails.vue

@@ -134,13 +134,27 @@
           <p style="flex: 1; margin: 0">
             {{ item.taskName }}
           </p>
-          <div class="taskPhotoConditionPassed">
-            <img
-              v-if="item.taskPhotoConditionPassed == 1"
-              :src="require('@/assets/taskPhotoSu.png')" />
-            <img
-              v-if="item.taskPhotoConditionPassed == 0"
-              :src="require('@/assets/taskPhotoErr.png')" />
+
+          <div class="taskPhotoConditionPassed" @click.stop>
+            <el-popover
+              :popper-class="item.taskPhotoConditionPassed == 1 ? 'zpoverSuccess' : 'zpover'"
+              placement="bottom"
+              width="120"
+              trigger="click"
+              :content="
+                item.taskPhotoConditionPassed == 1
+                  ? '陈列奖励案拍照AI识别成功'
+                  : '陈列奖励案拍照AI识别失败'
+              ">
+              <div class="taskPhotoConditionPassed" slot="reference">
+                <img
+                  v-if="item.taskPhotoConditionPassed == 1"
+                  :src="require('@/assets/taskPhotoSu.png')" />
+                <img
+                  v-if="item.taskPhotoConditionPassed == 0"
+                  :src="require('@/assets/taskPhotoErr.png')" />
+              </div>
+            </el-popover>
           </div>
           <p class="arrowdetils1">
             <van-icon name="arrow" />
@@ -523,7 +537,7 @@ export default {
   }
 }
 </style>
-<style>
+<style lang="scss">
 .fontWeit .van-cell__title {
   font-weight: bold;
   font-size: 16px;
@@ -540,4 +554,20 @@ export default {
   border-radius: 6px;
   overflow: hidden;
 }
+.historicalDetails {
+  .card {
+    .el-popover__reference-wrapper {
+      display: flex;
+    }
+  }
+}
+.zpoverSuccess {
+  background-color: #28e978 !important;
+  color: #fff !important;
+  padding: 8px 10px !important;
+  z-index: 1 !important;
+  border-radius: 6px !important;
+  border: 0 !important;
+  box-shadow: none !important;
+}
 </style>

src/views/historicalVisit/hisvistdeils.vue

@@ -269,6 +269,34 @@
         </div>
       </van-form>
     </div>
+    <!-- 识别结果 -->
+    <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"
+          border
+          class="table-headermdhome"
+          style="width: 100%">
+          <el-table-column label="" type="index" width="50px" align="center" />
+          <el-table-column label="产品" prop="skuProductName" align="center" />
+          <el-table-column label="要求" prop="conditionIdentifyNum" align="center" width="60px">
+          </el-table-column>
+          <el-table-column
+            label="识别排面数"
+            prop="identifyTheNumberOfCards"
+            width="70px"
+            align="center"
+            >meetTheStandard
+            <template slot-scope="scope">
+              <span :style="{ color: scope.row.meetTheStandard == 1 ? '#07c160' : 'red' }">
+                {{ scope.row.identifyTheNumberOfCards }}
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
     <van-dialog v-model="listShow" title="历史回显" show-cancel-button :showConfirmButton="false">
       <div style="border: 1px solid #eee; margin-top: 18px">
         <div class="itenHhistory" v-for="item in list">
@@ -325,6 +353,7 @@ export default {
       putInCode: '',
       inspectionType: '',
       equipmentCode: '',
+      taskPhotoRecognitionResult: null,
     };
   },
   activated() {
@@ -342,6 +371,7 @@ export default {
     } else {
       this.indexselect = 1;
     }
+    this.taskPhotoRecognitionResult = null;
     this.getPhotoTypeList();
     this.info();
   },
@@ -395,6 +425,8 @@ export default {
       getVisitsDetail({ visitsId: this.visitId }).then((res) => {
         this.toastLoading().clear();
         this.infoData = res.data;
+        this.taskPhotoRecognitionResult =
+          res.data.sfaTaskList[this.$route.query.ids].taskPhotoRecognitionResult;
         var collectionItemLists = res.data.sfaTaskList[this.$route.query.ids].collectionItemList;
         if (res.data.sfaTaskList[this.$route.query.ids].checkUnManage == 'Y') {
           this.checkShow = true;