From 7b3ded19acade1ea4617e299934bf244fd51ec3b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 26 Mar 2021 11:07:26 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/api/client/client.js | 12 +++++++++++-
src/views/system/user.vue | 14 +-------------
src/views/clientManagement/clientManagement.vue | 6 +++---
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/api/client/client.js b/src/api/client/client.js
index a103540..dc03238 100644
--- a/src/api/client/client.js
+++ b/src/api/client/client.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params,pid) => {
return request({
- url: '/api/blade-jfpts/equipment/equipment/pages',
+ url: '/api/blade-jfpts/equipment/equipment/pageDept',
method: 'get',
params: {
...params,
@@ -77,3 +77,13 @@
})
}
+export const getDeptTree = (tenantId) => {
+ return request({
+ url: '/api/blade-system/dept/tree',
+ method: 'get',
+ params: {
+ tenantId,
+ }
+ })
+}
+
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index bb24e5e..ff176a4 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -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"
@@ -567,7 +567,7 @@
});
},
searchReset() {
- this.treeDeptId = null;
+ this.treeDeptId = "";
this.query = {};
this.onLoad(this.page);
},
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0c3db78..fdb4cf2 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
},
--
Gitblit v1.9.3