Merge remote-tracking branch 'origin/master'

jiangping

2025-03-03 3a11109642961896bd5ae64ead123cf1a31e5216

 admin/src/views/business/platformBroadcastLog.vue

@@ -1,7 +1,8 @@
<template>
    <TableLayout :permissions="['business:platformbroadcastlog:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
    <div slot="search-form" ref="QueryFormRef">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
            <el-form-item label="" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入标题" @keypress.enter.native="search"></el-input>
            </el-form-item>
@@ -23,15 +24,8 @@
                </el-select>
            </el-form-item>
            <el-form-item label="起止时间" prop="eventType">
                <el-date-picker
                    @change="seleTime"
                    v-model="time"
                    type="datetimerange"
                    format="yyyy-MM-dd HH:mm:ss"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    range-separator="至"
                    start-placeholder="开始时间"
                    end-placeholder="结束时间">
          <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
                </el-date-picker>
            </el-form-item>
            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
@@ -44,6 +38,8 @@
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
    </div>

        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:platformbroadcastlog:exportExcel']">
@@ -51,11 +47,7 @@
                <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformbroadcastlog:exportExcel']" @click="exportExcel">导出</el-button></li>
-->
            </ul>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
                <el-table-column prop="deviceType" label="设备类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.deviceType == 0">广播</span>
@@ -76,11 +68,7 @@
                <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
            </pagination>
        </template>
    </TableLayout>
@@ -119,6 +107,11 @@
    })
    this.changeRadio('0')
  },
  mounted() {
    this.$nextTick(() => {
      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
    })
  },
  methods: {
    changeRadio (e) {
      if (e === '0') {