From e37e45cfe1123928dba5d9c5a427b0ee497b7ad6 Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期二, 23 八月 2022 03:21:32 +0800 Subject: [PATCH] 修复算法配置的字段内容 --- src/views/search/Searching.vue | 814 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 471 insertions(+), 343 deletions(-) diff --git a/src/views/search/Searching.vue b/src/views/search/Searching.vue index a1fc267..048c982 100644 --- a/src/views/search/Searching.vue +++ b/src/views/search/Searching.vue @@ -1,29 +1,18 @@ <template> - <div class="searching-box"> + <div class="searching-box" @click="showDownBox = false"> <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" @@ -37,7 +26,7 @@ " ></el-button> </el-tooltip> - <p class="p-label" style="width: 16%"> + <!-- <p class="p-label" style="width: 16%"> <b>鏍囩锛�</b> <el-select v-model="tagValues" @@ -58,7 +47,7 @@ :title="item.title" ></el-option> </el-select> - </p> + </p> --> <p class="p-task" style="width: 16%"> <b>鍦烘櫙锛�</b> <el-select @@ -89,16 +78,16 @@ ></el-option> </el-select> </p> - <p class="p-level" style="width: 18%"> + <p class="p-level" style="width: 14%; margin-left: 10px"> <b>浜嬩欢绛夌骇锛�</b> - <!-- <el-select + <el-select v-model="alarmValues" multiple @change="searchingBtn" :disabled="isDisabled" collapse-tags size="mini" - style="width: calc(100% - 64px); min-width: 120px" + style="width: calc(100% - 90px); min-width: 120px" placeholder="璇烽�夋嫨" > <el-option @@ -107,9 +96,26 @@ :label="item.name" :value="item.value" ></el-option> - </el-select> --> + </el-select> </p> - <p class="p-date" style="width: 19%; vertical-align: top"> + <p class="p-level" style="width: 14%; margin-right: 20px"> + <b>鎺掓煡绫诲瀷锛�</b> + <el-select + v-model="warningFlag" + @change="searchingBtn" + size="mini" + style="width: calc(100% - 90px); min-width: 120px" + placeholder="璇烽�夋嫨" + > + <el-option + v-for="item in waningOptions" + :key="item.id" + :label="item.name" + :value="item.value" + ></el-option> + </el-select> + </p> + <p class="p-date" style="width: 22%; vertical-align: top"> <el-date-picker size="mini" v-model="searchTime" @@ -134,12 +140,39 @@ 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> + <!-- <el-tooltip + class="item" + effect="dark" + content="閰嶇疆瀛樺偍璺緞" + placement="bottom" + > + <span @click="showSetBox = true" class="iconfont setIcon" + ></span + > + </el-tooltip> --> + <p class="p-clear"> + <download-excel + class="export-excel-wrapper" + :data="VideoPhotoData.cards" + :fields="json_fields" + :name="'瑙嗛鍒嗘瀽鎶ヨ缁熻' + searchTimeFormated + '.xlsx'" + > + <!-- 涓婇潰鍙互鑷畾涔夎嚜宸辩殑鏍峰紡锛岃繕鍙互寮曠敤鍏朵粬缁勪欢button --> + <!-- <el-button type="primary" size="small">瀵煎嚭EXCEL</el-button> --> + <!-- <div class="btnArea"> + <div class="button light"> + <span class="iconfont"></span> + 瀵煎嚭鏁版嵁 + </div> + </div> --> + <b class="clear-searching"> <span class="iconfont"></span> 瀵煎嚭鏁版嵁</b> + </download-excel> </p> </div> <div ref="mid" style="height: calc(100% - 50px)"> @@ -150,24 +183,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 +243,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,49 +257,45 @@ <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">淇濆瓨</el-button> + <el-button type="default">鍙栨秷</el-button> </div> </div> </hsc-window> </hsc-window-style-metal> + <SetBox v-if="showSetBox" @close="showSetBox = false"></SetBox> </div> </template> <script> -import Card from "./components/Card"; -import UploadImg from "./components/UploadImg"; -import bus from "@/main"; -import { getUrlKey } from "@/api/utils.ts"; +import Card from "./components/Card" +import UploadImg from "./components/UploadImg" +import bus from "@/main" +import { getUrlKey } from "@/api/utils.ts" +import SetBox from "@/views/search/components/SetBox" +import { saveWarning } from "@/api/es" + export default { name: "RightSide", components: { Card, UploadImg, + SetBox + }, + computed: { + searchTimeFormated() { + return this.format(this.searchTime) + } }, data() { return { @@ -298,114 +309,190 @@ searchImgCardWidth: "", tagValues: [], alarmValues: [], + warningFlag: 0, taskValues: [], - searchTime: [ - this.$moment().format("YYYY-MM-DD 00:00:00"), - this.$moment().format("YYYY-MM-DD HH:mm:ss"), - ], + showDownBox: false, + searchTime: [this.$moment().format("YYYY-MM-DD 00:00:00"), this.$moment().format("YYYY-MM-DD HH:mm:ss")], searchText: "", currentPage: 1, - }; - }, - computed: { - searchTimeFormated() { - return this.format(this.searchTime); - }, + showSetBox: false, + json_fields: { + 閮ㄩ棬: { + field: "activeObject.cameraId", + //鑷畾涔夊洖璋冨嚱鏁� + callback: (value) => { + let org = "" + if (this.TreeDataPool.cameraParents.hasOwnProperty(value)) { + org = this.TreeDataPool.cameraParents[value] + } + return org + } + }, + // 鍛婅鏍囪: "", + // 鏁存敼鎻忚堪: "", + 鎽勫儚鏈篒D: "activeObject.cameraId", + 鎽勫儚鏈哄悕绉�: "activeObject.cameraName", + 鎽勫儚鏈哄湴鍧�: "activeObject.cameraAddr", + 鍦烘櫙ID: "activeObject.taskId", + 鍦烘櫙鍚嶇О: "activeObject.taskName", + 浜嬩欢绛夌骇: { + field: "activeObject.alarmRules", + //鑷畾涔夊洖璋冨嚱鏁� + callback: (value) => { + return value.length ? value[0].alarmLevel : "" + } + }, + 璁惧ID: "activeObject.analyServerId", + 璁惧IP: "activeObject.analyServerIp", + 璁惧鍚嶇О: "activeObject.analyServerName", + 鎶撴媿鏃堕棿: "activeObject.picDate", + 鏇存柊鏃堕棿: "activeObject.likeDate", + 鎶撴媿鍏ㄦ櫙鍥惧湴鍧�: "activeObject.picMaxUrl", + 褰曞儚鍦板潃: "activeObject.videoUrl", + 妫�娴嬪尯鍩焛d: { + field: "activeObject.targetInfo", + //鑷畾涔夊洖璋冨嚱鏁� + callback: (value) => { + return value.length ? value[0].areaId : "" + } + }, + 妫�娴嬪尯鍩熷悕绉�: { + field: "activeObject.targetInfo", + //鑷畾涔夊洖璋冨嚱鏁� + callback: (value) => { + return value.length ? value[0].areaName : "" + } + } + }, + waningOptions: [ + { + id: 0, + name: "鍏ㄩ儴", + value: 0 + }, + { + id: 1, + name: "璇姤", + value: 1 + }, + { + id: 2, + name: "宸叉暣鏀�", + value: 2 + }, + { + id: 3, + name: "鏈暣鏀�", + value: 3 + }, + { + id: 4, + name: "宸叉帓鏌�", + value: 4 + }, + { + id: 5, + name: "鏈帓鏌�", + value: 5 + } + ] + } }, created() { - this.VideoPhotoData.activeCard = ""; - this.TreeDataPool.readonly = true; - this.TreeDataPool.gbReadonly = true; - this.TreeDataPool.multiple = true; - this.TreeDataPool.clean(); - this.TreeDataPool.fetchTreeData(); + this.VideoPhotoData.activeCard = "" + this.TreeDataPool.readonly = true + this.TreeDataPool.gbReadonly = true + this.TreeDataPool.multiple = true + this.TreeDataPool.clean() }, 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 && + 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) { if (n && n == "camera") { - this.VideoPhotoData.treeNodes = []; - this.setLoadSearch(this.VideoPhotoData.querySearchList()); + this.VideoPhotoData.treeNodes = [] + this.setLoadSearch(this.VideoPhotoData.querySearchList()) } }, "TreeDataPool.showTreeBox"() { - 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) { @@ -415,206 +502,195 @@ // } // }, "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 () { - let card = - this.$refs.scrollContain.getElementsByClassName("my-active-card"); - console.log("------"); - console.log(card); + "VideoPhotoData.activeCard": function() { + 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 () { - this.blackAngWhite(); + "VideoPhotoData.selectBlacks": function() { + this.blackAngWhite() }, - "VideoPhotoData.selectWhites": function () { - this.blackAngWhite(); + "VideoPhotoData.selectWhites": function() { + 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 && - this.VideoPhotoData.selectBlacks.length > 0 - ) { + if (this.VideoPhotoData.selectBlacks && 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 && - this.VideoPhotoData.selectBlacks.length == 0 - ) { + if (this.VideoPhotoData.selectBlacks && 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 && - this.VideoPhotoData.selectWhites.length > 0 - ) { + if (this.VideoPhotoData.selectWhites && 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 && - this.VideoPhotoData.selectWhites.length == 0 - ) { + if (this.VideoPhotoData.selectWhites && 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) { + // 鏍囪宸叉帓鏌� + if (this.VideoPhotoData.cards[index].activeObject.warningFlag == 0) { + saveWarning({ + warningFlag: 4, + id: this.VideoPhotoData.cards[index].activeObject.id, + correctionDescription: "" + }).then((rsp) => { + if (rsp && rsp.success) { + this.VideoPhotoData.cards[index].activeObject.warningFlag = 4 + } + }) + } + //let obj = this.CardList.datalist[index]; - this.CardList.datalist = this.VideoPhotoData.cards; - let obj = this.CardList.datalist[index]; + this.CardList.datalist = this.VideoPhotoData.cards + let obj = this.CardList.datalist[index] /* try { this.CardList.details = Array.from( new Set([...this.CardList.details, ...[obj]]) @@ -622,27 +698,26 @@ } catch (error) { console.log(error); } */ - this.CardList.details = []; - this.CardList.details.push(obj); + this.CardList.details = [] + this.CardList.details.push(obj) // this.CardList.details.push(obj); - this.VideoPhotoData.activeCard = obj.activeObject.id; - console.log(this.VideoPhotoData.activeCard); + 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) { // } @@ -650,162 +725,164 @@ }, 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) { + if (!array || 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'); - // let load = this.$loading({ - // target:obj, - // }) - // load.close(); - // this.AuthData.loading = true - this.VideoPhotoData.page = 1; - this.VideoPhotoData.queryTabs = this.tagValues; + if (!this.searchTime) { + this.searchTime = [] + } + this.VideoPhotoData.page = 1 + this.VideoPhotoData.queryTabs = this.tagValues //澶勭悊鎼滅储绫诲瀷 - var tempArr = this.taskValues.map((task) => task.split(",")); - var tasks = []; - tempArr.forEach((arr) => { - tasks = tasks.concat(arr); - }); - this.VideoPhotoData.queryTasks = tasks; + var tempArr = this.taskValues.map((task) => task.split(",")) + var tasks = [] - this.VideoPhotoData.queryAlarmlevel = this.stringToNum(); - this.VideoPhotoData.searchTime = this.format(this.searchTime); + tempArr.forEach((arr) => { + tasks = tasks.concat(arr) + }) + this.VideoPhotoData.queryTasks = tasks + + this.VideoPhotoData.queryAlarmlevel = this.stringToNum() + + // 鏃堕棿鑼冨洿 + this.VideoPhotoData.searchTime = this.format(this.searchTime) + + // 鎺掓煡鐧昏 + this.VideoPhotoData.warningFlag = this.warningFlag + //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.page = this.currentPage; - // this.VideoPhotoData.querySearchList(); - this.setLoadSearch(this.VideoPhotoData.querySearchList()); + this.VideoPhotoData.uploadDiaplay = false + + 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"> @@ -864,6 +941,16 @@ b:hover { color: #2249b4; } + } + .p-input .el-button { + transform: translateY(-1px); + } + + .setIcon { + margin-left: 10px; + font-size: 18px; + color: #1677ff; + cursor: pointer; } .clear-searching { cursor: pointer; @@ -985,9 +1072,6 @@ bottom: 15px; } } -.search { - background-color: #eee; -} </style> <style lang="scss" scoped> .left-selection { @@ -1019,4 +1103,48 @@ position: relative; } } +.btnArea { + padding: 0 10px; + margin-right: 10px; + color: #0064ff; + background-color: #fff; + text-align: center; + line-height: 28px; + display: inline-block; + height: 28px; + border-radius: 5px; + cursor: pointer; + font-size: 12px; + border: 1px solid #0065ff; + + .light { + } + + .downBox { + top: 104px; + right: 255px; + position: absolute; + text-align: center; + background-color: #fff; + border-radius: 3px; + color: #3d3d3d; + width: 100px; + z-index: 10; + padding: 10px; + box-shadow: 0px 1px 10px 0px rgba(0, 0, 0, 0.05), 0px 4px 5px 0px rgba(0, 0, 0, 0.08), + 0px 2px 4px -1px rgba(0, 0, 0, 0.12); + + .downItem { + text-align: center; + height: 40px; + line-height: 40px; + font-size: 12px; + cursor: pointer; + + &:hover { + background-color: #f0f5fa; + } + } + } +} </style> -- Gitblit v1.8.0