From 7c4b47852e921718259c3e27421f44f8d2edb7fc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 26 Apr 2021 16:45:52 +0800
Subject: [PATCH] 冲突合并
---
src/api/client/client.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/src/api/client/client.js b/src/api/client/client.js
index b5a9ac5..28cb76d 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/page',
+ url: '/api/blade-jfpts/equipment/equipment/pageDept',
method: 'get',
params: {
...params,
@@ -13,9 +13,28 @@
})
}
+export const getListliu = (current, size, params,pid) => {
+ return request({
+ url: '/api/blade-jfpts/equipment/equipment/pageDept',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ pid,
+ }
+ })
+}
+export const getAll = () => {
+ return request({
+ url: '/api/blade-jfpts/equipment/equipment/listAll',
+ method: 'get'
+ })
+}
+
export const remove = (ids) => {
return request({
- url: '/api/blade-desk/notice/remove',
+ url: '/api/blade-jfpts/equipment/equipment/remove',
method: 'post',
params: {
ids,
@@ -25,7 +44,7 @@
export const add = (row) => {
return request({
- url: '/api/blade-desk/notice/submit',
+ url: '/api/blade-jfpts/equipment/equipment/submit',
method: 'post',
data: row
})
@@ -33,9 +52,20 @@
export const update = (row) => {
return request({
- url: '/api/blade-desk/notice/submit',
+ url: '/api/blade-jfpts/equipment/equipment/submit',
method: 'post',
data: row
+ })
+}
+
+export const updates = (expireTime,deviceNumber) => {
+ return request({
+ url: '/api/blade-jfpts/equipment/equipment/updateexpireTime',
+ method: 'post',
+ params: {
+ expireTime,
+ deviceNumber
+ }
})
}
@@ -51,7 +81,7 @@
export const getDeptLazyTree = (parentId) => {
return request({
- url: '/api/blade-jfpts/catalogs/catalogs/lazy-tree',
+ url: '/api/blade-system/dept/lazy-trees',
method: 'get',
params: {
parentId
@@ -59,3 +89,23 @@
})
}
+export const getDeptTree = (tenantId) => {
+ return request({
+ url: '/api/blade-system/dept/tree',
+ method: 'get',
+ params: {
+ tenantId,
+ }
+ })
+}
+
+export const getBaTree = (id) => {
+ return request({
+ url: '/api/blade-user/pages',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
+}
+
--
Gitblit v1.9.3