From 45a084372cfd5aead36fa5944edabc722b2234d8 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期一, 20 十二月 2021 11:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index a036204..dc61077 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -265,7 +265,7 @@
</span>
</div>
<div v-else-if="hasError(data)" class="has-error">
- <span>鏈夊紓甯�</span>
+ <span>{{ errWord(data) }}</span>
</div>
<div v-else class="no-error">
<span>鏃犲紓甯�</span>
@@ -711,6 +711,20 @@
});
});
});
+ },
+ errWord(data) {
+ let text;
+ data.EventLst.forEach((item, i) => {
+ if (
+ item.state == 0 &&
+ item.Event.indexOf("杩涘嚭绔�") == -1 &&
+ item.Event.indexOf("淇″彿鏈�") == -1 &&
+ item.Event.indexOf("杩囧垎鐩�") == -1
+ ) {
+ text= item.Event
+ }
+ });
+ return text||"鏈墜姣�"
},
hasError(data) {
let status = true;
@@ -1176,17 +1190,21 @@
.show-type {
display: flex;
.list span {
- font-size: 20px;
+ font-size: 18px;
+ line-height: 20px;
}
.type {
- font-size: 18px;
- padding: 2px 4px 0px 4px;
+ font-size: 17px;
border-radius: 4px;
cursor: pointer;
+ height: 20px;
+ width: 20px;
+ line-height: 19px;
+
&.menu {
- margin-right: 10px;
+ margin-right: 5px;
span {
- font-size: 15px;
+ font-size: 14px;
}
}
&.current {
@@ -1226,8 +1244,8 @@
cursor: pointer;
border-radius: 3px;
width: 100%;
- padding-top: 56.25%;
- height: 0;
+ // padding-top: 56.25%;
+ height: 57%;
position: relative;
img {
position: absolute;
--
Gitblit v1.8.0