root/hht-huahong-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

联调

Browse Source
This commit is contained in:
caill
2024-06-24 18:01:32 +08:00
parent 4942a11d8a
commit 5d8b77987d
5 changed files with 176 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/getData2.js
View File

@@ -126,14 +126,10 @@ export const rgfjskTask = (code) => request({
* 任务管理
*/
// 1.1 1.1 查询无指令的任务（任务号为-开头）
export const handTasks = (key, scode, ncode) => request({
export const handTasks = () => request({
url:'api/hand/tasks',
acsurl: true,
data: {
keyword: key,
start_devicecode: scode,
next_devicecode: ncode
}
data: {}
})
// 1.2 任务操作
export const handTaskoperation = (type, id) => request({
@@ -149,14 +145,10 @@ export const handTaskoperation = (type, id) => request({
* 指令管理
*/
// 1.1 查询未完成指令(生成任务号为-开头)
export const handInsts = (key, scode, ncode) => request({
export const handInsts = () => request({
url:'api/hand/insts',
acsurl: true,
data: {
keyword: key,
start_devicecode: scode,
next_devicecode: ncode
}
data: {}
})
// 1.2 指令操作
export const handInst = (type, id) => request({

105
utils/mork2.js
View File

@@ -502,22 +502,95 @@ export const rgfjskTask = (code) => {
}
// 任务管理
export const handTasks = (key, scode, ncode) => {
let res = {
"data": [
{
"task_no": "-087",
"task_status": "2",
"create_time": "2024-03-28 10:54:39",
"carrier": '001',
"task_uuid": "012bc5e653ce48949020f1147333aa7f",
"inst_step": "7",
"next_devicecode": "L1",
"start_devicecode": "RKSSX2",
"instruction_code": "163",
"priority": "1"
}
],
"message": "操作成功"
let res = {
"result": [
{
"material_type": "",
"task_status": "1",
"carrier": "0033",
"task_no": "1800358896351711233",
"create_time": "2024-06-11 10:47:33",
"task_status_name": "执行中",
"next_devicecode": "HCHJ01",
"start_devicecode": "CYHCX39",
"material_type_name": "",
"task_uuid": "718e14a17b744a81bc51a51945355daa",
"task_type": "1",
"priority": "1"
},
{
"material_type": "",
"task_status": "1",
"carrier": "3010",
"task_no": "1800768187059539969",
"create_time": "2024-06-12 13:56:04",
"task_status_name": "执行中",
"next_devicecode": "HNJ03DJW",
"start_devicecode": "KLHW19",
"material_type_name": "",
"task_uuid": "f8e5ab3341f64bee887f4acaf403a4be",
"task_type": "1",
"priority": "1"
},
{
"material_type": "",
"task_status": "1",
"carrier": "3011",
"task_no": "1800771496990347265",
"create_time": "2024-06-12 14:06:44",
"task_status_name": "执行中",
"next_devicecode": "KLHW36",
"start_devicecode": "HNJ03DJW",
"material_type_name": "",
"task_uuid": "177eb5d976d245efbe3d5d56c8e93e22",
"task_type": "1",
"priority": "1"
},
{
"material_type": "",
"task_status": "1",
"carrier": "4011",
"task_no": "1800773119993057281",
"create_time": "2024-06-12 14:15:54",
"task_status_name": "执行中",
"next_devicecode": "HNJ04DJW",
"start_devicecode": "KLHW23",
"material_type_name": "",
"task_uuid": "29053a22a18b489eb0af483d897c0468",
"task_type": "1",
"priority": "1"
},
{
"material_type": "",
"task_status": "1",
"carrier": "0030",
"task_no": "1800819807675879425",
"create_time": "2024-06-12 17:18:44",
"task_status_name": "执行中",
"next_devicecode": "RYHCX01",
"start_devicecode": "YJ02XLW02",
"material_type_name": "",
"task_uuid": "6f8642c70ee14bfc8d2699477fa977c7",
"task_type": "1",
"priority": "1"
},
{
"material_type": "",
"task_status": "0",
"carrier": "",
"task_no": "1800820183942696961",
"create_time": "2024-06-12 17:20:14",
"task_status_name": "就绪",
"next_devicecode": "YJ02XLW02",
"start_devicecode": "CPJCK",
"material_type_name": "",
"task_uuid": "f41e5bfb7b32472fa940a8085c1e6d5e",
"task_type": "1",
"priority": "1"
}
],
"code": "1",
"desc": "查询成功"
}
return res
}