From f1c611bf480463cac5bcaabcd3f45b8dd0622e7a Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期三, 10 十一月 2021 10:15:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 74 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index 1db8536..f731374 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -75,9 +75,25 @@
{{ item.text }}
</div>
<div
+ v-if="checkType === 1"
class="self-dot"
:class="
curVideo.IsOperate == '1' &&
+ item.state == 0 &&
+ !item.text.includes('鎵嬫瘮')
+ ? 'red'
+ : getColor(item.text)
+ "
+ :style="{
+ left: (item.offset / maxSecond) * 100 + '%',
+ }"
+ @click="dotJump(item.offset)"
+ ></div>
+ <div
+ v-if="checkType === 2 || checkType === 3"
+ class="self-dot"
+ :class="
+ curVideo.IsOperate == '11' &&
item.state == 0 &&
!item.text.includes('鎵嬫瘮')
? 'red'
@@ -291,7 +307,7 @@
>{{ item.text }}
</span>
- <span class="list-warn">鏈墜姣� </span>
+ <span class="list-warn" v-if="checkType === 1">鏈墜姣� </span>
</div>
</div>
</div>
@@ -445,6 +461,7 @@
},
data() {
return {
+ checkType: 1,
showHand: true,
guid: 1,
labelDialogVisible: false,
@@ -506,12 +523,12 @@
console.log(arr);
}, */
},
- mounted() {
+ async mounted() {
this.renderLabelOpts();
this.setGuid(1);
- this.getCurVideos(this.videoDetails);
+ await this.getCurVideos(this.videoDetails);
// this.getRelatedVideos(this.videoDetails);
},
@@ -702,6 +719,24 @@
sec = +arr[2];
_this.maxSecond = min * 60 + sec;
});
+
+ this.eventMarks.forEach((item) => {
+ if (
+ item.text.indexOf("鐜╂墜鏈�") > -1 ||
+ item.text.indexOf("瓒翠紡") > -1 ||
+ item.text.indexOf("浠板崸") > -1 ||
+ item.text.indexOf("浠板潗") > -1
+ ) {
+ this.checkType = 2;
+ } else if (
+ item.text.indexOf("鐬湜") > -1 ||
+ item.text.indexOf("浜烘暟鍙樺寲") > -1
+ ) {
+ this.checkType = 3;
+ } else {
+ this.checkType = 1;
+ }
+ });
});
},
renderLabelOpts() {
@@ -723,7 +758,8 @@
if (
text.indexOf("鐜╂墜鏈�") > -1 ||
text.indexOf("瓒翠紡") > -1 ||
- text.indexOf("浠板崸") > -1
+ text.indexOf("浠板崸") > -1 ||
+ text.indexOf("浠板潗") > -1
) {
return "red";
}
@@ -924,14 +960,28 @@
if (this.curVideo.IsOperate == 0) {
return [];
}
- return this.eventMarks.filter((x) => {
- return (
- (x.text.indexOf("杩涘嚭绔�") > -1 ||
- x.text.indexOf("杩囧垎鐩�") > -1 ||
- x.text.indexOf("淇″彿鏈�") > -1) &&
- x.state == 0
- );
- });
+
+ if (this.checkType === 1) {
+ return this.eventMarks.filter((x) => {
+ return (
+ (x.text.indexOf("杩涘嚭绔�") > -1 ||
+ x.text.indexOf("杩囧垎鐩�") > -1 ||
+ x.text.indexOf("淇″彿鏈�") > -1) &&
+ x.state == 0
+ );
+ });
+ } else if (this.checkType === 2) {
+ return this.eventMarks.filter((x) => {
+ return (
+ x.text.indexOf("鐜╂墜鏈�") > -1 ||
+ x.text.indexOf("瓒翠紡") > -1 ||
+ x.text.indexOf("浠板崸") > -1 ||
+ x.text.indexOf("浠板潗") > -1
+ );
+ });
+ }
+
+ return [];
},
marks_filter() {
if (this.showHand) {
--
Gitblit v1.8.0