From 14e02654e0545ee69456d64aef2f35c7c219d708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 11:26:49 +0800
Subject: [PATCH] 地图模式设备状态修改
---
src/views/system/user.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0e50af3..ac38e50 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -90,6 +90,13 @@
slot="userTypeName">
<el-tag>{{row.userTypeName}}</el-tag>
</template>
+ <template slot-scope="{ row }" slot="online_status">
+ <el-tag
+ >{{
+ row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
+ }}
+ </el-tag>
+ </template>
</avue-crud>
<el-dialog title="用户角色配置"
append-to-body
@@ -197,7 +204,7 @@
};
return {
form: {},
- search:{},
+ search: {},
roleBox: false,
excelBox: false,
platformBox: false,
@@ -254,7 +261,7 @@
},
option: {
height: 'auto',
- calcHeight: 80,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -295,10 +302,23 @@
slot: true,
display: false
},
+
{
label: "用户平台",
prop: "userTypeName",
slot: true,
+ display: false
+ }, {
+ label: "在线状态",
+ prop: "online_status",
+ slot: true,
+ display: false
+ },
+ {
+ label: "工作状态",
+ prop: "work_status",
+ slot: true,
+ hide: true,
display: false
},
{
@@ -495,8 +515,8 @@
{
label: "所属部门",
prop: "deptId",
- type: "tree",
- multiple: true,
+ type: "cascader",
+ //multiple: true,
dicData: [],
props: {
label: "title"
@@ -864,7 +884,6 @@
this.excelBox = true;
},
uploadAfter(res, done, loading, column) {
- window.console.log(column);
this.excelBox = false;
this.refreshChange();
done();
@@ -885,13 +904,13 @@
if (["edit", "view"].includes(type)) {
getUser(this.form.id).then(res => {
this.form = res.data.data;
- if(this.form.hasOwnProperty("deptId")){
+ if (this.form.hasOwnProperty("deptId")) {
this.form.deptId = this.form.deptId.split(",");
}
- if(this.form.hasOwnProperty("roleId")){
+ if (this.form.hasOwnProperty("roleId")) {
this.form.roleId = this.form.roleId.split(",");
}
- if(this.form.hasOwnProperty("postId")){
+ if (this.form.hasOwnProperty("postId")) {
this.form.postId = this.form.postId.split(",");
}
});
--
Gitblit v1.9.3