From 84dbd1cc67f5edbb233a49174cd022edf07fc64a Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Mon, 15 Aug 2022 16:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/logManage/operateLog/index.vue     |  1 +
 src/views/system/logManage/warnLog/index.vue  | 38 +++++++++----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/views/system/logManage/operateLog/index.vue b/src/views/system/logManage/operateLog/index.vue
index 7aff159..7421041 100644
--- a/src/views/system/logManage/operateLog/index.vue
+++ b/src/views/system/logManage/operateLog/index.vue
@@ -198,5 +198,6 @@ export default {
 .head-container{
   display: flex;
   align-items: flex-start;
+  padding-bottom: 0;
 }
 </style>
diff --git a/src/views/system/logManage/warnLog/index.vue b/src/views/system/logManage/warnLog/index.vue
index 8ceae55..b05be35 100644
--- a/src/views/system/logManage/warnLog/index.vue
+++ b/src/views/system/logManage/warnLog/index.vue
@@ -1,15 +1,13 @@
 <template>
   <div>
     <div class="head-container">
-      <!-- <crudOperation /> -->
-      <!-- <el-button v-permission="permission.download" :loading="crud.downloadLoading" :disabled="!selections.length" size="mini" icon="el-icon-download" @click="handleDownload">导出</el-button> -->
       <el-button :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="handleDownload">导出</el-button>
       <el-button size="mini" icon="el-icon-download" :disabled="!(selections.length===1)" @click="handleHand">手动处理</el-button>
       <el-select v-model="oprType" class="filter-item" style="width: 100px; height: 30px;margin:0 0 0 10px" @change="crud.toQuery">
         <el-option v-for="item in oprTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-input
-        v-model="keyWord"
+        v-model="query.blurry"
         size="small"
         clearable
         placeholder="请输入关键词"
@@ -17,7 +15,6 @@
         class="input-prepend filter-item"
         @keyup.enter.native="crud.toQuery"
       >
-        <!-- <el-select slot="prepend" v-model="optionVal" style="width: 100px" @keyup.enter.native="crud.toQuery"> -->
         <el-select slot="prepend" v-model="optionVal" style="width: 80px">
           <el-option
             v-for="item in options"
@@ -27,7 +24,7 @@
           />
         </el-select>
       </el-input>
-      <date-range-picker v-model="queryTime" class="date-item" />
+      <date-range-picker v-model="query.createTime" class="date-item" />
       <rrOperation />
     </div>
     <el-table
@@ -83,19 +80,21 @@
 
 <script>
 import rrOperation from '@crud/RR.operation'
-import CRUD, { presenter, crud } from '@crud/crud'
+import CRUD, { presenter, crud, header } from '@crud/crud'
 import DateRangePicker from '@/components/DateRangePicker'
 import pagination from '@crud/Pagination'
 import { warnRemark } from '@/api/system/logs'
+import { exportFile } from '@/utils/index'
+// import qs from 'qs'
+import { mapGetters } from 'vuex'
 export default {
   name: 'LoginLog',
   components: { rrOperation, DateRangePicker, pagination },
-  mixins: [presenter(), crud()],
+  mixins: [presenter(), crud(), header()],
   cruds() {
     return CRUD({
       url: 'api/alarmlog/',
-      sort: ['createTime,desc'],
-      // crudMethod: caseCrudMethod,
+      sort: ['state'],
       optShow: {
         add: false,
         edit: false,
@@ -132,28 +131,27 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseApi'
+    ])
+  },
   methods: {
     // 获取数据前的处理
     [CRUD.HOOK.beforeRefresh]() {
       this.crud.downloadLoading = true
       this.crud.query.state = null
-      this.crud.query.blurry = this.keyWord
+      // this.crud.query.blurry = this.keyWord
       if (this.oprType > -1) {
         this.crud.query.state = this.oprType
       }
-      console.log(this.crud.query, '--')
       this.crud.downloadLoading = false
     },
-    getData() {
-      const arr = this.crud.data
-      console.log(arr, 'arr')
-    },
     // 导出
     handleDownload() {
-
-    },
-    test() {
-      console.log(this.crud, 'crud')
+      this.crud.downloadLoading = true
+      exportFile(this.baseApi + '/api/alarmlog/download')
+      this.crud.downloadLoading = false
     },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row) // 单击选中
@@ -181,7 +179,7 @@ export default {
       this.$refs.formDom.validate((valid) => {
         if (valid) {
           warnRemark(params).then(res => {
-            console.log(res, '手动处理')
+            // console.log(res, '手动处理')
             if (res === 'SUCCESS') {
               this.crud.refresh()
               this.$message({