From 7e8f2eee438ab9901928dcdf4145d6d7488db481 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 21 Mar 2023 19:13:34 +0800
Subject: [PATCH] home

---
 pages/home/home.vue   | 133 +++++++++++++++++++++---------------------
 pages/login/login.vue |   4 +-
 2 files changed, 67 insertions(+), 70 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 52f89e2..d63ac74 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -9,7 +9,30 @@
 			</view>
 		</view>
 		<view class="nav-wrap">
-			<view class="nav-item"><text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">设备状态修改</text></view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">入箱扫码异常</text>
+			</view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">出箱扫码异常</text>
+			</view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">缓存线盘点</text>
+			</view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">AGV入箱异常</text>
+			</view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">AGV出箱异常</text>
+			</view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">缓存线出箱异常</text>
+			</view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">指令操作</text>
+			</view>
+			<view class="nav-item">
+				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">缓存线异常处理</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -40,71 +63,45 @@
 	}
 </script>
 
-<style lang="scss" scoped>
-.content{
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: flex-start;
-	width: 100%;
-	height: 100%;
-}
-.header{
-	display: flex;
-	width: 100%;
-	height: 44px;
-	background-color: #d7592f;
-}
-.header-item {
-	width: calc(50% - 10px);
-	padding: 0 10px;
-}
-.header-user {
-	font-size: 16px;
-	line-height: 44px;
-	color: #ffffff;
-}
-.header-r{
-	display: flex;
-	justify-content: flex-end;
-	align-items: center
-}
-/deep/ .header-r uni-button{
-	margin-right: 0;
-}
-.header-button{
-	width: 80px;
-	height: 30px;
-	font-size: 16px;
-	color: #333333;
-	line-height: 30px;
-}
-.nav-wrap{
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: flex-start;
-	align-content: center;
-	width: calc(100% - 40%);
-	height: calc(100% - 44px);
-	padding: 0 20%;
-}
-.nav-item{
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 30%;
-	height: 100px;
-	background-color: #acbec6;
-	border-radius: 10px;
-	margin: 7.5px 5% 7.5px 0;
-}
-.nav-item:nth-child(3n){
-	margin-right: 0;
-}
-.nav-text{
-	font-size: 22px;
-	line-height: 30px;
-	color: #ffffff;
-	letter-spacing: 2px;
-}
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.content
+	_fj()
+	_wh(100%, 100%)
+	flex-direction column
+	background-color: #fff
+.header
+	_fj()
+	_wh(100%,88rpx)
+	background-color $red
+.header-item
+	width calc(50% - 20rpx)
+	padding 0 10px
+.header-user
+	_font(32rpx, 88rpx, #fff,,)
+.header-r
+	_fj(flex-end)
+/deep/ .header-r uni-button
+	margin-right 0
+.header-button
+	_wh(160rpx, 60rpx)
+	_font(32rpx,60rpx,#333,,)
+.nav-wrap
+	_fj(flex-start)
+	align-content center
+	flex-wrap wrap
+	_wh(calc(100%),calc(100% - 88rpx))
+	padding 0 20%
+.nav-item
+	_fj(center)
+	align-items center
+	_wh(30%,200rpx)
+	border-radius 20rpx
+	border 10px solid #acbec6
+	margin 15rpx 5% 15rpx 0
+.nav-item:nth-child(3n)
+	margin-right 0
+.nav-text
+	_font(40rpx, 60rpx, #333,,)
+	letter-spacing: 4rpx
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ef5bdab..f270e14 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-	// import { RSAencrypt } from '@/utils/jsencrypt.js'
+	import { RSAencrypt } from '@/utils/jsencrypt.js'
 	import {handLogin} from '@/utils/getData2.js'
 	export default {
 		data() {
@@ -143,7 +143,7 @@
 	}
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .login_bg
 	_wh(100%, 100%)