From 3fc1d9ed6c937c1e8db7004f7102c7a157a2687a Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 12 十一月 2021 16:52:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/shuohuangMonitorAnalyze/components/configManage.vue | 13 +++-
src/pages/desktop/index/components/ToolsEntry.vue | 1
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 50 ++++++++++++++--
src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue | 74 ++++++++++++++++++++----
4 files changed, 114 insertions(+), 24 deletions(-)
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index 3fe47ce..a64f6bd 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -196,7 +196,6 @@
});
},
dockClick(dock) {
- debugger;
if (dock.type === "1") {
window.open(dock.url);
} else if (dock.type === "2" && !dock.isOpen) {
diff --git a/src/pages/shuohuangMonitorAnalyze/components/configManage.vue b/src/pages/shuohuangMonitorAnalyze/components/configManage.vue
index 1d4770f..eafc08a 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/configManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/configManage.vue
@@ -17,14 +17,21 @@
</div>
<div>
<label>瀛樺偍鏃堕棿</label>
- <el-select
+ <el-input-number
+ v-model="memoryTime" min="0"
+ size="small" style="max-width: 190px"
+ >
+
+
+ </el-input-number> 鍛�
+ <!-- <el-select
v-model="memoryTime"
size="small"
style="max-width: 190px"
>
<el-option value="week">涓�鍛�</el-option>
<el-option value="month">涓�涓湀</el-option>
- </el-select>
+ </el-select> -->
</div>
</div>
<div class="flex-box">
@@ -97,7 +104,7 @@
return {
activeNames: ["1", "2"],
memoryServe: false,
- memoryTime: "",
+ memoryTime: 1,
format: false,
autoRemove: true,
removeTime: "",
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 8d2a8a7..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>
@@ -712,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";
},
@@ -1160,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 {
@@ -1210,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;
diff --git a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
index 1db8536..f731374 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/videoAnalyze.vue
@@ -75,9 +75,25 @@
{{ item.text }}
</div>
<div
+ v-if="checkType === 1"
class="self-dot"
:class="
curVideo.IsOperate == '1' &&
+ item.state == 0 &&
+ !item.text.includes('鎵嬫瘮')
+ ? 'red'
+ : getColor(item.text)
+ "
+ :style="{
+ left: (item.offset / maxSecond) * 100 + '%',
+ }"
+ @click="dotJump(item.offset)"
+ ></div>
+ <div
+ v-if="checkType === 2 || checkType === 3"
+ class="self-dot"
+ :class="
+ curVideo.IsOperate == '11' &&
item.state == 0 &&
!item.text.includes('鎵嬫瘮')
? 'red'
@@ -291,7 +307,7 @@
>{{ item.text }}
</span>
- <span class="list-warn">鏈墜姣� </span>
+ <span class="list-warn" v-if="checkType === 1">鏈墜姣� </span>
</div>
</div>
</div>
@@ -445,6 +461,7 @@
},
data() {
return {
+ checkType: 1,
showHand: true,
guid: 1,
labelDialogVisible: false,
@@ -506,12 +523,12 @@
console.log(arr);
}, */
},
- mounted() {
+ async mounted() {
this.renderLabelOpts();
this.setGuid(1);
- this.getCurVideos(this.videoDetails);
+ await this.getCurVideos(this.videoDetails);
// this.getRelatedVideos(this.videoDetails);
},
@@ -702,6 +719,24 @@
sec = +arr[2];
_this.maxSecond = min * 60 + sec;
});
+
+ this.eventMarks.forEach((item) => {
+ if (
+ item.text.indexOf("鐜╂墜鏈�") > -1 ||
+ item.text.indexOf("瓒翠紡") > -1 ||
+ item.text.indexOf("浠板崸") > -1 ||
+ item.text.indexOf("浠板潗") > -1
+ ) {
+ this.checkType = 2;
+ } else if (
+ item.text.indexOf("鐬湜") > -1 ||
+ item.text.indexOf("浜烘暟鍙樺寲") > -1
+ ) {
+ this.checkType = 3;
+ } else {
+ this.checkType = 1;
+ }
+ });
});
},
renderLabelOpts() {
@@ -723,7 +758,8 @@
if (
text.indexOf("鐜╂墜鏈�") > -1 ||
text.indexOf("瓒翠紡") > -1 ||
- text.indexOf("浠板崸") > -1
+ text.indexOf("浠板崸") > -1 ||
+ text.indexOf("浠板潗") > -1
) {
return "red";
}
@@ -924,14 +960,28 @@
if (this.curVideo.IsOperate == 0) {
return [];
}
- return this.eventMarks.filter((x) => {
- return (
- (x.text.indexOf("杩涘嚭绔�") > -1 ||
- x.text.indexOf("杩囧垎鐩�") > -1 ||
- x.text.indexOf("淇″彿鏈�") > -1) &&
- x.state == 0
- );
- });
+
+ if (this.checkType === 1) {
+ return this.eventMarks.filter((x) => {
+ return (
+ (x.text.indexOf("杩涘嚭绔�") > -1 ||
+ x.text.indexOf("杩囧垎鐩�") > -1 ||
+ x.text.indexOf("淇″彿鏈�") > -1) &&
+ x.state == 0
+ );
+ });
+ } else if (this.checkType === 2) {
+ return this.eventMarks.filter((x) => {
+ return (
+ x.text.indexOf("鐜╂墜鏈�") > -1 ||
+ x.text.indexOf("瓒翠紡") > -1 ||
+ x.text.indexOf("浠板崸") > -1 ||
+ x.text.indexOf("浠板潗") > -1
+ );
+ });
+ }
+
+ return [];
},
marks_filter() {
if (this.showHand) {
--
Gitblit v1.8.0