From 0b737708e696c45720499759b5c31aced87fdbb6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 七月 2021 14:10:03 +0800
Subject: [PATCH] merge master

---
 src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue b/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue
index f11d59a..67917d6 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/transferDeviceManage.vue
@@ -34,7 +34,10 @@
         :key="indicator.id"
       >
         <div class="title">
-          <span class="dot" :class="{'kx':indicator.id=='kx','dx':indicator.id=='dx','ccgz':indicator.id=='ccgz'}"></span>
+          <span
+            class="dot"
+            :class="{'kx':indicator.id=='kx','dx':indicator.id=='dx','ccgz':indicator.id=='ccgz'}"
+          ></span>
           <span class="word">{{indicator.title}}</span>
         </div>
         <div class="indicator-val">{{indicator.slots.length}}</div>
@@ -52,12 +55,15 @@
           <label>璁惧鐘舵��:</label>
           <div>
             <el-select v-model="deviceState" size="small">
-              <el-option></el-option>
+              <el-option value="" label="鍏ㄩ儴"></el-option>
+              <el-option value="1" label="璇诲啓涓�"></el-option>
+              <el-option value="0" label="绌洪棽涓�"></el-option>
+              <el-option value="2" label="鎻掓Ы鏁呴殰"></el-option>
             </el-select>
           </div>
         </div>
         <div class="btns">
-          <el-button type="primary" size="small">鏌ヨ</el-button>
+          <el-button @click="findDeviceIfo" type="primary" size="small">鏌ヨ</el-button>
         </div>
       </div>
       <el-table class="thbg" :data="tableData" fit>
@@ -109,9 +115,9 @@
   </div>
 </template>
 <script>
-import { addDevice, getDeviceList, getDeviceInfoById } from '@/api/shuohuang';
+import { addDevice, getDeviceList, getDeviceInfo } from '@/api/shuohuang';
 export default {
-  data () {
+  data() {
     return {
       actTab: 'dev1',
       devices: [],
@@ -124,11 +130,11 @@
       IP: '',
     }
   },
-  mounted () {
+  mounted() {
     this.findDeviceList();
   },
   methods: {
-    findDeviceList () {
+    findDeviceList() {
       let _this = this;
       getDeviceList().then(res => {
         _this.devices = res.data;
@@ -136,9 +142,12 @@
         _this.findDeviceIfo()
       })
     },
-    findDeviceIfo () {
+    findDeviceIfo() {
       let _this = this;
-      getDeviceInfoById({ DeviceID: this.actTab }).then(res => {
+      getDeviceInfo({ 
+        DeviceID: this.actTab,
+        Status:this.deviceState
+        }).then(res => {
         // debugger
         _this.tableData = res.data;
         //缁熻褰撳墠鎻掓Ы鐘舵��
@@ -162,7 +171,7 @@
         //_this.generalIndicators
       })
     },
-    toAddDevice () {
+    toAddDevice() {
       let _this = this;
       let params = {
         Name: this.Name,
@@ -178,14 +187,14 @@
         }
       })
     },
-    showAddDevice () {
+    showAddDevice() {
       this.visibleOfialogAddDev = true;
 
     },
-    checkTab (tab, event) {
+    checkTab(tab, event) {
       this.findDeviceIfo();
     },
-    checkSlot (row) {
+    checkSlot(row) {
 
     }
   }
@@ -247,7 +256,7 @@
       flex: 1;
       position: relative;
       &:not(.lastOne):after {
-        content: '';
+        content: "";
         width: 1px;
         height: 57px;
         background: #e9e9e9;

--
Gitblit v1.8.0