Merge remote-tracking branch 'origin/master'

jiangping

2025-03-07 9f4d96b920b842ecf7b4149b7c85b980dcbb3613

 admin/src/views/business/platformBroadcastLog.vue

@@ -1,89 +1,77 @@
<template>
    <TableLayout :permissions="['business:platformbroadcastlog:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :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>
            <el-form-item label="" prop="content">
                <el-input v-model="searchForm.content" placeholder="请输入内容" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="" prop="personType">
                <el-select v-model="searchForm.deviceType" placeholder="请选择设备类型">
                    <el-option label="广播" value="0"></el-option>
                    <el-option label="LED" value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="" prop="eventType">
                <el-select v-model="searchForm.hkStatus" placeholder="请选择下发状态">
                    <el-option label="待下发" value="0"></el-option>
                    <el-option label="下发中" value="1"></el-option>
                    <el-option label="下发成功" value="2"></el-option>
                    <el-option label="下发失败" value="3"></el-option>
                </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>
            </el-form-item>
            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
                <el-radio-button label="0">当天</el-radio-button>
                <el-radio-button label="1">近7天</el-radio-button>
                <el-radio-button label="2">近30天</el-radio-button>
            </el-radio-group>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:platformbroadcastlog:exportExcel']">
<!--
  <TableLayout :permissions="['business:platformbroadcastlog:query']">
    <!-- 搜索表单 -->
    <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>
        <el-form-item label="" prop="content">
          <el-input v-model="searchForm.content" placeholder="请输入内容" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="personType">
          <el-select v-model="searchForm.deviceType" placeholder="请选择设备类型">
            <el-option label="广播" value="0"></el-option>
            <el-option label="LED" value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="eventType">
          <el-select v-model="searchForm.hkStatus" placeholder="请选择下发状态">
            <el-option label="待下发" value="0"></el-option>
            <el-option label="下发中" value="1"></el-option>
            <el-option label="下发成功" value="2"></el-option>
            <el-option label="下发失败" value="3"></el-option>
          </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>
        </el-form-item>
        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
          <el-radio-button label="1">近7天</el-radio-button>
          <el-radio-button label="2">近30天</el-radio-button>
        </el-radio-group>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
    </div>

    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:platformbroadcastlog:exportExcel']">
        <!--
                <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-column prop="deviceType" label="设备类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.deviceType == 0">广播</span>
                        <span v-if="row.deviceType == 1">LED</span>
                    </template>
                </el-table-column>
                <el-table-column prop="hkStatus" label="下发状态" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.hkStatus == 0" style="color: #0c6ce3">待下发</span>
                        <span v-if="row.hkStatus == 1" style="color: #0c6ce3">下发中</span>
                        <span v-if="row.hkStatus == 2" style="color: green">下发成功</span>
                        <span v-if="row.hkStatus == 3" style="color: red">下发失败</span>
                    </template>
                </el-table-column>
                <el-table-column prop="name" label="标题" min-width="100px"></el-table-column>
                <el-table-column prop="info" label="内容" min-width="100px"></el-table-column>
                <el-table-column prop="ids" label="设备编码" min-width="100px"></el-table-column>
                <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>
        </template>
    </TableLayout>
      </ul>
      <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>
            <span v-if="row.deviceType == 1">LED</span>
          </template>
        </el-table-column>
        <el-table-column prop="hkStatus" label="下发状态" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.hkStatus == 0" style="color: #0c6ce3">待下发</span>
            <span v-if="row.hkStatus == 1" style="color: #0c6ce3">下发中</span>
            <span v-if="row.hkStatus == 2" style="color: green">下发成功</span>
            <span v-if="row.hkStatus == 3" style="color: red">下发失败</span>
          </template>
        </el-table-column>
        <el-table-column prop="name" label="标题" min-width="100px"></el-table-column>
        <el-table-column prop="info" label="内容" min-width="100px"></el-table-column>
        <el-table-column prop="ids" label="设备编码" min-width="100px"></el-table-column>
        <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>
    </template>
  </TableLayout>
</template>

<script>
@@ -95,7 +83,7 @@
  name: 'DeviceEvent',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -103,14 +91,14 @@
        info: '',
        deviceType: '',
        hkStatus: '',
        startTime: '',
        endTime: '',
        startDate: '',
        endDate: '',
        radio: 0
      },
      time: []
    }
  },
  created () {
  created() {
    this.config({
      module: 'LED广播播放记录',
      api: '/business/platformBroadcastLog',
@@ -119,34 +107,39 @@
    })
    this.changeRadio('0')
  },
  mounted() {
    this.$nextTick(() => {
      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
    })
  },
  methods: {
    changeRadio (e) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.searchForm.startDate = timeForMat(0)[0]
        this.searchForm.endDate = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.startDate = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.startDate= timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      }
      this.search()
    },
    seleTime (e) {
    seleTime(e) {
      this.searchForm.startTime = e[0]
      this.searchForm.endTime = e[1]
      this.searchForm.radio = null
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.time = []
      this.searchForm.radio = '0'
      this.changeRadio('0')
      this.searchForm.radio = ''
      // this.changeRadio('0')
      this.search()
    }
  }