diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index a3e5dd6..a6122c9 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -1,49 +1,95 @@
 <template>
 	<view class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
 		<view class="right-container-title-nav">
-			<text style="margin-left: 30rpx;">
-				NUID：{{ uni.getStorageSync('nuId')}}
-			</text>
-			<text class="new-weight">
-				{{ uni.getStorageSync('nuName')}}
-			</text>
-			<view class="right-icons">
+			<view class="title-card">
+				<view class="card-top">
+					<view class="card-top-left">
+						50
+					</view>
+					<view class="card-top-right">
+						<image class="right-img" src="/static/index/card/arrow.png" />
+					</view>
+					<view class="card-spec">
+						<view class="line">
+						</view>
+						<view class="line-gray">
+							80
+						</view>
+					</view>
+
+				</view>
+				<view class="card-bottom">
+					<image class="bottom-img" src="/static/index/card/help.png" />
+					<view class="bottom-font">
+						护理
+					</view>
+				</view>
+			</view>
+			<view class="title-card">
+				<view class="card-top">
+					<view class="card-top-left">
+						32
+					</view>
+					<view class="card-top-right">
+						<image class="right-img" src="/static/index/card/arrow.png" />
+					</view>
+					<view class="card-spec">
+						<view class="line">
+						</view>
+						<view class="line-gray">
+							60
+						</view>
+					</view>
+
+				</view>
+				<view class="card-bottom">
+					<image class="bottom-img" src="/static/index/card/doctor.png" />
+					<view class="bottom-font">
+						医疗
+					</view>
+				</view>
+			</view>
+			<view class="title-card">
+				<view class="card-top">
+					<view class="card-top-left">
+						65
+					</view>
+					<view class="card-top-right">
+						<image class="right-img" src="/static/index/card/arrow.png" />
+					</view>
+					<view class="card-spec">
+						<view class="line">
+						</view>
+						<view class="line-gray">
+							70
+						</view>
+					</view>
+
+				</view>
+				<view class="card-bottom">
+					<image class="bottom-img" src="/static/index/card/work.png" />
+					<view class="bottom-font">
+						行政
+					</view>
+				</view>
+			</view>
+			<view class="title-time">
+				<view class="time-title">
+					{{ currentTime }}
+				</view>
+				<view class="time-date">
+					{{ fullDate }}
+				</view>
 				<view class="right-container-tem">
 					<image class="right-container-tem-img" src="/static/index/newindex/wendu/0.png" />
-					<text class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C</text>
+					<text
+						class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C</text>
 					<image class="right-container-tem-img" src="/static/index/newindex/wendu/1.png" />
-					<text class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%</text>
+					<text
+						class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%</text>
 				</view>
-
-				<image class="right-icons-img" :src="`/static/index/undericons/man.png`" />
-				<view>{{name}}</view>
 			</view>
 		</view>
-		<view class="scroll-vi">
-			<view class="zhezhao-left"></view>
-			<view class="zhezhao-right"></view>
-			<scroll-view scroll-x="true" style="width: 100%;height: 100%;">
-				<view style="display: flex;align-items: center;">
-					<view style="width: 30rpx;"></view>
-					<view v-for="(item,index) in typeArray" :key="index"
-						:class="{zerotarget: movetype===0 && zeroIndex===index}" class="menu"
-						:style="{backgroundColor: movetype===0 && zeroIndex===index?`#ddf0ff`:``}"
-						@click="typeNow=index;zeroIndex=index;clean();movetype=0;">
-
-						<donghua :links="item.url" :playing="typeNow===index" />
-						<text class="menu-font" :class="{ zoom: typeNow===index }"
-							:style="typeNow===index?{color:`#008FF5`}:{}">
-							{{item.name}}
-						</text>
-					</view>
-					<view style="width: 100rpx;">
-
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-
-
 		<view class="photo-father">
 			<view class="juzhong" style="margin-left: -30rpx;">
 				<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
@@ -69,7 +115,7 @@
 					一级压疮防护
 				</view>
 			</view>
-			<view style="display: flex;align-items: center;margin-top: 20rpx;">
+			<!-- <view style="display: flex;align-items: center;margin-top: 20rpx;">
 				<image class="down-img" :src="`/static/index/newindex/states/left.png`" />
 				<view v-for="(item,index) in downStates" :key="index" class="states-father">
 					<image class="icon-img" :src="item.url" />
@@ -79,15 +125,14 @@
 
 				</view>
 				<image class="down-img" :src="`/static/index/newindex/states/right.png`" />
-			</view>
+			</view> -->
 			<view style="display: flex;margin-top: 40rpx;">
-				<view :class="{thirdtarget: movetype===3 && zeroIndex===0}"
-					style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
+				<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
 					<view class="start-button">
 						开始服务
 					</view>
 				</view>
-				<view :class="{thirdtarget: movetype===3 && zeroIndex===1}" style="width: 240rpx;height: 90rpx;">
+				<view style="width: 240rpx;height: 90rpx;">
 					<view class="end-button">
 						结束服务
 					</view>
@@ -96,9 +141,8 @@
 			</view>
 		</view>
 		<view class="left-menu">
-			<view v-for="(item,index) in leftArray" :key="index" style="margin: 30rpx 0;"
-				:class="{firsttarget: movetype===1 && zeroIndex===index}">
-				<view class="left-ball" :style="{backgroundColor: movetype===1 && zeroIndex===index?`#ddf0ff`:``}">
+			<view v-for="(item,index) in leftArray" :key="index" style="margin: 30rpx 0;">
+				<view class="left-ball">
 					<image class="left-menu-img" :src="item" />
 				</view>
 
@@ -110,13 +154,11 @@
 			<image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`"
 				@click="scrollTop>0? scrollTop -= 115:scrollTop=0" />
 			<scroll-view scroll-y="true" class="right-scroll" :scroll-top="scrollTop" @scroll="onScroll">
-				<view style="height: 30rpx;">
+				<view style="height: 20rpx;">
 
 				</view>
-				<view v-for="(item,index) in rightMenu" :class="{secondtarget: movetype===2 && zeroIndex===index}"
-					style="margin: 20rpx auto;width: 110rpx;">
-					<view class="white-circle"
-						:style="{backgroundColor: movetype===2 && zeroIndex===index?`#ddf0ff`:``}">
+				<view v-for="(item,index) in rightMenu" style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;">
+					<view class="white-circle">
 						<image class="right-menu-img" :src="item.url" />
 						<view class="right-menu-name">
 							{{ item.name }}
@@ -132,16 +174,69 @@
 			<image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`"
 				@click="scrollTop > (55* rightMenu.length) ? scrollTop = (55* rightMenu.length) : scrollTop += 115 " />
 		</view>
-		<!-- 轮盘 -->
-
 	</view>
+	<view class="index-content-right" :style="transition?{opacity: `1`}:{opacity: `0`}">
+		<view class="right-top">
+			<view class="top-title">
+				护理单元
+			</view>
+			<view class="top-heng"></view>
+			<scroll-view class="top-list" scroll-y>
+				<view class="list-view" :style="menutarget===index?{borderColor:`#8DD6FF`}:{}"
+					v-for="(item,index) in filteredMenu(0)" :key="index" @click="clickmenu(index)">
+					<image class="list-img" :src="`/static/index/newindex/leftmenu/NU${item.elderInfo?.name?`blue`:`white`}.png`" />
+					<view class="">
+						<view class="first-line">
+							<view style="font-size: 1.2vw;">
+								护理单元01
+							</view>
+							<view class="first-line-second">
+								{{ item.elderInfo?.name?`入住`:`空闲` }}
+							</view>
+						</view>
+						<view class="second-line">
+							NUID：2506000001
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="right-bottom">
+			<view class="bottom-title">
+				<image class="bottom-carmera" src="/static/index/newindex/leftmenu/carmera.png" />
+				<view class="blue-button">
+					长者标签
+				</view>
 
+			</view>
+			<image class="big-older" src="/static/index/newindex/leftmenu/older.png" />
+			<view class="name-weight">
+				{{ uni.getStorageSync('NUall').elderInfo?.name }}
+			</view>
+			<view class="message-view">
+				{{ uni.getStorageSync('NUall').elderInfo?.sex }}
+				<view class="message-shu"></view>
+				<view style="font-weight: 600;">
+					{{ calcAge(uni.getStorageSync('NUall').elderInfo?.dateOfBirth) }}
+				</view>
+				岁
+				<view class="message-shu"></view>
+				<image class="message-img" :src="`/static/index/newindex/leftmenu/time.png`" />
+				{{ uni.getStorageSync('NUall').elderInfo?.startTime }}
+			</view>
+			<view class="message-bottom">
+				<view class="bottom-tags" v-for="(item,index) in tagarray" :key="index">
+					{{ item }}
+				</view>
+			</view>
+		</view>
+	</view>
 
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch } from 'vue';
-
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
+	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
 
 	const props = defineProps({
 		isShow: {
@@ -150,8 +245,25 @@
 		},
 
 	});
+	const leftMenuArray = ref([]);
+	
+	const menutarget = ref(0)
 
+	const clickmenu = (index : number) => {
+		menutarget.value = index
+		let data = filteredMenu(0)[index]
+		uni.setStorageSync('nuId', data.nuId);
+		uni.setStorageSync('nuName', data.nuName);
+		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
+		uni.setStorageSync('NUall', data);
+	}
+	const tagarray = ["市医保", "半失能", "正常计费"]
 
+	function calcAge(dateOfBirth : string) {
+		const birthYear = parseInt(dateOfBirth.slice(0, 4), 10);
+		const currentYear = new Date().getFullYear();
+		return currentYear - birthYear;
+	}
 	const typeNow = ref(-1);
 	const photoplay = ref(false)
 	const downArray = ref()
@@ -204,8 +316,8 @@
 	])
 	const leftArray = ref(genPaths(
 		'/static/index/newindex/leftmenu',
-		'',
-		3,     // 张数
+		'left',
+		5,     // 张数
 		'png',
 		0,     // 起始索引
 		false  // 不补零
@@ -257,6 +369,7 @@
 				// console.log("????",transition.value)
 				setTimeout(() => {
 					transition.value = true;
+					console.log("看看", uni.getStorageSync('NUall'))
 				}, 50)
 			} else {
 				transition.value = false;
@@ -267,52 +380,171 @@
 	const name = ref("");
 
 	// 定义响应式数据现在时间
-	// const currentTime = ref('');
-	// const fullDate = ref('');
-	// const weekDay = ref('');
-	// let timerId = null;
-	// // 更新时间、日期和星期的方法
-	// const updateTime = () => {
-	// 	const now = new Date();
+	const currentTime = ref('');
+	const fullDate = ref('');
+	const weekDay = ref('');
+	let timerId = null;
+	// 更新时间、日期和星期的方法
+	const updateTime = () => {
+		const now = new Date();
 
-	// 	// 获取当前时间的时分
-	// 	const hours = now.getHours().toString().padStart(2, '0');
-	// 	const minutes = now.getMinutes().toString().padStart(2, '0');
-	// 	currentTime.value = `${hours}:${minutes}`;
+		// 获取当前时间的时分
+		const hours = now.getHours().toString().padStart(2, '0');
+		const minutes = now.getMinutes().toString().padStart(2, '0');
+		currentTime.value = `${hours}:${minutes}`;
 
-	// 	// 获取完整的日期（年/月/日）
-	// 	const year = now.getFullYear();
-	// 	const month = (now.getMonth() + 1).toString().padStart(2, '0');
-	// 	const day = now.getDate().toString().padStart(2, '0');
-	// 	fullDate.value = `${month}-${day}`;
+		// 获取星期几
+		const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+		const week = weekDays[now.getDay()];
+		weekDay.value = week;
 
-	// 	// 获取星期几
-	// 	const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-	// 	const week = weekDays[now.getDay()];
-	// 	weekDay.value = week;
-	// };
+		// 获取完整的日期（年/月/日）
+		const year = now.getFullYear();
+		const month = (now.getMonth() + 1).toString().padStart(2, '0');
+		const day = now.getDate().toString().padStart(2, '0');
+		fullDate.value = `${year}.${month}.${day} ${weekDay.value}`;
+	};
 	onMounted(() => {
 		name.value = uni.getStorageSync('realname')
 		typeNow.value = 0;
-		// timerId = updateTime();
-		// // 每秒更新一次时间
-		// setInterval(updateTime, 1000);
+		timerId = updateTime();
+		// 每秒更新一次时间
+		setInterval(updateTime, 1000);
 		photoplay.value = true;
+		getmenu()
 	})
+	const filteredMenu = (index : number) => {
+		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
+	}
+	const getmenu = () => {
+		queryPadPageList().then((res => {
+			leftMenuArray.value = res.result.records;
+			leftMenuArray.value.forEach((element:any,index:number)=>{
+				if(element.nuId===uni.getStorageSync('NUall').nuId){
+					menutarget.value = index
+				}
+			})
+		}))
+	}
 	const lanjie = ref(false);
-	// const clean = () => {
-	// 	if (movetype.value == -1) {
-	// 		lanjie.value = true;
-	// 		emit("cleanmain")
-	// 	}
-
-	// }
 </script>
 
 <style scoped lang="less">
+	.index-content-right {
+		width: 19.5vw;
+		margin-left: 2vw;
+		height: 100%;
+		transition: opacity 1s ease;
+
+		.right-top {
+			margin-top: 8vh;
+			width: 100%;
+			height: 50vh;
+			background-color: #fff;
+			border-radius: 4vh;
+
+			.top-title {
+				width: 100%;
+				height: 7vh;
+				display: flex;
+				align-items: center;
+				margin-left: 2vw;
+				font-size: 1.4vw;
+				font-weight: 600;
+			}
+
+			.top-heng {
+				width: 90%;
+				margin-left: 5%;
+				height: 0.05vw;
+				background-color: #DCDCDC;
+			}
+
+			.top-list {
+				width: 100%;
+				height: 41vh;
+
+				.list-view {
+					width: 90%;
+					margin-left: 5%;
+					height: 8vh;
+					border: 2rpx solid transparent;
+					border-radius: 7vw;
+					margin-bottom: 0.6vh;
+					display: flex;
+					align-items: center;
+
+					.list-img {
+						width: 4vw;
+						height: 4vw;
+						margin-left: 0.5vw;
+						margin-right: 0.5vw;
+					}
+
+					.first-line {
+						display: flex;
+
+						.first-line-second {
+							background-color: #E5E5E5;
+							color: #555555;
+							width: 3.2vw;
+							height: 1.5vw;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							font-size: 0.9vw;
+							border-radius: 0.5vw;
+							margin-left: 0.5vw;
+						}
+					}
+
+					.second-line {
+						color: #999999;
+						margin-top: 0.2vw;
+						font-size: 1vw;
+					}
+				}
+
+			}
+		}
+
+		.right-bottom {
+			margin-top: 2vh;
+			width: 100%;
+			height: 38vh;
+			background-color: #fff;
+			border-radius: 3vh;
+			padding-top: 1vh;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.bottom-title {
+
+				width: 100%;
+				padding: 0 8%;
+				display: flex;
+				justify-content: space-between;
+
+				.bottom-carmera {
+					margin-top: 0.5vw;
+					width: 3vw;
+					height: 3vw;
+				}
+			}
+
+			.big-older {
+				margin-top: 0.5vw;
+				width: 9vw;
+				height: 9vw;
+				border: 1rpx solid #DCDCDC;
+				border-radius: 50%;
+			}
+		}
+	}
+
 	.index-content-other {
-		width: calc(100% - 260rpx);
-		// background-color: red;
+		width: 65vw;
 		height: 100%;
 		transition: opacity 1s ease;
 		position: relative;
@@ -334,81 +566,22 @@
 	}
 
 	.right-container-title-nav {
-		margin-top: 60rpx;
+		margin-top: 100rpx;
 		display: flex;
-		align-items: center;
-		height: 60rpx;
+		height: 20vh;
 		position: relative;
 		font-size: 28rpx;
-
-		.new-weight {
-			margin-left: 30rpx;
-			font-weight: 600;
-		}
-
-		.right-icons {
-			position: absolute;
-			right: 30rpx;
-			top: 0;
-			// transform: translateY(-50%);
-			display: flex;
-			align-items: center;
-			height: 60rpx;
-		}
-
-		.right-icons-img {
-			width: 60rpx;
-			height: 60rpx;
-			margin-left: 20rpx;
-			margin-right: 20rpx;
-		}
-	}
-
-	.scroll-vi {
-		height: 120rpx;
-		width: 95%;
-		margin-left: 0rpx;
-		margin-top: 20rpx;
-		position: relative;
-		margin-bottom: 80rpx;
-
-		.menu {
-			margin-top: 15rpx;
-			flex: 0 0 auto; // 👈 关键点
-			height: 90rpx;
-			width: 240rpx;
-			border-radius: 50rpx;
-			// margin: 45rpx auto;
-			margin-right: 20rpx;
-			background-color: #fff;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			padding-top: 9rpx;
-
-			.menu-img {
-				width: 55rpx;
-				height: 55rpx;
-				margin-right: 15rpx;
-			}
-
-			.menu-font {
-				margin-top: 18rpx;
-				font-size: 25rpx;
-
-			}
-
-		}
 	}
 
 	.date {
 		display: flex;
 		justify-content: space-around;
-		margin-top: 10rpx;
+		margin-top: 0.8vw;
 	}
 
 	.right-container-tem {
 		display: flex;
+		margin-top: 0.8vw;
 
 		.right-container-tem-text {
 			font-size: 30rpx;
@@ -447,7 +620,6 @@
 		margin-bottom: 0rpx;
 		position: relative;
 		margin-left: -50rpx;
-		// z-index: 3;
 	}
 
 	.big-img {
@@ -520,7 +692,6 @@
 		justify-content: center;
 		align-items: center;
 		border-radius: 40rpx;
-		// color: #fff;
 		font-size: 30rpx;
 	}
 
@@ -548,8 +719,8 @@
 
 	.left-menu {
 		position: absolute;
-		top: 50%;
-		left: 30rpx;
+		top: 55%;
+		left: 100rpx;
 		transform: translateY(-50%);
 	}
 
@@ -561,8 +732,8 @@
 
 	.left-ball {
 
-		width: 100rpx;
-		height: 100rpx;
+		width: 80rpx;
+		height: 80rpx;
 		border-radius: 50%;
 		display: flex;
 		justify-content: center;
@@ -571,14 +742,14 @@
 		background-color: #fff;
 
 		.left-menu-img {
-			width: 50rpx;
-			height: 50rpx;
+			width: 40rpx;
+			height: 40rpx;
 		}
 	}
 
 	.right-menu {
 		position: absolute;
-		top: 50%;
+		top: 60%;
 		right: 80rpx;
 		transform: translateY(-50%);
 		display: flex;
@@ -592,29 +763,13 @@
 			padding: 0 50rpx;
 		}
 
-		// .top-img ::before {
-		// 	content: "";
-		// 	position: absolute;
-		// 	top: 0;
-		// 	left: 0;
-		// 	width: 100%;
-		// 	height: 100%;
-		// 	background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8) 0%, rgba(255, 255, 255, 0) 100%);
-		// 	filter: blur(10px);
-		// 	/* 模糊强度 */
-		// 	z-index: 1;
-		// }
-
 		.right-scroll {
 			width: 100%;
-			height: 750rpx;
-			// background-color: red;
+			height: 650rpx;
 		}
 
 		.white-circle {
-
-			height: 200rpx;
-
+			height: 170rpx;
 			border-radius: 60rpx;
 			background-color: #fff;
 			display: flex;
@@ -622,14 +777,16 @@
 			align-items: center;
 			flex-direction: column;
 			text-align: center;
+			font-size: 25rpx;
+			width: 100rpx;
 
 			.right-menu-img {
-				width: 80rpx;
-				height: 80rpx;
+				width: 50rpx;
+				height: 50rpx;
 			}
 
 			.right-menu-name {
-				width: 80rpx;
+				width: 50rpx;
 			}
 		}
 	}
@@ -694,106 +851,169 @@
 		z-index: 4;
 	}
 
-	.zerotarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 50rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
+	.title-card {
+		width: 10vw;
+		height: 9vw;
+		border-radius: 2vw;
+		background-color: #FFFFFF;
+		padding: 1.6vw;
 		position: relative;
-		z-index: 0;
-	}
+		margin-right: 1.5vw;
 
-	.firsttarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 50%;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
+		.card-bottom {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			height: 3vw;
+			display: flex;
 
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
+			.bottom-img {
+				width: 1.6vw;
+				height: 1.6vw;
+				margin-left: 1.8vw;
+			}
 
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	.secondtarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 60rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	.thirdtarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 40rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	@keyframes scalePulse {
-		0% {
-			transform: scale(1);
+			.bottom-font {
+				color: #555555;
+				font-size: 1.4vw;
+				margin-left: 0.5vw;
+			}
 		}
 
-		25% {
-			/* 先收缩一点点 */
-			transform: scale(0.94);
+		.card-top {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			position: relative;
+
+			.card-top-left {
+				font-size: 1.8vw;
+				font-weight: 600;
+			}
+
+			.card-top-right {
+				width: 2vw;
+				height: 2vw;
+				border-radius: 50%;
+				background-color: #F1F2F3;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.right-img {
+					width: 0.8vw;
+					height: 0.8vw;
+				}
+			}
+
+			.card-spec {
+				position: absolute;
+				top: 1.1vw;
+				left: 1.6vw;
+				width: 1.5vw;
+				height: 2vw;
+				// background-color: #0076FF;
+
+				.line {
+					position: absolute;
+					inset: 0;
+					background: linear-gradient(to bottom right,
+							transparent calc(50% - 1px),
+							#d5d5d5 50%,
+							transparent calc(50% + 1px))
+				}
+
+				.line-gray {
+					position: absolute;
+					right: -1.1vw;
+					bottom: -0.6vw;
+					color: #888888;
+					font-size: 1.3vw;
+				}
+			}
+		}
+	}
+
+	.title-time {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 15vw;
+		height: 9.5vw;
+		border-radius: 2vw;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.time-title {
+			font-weight: 600;
+			font-size: 3vw;
+			margin-top: 0.4vw;
 		}
 
-		65% {
-			/* 再放大到略超出的感觉 */
-			transform: scale(1.08);
+		.time-date {
+			margin-top: 0.2vw;
+			font-size: 1.3vw;
+			color: #222222;
+		}
+	}
+
+	.blue-button {
+		margin-top: 0.5vw;
+		width: 7vw;
+		height: 2.5vw;
+		background: linear-gradient(to bottom, #009DEF, #0076FF);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 40rpx;
+		color: #fff;
+		font-size: 28rpx;
+	}
+
+	.name-weight {
+		font-size: 2vw;
+		font-weight: 600;
+		margin: 0.2vw 0;
+	}
+
+	.message-view {
+		display: flex;
+
+		.message-shu {
+			width: 3rpx;
+			height: 1.5vw;
+			background-color: #bcc1c7;
+			margin: 0 0.4vw;
+			margin-top: 0.1vw;
 		}
 
-		100% {
-			transform: scale(1);
+		.message-img {
+			width: 1.5vw;
+			height: 1.5vw;
+			margin-top: 0.1vw;
+		}
+	}
+
+	.message-bottom {
+		margin-top: 0.5vh;
+		width: 100%;
+		height: 4vh;
+		display: flex;
+		justify-content: center;
+
+		.bottom-tags {
+			background-color: #E7F1FF;
+			color: #0084FA;
+			height: 100%;
+			display: flex;
+			align-items: center;
+			padding: 0 0.6vw;
+			border-radius: 0.8vw;
+			font-size: 1.2vw;
+			margin: 0 0.2vw;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index 0fea1f1..27ee042 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -2120,7 +2120,7 @@
 						bodyTagListLook.value.push(res.netPic)
 					}
 				})
-				console.log("res11111",res)
+				// console.log("res11111",res)
 			})
 		}
 	}
@@ -2164,7 +2164,7 @@
 				})
 			})
 			bigArray.value = res.result;
-			console.log("右侧",bigArray.value)
+			// console.log("右侧",bigArray.value)
 		}
 		downList.value = bigArray.value[0].children
 		upmenuIndex.value = -1;
diff --git a/pages/login/animationpage.vue b/pages/login/animationpage.vue
index cd99d55..37ca60d 100644
--- a/pages/login/animationpage.vue
+++ b/pages/login/animationpage.vue
@@ -61,6 +61,10 @@
 					<image class="small-imge" src="/static/index/warehouse/t2.png" mode=""></image>
 					医疗矩阵 
 				</view>
+				<view class="one-button">
+					<image class="small-imge" src="/static/index/warehouse/t5.png" mode=""></image>
+					库房矩阵 
+				</view>
 			</view>
 			<view class="openmore-button">
 				<view class="one-button">
@@ -813,7 +817,7 @@
 		position: fixed;
 		top: 30vh;
 		left: 33.5vw;
-		width: 22vw;
+		width: 27.7vw;
 		height: 22.5vh;
 		background-color: #fff;
 		z-index: 53;
@@ -847,10 +851,10 @@
 			// background-color: red;
 			.one-button{
 				display: flex;
-				justify-content: center;
+				// justify-content: center;
 				align-items: center;
 				height: 1vw;
-				width: 10vw;
+				width: 8vw;
 				font-size: 1.2vw;
 				.small-imge{
 					width: 1.5vw;
diff --git a/static/index/card/NU@2x.png b/static/index/card/NU@2x.png
new file mode 100644
index 0000000..c69403c
Binary files /dev/null and b/static/index/card/NU@2x.png differ
diff --git a/static/index/card/arrow.png b/static/index/card/arrow.png
new file mode 100644
index 0000000..8301487
Binary files /dev/null and b/static/index/card/arrow.png differ
diff --git a/static/index/card/doctor.png b/static/index/card/doctor.png
new file mode 100644
index 0000000..8a2fdd4
Binary files /dev/null and b/static/index/card/doctor.png differ
diff --git a/static/index/card/help.png b/static/index/card/help.png
new file mode 100644
index 0000000..6623b83
Binary files /dev/null and b/static/index/card/help.png differ
diff --git a/static/index/card/work.png b/static/index/card/work.png
new file mode 100644
index 0000000..1393e76
Binary files /dev/null and b/static/index/card/work.png differ
diff --git a/static/index/card/形状 1@2x.png b/static/index/card/形状 1@2x.png
new file mode 100644
index 0000000..08bcbc5
Binary files /dev/null and b/static/index/card/形状 1@2x.png differ
diff --git a/static/index/card/温度 (2)@2x.png b/static/index/card/温度 (2)@2x.png
new file mode 100644
index 0000000..a8ed198
Binary files /dev/null and b/static/index/card/温度 (2)@2x.png differ
diff --git a/static/index/newindex/leftmenu/NUblue.png b/static/index/newindex/leftmenu/NUblue.png
new file mode 100644
index 0000000..c69403c
Binary files /dev/null and b/static/index/newindex/leftmenu/NUblue.png differ
diff --git a/static/index/newindex/leftmenu/NUwhite.png b/static/index/newindex/leftmenu/NUwhite.png
new file mode 100644
index 0000000..1aef06a
Binary files /dev/null and b/static/index/newindex/leftmenu/NUwhite.png differ
diff --git a/static/index/newindex/leftmenu/carmera.png b/static/index/newindex/leftmenu/carmera.png
new file mode 100644
index 0000000..f1f9dad
Binary files /dev/null and b/static/index/newindex/leftmenu/carmera.png differ
diff --git a/static/index/newindex/leftmenu/0.png b/static/index/newindex/leftmenu/left0.png
similarity index 100%
rename from static/index/newindex/leftmenu/0.png
rename to static/index/newindex/leftmenu/left0.png
diff --git a/static/index/newindex/leftmenu/1.png b/static/index/newindex/leftmenu/left1.png
similarity index 100%
rename from static/index/newindex/leftmenu/1.png
rename to static/index/newindex/leftmenu/left1.png
diff --git a/static/index/newindex/leftmenu/left2.png b/static/index/newindex/leftmenu/left2.png
new file mode 100644
index 0000000..f1594dd
Binary files /dev/null and b/static/index/newindex/leftmenu/left2.png differ
diff --git a/static/index/newindex/leftmenu/left3.png b/static/index/newindex/leftmenu/left3.png
new file mode 100644
index 0000000..9cfe856
Binary files /dev/null and b/static/index/newindex/leftmenu/left3.png differ
diff --git a/static/index/newindex/leftmenu/2.png b/static/index/newindex/leftmenu/left4.png
similarity index 100%
rename from static/index/newindex/leftmenu/2.png
rename to static/index/newindex/leftmenu/left4.png
diff --git a/static/index/newindex/leftmenu/older.png b/static/index/newindex/leftmenu/older.png
new file mode 100644
index 0000000..7dca398
Binary files /dev/null and b/static/index/newindex/leftmenu/older.png differ
diff --git a/static/index/newindex/leftmenu/time.png b/static/index/newindex/leftmenu/time.png
new file mode 100644
index 0000000..47652ab
Binary files /dev/null and b/static/index/newindex/leftmenu/time.png differ
diff --git a/static/index/warehouse/t5.png b/static/index/warehouse/t5.png
new file mode 100644
index 0000000..4bad20b
Binary files /dev/null and b/static/index/warehouse/t5.png differ
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 04100f2..12310ff 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index c959abe..dd59bdc 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };