From 1e09a7a01a6c1888e1a2a832eb007fb8c2b653a0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 26 一月 2022 11:06:27 +0800
Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index d6d1a9b..06d8766 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -242,9 +242,12 @@
>
{{
label.Desc +
- (index == data.LableLst.length - 1 ? "" : "锛�")
+ (index == data.LableLst.length - 1 ? "" : ",")
}}
</span>
+ </div>
+ <div v-else-if=" hasError(data)">
+ <span style="color:orangered;">鏈夊紓甯�</span>
</div>
<div v-else>
<span>鏃犲紓甯�</span>
@@ -426,7 +429,7 @@
keyword: "",
IsFollow: "",
searchTime: [
- new Date(2020, 0, 1, 0, 0, 0),
+ new Date(2021, 0, 1, 0, 0, 0),
new Date(2021, 11, 31, 23, 59, 59),
],
curTabPage: 1,
@@ -535,6 +538,14 @@
this.tabPageSize = size;
this.filterSearchData();
},
+ hasError(data){
+ if (!data.EventLst||data.EventLst.length==0) {
+ return false
+ }
+
+ const t = data.EventLst.some((x) => x.state==0)
+ return t && data.IsOperate=="1"
+ },
handleTableSizeChange(size) {
this.tablePageSize = size;
this.filterSearchData();
@@ -580,7 +591,7 @@
_this.tabData = _this.tabData.map(function (item) {
const set = new Set();
item.LableLst.forEach(function (label) {
- label.Desc.split("锛�").forEach(function (d) {
+ label.Desc.split(",").forEach(function (d) {
set.add(d);
});
});
@@ -591,6 +602,7 @@
item.LableLst = lblst;
return item;
});
+ _this.tabData
}
});
},
@@ -637,7 +649,7 @@
_this.tabData = _this.tabData.map(function (item) {
const set = new Set();
item.LableLst.forEach(function (label) {
- label.Desc.split("锛�").forEach(function (d) {
+ label.Desc.split(",").forEach(function (d) {
set.add(d);
});
});
--
Gitblit v1.8.0