From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/platformBroadcastLog.vue | 217 ++++++++++++++++++++++++++++--------------------------
1 files changed, 113 insertions(+), 104 deletions(-)
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
index 9abaad8..d374fdf 100644
--- a/admin/src/views/business/platformBroadcastLog.vue
+++ b/admin/src/views/business/platformBroadcastLog.vue
@@ -1,89 +1,78 @@
<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="info">
+ <el-input v-model="searchForm.info" 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="changeDate" v-model="searchForm.startDate" type="datetime"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
+ <el-date-picker @change="changeDate" v-model="searchForm.endDate" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
+ </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 +84,7 @@
name: 'DeviceEvent',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -103,14 +92,14 @@
info: '',
deviceType: '',
hkStatus: '',
- startTime: '',
- endTime: '',
+ startDate: '',
+ endDate: '',
radio: 0
},
time: []
}
},
- created () {
+ created() {
this.config({
module: 'LED骞挎挱鎾斁璁板綍',
api: '/business/platformBroadcastLog',
@@ -119,32 +108,52 @@
})
this.changeRadio('0')
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
+ })
+ },
methods: {
- changeRadio (e) {
+ changeDate(e) {
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.endDate = this.searchForm.startDate
+ this.search()
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ } else {
+ this.search()
+ }
+ },
+ changeRadio(e) {
if (e === '0') {
- this.searchForm.startTime = timeForMat(0)[0]
- this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
+ 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.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
+ this.searchForm.startDate = timeForMat(6)[0]
+ this.searchForm.endDate = timeForMat(6)[1]
+ // this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startTime = timeForMat(29)[0]
- this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ this.searchForm.startDate = timeForMat(29)[0]
+ this.searchForm.endDate = timeForMat(29)[1]
+ // this.time = timeForMat(29)
+ }
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.startDate = this.searchForm.endDate
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
this.search()
},
- 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 = {
+ name: '',
+ info: '',
+ deviceType: '',
+ hkStatus: '',
+ startDate: '',
+ endDate: '',
+ }
this.searchForm.radio = ''
// this.changeRadio('0')
this.search()
--
Gitblit v1.9.3