From f3c59a17062fb0a89b5f89b7845341386952a6b1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 24 九月 2025 16:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/platform.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index 9548d14..3446e39 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -14,6 +14,12 @@
</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>
@@ -34,9 +40,17 @@
<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="sortnum" label="鎺掑簭鐮�" min-width="90px"></el-table-column>
- <el-table-column prop="workingNum" label="鍚屾椂鍙彿杞﹁締鏁�" min-width="120px"></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>
@@ -100,6 +114,7 @@
working1: false,
searchForm: {
name: '',
+ type:null,
groupId: null
}
}
--
Gitblit v1.9.3