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/roomStatistics.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/meeting/roomStatistics.vue b/admin/src/views/meeting/roomStatistics.vue
index 5550a21..1ab4e4f 100644
--- a/admin/src/views/meeting/roomStatistics.vue
+++ b/admin/src/views/meeting/roomStatistics.vue
@@ -57,7 +57,6 @@
v-loading="isWorking.search"
:data="tableData.list"
stripe
- border
@selection-change="handleSelectionChange"
>
<el-table-column prop="roomName" label="浼氳瀹�" align="center" min-width="120px"></el-table-column>
@@ -130,7 +129,7 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-import { getRoomStatistics, exportRoomStatistics } from '@/views/meeting/api/bookings'
+import { getRoomStatistics, exportRoomStatistics } from '@/api/meeting/bookings'
// import { findList } from '@/api/meeting/rooms'
export default {
name: 'Rooms',
@@ -153,7 +152,7 @@
created () {
this.config({
module: '浼氳瀹や俊鎭〃',
- api: '@/views/meeting/api/rooms',
+ api: '/meeting/rooms',
'field.id': 'id',
'field.main': 'id'
})
@@ -183,7 +182,7 @@
this.download(response)
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.export = false
@@ -200,7 +199,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