From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/userStatistics.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/meeting/userStatistics.vue b/admin/src/views/meeting/userStatistics.vue
index 89dd501..22722a3 100644
--- a/admin/src/views/meeting/userStatistics.vue
+++ b/admin/src/views/meeting/userStatistics.vue
@@ -48,7 +48,6 @@
v-loading="isWorking.search"
:data="tableData.list"
stripe
- border
@selection-change="handleSelectionChange"
>
<!-- <el-table-column prop="roomName" label="浼氳瀹�" align="center" min-width="100px"></el-table-column> -->
@@ -128,7 +127,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import { getUserStatistics, exportUserStatistics } from '@/views/meeting/api/bookings'
+import { getUserStatistics, exportUserStatistics } from '@/api/meeting/bookings'
import { fetchList as userList } from '@/api/system/user'
export default {
@@ -152,7 +151,7 @@
created () {
this.config({
module: '浼氳瀹や俊鎭〃',
- api: '@/views/meeting/api/rooms',
+ api: '/meeting/rooms',
'field.id': 'id',
'field.main': 'id'
})
@@ -167,7 +166,7 @@
userList({
page: 1,
capacity: 9999,
- model: { realname: this.filterText },
+ model: { realname: this.filterText, companyType: 1 },
})
.then(res => {
console.log('userList', res);
@@ -192,7 +191,7 @@
this.download(response)
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.export = false
@@ -215,7 +214,7 @@
this.tableData.pagination.total = data.total
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.search = false
--
Gitblit v1.9.3