From a6d047e106c00a32603ed9c037a1e27b7f75ee6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 三月 2025 18:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceEvent.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 69a41b9..5564933 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -56,7 +56,7 @@
<li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
-->
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
<!-- <el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.personType == 0">鍔冲姟璁垮</span>
@@ -170,7 +170,15 @@
},
reset() {
this.$refs.searchForm.resetFields()
- this.time = []
+ this.searchForm = {
+ keyWords: '',
+ companyName: '',
+ personType: '',
+ eventType: '',
+ startTime: '',
+ endTime: '',
+ radio: 0
+ }
this.searchForm.radio = ''
// this.changeRadio('0')
this.search()
--
Gitblit v1.9.3