From 7a0c694173afd738c700efef3f74ce37d41276a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Thu, 28 Mar 2024 16:04:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                  |  2 +-
 pages.json                               | 29 ++++++---
 pages/agv/agv-in/agv-in.vue              | 60 ++++++++++++++++++
 pages/agv/agv-out/agv-out.vue            | 22 +++++++
 pages/agv/agv.vue                        | 78 ++++++++++++++++++++++--
 pages/agv/components/dateCheck/index.vue | 32 ++++++++++
 pages/agv/components/orderItem/index.vue | 22 +++++++
 utils/request.js                         |  4 +-
 8 files changed, 231 insertions(+), 18 deletions(-)
 create mode 100644 pages/agv/agv-in/agv-in.vue
 create mode 100644 pages/agv/agv-out/agv-out.vue
 create mode 100644 pages/agv/components/dateCheck/index.vue
 create mode 100644 pages/agv/components/orderItem/index.vue

diff --git a/main.js b/main.js
index d7360dd..270c568 100644
--- a/main.js
+++ b/main.js
@@ -13,7 +13,7 @@ Vue.use(uView)
 
 Vue.component('PdaScanInput',PdaScanInput)
 Vue.use(plugins)
-
+uni.$u.config.unit = 'rpx'
 Vue.config.productionTip = false
 Vue.prototype.$store = store
 
diff --git a/pages.json b/pages.json
index 57664ee..82d7ed5 100644
--- a/pages.json
+++ b/pages.json
@@ -13,19 +13,13 @@
 		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/images/tabbar/home.png",
-				"selectedIconPath": "static/images/home_.png",
-				"text": "首页"
+				"selectedIconPath": "static/images/tabbar/home_.png",
+				"text": "仓库"
 			},
 			{
 				"pagePath": "pages/agv/agv",
 				"iconPath": "static/images/tabbar/work.png",
-				"selectedIconPath": "static/images/work_.png",
-				"text": "AGV"
-			},
-			{
-				"pagePath": "pages/agv/agv",
-				"iconPath": "static/images/tabbar/work.png",
-				"selectedIconPath": "static/images/work_.png",
+				"selectedIconPath": "static/images/tabbar/work_.png",
 				"text": "AGV"
 			}
 		]
@@ -93,8 +87,25 @@
 			"path": "pages/agv/agv",
 			"style": {
 				"navigationBarTitleText": "AGV",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path" : "pages/agv/agv-in/agv-in",
+			"style" : 
+			{
+				"navigationBarTitleText" : "入料",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/agv/agv-out/agv-out",
+			"style" : 
+			{
+				"navigationBarTitleText" : "出料",
+				"enablePullDownRefresh" : false
+			}
 		}
 	]
 
diff --git a/pages/agv/agv-in/agv-in.vue b/pages/agv/agv-in/agv-in.vue
new file mode 100644
index 0000000..a89def3
--- /dev/null
+++ b/pages/agv/agv-in/agv-in.vue
@@ -0,0 +1,60 @@
+<template>
+	<view>
+		<dateCheck></dateCheck>
+		<scroll-view class="scroll-view-box" :scroll-y="true">
+			<view v-for="(item, index) in oldMaterialList">
+				<materialItem style="background-color: darkgray" :materialInfo="item"></materialItem>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import dateCheck from '@/pages/agv/components/dateCheck/index.vue';
+	export default {
+		components: {
+			dateCheck
+		},
+		data() {
+			return {
+				oldMaterialList: [],
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+.scroll-view-box {
+	width: 94%;
+	margin: 0 auto;
+	margin-top: 30px;
+	height: 400px;
+	padding: 10px;
+	background-color: rgba(179, 179, 179, 0.7);
+	border-radius: 5px;
+}
+.scroll-view-last {
+	width: 100%;
+	height: 60px;
+	font-size: 20px;
+	color: rgba(0, 9, 0, 0.7);
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	margin-top: 10px;
+	padding-left: 10px;
+	padding-right: 10px;
+	border-radius: 10px;
+	background-color: white;
+}
+.button-box {
+	width: 80%;
+	margin: 10px auto;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+</style>
diff --git a/pages/agv/agv-out/agv-out.vue b/pages/agv/agv-out/agv-out.vue
new file mode 100644
index 0000000..0cc4450
--- /dev/null
+++ b/pages/agv/agv-out/agv-out.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		出料
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/agv/agv.vue b/pages/agv/agv.vue
index 8183fd0..f8d23c9 100644
--- a/pages/agv/agv.vue
+++ b/pages/agv/agv.vue
@@ -1,6 +1,15 @@
 <template>
-	<view>
-		
+	<view class="content background">
+		<view class="grid-box">
+			<uni-grid :column="3" @change="gridCheck" :showBorder="false" :highlight="false">
+				<uni-grid-item v-for="(item, index) in gridItemList" :index="index + 1">
+					<view class="item">
+						<uni-icons :type="item.icon" :size="40" color="#00aaff" />
+						<text class="text">{{ item.name }}</text>
+					</view>
+				</uni-grid-item>
+			</uni-grid>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +17,72 @@
 	export default {
 		data() {
 			return {
-				
+				gridItemList: [{
+						name: '入料',
+						icon: 'download-filled'
+					},
+					{
+						name: '出料',
+						icon: 'upload-filled'
+					},
+
+				]
 			}
 		},
 		methods: {
-			
+			gridCheck(item) {
+				const index = item.detail?.index;
+				switch (index) {
+					case 1:
+						uni.navigateTo({
+							url: '/pages/agv/agv-in/agv-in'
+						});
+						break;
+					case 2:
+						uni.navigateTo({
+							url: '/pages/agv/agv-out/agv-out'
+						});
+						break;
+					default:
+						break;
+				}
+			}
 		}
 	}
 </script>
 
-<style>
+<style scoped>
+	.background {
+		/* margin-top: 20px;
+		height: 692px; */
+		/* background-color: #4671d5; */
+	}
 
-</style>
+	.title-box {
+		width: 100%;
+		height: 150px;
+	}
+
+	.grid-box {
+		width: 100%;
+		height: 100%;
+	}
+
+	.grid-box .item {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.item {
+		background-color: rgba(128, 128, 128, 0.5);
+	}
+
+	.text {
+		font-size: 24px;
+		color: white;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/agv/components/dateCheck/index.vue b/pages/agv/components/dateCheck/index.vue
new file mode 100644
index 0000000..982caba
--- /dev/null
+++ b/pages/agv/components/dateCheck/index.vue
@@ -0,0 +1,32 @@
+<template>
+	<div>
+		<u-calendar :show="show" title="请选择工单日期"></u-calendar>
+		<u-button @click="show = true">选择工单日期</u-button>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+			}
+		},
+		methods: {
+			change(e) {
+				console.log(e);
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/agv/components/orderItem/index.vue b/pages/agv/components/orderItem/index.vue
new file mode 100644
index 0000000..0746720
--- /dev/null
+++ b/pages/agv/components/orderItem/index.vue
@@ -0,0 +1,22 @@
+<template>
+	<div>
+		<u-picker v-model="show" mode="time"></u-picker>
+		<u-button @click="show = true">打开</u-button>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index e7ea161..e1148b8 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -18,9 +18,9 @@ import {
 let timeout = 10000
 const request = config => {
 	// 浏览器测试用
-	  const storageBaseUrl = 'http://' + getBaseUrl() + '/api';
+	  // const storageBaseUrl = 'http://' + getBaseUrl() + '/api';
 	// 真机测试以及部署用
-	//const storageBaseUrl = 'http://' + getBaseUrl();
+	const storageBaseUrl = 'http://' + getBaseUrl();
 	// 是否需要设置 token
 	const isToken = (config.headers || {}).isToken === false
 	config.header = config.header || {}