From 3cf8334f5dedcfceff663808b2260e2a1e5b2cbd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 26 Mar 2021 10:57:39 +0800
Subject: [PATCH] webSocket调整，改为在请求页调用，防止关闭后自动登录的情况
---
src/views/clientManagement/clientManagement.vue | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 05a3797..ff176a4 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -28,7 +28,7 @@
@on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
- size="small"
+ size="mini"
icon="el-icon-delete"
plain
v-if="permission.clientManagement_delete"
@@ -258,9 +258,9 @@
},
{
label: "上级菜单",
- prop: "pid",
+ prop: "deptId",
type: "tree",
- dicUrl: "/api/blade-jfpts/catalogs/catalogs/tree",
+ dicUrl: "/api/blade-system/dept/trees",
hide: true,
props: {
label: "title"
@@ -352,13 +352,26 @@
value: "1"
}
]
- }, {
+ },
+ {
label: "设备状态",
align: "center",
prop: "dxzt",
slot: true,
addDisplay: false,
editDisplay: false,
+ },
+ {
+ label: "故障状态",
+ prop: "state",
+ addDisplay: false,
+ editDisplay: false
+ },
+ {
+ label: "故障原因",
+ prop: "reason",
+ addDisplay: false,
+ editDisplay: false
},
{
label: "设备类型",
@@ -472,7 +485,7 @@
permissionList() {
return {
addBtn: this.vaildData(this.permission.clientManagement_add, false),
- viewBtn: this.vaildData(this.permission.clientManagement_view, false),
+ viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(this.permission.clientManagement_delete, false),
editBtn: this.vaildData(this.permission.clientManagement_edit, false)
};
@@ -554,7 +567,7 @@
});
},
searchReset() {
- this.treeDeptId = null;
+ this.treeDeptId = "";
this.query = {};
this.onLoad(this.page);
},
--
Gitblit v1.9.3