Merge remote-tracking branch 'origin/master'

api/login/index.js

@@ -10,4 +10,11 @@ export function getUserInfo() {
 		// header: reqHeader,
 		method: 'GET',
 	})
+}
+export function getDeptName(userId) {
+	return req.request({
+		url:'/system/dept/getDeptName/'+userId,
+		// header: reqHeader,
+		method: 'GET',
+	})
 }

components/dialog-login/dialog-login.vue

@@ -29,7 +29,8 @@
 	const currentUser = ref({})
 	const errorMsg = ref('用户名或密码错误')
 	const successMsg = ref('登录成功')
-	const userInfo = ref ([])
+	const userInfo = ref ({})
+	const user = ref([])
 	// const { proxy } = getCurrentInstance()
 
 	const open = (data) => {
@@ -37,7 +38,7 @@
 		// console.log(dialog.value)
 		baseDialog.value.open()
 	}
-	const handleLogin = () => {
+	 const handleLogin = () => {
 		uni.request({
 			method: 'POST',
 			url: baseURL +'/login',
@@ -68,13 +69,15 @@
 					});
 					getUserInfo(currentUser.value).then((res)=>{
 						if(res.code ==200) {
-							userInfo.value.push(res.data)
-							console.log(userInfo.value)
+							userInfo.value = res.data;
+							user.value.push(userInfo.value);
+							console.log(userInfo.value,999);
+							uni.redirectTo({
+					  url: '/pages/dashboard/index?userName='+userInfo.value.userName + '&userId=' + userInfo.value.userId
+					});
 						}
 					})
-					uni.redirectTo({
-						url: '/pages/dashboard/index'
-					})
+					
 				} else {
 					uni.showToast({
 						title: errorMsg.value,

pages/dashboard/index.vue

@@ -5,10 +5,10 @@
 		</view>
 		<view class="title"><text class="label">德迈仕数字生产线管理平台</text></view>
 		<view class="user-info-container uni-row">
-			<view class="icon"><text class="label">张</text></view>
+			<view class="icon"><text class="label">{{userName.charAt(0)}}</text></view>
 			<view class="user-info uni-column">
-				<view class="nickname"><text class="label">张三 ID 15521</text> </view>
-				<view class="process"><text class="label">当前工段：热处理</text></view>
+				<view class="nickname uni-row"><text class="label">{{userName}}</text><text class="label" style="margin-left: 12rpx;">ID</text><text class="label" style="margin-left: 8rpx;">{{userId}}</text> </view>
+				<view class="process uni-row"><text class="label">当前工段：</text><text class="label">{{deptName}}</text></view>
 			</view>
 		</view>
 		<view class="business-btn uni-row" @click="handleToRecerptSfprod"><text class="label">半成品接收</text></view>
@@ -24,9 +24,21 @@
 <script setup>
 	import { ref } from 'vue'
 	import { getSubPlanDetailsList } from '../../api/business/subPlanDetails'
+	import { getDeptName } from '@/api/login/index.js'
+	import {
+		onLoad,
+		onReady
+	} from '@dcloudio/uni-app'
 	
+	onLoad((options) => {
+		userName.value = options.userName;
+		userId.value = options.userId;
+		getDepartmentName();
+	})
+	const deptName = ref('')
 	const name = ref('')
-	
+	const userName = ref('')
+	const userId = ref(null)
 	const handleToRecerptSfprod = () => {
 		uni.navigateTo({
 			url: "/pages/recerptSfprod/index",
@@ -50,6 +62,16 @@
 		    url:"/pages/index/index",
 		})
 	}
+	function getDepartmentName() {
+		getDeptName(userId.value).then((res) => { 
+			if(res.code == 200){
+				deptName.value = res.msg;
+			}
+		})
+		
+	}
+	
+	
 </script>
 
 <style lang="scss">