|
|
@@ -117,14 +117,6 @@
|
|
|
>
|
|
|
<div
|
|
|
class="imgListData"
|
|
|
- style="
|
|
|
- height: 245px;
|
|
|
- margin: 0 0 0 10px;
|
|
|
- text-align: center;
|
|
|
- background: #f5f5f5;
|
|
|
- border-radius: 5px;
|
|
|
- position: relative;
|
|
|
- "
|
|
|
>
|
|
|
<div class="photoInfo">
|
|
|
<template>
|
|
|
@@ -152,69 +144,42 @@
|
|
|
alt=""
|
|
|
/>
|
|
|
</div>
|
|
|
- <ul class="result_ul" style="height: 45px">
|
|
|
+ <ul class="result_ul">
|
|
|
<li class="result_list">
|
|
|
<div class="result_listBox">
|
|
|
<div class="result_listBox_circle">
|
|
|
{{ (item.addtime * 1000) | formatTime }}
|
|
|
</div>
|
|
|
- <!-- <div
|
|
|
- class="result_listBox_sum"
|
|
|
- v-if="userType == 1 || disableVal == 1"
|
|
|
- >
|
|
|
- 害虫总数：{{
|
|
|
- item.insectSum == undefined || item.insectSum == ""
|
|
|
- ? 0
|
|
|
- : item.insectSum[item.insectSum.length - 1]
|
|
|
- }}头
|
|
|
- </div> -->
|
|
|
-
|
|
|
- <div
|
|
|
- class="result_listBox_sum"
|
|
|
- v-if="userType == 1 || disableVal == 1"
|
|
|
- >
|
|
|
- 害虫总数：
|
|
|
- <span
|
|
|
- v-if="
|
|
|
- item.markNum != undefined &&
|
|
|
- item.markNum !== 0 &&
|
|
|
- item.markNum !== null
|
|
|
- "
|
|
|
- >{{
|
|
|
- item.insectSum == undefined ||
|
|
|
- item.insectSum == ""
|
|
|
- ? 0
|
|
|
- : item.insectSum[item.insectSum.length - 1] +
|
|
|
- item.markNum
|
|
|
- }}</span
|
|
|
- >
|
|
|
- <span v-else>{{
|
|
|
- item.insectSum == undefined || item.insectSum == ""
|
|
|
- ? 0
|
|
|
- : item.insectSum[item.insectSum.length - 1]
|
|
|
- }}</span>
|
|
|
- 头
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div
|
|
|
- class="result_listBox_btn"
|
|
|
- v-if="userType == 1 || disableVal == 1"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- @click="pictureDetailsFun(item)"
|
|
|
- size="mini"
|
|
|
- type="warning"
|
|
|
- >查看详情
|
|
|
+ <div class="info_box">
|
|
|
+ <div class="info_contentBox">
|
|
|
+ <div class="result_listBox_sum info_contentBox">
|
|
|
+ <el-image :preview-src-list="[`${item.addr_c || item.addr}`]" :src="item.addr_c || item.addr">
|
|
|
+ </el-image>
|
|
|
+ <div class="image-slot">
|
|
|
+ 害虫总数：<span>{{ item.count_c || 0 }}头</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="result_listBox_sum"
|
|
|
+ v-if="userType == 1 || disableVal != 0"
|
|
|
+ >
|
|
|
+ 识别：
|
|
|
+ <span>{{ item.count_a || 0}}</span>
|
|
|
+ 头
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div
|
|
|
- style="
|
|
|
- line-height: 12px;
|
|
|
- margin: 0 0 0 5px;
|
|
|
- display: inline-block;
|
|
|
- "
|
|
|
+ class="result_listBox_btn"
|
|
|
>
|
|
|
- <!-- <i style="" class="iconfont icon-jiantou"></i> -->
|
|
|
+ <el-button
|
|
|
+ @click="pictureDetailsFun(item)"
|
|
|
+ size="mini"
|
|
|
+ type="warning"
|
|
|
+ v-if="userType == 1 || disableVal != 0"
|
|
|
+ >查看详情
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
- </el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</li>
|
|
|
</ul>
|
|
|
@@ -2032,6 +1997,9 @@ export default {
|
|
|
obj["addr"] = data[i].addr; // 原图
|
|
|
obj["mark"] = data[i].mark;
|
|
|
obj["time"] = data[i].time;
|
|
|
+ obj["addr_c"] = data[i].addr_c;
|
|
|
+ obj["count_c"] = data[i].count_c;
|
|
|
+ obj["count_a"] = data[i].count_a;
|
|
|
if (data[i].indentify_result) {
|
|
|
var sum = [];
|
|
|
var str = data[i].indentify_result;
|
|
|
@@ -3875,20 +3843,49 @@ border-radius: 3px; */
|
|
|
.result_list {
|
|
|
// border: 1px solid #000;
|
|
|
margin: 5px 0 0 0;
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- color: #636363;
|
|
|
.result_listBox {
|
|
|
font-size: 11.5px;
|
|
|
text-align: left;
|
|
|
// margin: -5px 0 0 0;
|
|
|
margin: 1px 0 0 3px;
|
|
|
-
|
|
|
+ .info_box{
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ .info_contentBox{
|
|
|
+ flex-grow: 2;
|
|
|
+ .result_listBox_sum:nth-child(1){
|
|
|
+ width: 50%;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
.result_listBox_circle {
|
|
|
// width: 100px;
|
|
|
}
|
|
|
.result_listBox_sum {
|
|
|
+ position: relative;
|
|
|
line-height: 22px;
|
|
|
+ margin-right: 5px;
|
|
|
+ float: left;
|
|
|
+ width: 40%;
|
|
|
+ /deep/ .el-image {
|
|
|
+ z-index: 1;
|
|
|
+ display: block;
|
|
|
+ height: 20px;
|
|
|
+ opacity: 0;
|
|
|
+ img{
|
|
|
+ height: 20px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .image-slot{
|
|
|
+ width: 100%;
|
|
|
+ position: absolute;
|
|
|
+ top: 0;
|
|
|
+ left: 0;
|
|
|
+ height: 44px;
|
|
|
+ z-index: 0;
|
|
|
+ color: #338cd9;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
.result_listBox_btn {
|
|
|
@@ -3924,6 +3921,11 @@ border-radius: 3px; */
|
|
|
}
|
|
|
|
|
|
.imgListData {
|
|
|
+ margin: 5px 0 0 10px;
|
|
|
+ text-align: center;
|
|
|
+ background: #f5f5f5;
|
|
|
+ border-radius: 5px;
|
|
|
+ position: relative;
|
|
|
&:hover {
|
|
|
.photoInfo {
|
|
|
i {
|
