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 | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0c3db78..ac38e50 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -93,14 +93,7 @@
<template slot-scope="{ row }" slot="online_status">
<el-tag
>{{
- row.online_status == "0" ? "掉线" : row.online_status == "1" ? "在线" : "掉线"
- }}
- </el-tag>
- </template>
- <template slot-scope="{ row }" slot="work_status">
- <el-tag
- >{{
- row.work_status == "0" ? "闲置" : row.work_status == "1" ? "工作中" : "闲置"
+ row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
}}
</el-tag>
</template>
@@ -268,7 +261,7 @@
},
option: {
height: 'auto',
- calcHeight: 80,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -320,10 +313,12 @@
prop: "online_status",
slot: true,
display: false
- }, {
+ },
+ {
label: "工作状态",
prop: "work_status",
slot: true,
+ hide: true,
display: false
},
{
@@ -520,8 +515,8 @@
{
label: "所属部门",
prop: "deptId",
- type: "tree",
- multiple: true,
+ type: "cascader",
+ //multiple: true,
dicData: [],
props: {
label: "title"
@@ -889,7 +884,6 @@
this.excelBox = true;
},
uploadAfter(res, done, loading, column) {
- window.console.log(column);
this.excelBox = false;
this.refreshChange();
done();
--
Gitblit v1.9.3