diff --git a/pages/NursingNew/component/api.js b/pages/NursingNew/component/api.js
index b53ad20..5df1a04 100644
--- a/pages/NursingNew/component/api.js
+++ b/pages/NursingNew/component/api.js
@@ -9,9 +9,9 @@ export const electricityMeterlist = () => {
 	})
 }
 // 获得护理单元主页大图
-export const queryWorkCareList = (data) => {
+export const queryWorkOrderList = (data) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryWorkCareList?workType=${data.workType}&employeeId=${data.employeeId}&nuId=${data.nuId}`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/queryWorkOrderList?workType=${data.workType}&employeeId=${data.employeeId}&nuId=${data.nuId}`,
 		method: 'get'
 	})
 }
diff --git a/pages/NursingNew/component/doctorask/api/api.js b/pages/NursingNew/component/doctorask/api/api.js
index ecf6f1f..6460976 100644
--- a/pages/NursingNew/component/doctorask/api/api.js
+++ b/pages/NursingNew/component/doctorask/api/api.js
@@ -1,16 +1,16 @@
 // 引入 request 文件
 import request from '@/request/index.js'
  
-export const queryCareList = (params) => {
+export const queryOrderList = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryCareList`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/queryOrderList`,
 		method: 'get',
 		data: params,
 	})
 }
-export const queryCareInfoList = (params) => {
+export const queryOrderInfoList = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryCareInfoList`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/queryOrderInfoList`,
 		method: 'get',
 		data: params,
 	})
@@ -18,28 +18,28 @@ export const queryCareInfoList = (params) => {
 
 export const startOrder = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/startOrder`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/startOrder`,
 		method: 'post',
 		data: params,
 	})
 }
 export const endOrder = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/endOrder`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/endOrder`,
 		method: 'post',
 		data: params,
 	})
 }
 export const editSubMp4 = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubMp4`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/editSubMp4`,
 		method: 'post',
 		data: params,
 	})
 }
 export const editSubPicPath = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubPicPath`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/editSubPicPath`,
 		method: 'post',
 		data: params,
 	})
diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue
index 223323d..c40f822 100644
--- a/pages/NursingNew/component/doctorask/doctorask.vue
+++ b/pages/NursingNew/component/doctorask/doctorask.vue
@@ -191,10 +191,9 @@
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
-	import {queryCareList,queryCareInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from './api/api.js'
+	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from './api/api.js'
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
-	
 	const form = reactive({
 		pageNo: 1,
 		pageSize: 10,
@@ -219,7 +218,7 @@
 		firstgetqueryCgdList();
 	}
 	const firstgetqueryCgdList = () => {
-		queryCareList(form).then(res => {
+		queryOrderList(form).then(res => {
 			console.log(res)
 			plsbuy.value.push(...res.result.records);
 			status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
@@ -243,7 +242,7 @@
 		let num = Math.ceil((index + 1))
 		leftscrolltop.value = (num - 2) * 186;
 		lefttarget.value = index;
-		queryCareInfoList({ mainId: item.id }).then(res => {
+		queryOrderInfoList({ mainId: item.id }).then(res => {
 			console.log(res)
 			cardarr.value = res.result
 		})
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 0a81b89..c031f1b 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -73,7 +73,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="title-card-right" >
+			<view class="title-card-right" @click="jszlshow = true">
 				<view class="card-top">
 					<view class="card-top-left">
 						65
@@ -89,9 +89,37 @@
 						即时
 					</view>
 				</view>
+				<view class="bianj" v-if="jszlshow">
+					<image src="/static/index/card/bj.png" mode="aspectFill"></image>
+				</view>
+				<view class="jszl guodu" :class="jszlshow?'':'jsh0'" @click.stop>
+					<view class="tittop">
+						<view></view>
+						即时服务指令
+					</view>
+					<view class="spiw">
+						<view v-for="(v,i) in ['护理','医疗','后勤']" :key="i" :class="i==0?'act':''">{{v}}</view> 
+					</view>
+					<scroll-view class="scrol" scroll-y="true">
+						<view v-for="(v,i) in 0" :key='i' :class="i==2?'act':''" class="cdk">
+							<image src="/static/qr.png" mode="aspectFill"></image>
+							<text>{{v}}</text>
+						</view>
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;">
+							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
+							<view style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
+								暂无服务指令
+							</view>
+						</view>
+					</scroll-view>
+					<view class="submit" >
+						<view @click.stop="jszlshow = false">取消</view>
+						<view @click="subitshowing">确定</view>
+					</view>
+				</view>
 			</view>
-
 		</view>
+		<view class="mengban" v-if="jszlshow" @click="jszlshow = false"></view>
 		<view class="photo-father">
 			<view class="juzhong" style="margin-left: -30rpx;" :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}">
 				<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
@@ -117,7 +145,7 @@
 
 				</view>
 			</view>
-			<image class="big-img" v-if="topbuttontarget==0"
+			<image class="big-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
 				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
 			<view style="display: flex;align-items: center;">
 				<view class="server-name" v-if="indexmessage?.startTime">
@@ -217,6 +245,7 @@
 				
 			</view>
 		</view>
+		
 		<view class="right-top">
 			<view class="top-title">
 				护理单元
@@ -242,13 +271,43 @@
 				</view>
 			</scroll-view>
 		</view>
+		<view class="mengban" v-if="zzbqshow" @click="zzbqshow = false"></view>
 		<view class="right-bottom">
 			<view class="bottom-title">
 				<image class="bottom-carmera" src="/static/index/newindex/leftmenu/carmera.png" @click="gotolook" />
-				<view class="blue-button">
+				<view class="blue-button" @click="geteverything()">
 					长者标签
+					<view class="jb" >
+						<image src="/static/index/card/bj.png" mode="aspectFill"></image>
+					</view>
+					<view class="zzbq guodu" @click.stop :class="zzbqshow?'':'zzh0'">
+						<view class="carfd" v-if="zzbqshow">
+							<view class="tittop">
+								<view></view>
+								体重标签
+							</view>
+							<view class="tg" style="border-right: 1px solid rgba(238, 238, 238, 1);">
+								<view v-for="(v,i) in emotionTagList" :key='i'>
+									<image :src="v.netPic" mode="aspectFill"></image>
+									<text>{{v.tagName}}</text>
+								</view>
+							</view>
+						</view>
+						<view class="carfd" v-if="zzbqshow">
+							<view class="tittop">
+								<view style="margin-left: 1vw;"></view>
+								情绪标签
+							</view>
+							<view class="tg">
+								<view v-for="(v,i) in bodyTagList" :key='i'>
+									<image :src="v.netPic" mode="aspectFill"></image>
+									<text>{{v.tagName}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
 				</view>
-
+				
 			</view>
 			<image class="big-older"
 				:src="`/static/index/newindex/leftmenu/${uni.getStorageSync('NUall').elderInfo?.name?`older`:`nopeople`}.png`" />
@@ -414,9 +473,10 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch ,reactive} from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
-	import { queryWorkCareList } from './api.js'
+	import { queryWorkOrderList } from './api.js'
 	// import {startOrder,endOrder} from './doctorask/api/api.js'
-	import {queryCareList,queryCareInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
+	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
+	import { getNclist } from "./nurse/api.js";
 	
 	const form = reactive({
 		pageNo: 1,
@@ -426,7 +486,7 @@
 	})
 	const plsbuy = ref([])
 	const firstgetqueryCgdList = () => {
-		queryCareList(form).then(res => {
+		queryOrderList(form).then(res => {
 			plsbuy.value.push(...res.result.records);
 			if(form.pageNo==1){
 				clickLeftMenu(0,plsbuy.value[0])
@@ -434,7 +494,7 @@
 		})
 	}
 	const clickLeftMenu = (index : any, item : object) => {
-		queryCareInfoList({ mainId: item.id }).then(res => {
+		queryOrderInfoList({ mainId: item.id }).then(res => {
 			indexmessage.value = res.result[0]
 		})
 	}
@@ -665,7 +725,8 @@
 	}
 	const start = (v) =>{
 		if(v.izStart!='N'){return}
-		startOrder({id:v.directiveId}).then(res=>{
+		console.log(v)
+		startOrder({id:v.id}).then(res=>{
 			console.log(res)
 			if(res.success){
 				v.izStart = "Y";
@@ -836,7 +897,8 @@
 			employeeId: uni.getStorageSync('userInfo').employessId,
 			workType: 5
 		}
-		queryWorkCareList(data).then((res : any) => {
+		console.log("看看图",data)
+		queryWorkOrderList(data).then((res : any) => {
 			console.log("看看图",res)
 			indexmessage.value = res.result.records[0]; 
 			console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
@@ -869,6 +931,34 @@
 			},
 		});
 	}
+	const jszlshow = ref(false)
+	
+	
+	const emotionTagList = ref([]);
+	const bodyTagList = ref([]);
+	const zzbqshow = ref(false)
+	const geteverything = () => {
+		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
+			emotionTagList.value = [];
+			bodyTagList.value = [];
+			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
+				 res.result.emotionTagList.forEach(item=>{
+					 if(item.izSelected == 'Y'){
+						 emotionTagList.value.push(item)
+					 }
+				 })
+				 res.result.bodyTagList.forEach(item=>{
+					 if(item.izSelected == 'Y'){
+						 bodyTagList.value.push(item)
+					 }
+				 })
+				 zzbqshow.value = true;
+				// emotionTagList.value = res.result.emotionTagList;
+				// bodyTagList.value = res.result.bodyTagList;
+				console.log(res.result)
+			})
+		}
+	}
 </script>
 
 <style scoped lang="less">
@@ -1087,7 +1177,6 @@
 
 	.big-img {
 		margin-top: 40rpx;
-		// width: 450rpx;
 		height: 450rpx;
 		z-index: 10;
 	}
@@ -1438,6 +1527,7 @@
 		border-radius: 40rpx;
 		color: #fff;
 		font-size: 28rpx;
+		position: relative;
 	}
 
 	.name-weight {
@@ -1673,4 +1763,222 @@
 			}
 		}
 	}
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+	.jsh0{
+		height: 0vw !important;
+		padding: 0 2vw !important;
+		top: 9.4vw !important;
+	}
+	.jszl{
+		width: 64.5vw;
+		height: 44vw;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136,148,167,0.19);
+		border-radius: 2.2vw;
+		position: absolute;
+		top: 11vw;
+		right: 0;
+		z-index: 200;
+		padding: 2vw;
+		overflow: hidden;
+		.submit{
+			width: 100%;
+			height: 3.2vw;
+			margin-top: 0.4vw;
+			padding-right: 2vw;
+			display: flex;
+			justify-content: flex-end;
+			view{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				&:nth-child(1){
+					width: 7.1vw;
+					height: 3.2vw;
+					background: #F8F8F8;
+					border-radius: 1.6vw;
+					border: 1px solid #E5E5E5;
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #555555;
+				}
+				&:nth-child(2){
+					width: 7.1vw;
+					height: 3.2vw;
+					background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+					border-radius: 1.6vw;
+					border: 1px solid rgba(3,133,250,0.34);
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #1083F8;
+					margin-left: 0.7vw;
+				}
+			}
+		}
+		.scrol{
+			width: 110%;
+			height: 30vw;
+			display: flex;
+			flex-wrap: wrap;
+			
+			.cdk{
+				width: 6.1vw;
+				height: 6.1vw;
+				background: #F8F8F8;
+				border-radius: 1.6vw;
+				margin: 1.5vw 1.5vw 0 0vw;
+				display: inline-block;
+				border: 1px solid #F8F8F8;
+				text-align: center;
+				image{
+					width: 2vw;
+					height: 2vw;
+					margin: 1.4vw auto 0vw;
+				}
+				text{
+					display: block;
+					text-align: center;
+					font-weight: 400;
+					font-size: 1.1vw;
+					color: #333333;
+					width: 100%;
+				}
+			}
+			.act{
+				background: #F2F8FF;
+				border: 1px solid rgba(1,125,233,0.43);
+				text{
+					color: #017DE9;
+				}
+			}
+		}
+		.spiw{
+			width: 14vw;
+			height: 2vw;
+			display: flex;
+			justify-content: space-around;
+			margin-top: 2.5vw;
+			view{
+				font-weight: 400;
+				font-size: 1.3vw;
+				color: #555555;
+				position: relative;
+				line-height: 1.5vw;
+			}
+			.act{
+				color: #222222 !important;
+				font-weight: 500;
+			}
+			.act::after{
+				width: 50%;
+				height: 0.2vw;
+				background: #0089FE;
+				border-radius: 0.1vw;
+				content: '';
+				position: absolute;
+				bottom: 0;
+				left: 25%;
+			}
+		}
+		.tittop{
+			height: 2vw;
+			font-weight: 400;
+			font-size: 1.4vw;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			view{
+				width: 0.4vw;
+				height: 1.2vw;
+				background: #017DE9;
+				border-radius: 0.2vw;
+				margin-right: 0.8vw;
+			}
+		}
+	}
+	.bianj{
+		position: absolute;
+		width: 2.2vw;
+		height: 1.1vw;
+		top: 9.68vw;
+		right: 2.5vw;
+		z-index: 220;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.jb{
+		position: absolute;
+		width: 2.2vw;
+		height: 1.1vw;
+		top: 2.7vw;
+		right: 1.5vw;
+		z-index: 220;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.zzh0{
+		height: 0vw !important;
+		padding: 0 1.6vw !important;
+		top: 2.7vw !important;
+	}
+	.zzbq{
+		width: 18vw;
+		height: 10vw;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136,148,167,0.19);
+		border-radius: 1.6vw;
+		right: -0.8vw;
+		top: 4vw;
+		position: absolute;
+		z-index: 200;
+		display: flex;
+		padding: 1.6vw 1.6vw 0;
+		.carfd{
+			width: 7.4vw;
+			height: 100%;
+			.tg{
+				width: 100%;
+				display: flex;
+				justify-content: space-around;
+				margin-top: 1vw;
+				view{
+					width: 1.8vw;
+					image{
+						width: 1.8vw;
+						height: 1.8vw;
+					}
+					text{
+						font-weight: 400;
+						font-size: 0.8vw;
+						color: #666666;
+						margin-top: 0.2vw;
+					}
+				}
+			}
+			
+			.tittop{
+				height: 2vw;
+				font-weight: 400;
+				font-size: 1.1vw;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				view{
+					width: 0.4vw;
+					height: 1.2vw;
+					background: #017DE9;
+					border-radius: 0.2vw;
+					margin-right: 0.8vw;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index d502dc9..db4bab5 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -4,7 +4,7 @@
 			<view class="logomain tp">
 				<image src="/static/shouye/logo2.png" mode="aspectFill"></image>
 			</view>
-			<view class="cont">
+			<scroll-view class="cont" :scroll-y="true">
 				<view class="items" v-for="(v,i) in list" :key='i' :class="{'act':i==dexleft}" @click="dexleft = i;emit('navurl',i,v)">
 					<view class="tm guodu">
 						<image :src="i==dexleft?v.urls:v.url" mode="aspectFill" class="guodu"></image>
@@ -12,7 +12,7 @@
 					</view>
 					<!-- <view class="heng guodu" :style="i!=dexleft&&i!=list.length-1?'opacity: 1':'opacity: 0'"></view> -->
 				</view>
-			</view>
+			</scroll-view>
 			<view class="logo">
 				<view class="tp">
 					<image src="/static/shouye/xd.png" mode="aspectFill"></image>
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 9fc557a..496e103 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -8,13 +8,12 @@
 		<nurse :isshow="menuIndex==1" v-if="swipedex==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
 		<!-- 医嘱 -->
 		<doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
-		<!-- 设备页 -->
 		<logistics :isshow="menuIndex==3" v-if="swipedex==3&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
-		<equipment :isShow="menuIndex==5" v-if="swipedex==5" />
 		<!-- 医嘱页 -->
 		<!-- <logistics :isShow="menuIndexshowfourth" v-if="menuIndex==3" /> -->
 		<requestform :isShow="menuIndex==4" v-if="swipedex==4" />
-		
+		<!-- 设备页 -->
+		<equipment :isShow="menuIndex==5" v-if="swipedex==5" />
 		<!-- 没有数据 -->
 		<view class="nomessageclass" :style="messageopit?{opacity: `1`}:{opacity: `0`}"
 			v-if="(menuIndex == 1 || menuIndex == 2) && (!uni.getStorageSync('elderId') ||!uni.getStorageSync('nuId'))">
@@ -40,9 +39,7 @@
 	const listarr = ref([]);
 	onMounted(() => {
 		menuIndex.value = 0;
-		swipedex.value = 0;
-		nextTick(() => swipedex.value = 0)
-
+		swipedex.value = 0;  
 		getServiceTree().then((res : any) => {
 			//缓存护嘱菜单
 			uni.setStorageSync("saveTree", res)
@@ -52,7 +49,8 @@
 			uni.setStorageSync("Packagelist", res.result)
 		})
 		getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
-			listarr.value = res.result;
+			console.log(res)
+			listarr.value = res.result ;
 		})
 	})
 
@@ -66,10 +64,10 @@
 		})
 	}
 	const tabbrarr = ref([
-		{ name: '护理矩阵', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'hldy_hljz'},
-		{ name: '医疗矩阵', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'hldy_yljz'},
-		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_xzjz'},
-		{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_ql'},
+		{ name: '护理矩阵', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'kzgn_hljz'},
+		{ name: '医疗矩阵', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'kzgn_yljz'},
+		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_hqjz'},
+		{ name: '库房矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_kfjz'},
 	])
 	const navurl = (e,v) => {
 		swipedex.value = -1;
@@ -81,28 +79,32 @@
 			},100)
 			console.log('护理单元')
 				break;
-			case 'hldy_hljz':
+			case 'kzgn_hljz':
 			swipedex.value = 1;
 			setTimeout(()=>{
 				menuIndex.value =1;
 			},100)
 			console.log('护理矩阵')
 				break;
-			case 'hldy_yljz':
+			case 'kzgn_yljz':
 			swipedex.value = 2;
 			setTimeout(()=>{
 				menuIndex.value = 2;
 			},100)
 			console.log('医疗矩阵')
 				break;
-			case 'hldy_xzjz':
+			case 'kzgn_hqjz':
 			swipedex.value = 3;
 			setTimeout(()=>{
 				menuIndex.value = 3;
 			},100)
-			console.log('行政矩阵')
+			console.log('后勤矩阵')
 				break;
-			case 'kf':
+			case 'kzgn_kfjz':
+			swipedex.value = 3;
+			setTimeout(()=>{
+				menuIndex.value = 3;
+			},100)
 			console.log('库房')
 				break;
 			case 'kf_cg':
@@ -149,15 +151,22 @@
 		{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}
 	])
 	const swip = ()=>{
+		let nuId = uni.getStorageSync('nuId');
+		let arrs = [];
+		listarr.value.forEach(item=>{
+			if(item.nuId == nuId){
+				arrs = item.dataList
+			}
+		})
 		let nuName = uni.getStorageSync('nuName')
+		
 		queryPadPageList({'pageNo':-1,'nuName':nuName}).then((res => {
-			console.log(res.result.records)
 			let arr = res.result.records[0].permissionList;
 			arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}];
 			let tbr = [];
 			if(arr){
 				arr.forEach((v,i)=>{
-					let obj = listarr.value.find(item=>
+					let obj = arrs.find(item=>
 						item.menuCode == v.menuCode
 					);
 					if(obj){
@@ -170,17 +179,17 @@
 					);
 					if(obj){
 						arrlist.value.push(obj);
-						console.log(arrlist.value)
 					}
 				}) 
 			}
 			
 			let back =[
+				{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_ql'},
 				{ name: '智慧物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png' ,type:'wl'},
 				{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' ,type:'back'}
 			]
 			arrlist.value.push(...back);
-			navurl(0,arrlist.value[0])
+			// navurl(0,arrlist.value[0])
 		}))
 	}
 	// 当前选中的菜单索引
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 87d7131..b4f1793 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -267,6 +267,7 @@
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
+		console.log(uni.getStorageSync('elderId'),uni.getStorageSync('nuId'),data.elderInfo)
 		uni.setStorageSync('NUall', data);
 		emit('swip')
 	}
diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue
index 5a97699..327a5ce 100644
--- a/pages/Warehouse/index/index.vue
+++ b/pages/Warehouse/index/index.vue
@@ -12,6 +12,9 @@
 				<outbound  :isShow="menuop == 4" v-if="swipdex == 4"></outbound>
 				<retstock  :isShow="menuop == 5" v-if="swipdex == 5"></retstock>
 				<inventory :isShow="menuop == 6" v-if="swipdex == 6"></inventory>
+				<nurse     :isshow="menuop == 7" v-if="swipdex==7&&uni.getStorageSync('nuId')" />
+				<doctorask :isshow="menuop == 8" v-if="swipdex==8&&uni.getStorageSync('nuId')" />
+				<logistics :isshow="menuop == 9" v-if="swipdex==9&&uni.getStorageSync('nuId')" />
 			</view>
 		</view>
 	</view>
@@ -31,14 +34,16 @@
 	import outbound from "@/pages/procurement/outbound.vue";
 	import inventory from "@/pages/procurement/inventory.vue";
 	import retstock from "@/pages/procurement/retstock.vue";
+	
+	import logistics from "@/pages/NursingNew/component/nurse/logistics.vue"
+	import doctorask from "@/pages/NursingNew/component/doctorask/doctorask.vue"
+	import nurse from "@/pages/NursingNew/component/nurse/index.vue"
 
 	const tabbrarr = ref([
-		{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png'  ,type:'kf_cg'},
-		{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png'  ,type:'kf_jh'},
-		{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png'  ,type:'kf_wj'},
-		{ name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png'  ,type:'kf_ql'},
-		{ name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png'  ,type:'kf_th'},
-		{ name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png'  ,type:'kf_pd'},
+		{ name: '护理矩阵', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'kzgn_hljz'},
+		{ name: '医疗矩阵', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'kzgn_yljz'},
+		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_hqjz'},
+		{ name: '库房矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_kfjz'},
 	])
 	const menuop = ref(0)
 	const swipdex = ref(0)
@@ -98,6 +103,34 @@
 					menuop.value = 6
 				},100)
 					break;
+				case 'kzgn_hljz':
+				swipdex.value = 7;
+				setTimeout(()=>{
+					menuop.value =7;
+				},100)
+				console.log('护理矩阵')
+					break;
+				case 'kzgn_yljz':
+				swipdex.value = 8;
+				setTimeout(()=>{
+					menuop.value = 8;
+				},100)
+				console.log('医疗矩阵')
+					break;
+				case 'kzgn_hqjz':
+				swipdex.value = 9;
+				setTimeout(()=>{
+					menuop.value = 9;
+				},100)
+				console.log('后勤矩阵')
+					break;
+				case 'kzgn_kfjz':
+				swipdex.value = 7;
+				setTimeout(()=>{
+					menuop.value =7;
+				},100)
+				console.log('库房')
+					break;
 				case 'back':
 				uni.navigateBack()
 					break;
@@ -107,18 +140,31 @@
 			}
 		},10)
 	}
-	const arrlist = ref([
-		{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'}
-	])
+	const arrlist = ref([ ])
 	const listarr = ref([])
 	const swip = ()=>{
+		let nuId = uni.getStorageSync('nuId');
 		getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
-			listarr.value = res.result;
+			console.log(res)
+			console.log(nuId)
+			res.result.forEach(item=>{
+				if(item.nuId == nuId){
+					listarr.value  = item.dataList
+				}
+			})
 		})
 		let nuName = uni.getStorageSync('nuName')
 		queryPadPageList({'pageNo':-1,'nuName':nuName}).then((res => {
 			let arr = res.result.records[0].permissionList;
-			arrlist.value = [{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'}];
+			arrlist.value = [
+				{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'},
+				{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png'  ,type:'kf_cg'},
+				{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png'  ,type:'kf_jh'},
+				{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png'  ,type:'kf_wj'},
+				{ name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png'  ,type:'kf_ql'},
+				{ name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png'  ,type:'kf_th'},
+				{ name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png'  ,type:'kf_pd'},
+			];
 			let tbr = [];
 			if(arr){
 				arr.forEach((v,i)=>{
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 06fdb5e..b933885 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -42,7 +42,7 @@
 					</view>
 				</view> -->
 			</view>
-			<view class="mengban" style="background: #fff;width:100vwvw;right:0;left: 0vw;top:-5vw;height: 110vh;" v-if="nomessageshow">
+			<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top:-5vw;height: 110vh;" v-if="nomessageshow">
 				<defaultr cont="暂无数据" style="z-index: 999;margin: auto;top: 0;left:35vw;bottom: 0;right: 0;"></defaultr>
 			</view>
 			<!-- <nomessage cont="暂无数据" :show="nomessageshow" />
diff --git a/static/index/card/bj.png b/static/index/card/bj.png
new file mode 100644
index 0000000..5d62e0c
Binary files /dev/null and b/static/index/card/bj.png differ
diff --git a/static/index/card/zw.png b/static/index/card/zw.png
new file mode 100644
index 0000000..9544254
Binary files /dev/null and b/static/index/card/zw.png differ
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 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 a0a8c0f..f69ae1a 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -578,7 +578,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
 };