From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 十二月 2023 11:42:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/api/home.js | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/CanadaMes-ui/src/api/home.js b/CanadaMes-ui/src/api/home.js
index 05cc8b4..29d0964 100644
--- a/CanadaMes-ui/src/api/home.js
+++ b/CanadaMes-ui/src/api/home.js
@@ -1,5 +1,22 @@
import request from "../utils/request";
+
+export function SelectPermissionByUserName(username) {
+ return request({
+ url: '/home/SelectPermissionByUserName?username='+username,
+ method: 'get',
+ data:""
+ })
+}
+
+export function currentUsername() {
+ return request({
+ url: '/api/user/currentUsername',
+ method: 'get',
+
+ })
+ }
+
/**
*鐧诲綍
* @param data
@@ -18,13 +35,6 @@
url: '/home/loads',
method: 'get',
data
- })
-}
-
-export function loadtask(type) {
- return request({
- url: '/home/loadinout?types=' + type,
- method: 'get',
})
}
@@ -132,11 +142,11 @@
})
}
-export function InsertQueueGlassId(glassid, id) {
+export function InsertQueueGlassId(id,data) {
return request({
- url: '/home/InsertQueueGlassId?glassid=' + glassid + '&id=' + id,
+ url: '/home/InsertQueueGlassId?id=' + id,
method: 'post',
- data: ""
+ data
})
}
@@ -180,9 +190,9 @@
})
}
-export function DeleteProductionQueueGlass(id) {
+export function DeleteProductionQueueGlass(FrameNo) {
return request({
- url: '/home/DeleteProductionQueueGlass?id='+id,
+ url: '/home/DeleteProductionQueueGlass?FrameNo='+FrameNo,
method: 'post',
data: ""
})
@@ -195,3 +205,28 @@
data
})
}
+
+export function isAllowQueues(isAllowQueue,data) {
+ return request({
+ url: '/home/isAllowQueues?isAllowQueue=' + isAllowQueue,
+ method: 'post',
+ data
+ })
+}
+
+export function isConfirmStates(isConfirmStates) {
+ return request({
+ url: '/home/isConfirmStates?isConfirmStates=' + isConfirmStates,
+ method: 'post',
+ data:""
+ })
+}
+
+export function CompleteQueue(id,frameid) {
+ return request({
+ url: '/home/CompleteQueue?id=' + id+'&frameid='+frameid,
+ method: 'post',
+ data:""
+ })
+}
+
--
Gitblit v1.8.0