add:收卷辊库\检测取样\废箔处理

utils/getData2.js

@@ -20,56 +20,36 @@ export const handLogin = (user, password) => request({
 		password: password
 	}
 })
-// 区域
-export const regionList = () => request({
-	url:'api/fab/regionList',
-	method: 'GET'
-})
-// 区域锁定
-export const handheldLock = (code, status) => request({
-	url:'api/handheld/lock',
-	data: {region_code: code, status: status}
-})
-// 外协区空料架送回
-export const handheldRack = (code, vcode) => request({
-	url:'api/handheld/rack',
-	data: {device_code: code, vehicle_code: vcode}
-})
-// 外协区空笼框送回
-export const handheldCageFrame = (code, list) => request({
-	url:'api/handheld/cageFrame',
-	data: {device_code: code, vehicle_list: list}
-})
-// 物料转运
-export const handheldTranshipment = (code, vcode) => request({
-	url:'api/handheld/transhipment',
-	data: {device_code: code, vehicle_code: vcode}
-})
-// 载具类型列表
-export const vehicleType = () => request({
-	url:'api/fab/vehicleType',
+// 菜单
+export const authority = () => request({
+	url:'mobile/auth/authority',
 	data: {}
 })
-// 补空框
-export const handheldStorehouse = (code, type) => request({
-	url:'api/handheld/storehouse',
-	data: {device_code: code, vehicle_type: type}
+// 入辊
+export const onlySendRollTruss = (code, vcode, type) => request({
+	url:'api/pda/other/onlySendRollTruss',
+	data: {point_code: code, vehicle_code: vcode, vehicle_type: type}
 })
-// 工序下料
-// export const handheldGetRegionCode = (code) => request({
-// 	url:'api/handheld/getRegionCode',
-// 	data: {orderCode: code}
-// })
-export const handheldBlanking = (code, rcode, vcode, material) => request({
-	url:'api/handheld/blanking',
-	data: {device_code: code, region_code: rcode, vehicle_code: vcode, material: material}
+// 
+export const onlyCallRollTruss = (code, vcode, type) => request({
+	url:'api/pda/other/onlyCallRollTruss',
+	data: {point_code: code, vehicle_type: type}
 })
-// 修改订单工序
-export const fabOrders = (code) => request({
-	url:'api/fab/orders',
-	data: {vehicle_code: code}
+// 呼叫取样
+export const callAgvToSampling = (code1, code2) => request({
+	url:'api/pda/other/callAgvToSampling',
+	data: {point_code1: code1, point_code1: code2}
 })
-export const updateOrder = (data) => request({
-	url:'api/handheld/updateOrder',
-	data: data
+export const callAgvToSamplingVerify = (flag, scode, ecode) => request({
+	url:'api/pda/other/callAgvToSamplingVerify',
+	data: {flag: flag, startPoint: scode, endPoint: ecode}
+})
+// 废箔搬运
+export const startMoveWasteFoilv2 = (code) => request({
+	url:'api/pda/other/startMoveWasteFoil/v2',
+	data: {point_code: code}
+})
+export const resumeMoveWasteFoilv2 = (flag, code) => request({
+	url:'api/pda/other/resumeMoveWasteFoil/v2',
+	data: {flag: flag, point_code: code}
 })

utils/mork2.js

@@ -1,24 +1,15 @@
-export const handLogin = (user, password) => {
+export const authority = () => {
 	let res = {
-		user: {
-			user: {username: 'admin'},
-		},
-		token: 'abcd'
-	}
-	return res
-}
-export const regionList = () => {
-	let res = {
-		content: [{value: '1', label: 'aa'}, {value: '2', label: 'bb'}]
-	}
-	return res
-}
-	
-export const fabOrders = (data) => {
-	let res = {
-		content: [
-		{order_code: '111', region_code: '3', due_date: '2020-10-10 11:30:30'}
-	]
-	}
+		code: '1',
+		result: {
+		rf_menu0: {
+			sonTree:
+			[
+				{path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]},
+				{path: 'RF01', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]},
+				{path: 'RF01', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]}
+			]
+		}
+	}}
 	return res
 }