From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 94 ++++++++++++++++++----------------------------
1 files changed, 37 insertions(+), 57 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 57ee9c1..06d8766 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -36,11 +36,6 @@
<span class="title">{{ config.title }}</span
> :
<span class="val" v-for="option in config.data" :key="option.id">
- <!-- <template>
- <div>
-
- </div>
- </template>-->
<span v-if="option.isChecked" class="val-show">
{{ option.name }}
<i>銆�</i>
@@ -167,8 +162,8 @@
@change="filterSearchData"
>
<el-option value label="鍏ㄩ儴"></el-option>
- <el-option :value="false" label="鏈叧娉�"></el-option>
- <el-option :value="true" label="宸插叧娉�"></el-option>
+ <el-option :value="'1'" label="鏈叧娉�"></el-option>
+ <el-option :value="'0'" label="宸插叧娉�"></el-option>
</el-select>
</div>
<div>
@@ -247,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>
@@ -315,10 +313,16 @@
<el-table-column label="澶у皬" prop="VideoSize" sortable>
<template slot-scope="scope" style="cursor: pointer">
- <div>{{ Math.round((+scope.row.VideoSize) / (1024*1024)) + " MB" }}</div>
+ <div>
+ {{ Math.round(+scope.row.VideoSize / (1024 * 1024)) + " MB" }}
+ </div>
</template>
</el-table-column>
- <el-table-column label="瑙嗛鏃堕棿" prop="StartTime" sortable></el-table-column>
+ <el-table-column
+ label="瑙嗛鏃堕棿"
+ prop="StartTime"
+ sortable
+ ></el-table-column>
<!-- <el-table-column label="鍒涘缓鏃ユ湡" prop="VideoCreateDate" sortable></el-table-column> -->
<el-table-column label="鎿嶄綔">
@@ -425,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,
@@ -474,7 +478,6 @@
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
- //start.setHours(0,0,0);
picker.$emit("pick", [start, end]);
},
},
@@ -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();
@@ -545,14 +556,6 @@
//浜岀骇鏌ヨ
filterSearchData() {
let _this = this;
- let isFollow = "";
- if (this.IsFollow === "") {
- isFollow = "";
- } else if (!!this.IsFollow) {
- isFollow = "1";
- } else {
- isFollow = "0";
- }
let query = {
KeyWord: this.keyword,
StartDate: this.searchTime[0],
@@ -562,7 +565,7 @@
PageSize:
this.showType == "list" ? this.tablePageSize : this.tabPageSize,
IsDetail: this.showType == "list",
- IsFollow: isFollow,
+ IsFollow: this.IsFollow ,
IsOperate: this.IsOperate,
};
let filterQuerys = [];
@@ -588,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);
});
});
@@ -599,11 +602,16 @@
item.LableLst = lblst;
return item;
});
+ _this.tabData
}
});
},
//涓�绾ф煡璇�
init() {
+ if (this.checkedConfigs.length) {
+ this.filterSearchData()
+ return
+ }
let _this = this;
let query = {
KeyWord: this.keyword,
@@ -617,7 +625,7 @@
IsFollow: this.IsFollow,
IsOperate: this.IsOperate,
};
- let filterQuerys = [];
+ let filterQuerys = [];
this.checkedConfigs.forEach((config) => {
let checkedOpts = config.data.filter((option) => option.isChecked);
if (checkedOpts.length) {
@@ -629,8 +637,8 @@
}
});
Object.assign(query, ...filterQuerys);
- // this.optionalConfigs = [];
- // this.highLevelConfigs = [];
+ this.optionalConfigs = [];
+ this.highLevelConfigs = [];
getlstInit(query).then((res) => {
if (_this.showType == "list") {
_this.tableTotal = res.total;
@@ -641,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);
});
});
@@ -653,15 +661,8 @@
return item;
});
}
-
res.filterlst.forEach((config) => {
this.$set(config, "isShow", true);
- // config.data = Object.keys(config.Node).map(key => {
- // let obj = {};
- // obj.name = key;
- // obj.id = config.Node[key]
- // return obj
- // });
config.data = config.Node.map((item) => {
let obj = {};
obj.name = item[0];
@@ -693,19 +694,18 @@
config.showMore = false;
}
});
- // console.log(this.optionalConfigs);
});
});
},
toggleFollow(data) {
data.IsFollow == "0" ? (data.IsFollow = "1") : (data.IsFollow = "0");
updateFollow({
- id : data.id,
+ id: data.id,
IsFollow: data.IsFollow,
}).then((res) => {
this.$notify({
type: "success",
- message: data.IsFollow == "0"? "宸叉坊鍔犲叧娉�!":"宸插彇娑堝叧娉�!",
+ message: data.IsFollow == "0" ? "宸叉坊鍔犲叧娉�!" : "宸插彇娑堝叧娉�!",
});
});
},
@@ -714,7 +714,6 @@
_this.selectedVideo = data;
_this.videoDialogVisible = true;
},
- checkFollow() {},
checkType(type) {
this.showType = type;
this.filterSearchData();
@@ -745,15 +744,11 @@
option.isChecked = true;
}
this.checkedConfigs.push(config);
-
config.isShow = false;
config.isMultCheck = false;
if (config.IsAdvanced) {
this.showAdvance = false;
}
- // this.$nextTick(() => {
- // this.$set(config, 'isShow', false)
- // })
},
cancleMultCheck(config) {
@@ -841,7 +836,7 @@
const disY = e.clientY - resizeEl.offsetTop;
document.onmousemove = function (e) {
- e.preventDefault(); // 绉诲姩鏃剁鐢ㄩ粯璁や簨浠� // 閫氳繃浜嬩欢濮旀墭锛岃绠楃Щ鍔ㄧ殑璺濈
+ e.preventDefault(); // 绉诲姩鏃剁鐢ㄩ粯璁や簨浠� 閫氳繃浜嬩欢濮旀墭锛岃绠楃Щ鍔ㄧ殑璺濈
const x = e.clientX - disX + (e.clientX - clientX); //杩欓噷 鐢变簬elementUI鐨刣ialog鎺у埗灞呬腑鐨勶紝鎵�浠ユ按骞虫媺浼告晥鏋滄槸鍙屽��
const y = e.clientY - disY; //姣旇緝鏄惁灏忎簬鏈�灏忓楂�
@@ -860,7 +855,6 @@
<style lang="scss">
.search-for-video-analyze {
- //padding: 20px 30px;
//鍑烘í鍚戞粴鍔ㄦ潯
padding: 20px 40px;
.flex-box {
@@ -992,8 +986,6 @@
}
.config-submenu {
.el-menu--horizontal {
- //max-width: 700px;
- //overflow-x: auto;
left: 20px !important;
& > ul {
flex-wrap: wrap;
@@ -1070,10 +1062,6 @@
margin: 0 -30px;
margin-bottom: -30px;
padding: 0;
- // .el-row {
- // display: flex;
- // flex-wrap: wrap;
- // }
.el-table__row {
cursor: pointer;
}
@@ -1107,9 +1095,6 @@
width: 100%;
height: 100%;
object-fit: contain;
- // width: 100%;
- // max-height: 200px;
- // border-radius: 3px;
}
}
.video-info {
@@ -1185,15 +1170,12 @@
top: -22px;
}
.dialog-video {
- // z-index: 2020 !important;
.el-dialog {
width: 1180px;
- // height: 893px;
}
.el-dialog__body {
background: #eaeaea;
padding: 0;
- // height: 100%;
height: inherit;
}
.el-dialog__header {
@@ -1237,8 +1219,6 @@
.window-view {
width: 100%;
height: auto;
- // height: 100%;
- // min-height: 684px;
overflow: auto;
z-index: 2000;
}
--
Gitblit v1.8.0