From 9c67dc3526d8ad356e1dcd0cc80e4382866ea6a7 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 09 Apr 2021 17:13:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/supervisoryConsole/card.vue | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/src/views/supervisoryConsole/card.vue b/src/views/supervisoryConsole/card.vue
index 8c88e28..62d08ff 100644
--- a/src/views/supervisoryConsole/card.vue
+++ b/src/views/supervisoryConsole/card.vue
@@ -7,12 +7,17 @@
v-model="inputSearchValue"
class="input-with-select"
>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click.stop="inputSearchBtn"
+ ></el-button>
</el-input>
</div>
<div class="radio">
<el-radio-group v-model="radio" @change="siteStatus">
- <el-radio label="仅显示设备在线">仅显示设备在线</el-radio>
+ <el-radio label="全部">全部</el-radio>
+ <el-radio label="仅显示预警设备">仅显示预警设备</el-radio>
<el-radio label="仅显示设备掉线">仅显示设备掉线</el-radio>
<el-radio label="仅显示设备故障">仅显示设备故障</el-radio>
</el-radio-group>
@@ -85,7 +90,7 @@
option: [],
count: [],
loading: false,
- radio: "仅显示设备在线",
+ radio: "全部",
inputSearchValue: "",
};
},
@@ -98,30 +103,7 @@
},
},
created() {
- getList().then((res) => {
- var a = [],
- b = [],
- c = [];
-
- res.data.data.forEach((item) => {
- if (item.state != "") a.push(item);
- if (item.state == "" && item.onlineStatus != 1) b.push(item);
- if (item.state == "" && item.onlineStatus == 1) c.push(item);
- });
-
- var d = a.concat(c.concat(b));
-
- d.forEach((item) => {
- this.count.push(item);
- });
- this.option = [];
- for (var i = 0; i <= 24; i++) {
- if (this.count.length > 0) {
- this.option.push(this.count[0]);
- this.count.shift();
- }
- }
- });
+ this.getEquipmentLists();
},
methods: {
--
Gitblit v1.9.3