From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- admin/src/views/platform/platform.vue | 50 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue index 5f097ce..9548d14 100644 --- a/admin/src/views/platform/platform.vue +++ b/admin/src/views/platform/platform.vue @@ -1,24 +1,26 @@ <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> + <!-- <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,11 +29,13 @@ <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="groupName" label="鎵�灞炴湀鍙扮粍" fixed min-width="150px"></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="stayTimeoutAlarmTime" label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="180px"> <template scope="{row}">{{ row.stayTimeoutAlarmTime ? (row.stayTimeoutAlarmTime) : '-' }}</template> @@ -39,7 +43,7 @@ <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 +54,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}"> @@ -63,8 +68,8 @@ <template slot-scope="{row}"> <el-button type="text" @click="$refs.operaPlatformWindow.open('缂栬緫鏈堝彴淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:platform:update']">缂栬緫</el-button> - <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" - v-permissions="['business:platform:delete']">鍒犻櫎</el-button> + <!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" + v-permissions="['business:platform:delete']">鍒犻櫎</el-button> --> </template> </el-table-column> </el-table> @@ -109,6 +114,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