From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
admin/src/views/platform/platform.vue | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index a9e3979..3446e39 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -1,24 +1,32 @@
<template>
<TableLayout :permissions="['business:platform:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <SearchFormCollapse slot="search-form" :need-more="false">
- <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="name">
- <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ユ湀鍙板悕绉�"
- @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="">
- <el-select v-model="searchForm.groupId" placeholder="璇烽�夋嫨鏈堝彴鍒嗙粍" @change="search" clearable>
- <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- <section> -->
+ <div ref="QueryFormRef" slot="search-form">
+ <SearchFormCollapse :need-more="false">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="name">
+ <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ユ湀鍙板悕绉�"
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="groupId">
+ <el-select v-model="searchForm.groupId" placeholder="璇烽�夋嫨鏈堝彴鍒嗙粍" @change="search" clearable>
+ <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨鏈堝彴绫诲瀷" @change="search" clearable>
+ <el-option label="鏁存墭鐩�" :value="0"></el-option>
+ <el-option label="鏁ｄ欢" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <section> -->
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
- <!-- </section> -->
- </el-form>
- </SearchFormCollapse>
+ <!-- </section> -->
+ </el-form>
+ </SearchFormCollapse>
+ </div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:hksync:platforms']">
@@ -27,19 +35,29 @@
<li><el-button type="primary" :loading="working1" @click="syncStatus" icon="el-icon-plus"
v-permissions="['business:hksync:platforms']">鍚屾瀹炴椂鐘舵��</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table
+ :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="鏈堝彴鍚嶇О" fixed min-width="100px"></el-table-column>
<el-table-column prop="code" label="鏈堝彴缂栫爜" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="type" label="鏈堝彴绫诲瀷" min-width="100px">
+ <template scope="{row}">
+ <span v-if="row.type == 0" class="green">鏁存墭鐩�</span>
+ <span v-else-if="row.type == 1" class="red">鏁ｄ欢</span>
+ <span v-else class="grey">-</span>
+ </template>
+ </el-table-column>
<el-table-column prop="groupName" label="鎵�灞炴湀鍙扮粍" fixed min-width="150px"></el-table-column>
- <el-table-column prop="workingNum" label="鍚屾椂鍙彿杞﹁締鏁�" min-width="120px"></el-table-column>
+ <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="90px"></el-table-column>
+ <el-table-column prop="workingNum" label="鍚屾椂鍙彿鏁伴噺" min-width="120px"></el-table-column>
+ <el-table-column prop="callReadyNum" label="鍚屾椂鍑嗗鏁伴噺" min-width="120px"></el-table-column>
<el-table-column prop="stayTimeoutAlarmTime" label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="180px">
<template scope="{row}">{{ row.stayTimeoutAlarmTime ? (row.stayTimeoutAlarmTime) : '-' }}</template>
</el-table-column>
<el-table-column prop="workTimeoutAlarmTime" label="浣滀笟瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="180px">
<template scope="{row}"> {{ row.workTimeoutAlarmTime ? (row.workTimeoutAlarmTime) : '-' }}</template>
</el-table-column>
- <el-table-column prop="workRate" label="鏈堝彴浣滀笟鏁堢巼(涓囧彧/灏忔椂)" min-width="180px"></el-table-column>
+ <el-table-column prop="workRate" label="鏈堝彴浣滀笟鏁堢巼(涓囨敮/灏忔椂)" min-width="180px"></el-table-column>
<!-- <el-table-column prop="platformStatus" label="鏈堝彴鐘舵��" min-width="100px">
<template scope="{row}">
<span v-if="row.platformStatus == 0">鏃犺溅</span>
@@ -50,6 +68,7 @@
</el-table-column> -->
<el-table-column prop="broadcastNames" label="鍏宠仈骞挎挱" min-width="100px"></el-table-column>
<el-table-column prop="ledNames" label="鍏宠仈LED" min-width="100px"></el-table-column>
+ <el-table-column prop="ledContent" label="LED绌洪棽鏂囨" min-width="180px"></el-table-column>
<el-table-column prop="hkDate" label="鍚屾鏃堕棿" min-width="150px"></el-table-column>
<el-table-column label="鏈堝彴鐘舵��" fixed="right" width="100px">
<template slot-scope="{row}">
@@ -95,6 +114,7 @@
working1: false,
searchForm: {
name: '',
+ type:null,
groupId: null
}
}
@@ -109,6 +129,11 @@
this.search()
this.loadGroupList()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
loadGroupList() {
allList({})
--
Gitblit v1.9.3