From e116bdd983b4a456c866119666e41bbaab4f7293 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期五, 15 七月 2022 16:42:08 +0800
Subject: [PATCH] 禅道bug
---
src/pages/search/index/Searching.vue | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index abcff6f..5f7c7a7 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -37,7 +37,7 @@
"
></el-button>
</el-tooltip>
- <p class="p-label" style="width: 16%">
+ <p class="p-label" style="width: 13%">
<b>搴曞簱锛�</b>
<el-select
v-model="tagValues"
@@ -45,9 +45,9 @@
: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"
@@ -59,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"
@@ -68,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"
@@ -89,7 +89,23 @@
></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"
@@ -99,7 +115,7 @@
collapse-tags
size="mini"
style="width: calc(100% - 64px); min-width: 120px"
- placeholder="璇烽�夋嫨"
+ placeholder="閫夋嫨"
>
<el-option
v-for="item in VideoPhotoData.dictionary.ALARMLEVEL"
@@ -121,13 +137,13 @@
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;
+ min-width: 85px;
margin-left: 10px;
margin-right: 10px;
"
@@ -298,6 +314,7 @@
tagValues: [],
alarmValues: [],
taskValues: [],
+ collection: "",
searchTime: [
this.$moment().format("YYYY-MM-DD 00:00:00"),
this.$moment().format("YYYY-MM-DD HH:mm:ss"),
@@ -401,7 +418,6 @@
}
},
"TreeDataPool.showTreeBox"(value) {
- console.log(2);
this.getHeight();
if (this.VideoPhotoData.realSmallPath.length > 0) {
this.VideoPhotoData.findPersonByPage();
@@ -418,8 +434,6 @@
// },
"TreeDataPool.selectedNodes": {
handler: function (newVal, oldVal) {
- console.log(3);
-
if (newVal !== oldVal) {
this.VideoPhotoData.treeNodes = newVal;
if (this.VideoPhotoData.uploadType) {
@@ -433,7 +447,6 @@
},
"DataStackPool.selectedDir": {
handler(nodes, oldNodes) {
- console.log(4);
if (nodes !== oldNodes && nodes.id != "") {
// this.VideoPhotoData.treeNodes = nodes.map(i=>{return i.id});
this.VideoPhotoData.treeNodes = [nodes.id];
@@ -667,6 +680,7 @@
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) {
this.VideoPhotoData.uploadDiaplay = false;
//this.VideoPhotoData.page = this.currentPage;
@@ -739,12 +753,14 @@
clearSearch() {
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();
--
Gitblit v1.8.0