diff --git a/common/style/layout.styl b/common/style/layout.styl
index 3b7e0fc..7ca5571 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -290,6 +290,15 @@ uni-button:after {
border: 2rpx solid #ff6a00;
border-radius: 10rpx;
}
+.button-primary1
+ background-color: #E9B451
+ border-color: #E9B451
+.button-primary2
+ background-color: #6CBE8B
+ border-color: #6CBE8B
+.button-primary3
+ background-color: #6798ef
+ border-color: #6798ef
.button-info, .submit-button[disabled] {
background-color: #c9c9c9;
border: 2rpx solid #c9c9c9;
diff --git a/pages.json b/pages.json
index ad5f40f..b1768ef 100644
--- a/pages.json
+++ b/pages.json
@@ -42,6 +42,22 @@
}
}
+ ,{
+ "path" : "pages/manage/sb-point-manage",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/manage/agv-call-manage",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index def4f8d..239b12e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -34,7 +34,9 @@
menuList: [
{id: 1, title: '呼叫管理', icon: 'RF01', path: '/pages/manage/call-manage'},
{id: 2, title: '指令管理', icon: 'RF02', path: '/pages/manage/inst-manage'},
- {id: 3, title: '任务管理', icon: 'RF03', path: '/pages/manage/task-manage'}
+ {id: 3, title: '任务管理', icon: 'RF03', path: '/pages/manage/task-manage'},
+ {id: 4, title: '生箔站点管理', icon: 'RF04', path: '/pages/manage/sb-point-manage'},
+ {id: 5, title: 'agv呼叫管理', icon: 'RF05', path: '/pages/manage/agv-call-manage'}
],
show: false,
secM: []
diff --git a/pages/manage/sb-point-manage.vue b/pages/manage/sb-point-manage.vue
new file mode 100644
index 0000000..3351253
--- /dev/null
+++ b/pages/manage/sb-point-manage.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+ {{e.device_name}}
+ {{e.device_code}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png
index e18e35a..d648d05 100644
Binary files a/static/image/menu/RF01.png and b/static/image/menu/RF01.png differ
diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
new file mode 100644
index 0000000..e18e35a
Binary files /dev/null and b/static/image/menu/RF04.png differ
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
new file mode 100644
index 0000000..b33885f
Binary files /dev/null and b/static/image/menu/RF05.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 71c5605..93e0618 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -83,4 +83,45 @@ export const handTaskoperation = (type, id) => request({
type: type,
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',
+ data: {
+ device_code: code,
+ option: option
+ }
+})
+/**
+ * agv呼叫管理
+ */
+// 1.1查询所有区域信息
+export const agvqueryDevices = () => request({
+ url:'api/hands/queryArea',
+ data: {}
+})
+// 1.2根据区域查询设备编号及状态
+export const agvqueryPointByArea = (code) => request({
+ url:'api/hands/queryPointByArea',
+ data: {
+ areaCode: code
+ }
+})
+// 1.2创建任务(生成任务号为-开头)
+export const agvcallTask = (scode1, ncode1, scode2, ncode2) => request({
+ url:'api/hands/callTask',
+ data: {
+ start_device_code1: scode1,
+ next_device_code1: ncode1,
+ start_device_code2: scode2,
+ next_device_code2: ncode2,
+ }
})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index e507916..829e72a 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -115,4 +115,32 @@ export const queryPointByArea = () => {
}]
}
return res
+}
+export const queryDevices = () => {
+ let res = {
+ data: [{
+ device_code: '1',
+ device_name: 'JLDFJLLJ',
+ seq_num: '1'
+ }, {
+ device_code: '12',
+ device_name: 'JLDFJLLJ'
+ }, {
+ device_code: '13',
+ device_name: 'JLDFJLLJ'
+ }, {
+ device_code: '14',
+ device_name: 'JLDFJLLJ'
+ }, {
+ device_code: '15',
+ device_name: 'JLDFJLLJ'
+ }, {
+ device_code: '16',
+ device_name: 'JLDFJLLJ'
+ }, {
+ device_code: '17',
+ device_name: 'JLDFJLLJ'
+ }]
+ }
+ return res
}
\ No newline at end of file