Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 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