Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-03-20 ea805dacb11fff828e6d8c60983addf4017b67ee

 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,