From db0bb91e10fb806357f3518738713e9a5e3ac8cc Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 14:01:27 +0800
Subject: [PATCH] 问题修复1
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 154 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 126 insertions(+), 28 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index f0ce4d4..8c33c6d 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -261,11 +261,12 @@
v-for="(label, index) in data.LableLst"
:key="index"
>
- {{
- label.Desc +
- (index == data.LableLst.length - 1 ? "" : "锛�")
- }}
+ {{ label.Desc }}
</span>
+ <!-- (index == data.LableLst.length - 1 ? "" : "锛�") -->
+ </div>
+ <div v-else-if="hasError(data)" class="has-error">
+ <span>鏈夊紓甯�</span>
</div>
<div v-else class="no-error">
<span>鏃犲紓甯�</span>
@@ -390,7 +391,7 @@
>
<div slot="title" class="title">
<div class="center">
- <i class="el-icon-connection"></i>
+ <img src="/images/shuohuang/璺緞 414.png" alt="" />
<span>鎾斁瑙嗛</span>
</div>
</div>
@@ -407,7 +408,7 @@
@close="eventDialogVisible = false"
>
<div class="title" slot="title">
- <i class="el-icon-connection"></i>
+ <img src="/images/shuohuang/璺緞 414.png" alt="" />
<span>{{ curEvName }}瑙嗛</span>
</div>
<event-videos :eventVideoArr="eventVideoArr"></event-videos>
@@ -601,7 +602,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);
});
});
@@ -658,7 +659,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);
});
});
@@ -705,6 +706,13 @@
});
});
});
+ },
+ 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";
},
toggleFollow(data) {
data.IsFollow == "0" ? (data.IsFollow = "1") : (data.IsFollow = "0");
@@ -885,8 +893,11 @@
.search-for-video-analyze {
background-color: #f4f6f9;
margin: 0 5px;
+ margin-bottom: 10px;
+
* {
box-sizing: content-box;
+ color: #425277;
}
.el-input__inner {
border: 1px solid #d7dce8;
@@ -1157,6 +1168,7 @@
font-size: 18px;
padding: 2px 4px 0px 4px;
border-radius: 4px;
+ cursor: pointer;
&.menu {
margin-right: 10px;
span {
@@ -1167,7 +1179,7 @@
span {
color: #fff;
}
- background-color: #2D52D7;
+ background-color: #2d52d7;
}
}
}
@@ -1178,11 +1190,13 @@
.el-table__row {
cursor: pointer;
}
+ .el-table {
+ border: none;
+ }
.el-col {
margin-bottom: 10px;
}
.card {
- cursor: pointer;
position: relative;
text-align: left;
background: #fff;
@@ -1194,6 +1208,7 @@
box-shadow: 3px 3px 4px #d3def2;
}
.video-wrap {
+ cursor: pointer;
border-radius: 3px;
width: 100%;
padding-top: 56.25%;
@@ -1214,32 +1229,61 @@
margin-bottom: 1px;
}
label {
- color: #999;
+ color: #808dab;
padding-right: 8px;
+ line-height: 16px;
+ }
+ span {
+ font-weight: bold;
+ color: #425277;
+ line-height: 16px;
}
}
.mark-info {
margin: 10px 0;
color: #3d68e1;
.abnormal {
- color: red;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ .abnormal-label {
+ display: inline-block;
+ border: 1px solid;
+ border: 1px solid #bf3a3a;
+ border-radius: 2px;
+ color: #bf3a3a;
+ padding: 0 3px;
+ margin-right: 3px;
+ }
}
.event-tag {
- margin-top: 10px;
+ margin-top: 8px;
+ .el-tag.el-tag--info {
+ background-color: #96a0b7;
+ border-color: #96a0b7;
+ color: #fff;
+ cursor: pointer;
+ height: 19px;
+ padding: 0 5px;
+ }
}
- .no-error{
+ .has-error {
width: fit-content;
- background: #2D52D7;
- padding: 1px 5px
-;
- border-radius: 2px
-;
-span{
- color: #fff;
-}
+ background: #bf3a3a;
+ padding: 1px 5px;
+ border-radius: 2px;
+ span {
+ color: #fff;
+ }
+ }
+ .no-error {
+ width: fit-content;
+ background: #2d52d7;
+ padding: 1px 5px;
+ border-radius: 2px;
+ span {
+ color: #fff;
+ }
}
}
.tag-info {
@@ -1258,11 +1302,11 @@
font-size: 20px;
right: 10px;
bottom: 10px;
- i{
- color: #C7D0E5;
+ i {
+ color: #c7d0e5;
}
.follow {
- color: #F90741;
+ color: #f90741;
}
}
}
@@ -1288,12 +1332,15 @@
padding: 10px 0 20px;
}
}
+
.el-dialog__wrapper {
top: -22px;
}
.dialog-video {
.el-dialog {
- width: 1180px;
+ width: 1340px;
+ top: 70px;
+ transform: none;
}
.el-dialog__body {
background: #eaeaea;
@@ -1301,7 +1348,7 @@
height: inherit;
}
.el-dialog__header {
- padding: 3px;
+ padding: 0px;
.el-dialog__headerbtn {
top: 6px;
}
@@ -1322,11 +1369,29 @@
}
}
.title {
- font-size: 15px;
+ font-size: 16px;
+ height: 40px;
+ line-height: 40px;
+ background: #2d52d7;
+
+ span {
+ line-height: 40px;
+ color: #fcfcfc;
+ }
+
+ img {
+ width: 20px;
+ vertical-align: middle;
+ margin-right: 10px;
+ }
+ }
+ .el-dialog__close::before {
+ color: #fff;
}
}
.dialog-event {
z-index: 2096 !important;
+
.el-dialog {
width: 1000px;
height: 800px;
@@ -1334,6 +1399,39 @@
.el-dialog__body {
padding: 0;
}
+ .el-dialog__header {
+ padding: 0px;
+ .el-dialog__headerbtn {
+ top: 6px;
+ }
+ }
+ .title {
+ font-size: 16px;
+ height: 40px;
+ line-height: 40px;
+ background: #2d52d7;
+
+ span {
+ line-height: 40px;
+ color: #fcfcfc;
+ }
+
+ img {
+ width: 20px;
+ vertical-align: middle;
+ margin-right: 10px;
+ }
+ }
+ .el-dialog__close::before {
+ color: #fff;
+ &:hover {
+ color: #fff;
+ }
+ }
+
+ .more-videos .top .title {
+ background-color: #fff;
+ }
}
}
}
--
Gitblit v1.8.0