From 253611a97ffccb446aad4958ca9343f11492f26b Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Wed, 7 Sep 2022 16:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=AE=A1=E7=90=86=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listenManage/listenConfig/index.vue       | 62 ++++++-------------
 .../listenManage/videoListen/index.vue        |  2 +-
 2 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/src/views/storeManage/listenManage/listenConfig/index.vue b/src/views/storeManage/listenManage/listenConfig/index.vue
index 4fdeee4..041c93f 100644
--- a/src/views/storeManage/listenManage/listenConfig/index.vue
+++ b/src/views/storeManage/listenManage/listenConfig/index.vue
@@ -6,37 +6,16 @@
       <el-select v-model="timeType" class="filter-item" style="width: 155px; height: 30px;margin:0 0 0 10px" @change="crud.toQuery">
         <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <el-input
-        v-model="keyWord"
-        size="small"
-        clearable
-        placeholder="请输入关键词"
-        style="width: 300px;margin-right:10px;padding-left:10px"
-        class="input-prepend filter-item"
-        @keyup.enter.native="crud.toQuery"
-      >
+      <el-input v-model="keyWord" size="small" placeholder="请输入关键词" style="width: 300px;margin-right:10px;padding-left:10px" class="input-prepend filter-item" @keyup.enter.native="crud.toQuery">
         <el-select slot="prepend" v-model="optionVal" style="width: 100px">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-input>
-      <date-range-picker v-model="queryTime" type="datetimerange" class="date-item" />
+      <date-range-picker v-model="queryTime" type="datetimerange" class="date-item el-date-range-picker" />
       <rrOperation />
     </div>
     <!-- :cell-class-name="cell" -->
-    <el-table
-      ref="table"
-      :data="crud.data"
-      style="width: 100%;"
-      height="calc(100vh - 356px)"
-      @row-click="clickRowHandler"
-      @row-dblclick="handleDbClick"
-      @selection-change="selectionChangeHandler"
-    >
+    <el-table ref="table" :data="crud.data" style="width: 100%;" height="calc(100vh - 356px)" @row-click="clickRowHandler" @row-dblclick="handleDbClick" @selection-change="selectionChangeHandler">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="100" align="center" />
       <el-table-column prop="storeroomName" label="所属区域" align="center" min-width="150" />
@@ -83,7 +62,7 @@ export default {
   cruds() {
     return CRUD({
       url: 'api/camera/list',
-      sort: ['createTime,asc']
+      sort: ['createTime,desc']
     })
   },
   data() {
@@ -92,12 +71,12 @@ export default {
       tableData: [],
       selections: [],
       keyWord: '',
-      timeType: 0,
+      timeType: '',
       timeOptions: [
-        { value: 0, label: '全部' },
-        { value: 10, label: '事件触发前后10秒' },
-        { value: 20, label: '事件触发前后20秒' },
-        { value: 30, label: '事件触发前后30秒' }
+        { value: '', label: '全部' },
+        { value: '10', label: '事件触发前后10秒' },
+        { value: '20', label: '事件触发前后20秒' },
+        { value: '30', label: '事件触发前后30秒' }
       ],
       optionVal: 1,
       options: [
@@ -114,13 +93,13 @@ export default {
     // 获取数据前的处理
     [CRUD.HOOK.beforeRefresh]() {
       // this.crud.downloadLoading = true
-      // this.crud.query.timeType = null
-      // this.crud.query.blurry = this.keyWord
-      // if (this.oprType > -1) {
-      //   this.crud.query.state = this.oprType
-      // }
-      // this.crud.downloadLoading = false
-      // this.crud.query.createTime =
+      this.crud.query.timeSize = this.timeType
+      this.crud.query.blurry = this.keyWord
+      if (this.queryTime) {
+        this.crud.query.createTime = this.queryTime
+      } else {
+        this.crud.query.createTime = null
+      }
     },
     // 绑定摄像头
     handleBind() {
@@ -153,12 +132,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~@/assets/styles/lend-manage.scss';
+@import "~@/assets/styles/lend-manage.scss";
 @import "~@/assets/styles/archives-manage.scss";
-.head-container{
-  .date-item{
+.head-container {
+  .date-item {
     width: 350px !important;
   }
 }
-
 </style>
diff --git a/src/views/storeManage/listenManage/videoListen/index.vue b/src/views/storeManage/listenManage/videoListen/index.vue
index 3098642..bc6904c 100644
--- a/src/views/storeManage/listenManage/videoListen/index.vue
+++ b/src/views/storeManage/listenManage/videoListen/index.vue
@@ -4,7 +4,7 @@
       <el-select v-model="optionVal" class="filter-item" style="width: 125px; height: 30px;margin:0 10px 0 0">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <date-range-picker v-model="queryTime" type="datetimerange" class="date-item" />
+      <date-range-picker v-model="queryTime" type="datetimerange" class="date-item el-date-range-picker" />
       <rrOperation />
     </div>
     <el-table