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/search/index/Searching.vue | 538 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 358 insertions(+), 180 deletions(-)
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index abb77ac..5f7c7a7 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -2,41 +2,56 @@
<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>
+ <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"
icon="el-icon-camera-solid"
size="mini"
circle
- :style="VideoPhotoData.uploadDiaplay ? 'margin-right: 20px;' : 'margin-right: 20px;background-color:#cccccc;border-color:#cccccc'"
+ :style="
+ VideoPhotoData.uploadDiaplay
+ ? 'margin-right: 20px;'
+ : 'margin-right: 20px;background-color:#cccccc;border-color:#cccccc'
+ "
></el-button>
</el-tooltip>
- <p class="p-label" style="width:16%">
- <b>鏍囩锛�</b>
+ <p class="p-label" style="width: 13%">
+ <b>搴曞簱锛�</b>
<el-select
v-model="tagValues"
multiple
- @change="searchingBtn"
:disabled="isDisabled"
collapse-tags
size="mini"
- style="width:calc(100% - 40px);min-width: 120px;"
- placeholder="璇烽�夋嫨"
+ style="width: calc(100% - 40px); min-width: 70px"
+ @change="tagChange"
+ placeholder="閫夋嫨"
>
<el-option
v-for="item in VideoPhotoData.tabs"
- style="font-size:12px"
+ style="font-size: 12px"
:key="item.key"
:label="item.title"
:value="item.value"
@@ -44,7 +59,7 @@
></el-option>
</el-select>
</p>
- <p class="p-task" style="width:16%">
+ <p class="p-task" style="width: 13%">
<b>鍦烘櫙锛�</b>
<el-select
v-model="taskValues"
@@ -53,8 +68,8 @@
:disabled="typeDisable"
collapse-tags
size="mini"
- style="width:calc(100% - 40px);min-width: 120px;"
- placeholder="璇烽�夋嫨"
+ style="width: calc(100% - 40px); min-width: 70px"
+ placeholder="閫夋嫨"
>
<!-- <el-option
v-for="item in VideoPhotoData.tasks"
@@ -66,15 +81,31 @@
></el-option>-->
<el-option
v-for="item in VideoPhotoData.tasks"
- style="font-size:12px"
- :key="item.id+'x'"
+ style="font-size: 12px"
+ :key="item.id + 'x'"
:value="item.id"
- :label="item.isDelete ? item.name+'锛堝凡鍒犻櫎锛�' : item.name"
- :title="item.isDelete ? item.name+'锛堝凡鍒犻櫎锛�' : item.name"
+ :label="item.isDelete ? item.name + '锛堝凡鍒犻櫎锛�' : item.name"
+ :title="item.isDelete ? item.name + '锛堝凡鍒犻櫎锛�' : item.name"
></el-option>
</el-select>
</p>
- <p class="p-level" style="width:18%">
+
+ <p class="p-task" style="width: 12%">
+ <b>鍏虫敞锛�</b>
+ <el-select
+ v-model="collection"
+ @change="searchingBtn"
+ size="mini"
+ style="width: calc(100% - 40px); min-width: 70px"
+ placeholder="閫夋嫨"
+ >
+ <el-option value="" label="鍏ㄩ儴"></el-option>
+ <el-option value="1" label="宸插叧娉�"></el-option>
+ <el-option value="0" label="鏈叧娉�"></el-option>
+ </el-select>
+ </p>
+
+ <p class="p-level" style="width: 15%">
<b>浜嬩欢绛夌骇锛�</b>
<el-select
v-model="alarmValues"
@@ -83,8 +114,8 @@
:disabled="isDisabled"
collapse-tags
size="mini"
- style="width:calc(100% - 64px);min-width: 120px;"
- placeholder="璇烽�夋嫨"
+ style="width: calc(100% - 64px); min-width: 120px"
+ placeholder="閫夋嫨"
>
<el-option
v-for="item in VideoPhotoData.dictionary.ALARMLEVEL"
@@ -94,95 +125,181 @@
></el-option>
</el-select>
</p>
- <p class="p-date" style="width:19%;vertical-align: top;">
+ <p class="p-date" style="width: 19%; vertical-align: top">
<el-date-picker
size="mini"
v-model="searchTime"
- @change="searchingBtn"
+ @change="changeTime"
type="datetimerange"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00','23:59:59']"
- style="width:99%;min-width:200px"
+ :default-time="['00:00:00', '23:59:59']"
+ style="width: 99%; min-width: 200px"
></el-date-picker>
</p>
- <p class="p-input" style="width:19%">
+ <p class="p-input" style="width: 16%">
<el-input
- placeholder="璇疯緭鍏ュ唴瀹�"
+ placeholder="璇疯緭鍏�"
prefix-icon="el-icon-search"
- style="width: calc(100% - 75px);min-width:100px;margin-left:10px;margin-right: 10px;"
+ style="
+ width: calc(100% - 75px);
+ min-width: 85px;
+ margin-left: 10px;
+ margin-right: 10px;
+ "
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>
</p>
</div>
- <div ref="mid" style="height:100%;overflow-y:auto;">
-
- <div id="searchMid" class="mid">
- <div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
- <upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
- </div>
- <div
- class="right-section"
- ref="scrollContain"
- :style="VideoPhotoData.uploadDiaplay ? 'calc(100% - 315px)' : 'width:100%'"
- >
+ <div ref="mid" style="height: calc(100% - 50px)">
+ <div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
+ <upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
+ </div>
+ <div
+ id="searchMid"
+ class="mid"
+ :style="{
+ 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"
@detailsClick="getDetails($event, index)"
@addToBase="toAdd"
></Card>
- </div>
- <div class="foot">
- <el-pagination
- :current-page="VideoPhotoData.page"
- @current-change="changePages"
- @size-change="sizeChange"
- :page-sizes="VideoPhotoData.pageSizeOption"
- :page-size="VideoPhotoData.size"
- layout="total, sizes, prev, pager, next, jumper"
- :total="VideoPhotoData.total"
- ></el-pagination>
+ <div class="foot">
+ <el-pagination
+ :current-page="VideoPhotoData.page"
+ @current-change="changePages"
+ @size-change="sizeChange"
+ :page-sizes="VideoPhotoData.pageSizeOption"
+ :page-size="VideoPhotoData.size"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="VideoPhotoData.total"
+ ></el-pagination>
+ </div>
</div>
</div>
-
</div>
- <!-- <div class="foot">
- <el-pagination
- :current-page="VideoPhotoData.page"
- @current-change="changePages"
- @size-change="sizeChange"
- :page-sizes="VideoPhotoData.pageSizeOption"
- :page-size="VideoPhotoData.size"
- layout="total, sizes, prev, pager, next, jumper"
- :total="VideoPhotoData.total"
- ></el-pagination>
- </div> -->
</div>
</div>
-
+ <hsc-window-style-metal class="windown-model">
+ <hsc-window
+ v-for="(item, index) in CardList.addBaseList"
+ :closeButton="true"
+ @closebuttonclick="closeWindow(index)"
+ :key="index"
+ @update:height="resizeHeight"
+ @update:width="resizeWidth"
+ style="background: white; height: 475px"
+ :left="center.x + index * 10"
+ :top="center.y + index * 10"
+ :resizable="true"
+ positionHint="center"
+ :isScrollable="true"
+ :minWidth="662"
+ :minHeight="479"
+ :maxWidth="10000"
+ :maxHeight="7000"
+ :height="defaultHeight"
+ :width="defaultWidth"
+ >
+ <div class="addToBase">
+ <div class="topLabel">鍔犲叆搴曞簱</div>
+ <div class="items">
+ <div class="lable">
+ <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
+ >
+ </div>
+ </el-checkbox-group>
+ </div>
+ </div>
+ <div class="items">
+ <div class="lable">
+ <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
+ >
+ </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
+ >
+ </div>
+ </div>
+ </hsc-window>
+ </hsc-window-style-metal>
</div>
</template>
<script>
import Card from "@/components/subComponents/Card";
import UploadImg from "@/components/searching/UploadImg";
-//import CardWindow from "../components/cardWindow";
import bus from "./main";
+import { getUrlKey } from "@/api/utils";
export default {
components: {
Card,
- UploadImg
+ UploadImg,
},
data() {
return {
@@ -196,18 +313,21 @@
searchImgCardWidth: "",
tagValues: [],
alarmValues: [],
- dialogVisible: false,
taskValues: [],
+ collection: "",
searchTime: [
this.$moment().format("YYYY-MM-DD 00:00:00"),
- this.$moment().format("YYYY-MM-DD HH:mm:ss")
+ this.$moment().format("YYYY-MM-DD HH:mm:ss"),
],
searchText: "",
currentPage: 1,
-
};
},
-
+ computed: {
+ searchTimeFormated() {
+ return this.format(this.searchTime);
+ },
+ },
created() {
this.TreeDataPool.readonly = true;
this.TreeDataPool.gbReadonly = true;
@@ -217,13 +337,13 @@
},
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
- })
+ 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();
@@ -234,16 +354,28 @@
// this.VideoTaskData.tasks[this.VideoTaskData.activeIndex].taskId
// ];
// }
-
- this.searchTime = this.getDateInit();
- this.VideoPhotoData.searchTime = this.getDateInit();
+ let start = getUrlKey("start");
+ let end = getUrlKey("end");
+ if (start && end) {
+ this.searchTime = [start, end];
+ this.VideoPhotoData.searchTime = [start, end];
+ } else {
+ this.searchTime = this.getDateInit();
+ this.VideoPhotoData.searchTime = this.getDateInit();
+ }
// 鏆傛椂鍏抽棴璺宠浆 20200730
// if (this.$route.query.showType === "findByPic") {
- if (this.VideoPhotoData.uploadDiaplay) {
- // this.$nextTick(() => {
- // this.$refs.uploadImg.rightSectionDisplay = true;
- // });
+ 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(); // 鏌ユ壘姝や汉
} else {
this.searchTime = this.getDateInit();
this.VideoPhotoData.searchTime = this.getDateInit();
@@ -255,7 +387,7 @@
this.VideoPhotoData.queryTaskList();
this.VideoPhotoData.queryDictionary();
this.$nextTick(() => {
- bus.$on("changePage", page => {
+ bus.$on("changePage", (page) => {
this.currentPage = page;
this.VideoPhotoData.page = page;
});
@@ -276,6 +408,15 @@
this.VideoPhotoData.selectWhites = [];
},
watch: {
+ "TreeDataPool.treeActiveName"(n, o) {
+ if (n && n == "camera") {
+ this.VideoPhotoData.dataSource = "camera";
+ this.VideoPhotoData.treeNodes = [];
+ this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ } else {
+ this.VideoPhotoData.dataSource = "stack";
+ }
+ },
"TreeDataPool.showTreeBox"(value) {
this.getHeight();
if (this.VideoPhotoData.realSmallPath.length > 0) {
@@ -288,7 +429,6 @@
// "TreeDataPool.selectedNodes": function(newValue,oldValue) {
// if (newValue !== oldValue) {
// this.VideoPhotoData.treeNodes = newValue;
- // console.log("鐩戝惉鏍戣妭鐐逛腑鐨勫埛鏂版柟娉�", newValue,oldValue);
// this.VideoPhotoData.querySearchList();
// }
// },
@@ -297,32 +437,32 @@
if (newVal !== oldVal) {
this.VideoPhotoData.treeNodes = newVal;
if (this.VideoPhotoData.uploadType) {
- this.VideoPhotoData.findPersonByPage()
+ this.VideoPhotoData.findPersonByPage();
} else {
- // this.VideoPhotoData.querySearchList();
this.setLoadSearch(this.VideoPhotoData.querySearchList());
}
}
},
- deep: true //娣卞害鐩戝惉
+ deep: true, //娣卞害鐩戝惉
},
"DataStackPool.selectedDir": {
handler(nodes, oldNodes) {
- if (nodes !== oldNodes) {
+ if (nodes !== oldNodes && nodes.id != "") {
// this.VideoPhotoData.treeNodes = nodes.map(i=>{return i.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());
}
}
},
- deep: true
+ deep: true,
},
"VideoPhotoData.activeCard": function (value) {
- let card = this.$refs.scrollContain.getElementsByClassName("my-active-card");
+ let card =
+ this.$refs.scrollContain.getElementsByClassName("my-active-card");
if (card.length > 0) {
let cardHeight = card[0].clientHeight;
@@ -337,40 +477,26 @@
}
},
"VideoPhotoData.uploadType": function (value) {
- console.log("椤甸潰妯″紡锛�", value)
if (value) {
this.typeDisable = true;
+ this.disabled = true;
} else {
this.typeDisable = false;
this.VideoPhotoData.querySearchList();
}
},
"VideoPhotoData.selectBlacks": function (value) {
- this.blackAngWhite()
+ this.blackAngWhite();
},
"VideoPhotoData.selectWhites": function (value) {
- this.blackAngWhite()
- },
- tagValues: function (newValue, oldValue) {
- if (newValue.length > 0) {
- this.showType = "compare";
- } else {
- this.showType = "search";
- }
- if (newValue.length !== oldValue.length) {
- console.log("tagValue涓殑鍒锋柊鏂规硶");
- // this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
- }
+ this.blackAngWhite();
},
"VideoPhotoData.uploadDiaplay": function (value) {
this.getHeight();
- console.log("upload鐨勫�兼槸锛�", value)
if (value) {
if (!this.VideoPhotoData.uploadType) {
- console.log("uploadDisplay涓殑鍒锋柊");
- let scrollContain = this.$refs.scrollContain
- this.VideoPhotoData.scrollContainDom = scrollContain
+ let scrollContain = this.$refs.scrollContain;
+ this.VideoPhotoData.scrollContainDom = scrollContain;
this.VideoPhotoData.showType = "search";
// this.VideoPhotoData.querySearchList();
//this.setLoadSearch(this.VideoPhotoData.querySearchList());
@@ -383,9 +509,28 @@
this.VideoPhotoData.uploadType = false;
this.VideoPhotoData.showType = "search";
}
- }
+ },
},
methods: {
+ isShowUpload() {
+ this.getHeight();
+ if (this.VideoPhotoData.uploadDiaplay) {
+ if (!this.VideoPhotoData.uploadType) {
+ let scrollContain = this.$refs.scrollContain;
+ this.VideoPhotoData.scrollContainDom = scrollContain;
+ this.VideoPhotoData.showType = "search";
+ // this.VideoPhotoData.querySearchList();
+ //this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.isDisabled = false;
+ } else {
+ //this.VideoPhotoData.scrollContainDom = '';
+ this.VideoPhotoData.showType = "findByPic";
+ }
+ } else {
+ this.VideoPhotoData.uploadType = false;
+ this.VideoPhotoData.showType = "search";
+ }
+ },
resizeWidth(w) {
this.defaultWidth = w;
},
@@ -396,71 +541,76 @@
let w = this.$refs.mid.offsetWidth;
let integer = parseInt(w / 330);
let integerSearchImg = parseInt((w - 300) / 325);
- this.handleSizeChange(integer, integerSearchImg);
+
+ // 鍙栨秷size淇敼
+ // this.handleSizeChange(integer, integerSearchImg);
+
this.cardWidth = `calc(${100 / integer}% - 20px)`;
this.searchImgCardWidth = `calc(${100 / integerSearchImg}% - 20px)`;
},
uploadChange() {
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.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.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)
- res.then(data => {
- console.log("then", data)
+ 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.VideoPhotoData.selectBlacks = [];
+ this.VideoPhotoData.selectWhites = [];
+ });
},
getDetails(ev, index) {
- debugger
//let obj = this.CardList.datalist[index];
this.CardList.datalist = this.VideoPhotoData.cards;
let obj = this.CardList.datalist[index];
@@ -471,14 +621,14 @@
this.VideoPhotoData.activeCard = obj.activeObject.id;
},
toAdd(item) {
- this.CardList.addBaseList.push(item)
+ this.CardList.addBaseList.push(item);
},
handleClose(done) {
- this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
+ this.$confirm("纭鍏抽棴锛�")
+ .then((_) => {
done();
})
- .catch(_ => { });
+ .catch((_) => {});
},
showUpload() {
this.VideoPhotoData.uploadDiaplay = !this.VideoPhotoData.uploadDiaplay;
@@ -503,31 +653,26 @@
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")
+ this.$moment(end).format("YYYY-MM-DD HH:mm:ss"),
];
},
format(array) {
+ if (array.length === 0) {
+ return [];
+ }
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');
- // console.log(obj,'target',document)
- // let load = this.$loading({
- // target:obj,
- // })
- // load.close();
- // console.log(load,'loading')
- // this.AuthData.loading = true
this.VideoPhotoData.page = 1;
this.VideoPhotoData.queryTabs = this.tagValues;
//澶勭悊鎼滅储绫诲瀷
- var tempArr = this.taskValues.map(task => task.split(','));
+ var tempArr = this.taskValues.map((task) => task.split(","));
var tasks = [];
- tempArr.forEach(arr => {
- tasks = tasks.concat(arr)
+ tempArr.forEach((arr) => {
+ tasks = tasks.concat(arr);
});
this.VideoPhotoData.queryTasks = tasks;
@@ -535,14 +680,13 @@
this.VideoPhotoData.searchTime = this.format(this.searchTime);
//this.VideoPhotoData.inputValue = this.searchText;
this.VideoPhotoData.showType = this.showType;
+ this.VideoPhotoData.collection = this.collection;
if (!this.VideoPhotoData.uploadType) {
- console.log("鏌ヨ鏂规硶");
this.VideoPhotoData.uploadDiaplay = false;
//this.VideoPhotoData.page = this.currentPage;
// this.VideoPhotoData.querySearchList();
this.setLoadSearch(this.VideoPhotoData.querySearchList());
} else {
- console.log("浠ュ浘鎼滃浘");
//this.VideoPhotoData.page = this.currentPage;
// this.VideoPhotoData.findPersonByPage();
this.setLoadSearch(this.VideoPhotoData.findPersonByPage());
@@ -550,7 +694,7 @@
},
stringToNum() {
var arr = [];
- this.alarmValues.forEach(element => {
+ this.alarmValues.forEach((element) => {
if (element == "-1") {
arr.push(-1);
}
@@ -570,13 +714,11 @@
arr.push(5);
}
});
- // console.log("杈撳嚭鐨勬暟缁勶細", arr);
return arr;
},
changePages(page) {
this.VideoPhotoData.page = page;
if (!this.VideoPhotoData.uploadType) {
- console.log("鍒嗛〉鏀瑰彉锛�")
this.VideoPhotoData.uploadDiaplay = false;
// this.VideoPhotoData.querySearchList();
this.setLoadSearch(this.VideoPhotoData.querySearchList());
@@ -609,14 +751,16 @@
}
},
clearSearch() {
- this.tagValues = []
- this.taskValues = []
- this.alarmValues = []
+ this.tagValues = [];
+ this.taskValues = [];
+ this.collection = "";
+ this.alarmValues = [];
this.VideoPhotoData.queryTabs = [];
this.VideoPhotoData.queryTasks = [];
this.VideoPhotoData.queryAlarmlevel = [];
this.VideoPhotoData.searchTime = this.getDateInit();
this.VideoPhotoData.inputValue = "";
+ this.VideoPhotoData.collection = "";
this.searchTime = this.getDateInit();
if (!this.VideoPhotoData.uploadType) {
// this.VideoPhotoData.querySearchList();
@@ -632,16 +776,34 @@
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);
- fn.then(_ => {
+ fn.then((_) => {
this.AuthData.closeLoad();
- })
- }
- }
+ });
+ },
+ tagChange(obj) {
+ if (obj.length > 0) {
+ this.showType = "compare";
+ } else {
+ this.showType = "search";
+ }
+
+ this.VideoPhotoData.queryTabs = obj;
+
+ this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ },
+ changeTime(val) {
+ if (!val) {
+ this.searchTime = [];
+ }
+
+ this.searchingBtn();
+ },
+ },
};
</script>
@@ -674,7 +836,7 @@
color: rgba(0, 0, 0, 0.78) !important;
}
.searching-right-content {
- height: calc(100% - 135px);
+ height: calc(100% - 80px);
width: 100%;
box-sizing: border-box;
.top {
@@ -713,7 +875,7 @@
.mid {
//width: 100%;
//height: 100%;
- padding: 10px;
+ padding: 5px;
overflow: auto;
position: relative;
.my-card {
@@ -726,8 +888,8 @@
overflow: hidden;
width: 100%;
height: 80px;
- line-height: 80px;
- padding-top: 24px;
+ //line-height: 80px;
+ padding-top: 20px;
padding-right: 24px;
box-sizing: border-box;
text-align: right;
@@ -747,9 +909,20 @@
white-space: nowrap;
text-overflow: ellipsis;
}
+.titlebar {
+ height: 10px !important;
+ background: #fff !important;
+ .button {
+ position: absolute;
+ font-size: 25px !important;
+ right: 10px;
+ top: 10px;
+ z-index: 3;
+ }
+}
.addToBase {
width: 98%;
- height: 450px;
+ height: 430px;
position: relative;
.topLabel {
margin-top: 20px;
@@ -816,7 +989,15 @@
}
</style>
<style lang="scss" scoped>
+.left-selection {
+ width: 300px;
+ height: 100%;
+ float: left;
+ margin-right: 15px;
+}
#searchMid {
+ height: 100%;
+ box-sizing: border-box;
.el-loading-mask {
.el-loading-spinner {
width: 100%;
@@ -826,16 +1007,13 @@
}
}
}
- .left-selection {
- width: 300px;
- height: 100%;
- float: left;
- margin-right: 15px;
- }
+
.right-section {
//width: calc(100% - 315px);
height: 100%;
- float: left;
+ padding-bottom: 20px;
+ box-sizing: border-box;
+ //float: left;
overflow: auto;
position: relative;
}
--
Gitblit v1.8.0