diff --git a/common/style/layout.styl b/common/style/layout.styl
index c4c7cb1..939e85f 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -190,28 +190,25 @@ uni-button:after {
box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
}
.item-font-1
- _font(30rpx,28rpx,#000,,)
+ _font(30rpx,52rpx,#000,,)
.item-font-2
- _font(24rpx,40rpx,$red,,)
+ _font(26rpx,52rpx,$red,,)
.item-font-3
- width 110rpx
- _font(24rpx,26rpx,#333,,)
+ _font(26rpx,38rpx,#333,,)
text-align:justify;
text-align-last: justify;
text-justify: inter-ideograph;
.item-font-4
- width calc(100% - 110rpx)
- _font(26rpx,26rpx,#999,,)
+ _font(26rpx,38rpx,#999,,)
.item-font-5
_font(44rpx,60rpx,$green,,center)
background-color #f6f6f6
.item-font-6
- width calc(50% - 110rpx)
- _font(24rpx,52rpx,#666,,center)
+ height 52rpx
+ _font(26rpx,52rpx,#666,,center)
background-color #e5e5e5
- border-radius 26rpx
+ border-radius 10rpx
.item-font-7
- width 110rpx
_font(24rpx,52rpx,#666,,center)
.item-font-8
_font(24rpx,52rpx,#666,,center)
diff --git a/pages/manage/inst-manage.vue b/pages/manage/inst-manage.vue
index 239d03a..b90d6c0 100644
--- a/pages/manage/inst-manage.vue
+++ b/pages/manage/inst-manage.vue
@@ -1,19 +1,189 @@
-
-
+
+
+
+
+
+
+ {{e.text}}
+
+
+
+
+
+
+
+ {{e.task_no}} | {{['就绪', '执行中', '完成','取消'][Number(e.inst_status)]}}
+ {{e.create_time}}
+
+
+
+
+ 指令号：
+ {{e.instruction_code}}
+
+
+ 指令执行步骤：
+ {{e.inst_step}}
+
+
+ 载具号：
+ {{e.carrier}}
+
+
+ 车号：
+ {{e.carno}}
+
+
+
+ {{e.priority}}
+ 优先级
+
+
+
+ 起始设备：{{e.start_devicecode}}
+ ––
+ 目标设备：{{e.next_devicecode}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关键字
+
+
+
+
+
+
+
+ 起始设备
+
+
+
+
+
+
+
+ 目标设备
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/manage/task-manage.vue b/pages/manage/task-manage.vue
index 239d03a..dc2d47d 100644
--- a/pages/manage/task-manage.vue
+++ b/pages/manage/task-manage.vue
@@ -1,19 +1,180 @@
-
-
+
+
+
+
+
+
+ {{e.text}}
+
+
+
+
+
+
+
+ {{e.task_no}}
+ {{e.create_time}}
+
+
+
+
+ 任务状态：
+ {{['就绪', '执行中', '完成'][Number(e.task_status)]}}
+
+
+ 载具号：
+ {{e.carrier}}
+
+
+
+ {{e.priority}}
+ 优先级
+
+
+
+ 起始设备：{{e.start_devicecode}}
+ ––
+ 目标设备：{{e.next_devicecode}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 关键字
+
+
+
+
+
+
+
+ 起始设备
+
+
+
+
+
+
+
+ 目标设备
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/getData2.js b/utils/getData2.js
index 246ed57..2b87938 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -120,4 +120,46 @@ export const rgfjqlTask = (sp, code) => request({
export const rgfjskTask = (code) => request({
url:'api/pda/rgfjskTask',
data: {deviceCode: code}
+})
+
+/**
+ * 任务管理
+ */
+// 1.1 1.1 查询无指令的任务（任务号为-开头）
+export const handTasks = (key, scode, ncode) => request({
+ url:'api/hand/tasks',
+ data: {
+ keyword: key,
+ start_devicecode: scode,
+ next_devicecode: ncode
+ }
+})
+// 1.2 任务操作
+export const handTaskoperation = (type, id) => request({
+ url:'api/hand/taskoperation',
+ data: {
+ type: type,
+ task_uuid: id
+ }
+})
+
+/**
+ * 指令管理
+ */
+// 1.1 查询未完成指令(生成任务号为-开头)
+export const handInsts = (key, scode, ncode) => request({
+ url:'api/hand/insts',
+ data: {
+ keyword: key,
+ start_devicecode: scode,
+ next_devicecode: ncode
+ }
+})
+// 1.2 指令操作
+export const handInst = (type, id) => request({
+ url:'api/hand/inst',
+ data: {
+ type: type,
+ inst_uuid: id
+ }
})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 9736a0a..3debe6a 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -499,4 +499,61 @@ export const rgfjqlTask = (sp, code) => {
export const rgfjskTask = (code) => {
let res = {"message":"人工分拣送空请求成功"}
return res
+}
+// 任务管理
+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": "操作成功"
+}
+ return res
+}
+// 1.2 任务操作
+export const handTaskoperation = (type, id) => {
+ let res = {
+ "message": "001"
+}
+ return res
+}
+// 指令管理
+export const handInsts = () => {
+ let res = {
+ "data": [
+ {
+ "task_no": "-087",
+ "inst_status": "2",
+ "create_time": "2024-03-28 10:54:39",
+ "carrier": '001',
+ "carno": '1号车',
+ "inst_uuid": "012bc5e653ce48949020f1147333aa7f",
+ "inst_step": "3",
+ "instruction_code": '11100',
+ "next_devicecode": "L1",
+ "start_devicecode": "RKSSX2",
+ "instruction_code": "163",
+ "priority": "1"
+ }
+ ],
+ "message": "操作成功"
+}
+ return res
+}
+export const handInst = (code) => {
+ let res = {
+ "message": "001"
+}
+ return res
}
\ No newline at end of file