diff --git a/README.md b/README.md
index 7d89305..73efc76 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
# 注意事项
+ 原生APP云打包使用自有证书
+ 证书别名:testalias
-+ app图标为acs
\ No newline at end of file
++ app图标项目中添加地址:static/logo.png
\ No newline at end of file
diff --git a/locale/en.json b/locale/en.json
index adb1f26..d83ac76 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -31,6 +31,7 @@
"title.call": "Call management",
"title.command": "Command management",
"title.task": "task management",
+ "title.release-confirm": "Release confirmation",
"call.sp": "start point",
"call.ep": "end point",
"call.toast": "The starting and ending points of the task cannot be the same",
@@ -54,5 +55,7 @@
"time": "time",
"state": "state",
"regenerate": "Regenerate",
- "forced-completion": "Forced completion"
+ "forced-completion": "Forced completion",
+ "take-and-place": "Take and place",
+ "allow-to-leave": "Allow to leave"
}
\ No newline at end of file
diff --git a/locale/ko.json b/locale/ko.json
index c3cc9c5..67cb7cf 100644
--- a/locale/ko.json
+++ b/locale/ko.json
@@ -31,6 +31,7 @@
"title.call": "콜 관리",
"title.command": "명령 관리",
"title.task": "작업 관리",
+ "title.release-confirm": "출하 확인",
"call.sp": "작업 시작",
"call.ep": "작업 끝",
"call.toast": "작업 시작점과 끝점은 같을 수 없습니다.",
@@ -54,5 +55,7 @@
"time": "시간",
"state": "상태",
"regenerate": "재생성",
- "forced-completion": "강제 완료"
+ "forced-completion": "강제 완료",
+ "take-and-place": "픽업 허용",
+ "allow-to-leave": "떠날 것을 허락하다"
}
\ No newline at end of file
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 31599ea..cd13c52 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -31,6 +31,7 @@
"title.call": "呼叫管理",
"title.command": "指令管理",
"title.task": "任务管理",
+ "title.release-confirm": "放货确认",
"call.sp": "任务起点",
"call.ep": "任务终点",
"call.toast": "任务起点终点不能相同",
@@ -54,5 +55,7 @@
"time": "时间",
"state": "状态",
"regenerate": "重新生成",
- "forced-completion": "强制完成"
+ "forced-completion": "强制完成",
+ "take-and-place": "允许取放",
+ "allow-to-leave": "允许离开"
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ad5f40f..031de30 100644
--- a/pages.json
+++ b/pages.json
@@ -42,6 +42,14 @@
}
}
+ ,{
+ "path" : "pages/manage/release-confirm",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d45c72f..3140f81 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -34,7 +34,8 @@
menuList: [
{id: 1, title: this.$t('title.call'), icon: 'RF01', path: '/pages/manage/call-manage'},
{id: 2, title: this.$t('title.command'), icon: 'RF02', path: '/pages/manage/inst-manage'},
- {id: 3, title: this.$t('title.task'), icon: 'RF03', path: '/pages/manage/task-manage'}
+ {id: 3, title: this.$t('title.task'), icon: 'RF03', path: '/pages/manage/task-manage'},
+ {id: 4, title: this.$t('title.release-confirm'), icon: 'RF04', path: '/pages/manage/release-confirm'}
],
show: false,
secM: []
diff --git a/pages/manage/release-confirm.vue b/pages/manage/release-confirm.vue
new file mode 100644
index 0000000..3032ebc
--- /dev/null
+++ b/pages/manage/release-confirm.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+ {{$t('call.sp')}}
+
+
+
+
+
+
+ {{$t('call.ep')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
index d2b969b..af989ff 100644
Binary files a/static/image/menu/RF04.png and b/static/image/menu/RF04.png differ
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
deleted file mode 100644
index 8f5a2c2..0000000
Binary files a/static/image/menu/RF05.png and /dev/null differ
diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png
deleted file mode 100644
index af989ff..0000000
Binary files a/static/image/menu/RF06.png and /dev/null differ
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
deleted file mode 100644
index 796026f..0000000
Binary files a/static/image/menu/RF07.png and /dev/null differ
diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
deleted file mode 100644
index 30c871f..0000000
Binary files a/static/image/menu/RF08.png and /dev/null differ
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
deleted file mode 100644
index 972a492..0000000
Binary files a/static/image/menu/RF09.png and /dev/null differ
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
deleted file mode 100644
index 15c177a..0000000
Binary files a/static/image/menu/RF10.png and /dev/null differ
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..d9b6847
Binary files /dev/null and b/static/logo.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 2186b23..c2f31d7 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -84,45 +84,15 @@ export const handTaskoperation = (type, id) => request({
task_uuid: id
}
})
+
/**
- * 生箔站点管理
+ * 放货确认
*/
-// 1.1根据区域查询设备编号及状态
-export const queryDevices = () => request({
- url:'api/hands/queryDevices',
- data: {}
-})
-// 1.3更新设备状态操作
-export const updateDeviceStatus = (code, option) => request({
- url:'api/hands/updateDeviceStatus',
+export const updateTask = (code1,code2,type) => request({
+ url:'api/wms/updateTask',
data: {
- device_code: code,
- option: option
- }
-})
-/**
- * agv呼叫管理
- */
-// 1.1查询所有区域信息
-export const agvqueryArea = () => request({
- url:'api/hands/queryArea',
- data: {}
-})
-// 1.2根据区域查询设备编号及状态
-export const agvqueryPointByArea = (code) => request({
- url:'api/hands/queryPointByArea',
- data: {
- region_code: code
- }
-})
-// 1.2创建任务(生成任务号为-开头)
-export const agvcallTask = (scode1, ncode1, scode2, ncode2,type) => request({
- url:'api/hands/callTask',
- data: {
- start_device_code1: scode1,
- next_device_code1: ncode1,
- start_device_code2: scode2,
- next_device_code2: ncode2,
- task_type: type
+ device_code: code1,
+ task_code: code2,
+ option: type
}
})
\ No newline at end of file