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 | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 10c1de4..2d8b3dd 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -124,10 +124,10 @@
</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>
@@ -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"
@@ -256,7 +258,8 @@
CLIP: 'http://',
keyword: '',
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: [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,6 +313,7 @@
showAdvance: true,
fixedOneLineHeight: 40,
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' },
@@ -363,10 +367,11 @@
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',
- IsFollow: isFollow
+ IsFollow: isFollow,
+ IsOperate: this.IsOperate
};
let filterQuerys = [];
this.checkedConfigs.forEach(config => {
@@ -401,7 +406,8 @@
PageIndex: this.showType == 'list' ? this.curTablePage : this.showType == 'list',
PageSize: this.showType == 'list' ? this.tablePageSize : this.tabPageSize,
IsDetail: this.showType == 'list',
- IsFollow: this.IsFollow
+ IsFollow: this.IsFollow,
+ IsOperate: this.IsOperate,
};
this.optionalConfigs = [];
this.highLevelConfigs = [];
@@ -422,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 => {
@@ -744,11 +756,20 @@
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 {
@@ -801,6 +822,10 @@
cursor: pointer;
}
}
+ .pagination-center{
+ text-align: center;
+ margin: 10px auto;
+ }
}
.dialog-video {
z-index: 2096 !important;
--
Gitblit v1.8.0