From ea805dacb11fff828e6d8c60983addf4017b67ee Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 20 Mar 2021 09:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

---
 src/views/clientManagement/clientManagement.vue |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 05a3797..20ee21e 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -352,7 +352,8 @@
                   value: "1"
                 }
               ]
-            }, {
+            },
+            {
               label: "设备状态",
               align: "center",
               prop: "dxzt",
@@ -361,6 +362,18 @@
               editDisplay: false,
             },
             {
+              label: "故障状态",
+              prop: "state",
+              addDisplay: false,
+              editDisplay: false
+            },
+            {
+              label: "故障原因",
+              prop: "reason",
+              addDisplay: false,
+              editDisplay: false
+            },
+            {
               label: "设备类型",
               prop: "deviceType",
               width: 100,

--
Gitblit v1.9.3