From 65752fcffafa02c5f646d0a6207c85bf81284b73 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:20:52 +0800
Subject: [PATCH] 统计查询
---
/dev/null | 0
src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue | 2
src/components/subComponents/CardItem.vue | 554 ++++++++++++++++++++++++++++++++++++++----------------
src/Pool/VideoPhotoData.ts | 9
4 files changed, 397 insertions(+), 168 deletions(-)
diff --git a/dist.rar b/dist.rar
deleted file mode 100644
index a977072..0000000
--- a/dist.rar
+++ /dev/null
Binary files differ
diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index db514fd..08ad20c 100644
--- a/src/Pool/VideoPhotoData.ts
+++ b/src/Pool/VideoPhotoData.ts
@@ -94,6 +94,15 @@
this.preCards.length = 0
if (rsp.data.datalist) {
rsp.data.datalist.forEach(element => {
+
+ if(element.activeObject.targetInfo&&element.activeObject.targetInfo.length === 0) {
+ element.activeObject.targetInfo = null
+ }
+
+ if(element.list[0].targetInfo&&element.list[0].targetInfo.length === 0) {
+ element.list[0].targetInfo = null
+ }
+
element.ownerPage = this.page
this.cards.push(element as any);
// 鍙厑璁告瘡涓猚ard娓叉煋涓�寮犲浘鐗�
diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue
index 063f9af..e65701a 100644
--- a/src/components/subComponents/CardItem.vue
+++ b/src/components/subComponents/CardItem.vue
@@ -2,13 +2,13 @@
<div class="box-card" ref="cardItem">
<!-- 宸︿晶鍥剧墖鍖哄煙 -->
<!-- 姣斿妯″紡 -->
- <div class="s-card-left-isCompare" v-if="showType === 'compare' ">
+ <div class="s-card-left-isCompare" v-if="showType === 'compare'">
<div class="card-img-box">
<div class="card-img-box-compear">
<div class="card-img-box-compear-left" ref="firstImg">
<img
:src="data.targetInfo[0].picSmUrl | httpImage"
- :id="'/compear/'+data.targetInfo[0].picSmUrl"
+ :id="'/compear/' + data.targetInfo[0].picSmUrl"
class="cursor-pointer"
@click="detailsClick($event)"
/>
@@ -20,7 +20,10 @@
indicator-position="none"
:arrow="data.baseInfo.length > 1 ? 'always' : 'never'"
>
- <el-carousel-item v-for="(item, index) in data.baseInfo" :key="index">
+ <el-carousel-item
+ v-for="(item, index) in data.baseInfo"
+ :key="index"
+ >
<img
:src="item.targetPicUrl | httpImage"
class="cursor-pointer"
@@ -33,7 +36,7 @@
class="s-card-left-isCompare-div compareScore111"
:style="{
bottom: '0',
- background: getUrl(data.baseInfo[initialIndex].bwType)
+ background: getUrl(data.baseInfo[initialIndex].bwType),
}"
>
<b>{{ data.baseInfo[initialIndex].compareScore | percentage }}</b>
@@ -52,13 +55,23 @@
:autoplay="false"
@change="changeCarousel"
>
- <el-carousel-item v-for="(item, index) in data.picMaxUrl" :key="index + 'img'">
- <img :src="item | httpImage" class="cursor-pointer" @click="detailsClick($event)" />
+ <el-carousel-item
+ v-for="(item, index) in data.picMaxUrl"
+ :key="index + 'img'"
+ >
+ <img
+ :src="item | httpImage"
+ class="cursor-pointer"
+ @click="detailsClick($event)"
+ />
</el-carousel-item>
</el-carousel>
<!-- 鏆傛椂璁や负鍙湁浜鸿劯鎶撴媿鐨勬姤璀�, 棣栭〉鏄剧ず灏忓浘, 鍏朵粬鏃堕棿鍧囨樉绀哄ぇ鍥� -->
<img
- v-else-if="data.targetInfo == null || data.targetInfo[0].targetType !== 'FaceDetect'"
+ v-else-if="
+ (data.targetInfo && data.targetInfo.length === 0) ||
+ data.targetInfo[0].targetType !== 'FaceDetect'
+ "
:src="data.picMaxUrl[0] | httpImage"
class="cursor-pointer"
@click="detailsClick($event)"
@@ -71,7 +84,10 @@
/>
</div>
<div class="s-card-left-box" v-else>
- <img :src="data.baseInfo[0].targetPicUrl | httpImage" class="cursor-pointer" />
+ <img
+ :src="data.baseInfo[0].targetPicUrl | httpImage"
+ class="cursor-pointer"
+ />
</div>
</div>
@@ -85,34 +101,52 @@
@mouseleave="cardMouseleave($event)"
>
<p>
- <span class="fontStyle color222">{{ data.picDate | formatTime}}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p style="margin-bottom: 8px;">
+ <p style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
<el-tooltip placement="right" popper-class="atooltip">
<div slot="content">
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule'">
- <span>{{data.taskName}}</span>
- <span v-if="item.alarmLevel !== '鎾ら槻'"> {{item.alarmLevel}}</span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
+ <span>{{ data.taskName }}</span
+ >
+ <span v-if="item.alarmLevel !== '鎾ら槻'"
+ > {{ item.alarmLevel }}</span
+ >
<span v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
</p>
</div>
<el-button
- style="line-height:17px;border:none;padding:0;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ line-height: 17px;
+ border: none;
+ padding: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- v-for="(item,index) in data.alarmRules"
- :key="index+'rule1'"
- style="text-overflow:ellipsis;max-width:100px"
+ v-for="(item, index) in data.alarmRules"
+ :key="index + 'rule1'"
+ style="text-overflow: ellipsis; max-width: 100px"
>
- <span class="fontStyle color666">{{data.taskName}}</span>
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ >
+ <span class="fontStyle color666" v-if="item.alarmLevel !== '鎾ら槻'"
+ > {{ item.alarmLevel }}</span
+ >
<span
class="fontStyle color666"
- v-if="item.alarmLevel !== '鎾ら槻'"
- > {{item.alarmLevel}}</span>
- <span class="fontStyle color666" v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</el-button>
</el-tooltip>
@@ -122,45 +156,61 @@
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span>
+ >{{ data.baseInfo[initialIndex].tableName }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].targetName"
- >/ {{ data.baseInfo[initialIndex].targetName }}</span>
- <span
- class="fontStyle"
- v-if="data.baseInfo[initialIndex].labels"
- >/ {{ data.baseInfo[initialIndex].labels | idCard}}</span>
+ >/ {{ data.baseInfo[initialIndex].targetName }}</span
+ >
+ <span class="fontStyle" v-if="data.baseInfo[initialIndex].labels"
+ >/ {{ data.baseInfo[initialIndex].labels | idCard }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].monitorLevel"
- >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span>
+ >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span
+ >
</p>
</div>
<el-button
- style="line-height:17px;border:none;padding:0;margin:0;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ line-height: 17px;
+ border: none;
+ padding: 0;
+ margin: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- :style="data.baseInfo[initialIndex].bwType === '1'
- ? 'color: red;font-size:12px;line-height:20px'
- : 'font-size:12px;line-height:20px'"
+ :style="
+ data.baseInfo[initialIndex].bwType === '1'
+ ? 'color: red;font-size:12px;line-height:20px'
+ : 'font-size:12px;line-height:20px'
+ "
>
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span>
+ >{{ data.baseInfo[initialIndex].tableName }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].targetName"
- >/ {{ data.baseInfo[initialIndex].targetName }}</span>
- <span
- class="fontStyle"
- v-if="data.baseInfo[initialIndex].labels"
- >/ {{ data.baseInfo[initialIndex].labels | idCard}}</span>
+ >/ {{ data.baseInfo[initialIndex].targetName }}</span
+ >
+ <span class="fontStyle" v-if="data.baseInfo[initialIndex].labels"
+ >/ {{ data.baseInfo[initialIndex].labels | idCard }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].monitorLevel"
- >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span>
+ >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span
+ >
</span>
</el-button>
</el-tooltip>
@@ -191,23 +241,44 @@
<p
:title="data.baseInfo[0].compareScore"
class="score"
- style="font-family: PingFangSC-Medium;font-size: 20px;color: #3D68E1;letter-spacing: 0.4px;"
+ style="
+ font-family: PingFangSC-Medium;
+ font-size: 20px;
+ color: #3d68e1;
+ letter-spacing: 0.4px;
+ "
>
- <span>{{ data.baseInfo[0].compareScore | percentage}}</span>
+ <span>{{ data.baseInfo[0].compareScore | percentage }}</span>
</p>
<p
- :style="data.baseInfo[0].bwType == '0' ? 'font-size:12px;line-height:20px' : 'color:red;font-size:12px;line-height:20px'"
- >{{ data.baseInfo[0].tableName }}</p>
+ :style="
+ data.baseInfo[0].bwType == '0'
+ ? 'font-size:12px;line-height:20px'
+ : 'color:red;font-size:12px;line-height:20px'
+ "
+ >
+ {{ data.baseInfo[0].tableName }}
+ </p>
<p :style="data.baseInfo[0].bwType == '0' ? '' : 'color:red'">
- <span>{{ data.baseInfo[0].targetName }}</span>
- <span
- v-if="data.baseInfo[0].labels"
- >/ {{ data.baseInfo[0].labels | idCard}}</span>
+ <span>{{ data.baseInfo[0].targetName }}</span
+ >
+ <span v-if="data.baseInfo[0].labels"
+ >/ {{ data.baseInfo[0].labels | idCard }}</span
+ >
</p>
</div>
<div class="card-icon-box">
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip" style="margin-left:10px">
- <i class="iconfont iconsousuoren" @click="tosearch(data)" title="鏌ユ壘姝や汉"></i>
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ style="margin-left: 10px"
+ >
+ <i
+ class="iconfont iconsousuoren"
+ @click="tosearch(data)"
+ title="鏌ユ壘姝や汉"
+ ></i>
</el-tooltip>
</div>
</div>
@@ -223,34 +294,54 @@
@mouseleave="cardMouseleave($event)"
>
<p :title="data.picDate">
- <span class="fontStyle color222">{{ data.picDate | formatTime }}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p :title="data.cameraAddr" style="margin-bottom: 8px;">
+ <p :title="data.cameraAddr" style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
<el-tooltip placement="right" popper-class="atooltip">
<div slot="content">
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule'">
- <span>{{data.taskName}}</span>
- <span v-if="item.alarmLevel !== '鎾ら槻'">{{item.alarmLevel}}</span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
+ <span>{{ data.taskName }}</span
+ >
+ <span v-if="item.alarmLevel !== '鎾ら槻'">{{
+ item.alarmLevel
+ }}</span
+ >
<span v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
</p>
</div>
<el-button
- style="border:none;padding:0;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- v-for="(item,index) in data.alarmRules"
- :key="index+'rule1'"
- style="text-overflow:ellipsis;max-width:100px"
+ v-for="(item, index) in data.alarmRules"
+ :key="index + 'rule1'"
+ style="text-overflow: ellipsis; max-width: 100px"
>
- <span class="fontStyle color666">{{data.taskName}}</span>
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ >
<span
class="fontStyle color666"
v-if="item.alarmLevel !== '鎾ら槻'"
- >{{item.alarmLevel}}</span>
- <span class="fontStyle color666" v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ >{{ item.alarmLevel }}</span
+ >
+ <span
+ class="fontStyle color666"
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</el-button>
</el-tooltip>
@@ -258,7 +349,11 @@
<div class="right-bottom">
<div v-if="!data.id" class="card-icon-box">
<!-- <i class="iconfont systemxing ml50" title="鏀惰棌" ></i> -->
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont iconsousuoren ml50" @click="tosearch(data)"></i>
</el-tooltip>
</div>
@@ -280,10 +375,18 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont iconsousuoren" @click="tosearch(data)"></i>
</el-tooltip>
- <el-tooltip content="鍔犲叆搴曞簱" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鍔犲叆搴曞簱"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
<el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
@@ -307,40 +410,72 @@
<p
class="score"
v-if="VideoPhotoData.uploadType"
- style="font-family: PingFangSC-Medium;font-size: 20px;color: #3D68E1;letter-spacing: 0.4px;"
+ style="
+ font-family: PingFangSC-Medium;
+ font-size: 20px;
+ color: #3d68e1;
+ letter-spacing: 0.4px;
+ "
>
- <span v-if="data.id">{{ data.compareScore | percentage}}</span>
- <span v-else>{{ data.baseInfo[0].compareScore | percentage}}</span>
+ <span v-if="data.id">{{ data.compareScore | percentage }}</span>
+ <span v-else>{{ data.baseInfo[0].compareScore | percentage }}</span>
</p>
<p :title="data.picDate">
- <span class="fontStyle color222">{{ data.picDate | formatTime }}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p :title="data.cameraAddr" style="margin-bottom: 8px;">
+ <p :title="data.cameraAddr" style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
- <el-tooltip placement="right" popper-class="atooltip" v-if="!VideoPhotoData.uploadType">
+ <el-tooltip
+ placement="right"
+ popper-class="atooltip"
+ v-if="!VideoPhotoData.uploadType"
+ >
<div slot="content">
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule2'">
- <span class="fontStyle">{{data.taskName}}</span>
- <span
- class="fontStyle"
- v-if="item.alarmLevel !== '鎾ら槻'"
- >{{item.alarmLevel}}</span>
- <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule2'">
+ <span class="fontStyle">{{ data.taskName }}</span
+ >
+ <span class="fontStyle" v-if="item.alarmLevel !== '鎾ら槻'">{{
+ item.alarmLevel
+ }}</span
+ >
+ <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</p>
</div>
<el-button
- style="border:none;padding:0;margin:0px;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ margin: 0px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
- <span v-for="(item,index) in data.alarmRules" :key="index+'rule3'">
- <span class="fontStyle color666">{{data.taskName}}</span>
+ <span
+ v-for="(item, index) in data.alarmRules"
+ :key="index + 'rule3'"
+ >
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ >
<span
class="fontStyle color666"
v-if="item.alarmLevel !== '鎾ら槻'"
- >{{item.alarmLevel}}</span>
- <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle color666"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ >{{ item.alarmLevel }}</span
+ >
+ <span
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ class="fontStyle color666"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</el-button>
</el-tooltip>
@@ -353,31 +488,52 @@
v-if="data.baseInfo && data.baseInfo[0].targetName != ''"
>
<div slot="content">
- <p v-for="(item,index) in data.baseInfo" :key="index+'base1'">
- <span class="fontStyle">{{item.tableName}}</span>
- <span class="fontStyle" v-if="item.targetName.length">/ {{item.targetName}}</span>
- <span
- class="fontStyle"
- v-if="item.labels.length"
- >/ {{item.labels | idCard}}</span>
- <span class="fontStyle" v-if="item.labels.length">/ {{item.labels | sex}}</span>
+ <p v-for="(item, index) in data.baseInfo" :key="index + 'base1'">
+ <span class="fontStyle">{{ item.tableName }}</span
+ >
+ <span class="fontStyle" v-if="item.targetName.length"
+ >/ {{ item.targetName }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | idCard }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | sex }}</span
+ >
</p>
</div>
<el-button
- style="border:none;padding:0;margin:0px;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ margin: 0px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- v-for="(item,index) in data.baseInfo"
- :key="index+'base'"
- :style="item.bwType == '1' ? 'color:red;font-size:12px;line-height:20px':'font-size:12px;line-height:20px'"
+ v-for="(item, index) in data.baseInfo"
+ :key="index + 'base'"
+ :style="
+ item.bwType == '1'
+ ? 'color:red;font-size:12px;line-height:20px'
+ : 'font-size:12px;line-height:20px'
+ "
>
- <span class="fontStyle">{{item.tableName}}</span>
- <span class="fontStyle" v-if="item.targetName.length">/ {{item.targetName}}</span>
- <span
- class="fontStyle"
- v-if="item.labels.length"
- >/ {{item.labels | idCard}}</span>
- <span class="fontStyle" v-if="item.labels.length">/ {{item.labels |sex }}</span>
+ <span class="fontStyle">{{ item.tableName }}</span
+ >
+ <span class="fontStyle" v-if="item.targetName.length"
+ >/ {{ item.targetName }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | idCard }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | sex }}</span
+ >
</span>
</el-button>
</el-tooltip>
@@ -386,15 +542,28 @@
placement="right"
popper-class="atooltip"
v-if="data.baseInfo == null"
- style="margin-top:5px"
+ style="margin-top: 5px"
>
<div slot="content">
- <span :style="'color:red;font-size:14px;line-height:20px'">{{data.showLabels}}</span>
+ <span :style="'color:red;font-size:14px;line-height:20px'">{{
+ data.showLabels
+ }}</span>
</div>
<el-button
- style="border:none;padding:0;margin:0px;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ margin: 0px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
- <span :style=" 'color:red;font-size:14px;line-height:20px'">{{data.showLabels}}</span>
+ <span :style="'color:red;font-size:14px;line-height:20px'">{{
+ data.showLabels
+ }}</span>
</el-button>
</el-tooltip>
</div>
@@ -402,7 +571,11 @@
<div v-if="!data.id" class="card-icon-box">
<!-- 搴曞簱浜哄憳 -->
<!-- <i class="iconfont systemxing ml50" title="鏀惰棌" ></i> -->
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont iconsousuoren ml50" @click="tosearch(data)"></i>
</el-tooltip>
</div>
@@ -456,16 +629,24 @@
>
<div>
<p :title="data.picDate">
- <span class="fontStyle color222">{{ data.picDate | formatTime }}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p :title="data.cameraAddr" style="margin-bottom: 8px;">
+ <p :title="data.cameraAddr" style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule'">
- <span class="fontStyle color666">{{data.taskName}}</span> /
- <span class="fontStyle color666">{{item.alarmLevel}}</span> /
- <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle color666">鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ > /
+ <span class="fontStyle color666">{{ item.alarmLevel }}</span
+ > /
+ <span
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ class="fontStyle color666"
+ >鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</p>
</div>
</div>
@@ -477,74 +658,84 @@
<script>
Date.prototype.Format = function (fmt) {
var o = {
- "M+": this.getMonth() + 1, //鏈堜唤
- "d+": this.getDate(), //鏃�
- "H+": this.getHours(), //灏忔椂
- "m+": this.getMinutes(), //鍒�
- "s+": this.getSeconds(), //绉�
- "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
- "S": this.getMilliseconds() //姣
+ "M+": this.getMonth() + 1, //鏈堜唤
+ "d+": this.getDate(), //鏃�
+ "H+": this.getHours(), //灏忔椂
+ "m+": this.getMinutes(), //鍒�
+ "s+": this.getSeconds(), //绉�
+ "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
+ S: this.getMilliseconds(), //姣
};
- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+ if (/(y+)/.test(fmt))
+ fmt = fmt.replace(
+ RegExp.$1,
+ (this.getFullYear() + "").substr(4 - RegExp.$1.length)
+ );
for (var k in o)
- if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ if (new RegExp("(" + k + ")").test(fmt))
+ fmt = fmt.replace(
+ RegExp.$1,
+ RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
+ );
return fmt;
-}
+};
export default {
mounted() {
//window.addEventListener("resize", this.watchWindow);
- window.addEventListener("resize", this.getBottom)
+ window.addEventListener("resize", this.getBottom);
},
props: {
data: {
type: Object,
- default: null
+ default: null,
},
showType: {
type: String,
- default: "search"
+ default: "search",
},
fromCluster: {
type: Boolean,
- default: false
+ default: false,
},
- searchT: {}
+ searchT: {},
},
computed: {
isId() {
- return this.data.id
- }
+ return this.data.id;
+ },
},
filters: {
formatTime(t) {
- return new Date(t).Format("yyyy-MM-dd HH:mm:ss")
+ return new Date(t).Format("yyyy-MM-dd HH:mm:ss");
},
percentage(score) {
- return score.toFixed(2) + "%"
+ return score.toFixed(2) + "%";
},
idCard(v) {
try {
- let obj = JSON.parse(v)
- return obj.idCard
+ let obj = JSON.parse(v);
+ return obj.idCard;
} catch (error) {
- return v.split("/")[1]
+ return v.split("/")[1];
}
},
sex(v) {
try {
- let obj = JSON.parse(v)
- return obj.sex
+ let obj = JSON.parse(v);
+ return obj.sex;
} catch (error) {
- return v.split("/")[0]
+ return v.split("/")[0];
}
},
httpImage(url) {
if (!url.length) {
- return ""
+ return "";
}
- return '/httpImage/' + url + ((url.indexOf("?") >= 0) ? '&' : '?') + 'width=160'
- }
+ return (
+ "/httpImage/" + url + (url.indexOf("?") >= 0 ? "&" : "?") + "width=160"
+ );
+ },
},
data() {
return {
@@ -552,33 +743,33 @@
initialIndex: 0,
carouselIndex: 0,
dialogVisible: false,
- overflowState: true
+ overflowState: true,
};
},
watch: {
data: {
handler(val, oldVal) {
- this.$forceUpdate()
+ this.$forceUpdate();
},
- deep: true
- }
+ deep: true,
+ },
},
methods: {
getBottom() {
this.$nextTick(() => {
- let imgDom = this.$refs.firstImg
+ let imgDom = this.$refs.firstImg;
if (imgDom) {
- let num = (imgDom.offsetHeight - imgDom.offsetWidth) / 2
+ let num = (imgDom.offsetHeight - imgDom.offsetWidth) / 2;
return `${num}px`;
}
return `4px`;
- })
+ });
},
getUrl(bwtype) {
if (bwtype == 1) {
- return `url(${require("@/assets/img/red.png")})`
+ return `url(${require("@/assets/img/red.png")})`;
} else {
- return `url(${require("@/assets/img/green.png")})`
+ return `url(${require("@/assets/img/green.png")})`;
}
},
changeInitialIndex(index) {
@@ -600,24 +791,53 @@
this.$emit("addToBase", item);
},
tosearch(item) {
- this.searchT
- let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id
- let imgUrl = item.targetInfo ? item.targetInfo[0].picSmUrl : item.baseInfo[0].targetPicUrl
- let compType = 1 // 鏁版嵁鏉ヨ嚜浜巈s
+ this.searchT;
+ let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id;
+ let imgUrl = item.targetInfo
+ ? item.targetInfo[0].picSmUrl
+ : item.baseInfo[0].targetPicUrl;
+ let compType = 1; // 鏁版嵁鏉ヨ嚜浜巈s
if (!item.id || item.id == "") {
- compType = 0 // 鏁版嵁鏉ヨ嚜浜庡簳搴�
+ compType = 0; // 鏁版嵁鏉ヨ嚜浜庡簳搴�
}
- let message
+ let message;
if (this.fromCluster) {
- message = 'toCluster?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '×tamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
+ message =
+ "toCluster?showType=findByPic&targetId=" +
+ captureId +
+ "&picSmUrl=" +
+ imgUrl +
+ "&compType=" +
+ compType +
+ "×tamp=" +
+ new Date().getTime() +
+ "&start=" +
+ this.searchT[0] +
+ "&end=" +
+ this.searchT[1];
} else {
- message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '×tamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
+ message =
+ "toSearch?showType=findByPic&targetId=" +
+ captureId +
+ "&picSmUrl=" +
+ imgUrl +
+ "&compType=" +
+ compType +
+ "×tamp=" +
+ new Date().getTime() +
+ "&start=" +
+ this.searchT[0] +
+ "&end=" +
+ this.searchT[1];
}
- window.parent.postMessage({
- msg: message
- }, "*")
- }
- }
+ window.parent.postMessage(
+ {
+ msg: message,
+ },
+ "*"
+ );
+ },
+ },
};
</script>
<style lang="scss">
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue
index ff9d97d..da349b8 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue
@@ -54,7 +54,7 @@
height: 534px;
background-color: #fff;
box-shadow: 0px 2px 16px 0px rgba(0, 43, 106, 0.25);
- z-index: 2;
+ z-index: 2100;
.title {
box-sizing: border-box;
--
Gitblit v1.8.0