From 7755e9ba6ca8ce58cc0a58578ddc1d965aba380a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 14 八月 2024 18:13:23 +0800 Subject: [PATCH] 最新版本 --- admin/src/views/platform/platform.vue | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue index 19d6d74..a06f52b 100644 --- a/admin/src/views/platform/platform.vue +++ b/admin/src/views/platform/platform.vue @@ -25,21 +25,28 @@ @selection-change="handleSelectionChange" > <el-table-column type="selection" width="55"></el-table-column> - <el-table-column prop="name" label="鏈堝彴鍚嶇О" min-width="100px"></el-table-column> - <el-table-column prop="hkId" label="鏈堝彴缂栫爜" min-width="100px"></el-table-column> - <el-table-column prop="groupName" label="鎵�灞炴湀鍙扮粍" min-width="100px"></el-table-column> - <el-table-column prop="workingNum" label="鍚屾椂鍙彿杞﹁締鏁�" min-width="100px"></el-table-column> - <el-table-column prop="alermTime" label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="100px"> - <template scope="{row}">{{row.alermTime?(row.alermTime/60):'-'}}</template> + <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="100px"></el-table-column> + <el-table-column prop="workingNum" label="鍚屾椂鍙彿杞﹁締鏁�" min-width="120px"></el-table-column> + <el-table-column prop="alermTime" label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="180px"> + <template scope="{row}">{{row.alermTime?(row.alermTime):'-'}}</template> </el-table-column> - <el-table-column prop="waitCallTime" label="浣滀笟瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="100px"> - <template scope="{row}"> {{row.waitCallTime?(row.alermTime/60):'-'}}</template> + <el-table-column prop="waitCallTime" label="浣滀笟瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="180px"> + <template scope="{row}"> {{row.waitCallTime?(row.alermTime):'-'}}</template> </el-table-column> - <el-table-column prop="workRate" label="鏈堝彴浣滀笟鏁堢巼(涓囧彧/灏忔椂)" min-width="100px"></el-table-column> - <el-table-column prop="status" label="鐘舵��" min-width="100px"></el-table-column> - <el-table-column prop="broadcastName" label="鍏宠仈骞挎挱" min-width="100px"></el-table-column> - <el-table-column prop="ledName" label="鍏宠仈LED" min-width="100px"></el-table-column> - <el-table-column prop="hkDate" label="鍚屾鏃堕棿" min-width="100px"></el-table-column> + <el-table-column prop="workRate" label="鏈堝彴浣滀笟鏁堢巼(涓囧彧/灏忔椂)" min-width="180px"></el-table-column> + <el-table-column prop="status" label="鐘舵��" min-width="100px"> + <template scope="{row}"> + <span v-if="row.status == 0">鏃犺溅</span> + <span v-if="row.status == 1">鏈夎溅</span> + <span v-if="row.status == 2">瓒呮椂鍋滈潬</span> + <span v-if="row.status == 3">閿欒鍋滈潬</span> + </template> + </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="hkDate" label="鍚屾鏃堕棿" min-width="140px"></el-table-column> <el-table-column v-if="containPermissions(['business:platform:update', 'business:platform:delete'])" label="鎿嶄綔" @@ -70,8 +77,6 @@ import SearchFormCollapse from '@/components/common/SearchFormCollapse' import Pagination from '@/components/common/Pagination' import OperaPlatformWindow from '@/components/business/OperaPlatformWindow' -import { syncDevices, updateEntranceById } from '@/api/business/device' -import { syncPlatforms } from '@/api/platform/platform' export default { name: 'Platform', extends: BaseTable, @@ -96,12 +101,6 @@ this.search() }, methods: { - changeManufature (e, row) { - updateEntranceById({ - id: row.id, - isEntrance: e - }) - }, syncData () { this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�') .then(() => { @@ -124,7 +123,7 @@ this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�') .then(() => { this.isWorking.working = true - this.api.syncPlatforms({}) + this.api.syncPlatformStatus({}) .then(res => { this.$tip.apiSuccess(res || '鍚屾鎴愬姛') this.search() -- Gitblit v1.9.3