From b9bc80def4e77e1bd2b224747a4dbf0b486e4c1d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 02 Apr 2021 16:49:12 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/system/user.vue | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0c3db78..1822253 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>
@@ -318,11 +311,6 @@
}, {
label: "在线状态",
prop: "online_status",
- slot: true,
- display: false
- }, {
- label: "工作状态",
- prop: "work_status",
slot: true,
display: false
},
@@ -889,7 +877,6 @@
this.excelBox = true;
},
uploadAfter(res, done, loading, column) {
- window.console.log(column);
this.excelBox = false;
this.refreshChange();
done();
--
Gitblit v1.9.3