From b2ac5951f22c36ae417b49aa208e73972b80515f Mon Sep 17 00:00:00 2001
From: xianfuxing <xianfuixng@16.com>
Date: Mon, 8 Jun 2020 13:54:28 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E8=B0=83=E6=95=B4=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/counter.js         |  4 ++++
 src/utils/request.js       |  2 +-
 src/views/counter/logs.vue | 12 +++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/api/counter.js b/src/api/counter.js
index 8178fc2..878af38 100644
--- a/src/api/counter.js
+++ b/src/api/counter.js
@@ -11,6 +11,7 @@ export function fetchDeviceList(query) {
 
 // device log list api
 export function fetchDeviceLogs(query) {
+  request.defaults.timeout = 5000 * 6
   return request({
     url: '/api/counter/logs/',
     method: 'get',
@@ -18,6 +19,9 @@ export function fetchDeviceLogs(query) {
   })
 }
 
+// reset timeout
+request.defaults.timeout = 5000
+
 // device logs history api
 export function fetchDeviceLogsHistory(query) {
   return request({
diff --git a/src/utils/request.js b/src/utils/request.js
index dbe55d2..1fcf829 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
-  timeout: 5000 * 2 // request timeout
+  timeout: 5000 // request timeout
 })
 
 // request interceptor
diff --git a/src/views/counter/logs.vue b/src/views/counter/logs.vue
index 7c390b2..e88a3d8 100644
--- a/src/views/counter/logs.vue
+++ b/src/views/counter/logs.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input @keyup.enter.native="handleFilter" size="small" style="width: 220px;" class="filter-item" :placeholder="$t('counter.logSeachContent')" v-model="logsListQuery.device">
+      <el-input
+        @keyup.enter.native="handleFilter"
+        @keyup.esc.native="handleEsc"
+        size="small" style="width: 220px;"
+        class="filter-item"
+        :placeholder="$t('counter.logSeachContent')" v-model="logsListQuery.device">
       </el-input>
       <div class="date-selector filter-item">
         <el-date-picker
@@ -141,6 +146,11 @@ export default {
       this.logsListQuery.page = 1
       this.getDeviceLogs(this.logsListQuery)
     },
+    handleEsc() {
+      this.logsListQuery.page = 1
+      this.logsListQuery.device = undefined
+      this.getDeviceLogs(this.logsListQuery)
+    },
     handleDateSelect(value) {
       if (value === null) {
         this.logsListQuery.start = undefined