From e01873ebcc69acc322c1432a10ed18c570441841 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 23 三月 2022 23:26:17 +0800
Subject: [PATCH] 修复检索视频选择下一个,播放器未重新加载的问题
---
src/pages/search/index/Searching.vue | 546 +++++++++++++++++++++++-------------------------------
src/components/wasmPlayer/index.vue | 14 +
2 files changed, 249 insertions(+), 311 deletions(-)
diff --git a/src/components/wasmPlayer/index.vue b/src/components/wasmPlayer/index.vue
index 43aca2c..8ff8d75 100644
--- a/src/components/wasmPlayer/index.vue
+++ b/src/components/wasmPlayer/index.vue
@@ -175,6 +175,17 @@
this.playVideo()
})
}
+ },
+ videoUrl: function(newVal, oldVal) {
+ if (newVal !== oldVal) {
+ if (this.player) {
+ this.player.stop()
+ }
+ this.$nextTick(() => {
+ this.player.preloadFlag = 0
+ this.playVideo()
+ })
+ }
}
},
mounted() {
@@ -406,7 +417,8 @@
},
setPlayerStatus(stat) {
this.videoLoading = false
- this.playerStatus = 1
+ // 鎺у埗鍔犺浇鍚庣殑鎾斁鎸夐挳鐘舵�侊紝瀹炴椂娴佷负鑷姩鎾斁锛岃棰戜负preload
+ this.playerStatus = this.isStream ? 1 : 0
},
stopVideo() {
if (this.player.hPlayer == 0) return
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 12de1ad..7a95b12 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -2,28 +2,17 @@
<div class="searching-box">
<div class="searching-right">
<div class="searching-right-nav">
- <el-breadcrumb
- separator-class="el-icon-arrow-right"
- style="display: inline-block"
- >
+ <el-breadcrumb separator-class="el-icon-arrow-right" style="display: inline-block">
<el-breadcrumb-item>
<span @click="uploadChange">妫�绱�</span>
</el-breadcrumb-item>
- <el-breadcrumb-item v-if="!VideoPhotoData.uploadType"
- >鍏ㄩ儴</el-breadcrumb-item
- >
- <el-breadcrumb-item v-if="VideoPhotoData.uploadType"
- >浠ュ浘鎼滃浘</el-breadcrumb-item
- >
+ <el-breadcrumb-item v-if="!VideoPhotoData.uploadType">鍏ㄩ儴</el-breadcrumb-item>
+ <el-breadcrumb-item v-if="VideoPhotoData.uploadType">浠ュ浘鎼滃浘</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="searching-right-content">
<div class="top">
- <el-tooltip
- content="浠ュ浘鎼滃浘"
- placement="bottom"
- popper-class="atooltip"
- >
+ <el-tooltip content="浠ュ浘鎼滃浘" placement="bottom" popper-class="atooltip">
<el-button
@click="showUpload"
type="primary"
@@ -134,9 +123,7 @@
v-model="VideoPhotoData.inputValue"
size="mini"
></el-input>
- <el-button type="primary" size="mini" @click="searchingBtn"
- >鎼滅储</el-button
- >
+ <el-button type="primary" size="mini" @click="searchingBtn">鎼滅储</el-button>
</p>
<p class="p-clear">
<b class="clear-searching" @click="clearSearch">閲嶇疆</b>
@@ -150,24 +137,16 @@
id="searchMid"
class="mid"
:style="{
- width: VideoPhotoData.uploadDiaplay
- ? 'calc(100% - 315px)'
- : '100%',
+ width: VideoPhotoData.uploadDiaplay ? 'calc(100% - 315px)' : '100%'
}"
>
<div class="right-section" ref="scrollContain">
<Card
v-for="(item, index) in VideoPhotoData.cards"
- :class="
- item.activeObject.id === VideoPhotoData.activeCard
- ? 'my-active-card'
- : ''
- "
+ :class="item.activeObject.id === VideoPhotoData.activeCard ? 'my-active-card' : ''"
:key="index + 'u'"
:outHeight="'162px'"
- :outWidth="
- VideoPhotoData.uploadDiaplay ? searchImgCardWidth : cardWidth
- "
+ :outWidth="VideoPhotoData.uploadDiaplay ? searchImgCardWidth : cardWidth"
:data="item"
:searchTime="searchTimeFormated"
:showType="showType"
@@ -218,21 +197,11 @@
<p>榛戝悕鍗� ></p>
</div>
<div class="baseList">
- <el-checkbox-group
- v-model="VideoPhotoData.selectBlacks"
- @change="blackAngWhite"
- >
- <div
- class="base"
- v-for="(item, index) in VideoPhotoData.blackList"
- :key="index"
- >
- <el-checkbox
- :label="item.value"
- :title="item.title"
- :disabled="item.disabled"
- >{{ item.title }}</el-checkbox
- >
+ <el-checkbox-group v-model="VideoPhotoData.selectBlacks" @change="blackAngWhite">
+ <div class="base" v-for="(item, index) in VideoPhotoData.blackList" :key="index">
+ <el-checkbox :label="item.value" :title="item.title" :disabled="item.disabled">{{
+ item.title
+ }}</el-checkbox>
</div>
</el-checkbox-group>
</div>
@@ -242,32 +211,18 @@
<p>鐧藉悕鍗� ></p>
</div>
<div class="baseList">
- <el-checkbox-group
- v-model="VideoPhotoData.selectWhites"
- @change="blackAngWhite"
- >
- <div
- class="base"
- v-for="(item, index) in VideoPhotoData.whiteList"
- :key="index"
- >
- <el-checkbox
- :label="item.value"
- :title="item.title"
- :disabled="item.disabled"
- >{{ item.title }}</el-checkbox
- >
+ <el-checkbox-group v-model="VideoPhotoData.selectWhites" @change="blackAngWhite">
+ <div class="base" v-for="(item, index) in VideoPhotoData.whiteList" :key="index">
+ <el-checkbox :label="item.value" :title="item.title" :disabled="item.disabled">{{
+ item.title
+ }}</el-checkbox>
</div>
</el-checkbox-group>
</div>
</div>
<div class="buttons">
- <el-button type="primary" @click="saveAddBase(item, index)"
- >淇濆瓨</el-button
- >
- <el-button type="default" @click="closeWindow(index)"
- >鍙栨秷</el-button
- >
+ <el-button type="primary" @click="saveAddBase(item, index)">淇濆瓨</el-button>
+ <el-button type="default" @click="closeWindow(index)">鍙栨秷</el-button>
</div>
</div>
</hsc-window>
@@ -276,14 +231,14 @@
</template>
<script>
-import Card from "@/components/subComponents/Card";
-import UploadImg from "@/components/searching/UploadImg";
-import bus from "./main";
-import { getUrlKey } from "@/api/utils";
+import Card from "@/components/subComponents/Card"
+import UploadImg from "@/components/searching/UploadImg"
+import bus from "./main"
+import { getUrlKey } from "@/api/utils"
export default {
components: {
Card,
- UploadImg,
+ UploadImg
},
data() {
return {
@@ -298,112 +253,109 @@
tagValues: [],
alarmValues: [],
taskValues: [],
- searchTime: [
- this.$moment().format("YYYY-MM-DD 00:00:00"),
- this.$moment().format("YYYY-MM-DD HH:mm:ss"),
- ],
+ searchTime: [this.$moment().format("YYYY-MM-DD 00:00:00"), this.$moment().format("YYYY-MM-DD HH:mm:ss")],
searchText: "",
- currentPage: 1,
- };
+ currentPage: 1
+ }
},
computed: {
searchTimeFormated() {
- return this.format(this.searchTime);
- },
+ return this.format(this.searchTime)
+ }
},
created() {
- this.TreeDataPool.readonly = true;
- this.TreeDataPool.gbReadonly = true;
- this.TreeDataPool.multiple = true;
- this.TreeDataPool.clean();
- this.TreeDataPool.fetchTreeData();
+ this.TreeDataPool.readonly = true
+ this.TreeDataPool.gbReadonly = true
+ this.TreeDataPool.multiple = true
+ this.TreeDataPool.clean()
+ this.TreeDataPool.fetchTreeData()
},
mounted() {
this.$nextTick(() => {
- let scrollContain = this.$refs.scrollContain;
- this.VideoPhotoData.scrollContainDom = scrollContain;
- let list = this.TreeDataPool.localVedioList.filter((i) => {
- return i.progress == 100;
- });
- this.TreeDataPool.localVedioList = list;
- });
- window.addEventListener("resize", this.getHeight);
- this.getCenter();
- this.getHeight();
- this.blackAngWhite();
+ let scrollContain = this.$refs.scrollContain
+ this.VideoPhotoData.scrollContainDom = scrollContain
+ // let list = this.TreeDataPool.localVedioList.filter((i) => {
+ // return i.progress == 100
+ // })
+ // this.TreeDataPool.localVedioList = list
+ })
+ window.addEventListener("resize", this.getHeight)
+ this.getCenter()
+ this.getHeight()
+ this.blackAngWhite()
// 瑙嗛鐩戞帶浠诲姟璺宠浆 灞忚斀 20200730
// if (this.$route.query.from === "video") {
// this.VideoPhotoData.queryTasks = this.taskValues = [
// this.VideoTaskData.tasks[this.VideoTaskData.activeIndex].taskId
// ];
// }
- let start = getUrlKey("start");
- let end = getUrlKey("end");
+ let start = getUrlKey("start")
+ let end = getUrlKey("end")
if (start && end) {
- this.searchTime = [start, end];
- this.VideoPhotoData.searchTime = [start, end];
+ this.searchTime = [start, end]
+ this.VideoPhotoData.searchTime = [start, end]
} else {
- this.searchTime = this.getDateInit();
- this.VideoPhotoData.searchTime = this.getDateInit();
+ this.searchTime = this.getDateInit()
+ this.VideoPhotoData.searchTime = this.getDateInit()
}
// 鏆傛椂鍏抽棴璺宠浆 20200730
// if (this.$route.query.showType === "findByPic") {
if (getUrlKey("showType")) {
- this.VideoPhotoData.uploadDiaplay = true;
- this.VideoPhotoData.picUrl = getUrlKey("picSmUrl");
- this.VideoPhotoData.uploadImg = getUrlKey("picSmUrl");
- this.VideoPhotoData.uploadType = true;
- this.VideoPhotoData.compTargetId = getUrlKey("targetId");
- this.VideoPhotoData.compTargetType = getUrlKey("compType");
- this.VideoPhotoData.size = 30;
- this.VideoPhotoData.compareTabs = ["esData"];
- this.VideoPhotoData.findPerson2(); // 鏌ユ壘姝や汉
+ this.VideoPhotoData.uploadDiaplay = true
+ this.VideoPhotoData.picUrl = getUrlKey("picSmUrl")
+ this.VideoPhotoData.uploadImg = getUrlKey("picSmUrl")
+ this.VideoPhotoData.uploadType = true
+ this.VideoPhotoData.compTargetId = getUrlKey("targetId")
+ this.VideoPhotoData.compTargetType = getUrlKey("compType")
+ this.VideoPhotoData.size = 30
+ this.VideoPhotoData.compareTabs = ["esData"]
+ this.VideoPhotoData.findPerson2() // 鏌ユ壘姝や汉
} else {
- this.searchTime = this.getDateInit();
- this.VideoPhotoData.searchTime = this.getDateInit();
+ this.searchTime = this.getDateInit()
+ this.VideoPhotoData.searchTime = this.getDateInit()
// this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
}
- this.VideoPhotoData.queryTagList();
- this.VideoPhotoData.queryTaskList();
- this.VideoPhotoData.queryDictionary();
+ this.VideoPhotoData.queryTagList()
+ this.VideoPhotoData.queryTaskList()
+ this.VideoPhotoData.queryDictionary()
this.$nextTick(() => {
bus.$on("changePage", (page) => {
- this.currentPage = page;
- this.VideoPhotoData.page = page;
- });
- });
+ this.currentPage = page
+ this.VideoPhotoData.page = page
+ })
+ })
},
destroyed() {
- window.removeEventListener("resize", this.getHeight);
- this.CardList.details = [];
+ window.removeEventListener("resize", this.getHeight)
+ this.CardList.details = []
// this.TreeDataPool.treeActiveName = "camera";
- this.VideoPhotoData.queryAlarmlevel = [];
- this.VideoPhotoData.inputValue = "";
- this.VideoPhotoData.queryTabs = [];
- this.VideoPhotoData.queryTasks = [];
- this.VideoPhotoData.treeNodes = [];
+ this.VideoPhotoData.queryAlarmlevel = []
+ this.VideoPhotoData.inputValue = ""
+ this.VideoPhotoData.queryTabs = []
+ this.VideoPhotoData.queryTasks = []
+ this.VideoPhotoData.treeNodes = []
- this.CardList.addBaseList = [];
- this.VideoPhotoData.selectBlacks = [];
- this.VideoPhotoData.selectWhites = [];
+ this.CardList.addBaseList = []
+ this.VideoPhotoData.selectBlacks = []
+ this.VideoPhotoData.selectWhites = []
},
watch: {
"TreeDataPool.treeActiveName"(n, o) {
if (n && n == "camera") {
- this.VideoPhotoData.treeNodes = [];
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.VideoPhotoData.treeNodes = []
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
}
},
"TreeDataPool.showTreeBox"(value) {
- this.getHeight();
+ this.getHeight()
if (this.VideoPhotoData.realSmallPath.length > 0) {
- this.VideoPhotoData.findPersonByPage();
+ this.VideoPhotoData.findPersonByPage()
} else {
// this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
}
},
// "TreeDataPool.selectedNodes": function(newValue,oldValue) {
@@ -413,216 +365,199 @@
// }
// },
"TreeDataPool.selectedNodes": {
- handler: function (newVal, oldVal) {
+ handler: function(newVal, oldVal) {
if (newVal !== oldVal) {
- this.VideoPhotoData.treeNodes = newVal;
+ this.VideoPhotoData.treeNodes = newVal
if (this.VideoPhotoData.uploadType) {
- this.VideoPhotoData.findPersonByPage();
+ this.VideoPhotoData.findPersonByPage()
} else {
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
}
}
},
- deep: true, //娣卞害鐩戝惉
+ deep: true //娣卞害鐩戝惉
},
"DataStackPool.selectedDir": {
handler(nodes, oldNodes) {
if (nodes !== oldNodes && nodes.id != "") {
// this.VideoPhotoData.treeNodes = nodes.map(i=>{return i.id});
- this.VideoPhotoData.treeNodes = [nodes.id];
+ this.VideoPhotoData.treeNodes = [nodes.id]
if (this.VideoPhotoData.uploadType) {
- this.VideoPhotoData.findPersonByPage();
+ this.VideoPhotoData.findPersonByPage()
} else {
// this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
}
}
},
- deep: true,
+ deep: true
},
- "VideoPhotoData.activeCard": function (value) {
- let card =
- this.$refs.scrollContain.getElementsByClassName("my-active-card");
- console.log(1);
- console.log(card);
+ "VideoPhotoData.activeCard": function(value) {
+ let card = this.$refs.scrollContain.getElementsByClassName("my-active-card")
if (card.length > 0) {
- let cardHeight = card[0].clientHeight;
- let cardTop = card[0].offsetTop;
- let scrollTop = this.$refs.scrollContain.scrollTop;
- let divHeight = this.$refs.scrollContain.clientHeight;
- console.log(2);
- console.log(cardHeight);
- console.log(cardTop);
- console.log(scrollTop);
- console.log(divHeight);
- if (
- cardTop - cardHeight - scrollTop > divHeight ||
- cardTop - cardHeight - scrollTop < 0
- )
- this.$refs.scrollContain.scrollTo(0, cardTop - cardHeight);
+ let cardHeight = card[0].clientHeight
+ let cardTop = card[0].offsetTop
+ let scrollTop = this.$refs.scrollContain.scrollTop
+ let divHeight = this.$refs.scrollContain.clientHeight
+ if (cardTop - cardHeight - scrollTop > divHeight || cardTop - cardHeight - scrollTop < 0)
+ this.$refs.scrollContain.scrollTo(0, cardTop - cardHeight)
}
},
- "VideoPhotoData.uploadType": function (value) {
+ "VideoPhotoData.uploadType": function(value) {
if (value) {
- this.typeDisable = true;
- this.disabled = true;
+ this.typeDisable = true
+ this.disabled = true
} else {
- this.typeDisable = false;
- this.VideoPhotoData.querySearchList();
+ this.typeDisable = false
+ this.VideoPhotoData.querySearchList()
}
},
- "VideoPhotoData.selectBlacks": function (value) {
- this.blackAngWhite();
+ "VideoPhotoData.selectBlacks": function(value) {
+ this.blackAngWhite()
},
- "VideoPhotoData.selectWhites": function (value) {
- this.blackAngWhite();
+ "VideoPhotoData.selectWhites": function(value) {
+ this.blackAngWhite()
},
- "VideoPhotoData.uploadDiaplay": function (value) {
- this.getHeight();
+ "VideoPhotoData.uploadDiaplay": function(value) {
+ this.getHeight()
if (value) {
if (!this.VideoPhotoData.uploadType) {
- let scrollContain = this.$refs.scrollContain;
- this.VideoPhotoData.scrollContainDom = scrollContain;
- this.VideoPhotoData.showType = "search";
+ let scrollContain = this.$refs.scrollContain
+ this.VideoPhotoData.scrollContainDom = scrollContain
+ this.VideoPhotoData.showType = "search"
// this.VideoPhotoData.querySearchList();
//this.setLoadSearch(this.VideoPhotoData.querySearchList());
- this.isDisabled = false;
+ this.isDisabled = false
} else {
//this.VideoPhotoData.scrollContainDom = '';
- this.VideoPhotoData.showType = "findByPic";
+ this.VideoPhotoData.showType = "findByPic"
}
} else {
- this.VideoPhotoData.uploadType = false;
- this.VideoPhotoData.showType = "search";
+ this.VideoPhotoData.uploadType = false
+ this.VideoPhotoData.showType = "search"
}
- },
+ }
},
methods: {
isShowUpload() {
- this.getHeight();
+ this.getHeight()
if (this.VideoPhotoData.uploadDiaplay) {
if (!this.VideoPhotoData.uploadType) {
- let scrollContain = this.$refs.scrollContain;
- this.VideoPhotoData.scrollContainDom = scrollContain;
- this.VideoPhotoData.showType = "search";
+ let scrollContain = this.$refs.scrollContain
+ this.VideoPhotoData.scrollContainDom = scrollContain
+ this.VideoPhotoData.showType = "search"
// this.VideoPhotoData.querySearchList();
//this.setLoadSearch(this.VideoPhotoData.querySearchList());
- this.isDisabled = false;
+ this.isDisabled = false
} else {
//this.VideoPhotoData.scrollContainDom = '';
- this.VideoPhotoData.showType = "findByPic";
+ this.VideoPhotoData.showType = "findByPic"
}
} else {
- this.VideoPhotoData.uploadType = false;
- this.VideoPhotoData.showType = "search";
+ this.VideoPhotoData.uploadType = false
+ this.VideoPhotoData.showType = "search"
}
},
resizeWidth(w) {
- this.defaultWidth = w;
+ this.defaultWidth = w
},
resizeHeight(h) {
- this.defaultHeight = h;
+ this.defaultHeight = h
},
getHeight() {
- let w = this.$refs.mid.offsetWidth;
- let integer = parseInt(w / 330);
- let integerSearchImg = parseInt((w - 300) / 325);
+ let w = this.$refs.mid.offsetWidth
+ let integer = parseInt(w / 330)
+ let integerSearchImg = parseInt((w - 300) / 325)
// 鍙栨秷size淇敼
// this.handleSizeChange(integer, integerSearchImg);
- this.cardWidth = `calc(${100 / integer}% - 20px)`;
- this.searchImgCardWidth = `calc(${100 / integerSearchImg}% - 20px)`;
+ this.cardWidth = `calc(${100 / integer}% - 20px)`
+ this.searchImgCardWidth = `calc(${100 / integerSearchImg}% - 20px)`
},
uploadChange() {
- this.VideoPhotoData.uploadDiaplay = false;
- this.VideoPhotoData.clearStatus();
+ this.VideoPhotoData.uploadDiaplay = false
+ this.VideoPhotoData.clearStatus()
},
blackAngWhite() {
if (this.VideoPhotoData.selectBlacks.length > 0) {
for (let i = 0; i < this.VideoPhotoData.whiteList.length; i++) {
//this.VideoPhotoData.whiteList[i].disabled = true
- this.$set(this.VideoPhotoData.whiteList[i], "disabled", true);
+ this.$set(this.VideoPhotoData.whiteList[i], "disabled", true)
}
}
if (this.VideoPhotoData.selectBlacks.length == 0) {
for (let i = 0; i < this.VideoPhotoData.whiteList.length; i++) {
//this.VideoPhotoData.whiteList[i].disabled = false
- this.$set(this.VideoPhotoData.whiteList[i], "disabled", false);
+ this.$set(this.VideoPhotoData.whiteList[i], "disabled", false)
}
}
if (this.VideoPhotoData.selectWhites.length > 0) {
for (let i = 0; i < this.VideoPhotoData.blackList.length; i++) {
// this.VideoPhotoData.blackList[i].disabled = true
- this.$set(this.VideoPhotoData.blackList[i], "disabled", true);
+ this.$set(this.VideoPhotoData.blackList[i], "disabled", true)
}
}
if (this.VideoPhotoData.selectWhites.length == 0) {
for (let i = 0; i < this.VideoPhotoData.blackList.length; i++) {
//this.VideoPhotoData.blackList[i].disabled = false
- this.$set(this.VideoPhotoData.blackList[i], "disabled", false);
+ this.$set(this.VideoPhotoData.blackList[i], "disabled", false)
}
}
},
saveAddBase(item, index) {
- if (
- this.VideoPhotoData.selectBlacks.length === 0 &&
- this.VideoPhotoData.selectWhites.length === 0
- ) {
+ if (this.VideoPhotoData.selectBlacks.length === 0 && this.VideoPhotoData.selectWhites.length === 0) {
this.$notify({
title: "娉ㄦ剰",
message: "璇烽�夋嫨瑕佹坊鍔犵殑搴曞簱",
- type: "warning",
- });
- return;
+ type: "warning"
+ })
+ return
}
- let res = this.VideoPhotoData.addBase(item);
+ let res = this.VideoPhotoData.addBase(item)
res.then((data) => {
if (data.success) {
this.$notify({
title: "鎴愬姛",
message: data.data,
- type: "success",
- });
+ type: "success"
+ })
} else {
this.$notify({
title: "澶辫触",
message: data.data,
- type: "error",
- });
+ type: "error"
+ })
}
- this.CardList.addBaseList.splice(index, 1);
- this.VideoPhotoData.selectBlacks = [];
- this.VideoPhotoData.selectWhites = [];
- });
+ this.CardList.addBaseList.splice(index, 1)
+ this.VideoPhotoData.selectBlacks = []
+ this.VideoPhotoData.selectWhites = []
+ })
},
getDetails(ev, index) {
//let obj = this.CardList.datalist[index];
- this.CardList.datalist = this.VideoPhotoData.cards;
- let obj = this.CardList.datalist[index];
- this.CardList.details = Array.from(
- new Set([...this.CardList.details, ...[obj]])
- );
- console.log(this.CardList.details);
+ this.CardList.datalist = this.VideoPhotoData.cards
+ let obj = this.CardList.datalist[index]
+ this.CardList.details = Array.from(new Set([...this.CardList.details, ...[obj]]))
// this.CardList.details.push(obj);
- this.VideoPhotoData.activeCard = obj.activeObject.id;
+ this.VideoPhotoData.activeCard = obj.activeObject.id
},
toAdd(item) {
- this.CardList.addBaseList.push(item);
+ this.CardList.addBaseList.push(item)
},
handleClose(done) {
this.$confirm("纭鍏抽棴锛�")
.then((_) => {
- done();
+ done()
})
- .catch((_) => {});
+ .catch((_) => {})
},
showUpload() {
- this.VideoPhotoData.uploadDiaplay = !this.VideoPhotoData.uploadDiaplay;
+ this.VideoPhotoData.uploadDiaplay = !this.VideoPhotoData.uploadDiaplay
//鍒濆鍖栨暟鎹�
- this.VideoPhotoData.clearStatus();
- this.CardList.details = [];
+ this.VideoPhotoData.clearStatus()
+ this.CardList.details = []
// if (this.VideoPhotoData.uploadDiaplay) {
// }
@@ -630,162 +565,153 @@
},
getDateInit() {
// 瑕佹眰 榛樿涓�涓湀
- const end = new Date();
- const start = new Date();
- const nowDate = new Date();
- nowDate.setHours(0);
- nowDate.setMinutes(0);
- nowDate.setSeconds(0);
- nowDate.setMilliseconds(0);
- start.setTime(nowDate.getTime() - 3600 * 1000 * 24 * 30);
- end.setTime(nowDate.getTime() + 3600 * 1000 * 24 - 1);
- return [
- this.$moment(start).format("YYYY-MM-DD HH:mm:ss"),
- this.$moment(end).format("YYYY-MM-DD HH:mm:ss"),
- ];
+ const end = new Date()
+ const start = new Date()
+ const nowDate = new Date()
+ nowDate.setHours(0)
+ nowDate.setMinutes(0)
+ nowDate.setSeconds(0)
+ nowDate.setMilliseconds(0)
+ start.setTime(nowDate.getTime() - 3600 * 1000 * 24 * 30)
+ end.setTime(nowDate.getTime() + 3600 * 1000 * 24 - 1)
+ return [this.$moment(start).format("YYYY-MM-DD HH:mm:ss"), this.$moment(end).format("YYYY-MM-DD HH:mm:ss")]
},
format(array) {
return [
this.$moment(array[0]).format("YYYY-MM-DD HH:mm:ss"),
- this.$moment(array[1]).format("YYYY-MM-DD HH:mm:ss"),
- ];
+ this.$moment(array[1]).format("YYYY-MM-DD HH:mm:ss")
+ ]
},
searchingBtn() {
- // let obj = document.getElementById('searchMid');
- // let load = this.$loading({
- // target:obj,
- // })
- // load.close();
- // this.AuthData.loading = true
- this.VideoPhotoData.page = 1;
- this.VideoPhotoData.queryTabs = this.tagValues;
+ this.VideoPhotoData.page = 1
+ this.VideoPhotoData.queryTabs = this.tagValues
//澶勭悊鎼滅储绫诲瀷
- var tempArr = this.taskValues.map((task) => task.split(","));
- var tasks = [];
+ var tempArr = this.taskValues.map((task) => task.split(","))
+ var tasks = []
tempArr.forEach((arr) => {
- tasks = tasks.concat(arr);
- });
- this.VideoPhotoData.queryTasks = tasks;
+ tasks = tasks.concat(arr)
+ })
+ this.VideoPhotoData.queryTasks = tasks
- this.VideoPhotoData.queryAlarmlevel = this.stringToNum();
- this.VideoPhotoData.searchTime = this.format(this.searchTime);
+ this.VideoPhotoData.queryAlarmlevel = this.stringToNum()
+ this.VideoPhotoData.searchTime = this.format(this.searchTime)
//this.VideoPhotoData.inputValue = this.searchText;
- this.VideoPhotoData.showType = this.showType;
+ this.VideoPhotoData.showType = this.showType
if (!this.VideoPhotoData.uploadType) {
- this.VideoPhotoData.uploadDiaplay = false;
+ this.VideoPhotoData.uploadDiaplay = false
//this.VideoPhotoData.page = this.currentPage;
// this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
} else {
//this.VideoPhotoData.page = this.currentPage;
// this.VideoPhotoData.findPersonByPage();
- this.setLoadSearch(this.VideoPhotoData.findPersonByPage());
+ this.setLoadSearch(this.VideoPhotoData.findPersonByPage())
}
},
stringToNum() {
- var arr = [];
+ var arr = []
this.alarmValues.forEach((element) => {
if (element == "-1") {
- arr.push(-1);
+ arr.push(-1)
}
if (element == "1") {
- arr.push(1);
+ arr.push(1)
}
if (element == "2") {
- arr.push(2);
+ arr.push(2)
}
if (element == "3") {
- arr.push(3);
+ arr.push(3)
}
if (element == "4") {
- arr.push(4);
+ arr.push(4)
}
if (element == "5") {
- arr.push(5);
+ arr.push(5)
}
- });
- return arr;
+ })
+ return arr
},
changePages(page) {
- this.VideoPhotoData.page = page;
+ this.VideoPhotoData.page = page
if (!this.VideoPhotoData.uploadType) {
- this.VideoPhotoData.uploadDiaplay = false;
+ this.VideoPhotoData.uploadDiaplay = false
// this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
} else {
// this.VideoPhotoData.findPersonByPage();
- this.setLoadSearch(this.VideoPhotoData.findPersonByPage());
+ this.setLoadSearch(this.VideoPhotoData.findPersonByPage())
}
},
closeWindow(index) {
- this.CardList.addBaseList.splice(index, 1);
+ this.CardList.addBaseList.splice(index, 1)
},
handleSizeChange(integer, integerSearchImg) {
if (this.VideoPhotoData.uploadDiaplay) {
- this.VideoPhotoData.size = integerSearchImg * 10;
+ this.VideoPhotoData.size = integerSearchImg * 10
//this.VideoPhotoData.findPersonByPage();
} else {
- this.VideoPhotoData.size = integer * 10;
+ this.VideoPhotoData.size = integer * 10
//this.VideoPhotoData.querySearchList();
}
},
sizeChange(size) {
if (this.VideoPhotoData.uploadType) {
- this.VideoPhotoData.size = size;
- this.VideoPhotoData.findPersonByPage();
+ this.VideoPhotoData.size = size
+ this.VideoPhotoData.findPersonByPage()
} else {
- this.VideoPhotoData.uploadDiaplay = false;
- this.VideoPhotoData.size = size;
+ this.VideoPhotoData.uploadDiaplay = false
+ this.VideoPhotoData.size = size
// this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
}
},
clearSearch() {
- this.tagValues = [];
- this.taskValues = [];
- this.alarmValues = [];
- this.VideoPhotoData.queryTabs = [];
- this.VideoPhotoData.queryTasks = [];
- this.VideoPhotoData.queryAlarmlevel = [];
- this.VideoPhotoData.searchTime = this.getDateInit();
- this.VideoPhotoData.inputValue = "";
- this.searchTime = this.getDateInit();
+ this.tagValues = []
+ this.taskValues = []
+ this.alarmValues = []
+ this.VideoPhotoData.queryTabs = []
+ this.VideoPhotoData.queryTasks = []
+ this.VideoPhotoData.queryAlarmlevel = []
+ this.VideoPhotoData.searchTime = this.getDateInit()
+ this.VideoPhotoData.inputValue = ""
+ this.searchTime = this.getDateInit()
if (!this.VideoPhotoData.uploadType) {
// this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
} else {
// this.VideoPhotoData.findPersonByPage();
- this.setLoadSearch(this.VideoPhotoData.findPersonByPage());
+ this.setLoadSearch(this.VideoPhotoData.findPersonByPage())
}
},
disabled(data) {
- this.isDisabled = data;
+ this.isDisabled = data
},
getCenter() {
this.center = {
x: document.documentElement.clientWidth / 2 - 250,
- y: document.documentElement.clientHeight / 2 - 200,
- };
+ y: document.documentElement.clientHeight / 2 - 200
+ }
},
setLoadSearch(fn) {
- this.AuthData.setLoading("searchMid", this);
+ this.AuthData.setLoading("searchMid", this)
fn.then((_) => {
- this.AuthData.closeLoad();
- });
+ this.AuthData.closeLoad()
+ })
},
tagChange(obj) {
if (obj.length > 0) {
- this.showType = "compare";
+ this.showType = "compare"
} else {
- this.showType = "search";
+ this.showType = "search"
}
- this.VideoPhotoData.queryTabs = obj;
+ this.VideoPhotoData.queryTabs = obj
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
- },
- },
-};
+ this.setLoadSearch(this.VideoPhotoData.querySearchList())
+ }
+ }
+}
</script>
<style lang="scss">
--
Gitblit v1.8.0