From 7a98d6724da914d86b6ec2912dba9bfdf2423c39 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 22 二月 2022 15:14:27 +0800
Subject: [PATCH] 添加rtsp用户信息urlencode功能
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index ead0f1a..0449fbb 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>
@@ -597,7 +597,6 @@
}
});
Object.assign(query, ...filterQuerys);
-
getlst(query).then((res) => {
if (_this.showType == "list") {
_this.tableTotal = res.total;
@@ -634,7 +633,7 @@
StartDate: this.searchTime[0],
EndDate: this.searchTime[1],
PageIndex:
- this.showType == "list" ? this.curTablePage : this.showType == "list",
+ this.showType == "list" ? this.curTablePage : this.curTabPage,
PageSize:
this.showType == "list" ? this.tablePageSize : this.tabPageSize,
IsDetail: this.showType == "list",
@@ -713,10 +712,40 @@
});
});
},
+ 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;
if (!data.EventLst || data.EventLst.length == 0) {
return false;
}
+
+ data.EventLst.forEach((item) => {
+ if (
+ item.Event.indexOf("鐬湜") > -1 ||
+ item.Event.indexOf("浜烘暟鍙樺寲") > -1
+ ) {
+ status = false;
+ false;
+ }
+ });
+
+ if (!status) {
+ return false;
+ }
+
const t = data.EventLst.some((x) => x.state == 0);
return t && data.IsOperate == "1";
},
@@ -900,7 +929,6 @@
background-color: #f4f6f9;
margin: 0 5px;
margin-bottom: 10px;
-
* {
box-sizing: content-box;
color: #425277;
@@ -1029,9 +1057,9 @@
padding: 0 10px;
text-align: left;
width: fit-content;
+ cursor: pointer;
}
&:hover > .option-name {
- // outline: 1px solid #a8b7ee;
background: #e2e7f9;
span {
color: #2d52d7;
@@ -1162,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 {
@@ -1212,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