From 77ea6f71e7532e89b974bcb65ce5a6b67a680ddb Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 25 二月 2021 17:35:12 +0800
Subject: [PATCH] 朔黄标注编辑后检索数据同步更新；头部模拟用户名头像
---
src/pages/shuohuangMonitorAnalyze/components/eventVideos.vue | 6 +++++-
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 17 +++++++++++++++--
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 3 ++-
src/pages/shuohuangMonitorAnalyze/components/topNav.vue | 27 ++++++++++++++++++++++-----
4 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/eventVideos.vue b/src/pages/shuohuangMonitorAnalyze/components/eventVideos.vue
index ad9e7d4..0834011 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/eventVideos.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/eventVideos.vue
@@ -25,7 +25,11 @@
type: Object,
default: {}
},
-
+ },
+ data(){
+ return {
+ curVideo: {},
+ }
}
}
</script>
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index a0e7169..87c4271 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -485,7 +485,20 @@
} else {
_this.tabTotal = res.total;
_this.tabData = res.data;
-
+ _this.tabData = _this.tabData.map(function (item) {
+ const set = new Set()
+ item.LableLst.forEach(function (label) {
+ label.Desc.split("锛�").forEach(function (d) {
+ set.add(d)
+ })
+ })
+ const lblst = []
+ set.forEach(function (d) {
+ lblst.push({ Desc: d })
+ })
+ item.LableLst = lblst
+ return item
+ })
}
});
},
@@ -873,7 +886,7 @@
text-align: left;
border: 1px solid #dedede;
border-radius: 5px;
- //height: 390px;
+ height: 420px;
.video-wrap {
border-radius: 3px;
width: 100%;
diff --git a/src/pages/shuohuangMonitorAnalyze/components/topNav.vue b/src/pages/shuohuangMonitorAnalyze/components/topNav.vue
index 7d28cff..41eaa9f 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/topNav.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/topNav.vue
@@ -1,21 +1,30 @@
<template>
<div class="top-nav">
- <div class="search-area">
+ <!-- <div class="search-area">
<i class="el-icon-search"></i>
</div>
<div class="notify">
<i class="el-icon-bell"></i>
- </div>
+ </div> -->
<div class="user-area" >
- <el-avatar size="small" src=""></el-avatar>
- username
+ <el-avatar size="small" :src="pic"></el-avatar>
+ <span class="name">寮犱笁</span>
</div>
</div>
</template>
<script>
export default {
-
+ data(){
+ return {
+
+ }
+ },
+ computed:{
+ pic(){
+ return "/images/search/nobody.png"
+ }
+ }
}
</script>
@@ -31,5 +40,13 @@
font-size: 20px;
padding: 14px;
}
+ .user-area{
+ span{
+ vertical-align: middle;
+ }
+ .name{
+ padding: 0 10px;
+ }
+ }
}
</style>
\ No newline at end of file
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index a6c5375..bdf1c20 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -383,6 +383,7 @@
this.$message.success("娣诲姞鎴愬姛");
// 鏍囨敞
_this.setMarks(this.curVideo);
+ _this.$parent.$parent.filterSearchData();
} else {
this.$message.warning(rsp.msg);
}
@@ -409,13 +410,13 @@
this.$message.success("鍒犻櫎鎴愬姛");
// 鏍囨敞
_this.setMarks(_this.curVideo);
+ _this.$parent.$parent.filterSearchData();
} else {
this.$message.warning(rsp.msg);
}
});
},
mergeMarks(videoInfo) {
- // debugger
const eMarks = videoInfo.EventLst.map(function (item) {
return {
offset: item.SecondsInVideo + "",
--
Gitblit v1.8.0