From 93a26507f76156fa65aead1515c430688c089e1d Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 22 二月 2021 15:49:01 +0800
Subject: [PATCH] 新版目录树样式调试及状态更新调试；朔黄批量导入列表调试；视频检索页面添加处理参数，添加标注接口添加参数；分页器展示优化，默认检索时间调整；转储设备接口调试
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 033f1e5..2d8b3dd 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -117,17 +117,17 @@
<div class="header-bar clearfix">
<div class="left">
<div>
- <el-select v-model="watch" size="mini">
+ <el-select v-model="IsFollow" size="mini" @change="filterSearchData">
<el-option value label="鍏ㄩ儴"></el-option>
- <el-option value="1" label="鏈叧娉�"></el-option>
- <el-option value="2" label="宸插叧娉�"></el-option>
+ <el-option :value="false" label="鏈叧娉�"></el-option>
+ <el-option :value="true" label="宸插叧娉�"></el-option>
</el-select>
</div>
<div>
- <el-select v-model="settle" size="mini">
+ <el-select v-model="IsOperate" size="mini" @change="filterSearchData">
<el-option value label="鍏ㄩ儴"></el-option>
- <el-option value="1" label="鏈鐞�"></el-option>
- <el-option value="2" label="宸插鐞�"></el-option>
+ <el-option value="0" label="鏈鐞�"></el-option>
+ <el-option value="1" label="宸插鐞�"></el-option>
</el-select>
</div>
</div>
@@ -169,8 +169,8 @@
</div>
</div>
<div class="mark-info">
- <div class="abnormal" v-if="data.IsUnusual==='1'">
- <span v-for="(mark,index) in data.marks" :key="index">{{mark}}</span>
+ <div class="abnormal" v-if="data.LableLst&&data.LableLst.length">
+ <span v-for="(label,index) in data.LableLst" :key="index">{{label.Desc}}</span>
</div>
<div v-else>
<span>鏃犲紓甯�</span>
@@ -187,6 +187,7 @@
</el-col>
</el-row>
<el-pagination
+ class="pagination-center"
background
@size-change="handleTabSizeChange"
@current-change="handleCurrentChange"
@@ -216,6 +217,7 @@
</el-table-column>
</el-table>
<el-pagination
+ class="pagination-center"
@size-change="handleTableSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="curTablePage"
@@ -229,7 +231,6 @@
class="dialog-video"
:visible="videoDialogVisible"
@close="videoDialogVisible=false"
- :append-to-body="false"
>
<div slot="title" class="title">
<div class="center">
@@ -237,7 +238,6 @@
<span>鎾斁瑙嗛</span>
</div>
</div>
-
<video-analyze :videoDetails="selectedVideo" />
</el-dialog>
</div>
@@ -255,9 +255,11 @@
},
data() {
return {
- CLIP: 'http://192.168.20.113/',
+ CLIP: 'http://',
keyword: '',
- searchTime: [this.$moment(new Date().getTime() - 3600 * 1000 * 24 * 5).format("YYYY-MM-DD HH:mm:ss"), this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss")],
+ IsFollow: '',
+ //searchTime: [this.$moment(new Date().getTime() - 3600 * 1000 * 24 * 5).format("YYYY-MM-DD HH:mm:ss"), this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss")],
+ searchTime: [new Date(2020,0,1,0,0,0),new Date(2020,11,31,23,59,59)],
curTabPage: 1,
curTablePage: 1,
tabPageSize: 8,
@@ -310,8 +312,8 @@
highLevelConfigs: [],
showAdvance: true,
fixedOneLineHeight: 40,
- watch: '',
settle: '',
+ IsOperate: '',
showType: 'menu',
tableData: [
{ name: 'SS4B115_06_B鑺備簩绔徃鏈哄_20201115_091500.mp4', size: '17.66M', updateTime: '2020-11-04 15:41', createTime: '2020-11-04 15:41' },
@@ -321,7 +323,6 @@
{ id: 'ss1', no: 'SS4B115', frequency: '8084', time: '2020-09-21 20:45:08', driver: '寮犱笁', marks: ['鏈懠鍞ゃ�佸懠鍞や笉鏍囧噯', '瀛︿範鍙告満鏈簲绛�'], markType: 1, tags: ['杩涘嚭绔�', '鍙告満绂诲矖'], follow: true },
{ id: 'ss2', no: 'SS4B115', frequency: '8084', time: '2020-09-21 20:45:08', driver: '寮犱笁', marks: [], markType: 0, tags: ['杩涘嚭绔�', '鍙告満绂诲矖'], follow: false }
],
-
videoDialogVisible: false,
hiddenDanger: 1,
labelDialogVisible: false,
@@ -341,7 +342,6 @@
},
methods: {
handleTabSizeChange(size) {
- debugger
this.tabPageSize = size;
this.filterSearchData()
},
@@ -355,13 +355,23 @@
//浜岀骇鏌ヨ
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],
EndDate: this.searchTime[1],
- PageIndex: this.showType == 'list' ? this.curTablePage : this.showType == 'list',
+ PageIndex: this.showType == 'list' ? this.curTablePage : this.curTabPage,
PageSize: this.showType == 'list' ? this.tablePageSize : this.tabPageSize,
- IsDetail: this.showType == 'list'
+ IsDetail: this.showType == 'list',
+ IsFollow: isFollow,
+ IsOperate: this.IsOperate
};
let filterQuerys = [];
this.checkedConfigs.forEach(config => {
@@ -395,7 +405,9 @@
EndDate: this.searchTime[1],
PageIndex: this.showType == 'list' ? this.curTablePage : this.showType == 'list',
PageSize: this.showType == 'list' ? this.tablePageSize : this.tabPageSize,
- IsDetail: this.showType == 'list'
+ IsDetail: this.showType == 'list',
+ IsFollow: this.IsFollow,
+ IsOperate: this.IsOperate,
};
this.optionalConfigs = [];
this.highLevelConfigs = [];
@@ -416,6 +428,12 @@
obj.id = config.Node[key]
return obj
});
+ // config.data = config.Node.map((item) => {
+ // let obj = {};
+ // obj.name = item[0];
+ // obj.id = item[1];
+ // return obj;
+ // });
config.id = config.ID;
config.title = config.NameZn;
config.data.forEach(item => {
@@ -464,6 +482,7 @@
let _this = this;
_this.selectedVideo = data;
_this.videoDialogVisible = true;
+
},
checkFollow() {
@@ -544,6 +563,9 @@
<style lang="scss">
.search-for-video-analyze {
padding: 20px 30px;
+ .flex-box {
+ display: flex;
+ }
.filter-area {
.input-area {
display: flex;
@@ -732,12 +754,22 @@
text-align: left;
border: 1px solid #dedede;
border-radius: 5px;
+ height: 350px;
.video-wrap {
- background: aliceblue;
border-radius: 3px;
+ width: 100%;
+ padding-top: 56.25%;
+ height: 0;
+ position: relative;
img {
+ position: absolute;
+ top: 0;
width: 100%;
- border-radius: 3px;
+ height: 100%;
+ object-fit: contain;
+ // width: 100%;
+ // max-height: 200px;
+ // border-radius: 3px;
}
}
.video-info {
@@ -790,10 +822,16 @@
cursor: pointer;
}
}
+ .pagination-center{
+ text-align: center;
+ margin: 10px auto;
+ }
}
.dialog-video {
+ z-index: 2096 !important;
.el-dialog {
width: 1180px;
+ height: 918px;
}
.el-dialog__body {
background: #f5f5f5;
--
Gitblit v1.8.0