diff --git a/component/public/newgame/joysticknew.vue b/component/public/newgame/joysticknew.vue
index f377f9e..6cb72b3 100644
--- a/component/public/newgame/joysticknew.vue
+++ b/component/public/newgame/joysticknew.vue
@@ -67,11 +67,11 @@
 		},
 		movebottom: {
 			type: Number,
-			default: 30
+			default: 80
 		},
 		moveright: {
 			type: Number,
-			default:60
+			default:70
 		},
 		pao:{
 			type: Boolean,
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
index fc4bc96..d1ed572 100644
--- a/pages/NursingNew/component/leftcontent/serveswipe.vue
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -18,8 +18,11 @@
 				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
 			</view>
 			<view class="bots" v-if="plsbuy.length>1">
-				<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"
-					:style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view>
+				<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''" 
+					@click="change({'detail':{'current':i}})">
+					<view class="bots-red" v-if="v?.chaoshitime"></view>
+				</view>
+				<!-- :style="v?.chaoshitime?'background:red':''" -->
 			</view>
 			<swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="autoplay" :interval="3000"
 				:duration="500" :current="current2" @change="change">
@@ -201,7 +204,8 @@
 				<view class="photowall-other">
 					<view class="bottom-title" v-for="(v,k) in zdxzarr" :key='k' @click="zdwu(v,k)"
 						:style="v.flag?{borderColor: `rgba(1, 125, 233, 0.3)`}:''">
-						<image style="width: 5.5vw;height: 5.5vw;border-radius: 50%;margin: 0 auto;margin-bottom: 1.5vw;margin-top: 2.2vw;"
+						<image
+							style="width: 5.5vw;height: 5.5vw;border-radius: 50%;margin: 0 auto;margin-bottom: 1.5vw;margin-top: 2.2vw;"
 							:src="v.headPath?serverpicUrl+v.headPath:'/static/shouye/xd.png'" />
 						<view class="name-weight">
 							{{v.name }}
@@ -250,8 +254,7 @@
 							<video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index"
 								:src="servervideoUrl+item" direction="180" mode="aspectFill"></video>
 							<view @click.stop="ilanarr.splice(index,1)"
-								v-if="topbuttontarget>0&&(listobj?.izStart=='Y'&& listobj?.izFinish=='N')"
-								class="del">
+								v-if="topbuttontarget>0&&(listobj?.izStart=='Y'&& listobj?.izFinish=='N')" class="del">
 								<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
 						height: 1.4vw;"></image>
 							</view>
@@ -267,7 +270,7 @@
 									点击上传{{topbuttontarget==1?'图片':'录像'}}
 								</view>
 							</view>
-							
+
 						</view>
 					</view>
 				</view>
@@ -592,7 +595,7 @@
 	}
 	const pici = ref(0);
 	const del = (v, i) => {
-		console.log("?????",i)
+		console.log("?????", i)
 		pici.value = i;
 	}
 	const del1 = () => {
@@ -884,7 +887,6 @@
 </script>
 
 <style scoped lang="less">
-
 	.del {
 		width: 2.5vw;
 		height: 2.5vw;
@@ -907,9 +909,9 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		
-		.uplods-info{
-			width:90%;
+
+		.uplods-info {
+			width: 90%;
 			height: 85%;
 			display: flex;
 			flex-direction: column;
@@ -962,6 +964,16 @@
 				background: #DCDCDC;
 				border-radius: 0.2vw;
 				margin: 0.7vw;
+				position: relative;
+				.bots-red{
+					position: absolute;
+					left: 0.2vw;
+					bottom: -0.4vw;
+					background-color: red;
+					width: 0.6vw;
+					height: 0.6vw;
+					border-radius: 50%;
+				}
 			}
 
 			.dot {
@@ -1077,6 +1089,7 @@
 		left: 50%;
 		transform: translate(-50%, 0);
 		z-index: -1;
+		opacity: 0.3;
 	}
 
 	.cardbox {
@@ -1794,7 +1807,7 @@
 				border: 2rpx solid #dedede;
 				padding: 1vw;
 				// background-color: #f9f9f9;
-				
+
 
 				video {
 					width: 100%;
@@ -2010,7 +2023,8 @@
 	.bottom-title {
 		border: 2px solid #f8f8f8;
 		width: 16.5vw;
-		margin-right: 1.6vw;;
+		margin-right: 1.6vw;
+		;
 		margin-bottom: 1.6vw;
 		height: 17vw;
 		border-radius: 1.1vw;
diff --git a/pages/NursingNew/component/logistics/index.vue b/pages/NursingNew/component/logistics/index.vue
deleted file mode 100644
index a928cd1..0000000
--- a/pages/NursingNew/component/logistics/index.vue
+++ /dev/null
@@ -1,1817 +0,0 @@
-<!-- 护嘱 -->
-<template>
-	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}"
-		@click="bottomisShaking=false;shakyTable = false">
-		<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 style="display: flex;align-items: center;margin-right: 25rpx;padding: 0 15rpx;"
-					:class="!topindex&&!bodystatus&&!facestatus?'firsttarget':''">
-					<view class="mark">
-						<view style="margin-right: 15rpx;">
-							老人标签:
-						</view>
-						<view class="overlay" v-show="openbody" @click="openbody=false"></view>
-					</view>
-					<view class="marknone" @click="openbody=!openbody;openface=false">
-						<view v-if="!bodyTagListLook.length&&!emotionTagListLook.length" style="margin-top: -3rpx;">
-							未选择
-						</view>
-						<view v-for="(item,index) in bodyTagListLook" :key="index">
-							<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
-						</view>
-						<view v-for="(item,index) in emotionTagListLook" :key="index">
-							<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
-						</view>
-					</view>
-					<view class="tri-down" @click="openbody=!openbody;openface=false">
-
-						<view class="mark-bgc" v-show="openbody" :style="{opacity:bodydonghua?1:0}" @click.stop>
-							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
-								<view>
-									体型标签
-								</view>
-							</view>
-							<view style="display: flex;flex-wrap: wrap;">
-								<view v-for="(item,index) in bodyTagList" :key="index" @click="addbody(index)">
-									<view class="tags-father" :class="bodystatustarget===index?'secondtarget':''">
-										<image class="tags-img"
-											:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
-										<view class="tags-font"
-											:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
-											{{item.tagName}}
-										</view>
-									</view>
-								</view>
-							</view>
-							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
-								<view>
-									情绪标签
-								</view>
-							</view>
-							<view style="display: flex;flex-wrap: wrap;">
-								<view v-for="(item,index) in emotionTagList" :key="index" @click="addface(index)">
-									<view class="tags-father" :class="facestatustarget===index?'secondtarget':''">
-										<image class="tags-img"
-											:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
-										<view class="tags-font"
-											:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
-											{{item.tagName}}
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- <view style="display: flex;align-items: center;margin-right: 15rpx;padding: 0 15rpx;"
-					:class="topindex===1&&!bodystatus&&!facestatus?'firsttarget':''">
-					<view class="mark">
-						情绪标签：
-						<view class="overlay" v-show="openface" @click="openface=false"></view>
-						<view class="mark-bgc" v-show="openface" :style="{opacity:facedonghua?1:0}" @click.stop>
-							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
-								<view>
-									情绪标签
-								</view>
-							</view>
-							<view style="display: flex;flex-wrap: wrap;">
-								<view v-for="(item,index) in emotionTagList" :key="index" @click="addface(index)">
-									<view class="tags-father" :class="facestatustarget===index?'secondtarget':''">
-										<image class="tags-img"
-											:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
-										<view class="tags-font"
-											:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
-											{{item.tagName}}
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="marknone" @click="openface=!openface;openbody=false">
-						<view v-if="!emotionTagListLook.length" style="margin-top: -3rpx;">
-							未选择
-						</view>
-						<view v-for="(item,index) in emotionTagListLook" :key="index">
-							<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
-						</view>
-					</view>
-
-					<view class="tri-down" @click="openface=!openface;openbody=false"></view>
-				</view> -->
-				<view class="white-button" @click="routerPush">
-					<image class="white-img" :src="`/static/index/newruler/yulan.png`" />
-					预览
-				</view>
-				<view class="white-button" @click="shareToWeixin">
-					<image class="white-img" :src="`/static/index/newruler/fenxiang.png`" />
-					分享
-				</view>
-				<view class="white-button" @click="changLeft(5)">
-					<image class="white-img" style="width: 45rpx;height: 45rpx;"
-						:src="`/static/index/newruler/watch.png`" />
-					监控
-				</view>
-			</view>
-		</view>
-		<view class="doctorsay-container-view">
-			<view class="doctorsay-container-container">
-				<view class="super-card">
-					<view class="boom-father">
-						<view class="boom" :style="{ transform: transformStyle }">
-							<view>
-								<view v-for="(item,index) in timearr[0].children" :key="index">
-									<view class="boom-son" v-show="item.tagName">
-										<text class="boom-text">
-											{{item.tagName}}
-										</text>
-
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="super-card-container">
-						<scroll-view style="height: 100%" scroll-with-animation :scroll-left="cardLeft" scroll-x
-							@scroll="handleTop" :show-scrollbar="false">
-							<view style="display: flex;width:4824rpx;">
-								<view v-for="(item0,index0) in timearr" :key="index0">
-									<view class="super-card-time">
-										{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
-									</view>
-								</view>
-							</view>
-							<view style="display: flex;height: calc(100% - 330rpx);position: relative;">
-								<view class="xian-bian"></view>
-								<scroll-view style="height: 100%;width:6744rpx;" :scroll-top="scrollTop"
-									scroll-with-animation :scroll-y="true" @scroll="handleScrolltime"
-									:show-scrollbar="false">
-									<view style="display: flex;height: 100%;">
-										<view v-for="(item0,index0) in timearr" :key="index0">
-											<view class="super-card-time-und">
-												<view v-for="(item1,index1) in item0.children" style="width: 100%;"
-													:key="index1">
-													<view
-														:class=" targetRuler.index0 === index0 && targetRuler.index1 === index1 ? targetRuler.index1 ?`title-time-border-big`:`title-time-border-big-top` : `super-card-time-card` "
-														:style="!targetRuler.bordershow && saveRulerTime.index0 === index0 && saveRulerTime.index1 === index1 ? {zIndex:999} : {borderBottom: '1rpx solid transparent'}"
-														:id="`a${index0}_${index1}`" style="position: relative;"
-														@click="rulerTouchClick(item1,index0,index1)"
-														:data-index0="index0" :data-index1="index1">
-														<view class="time-button-orange-spe"
-															:style="{left:flyNumber.index0?`-130rpx`:`0`}"
-															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1==0">
-															请选择服务指令迁移的目标单元格
-
-														</view>
-														<view class="time-button-orange"
-															:style="{left:flyNumber.index0?`-130rpx`:`0`}"
-															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1">
-															请选择服务指令迁移的目标单元格
-
-														</view>
-														<view class="title-time-blue"
-															v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
-														</view>
-														
-														<view :class="getClass(item1,index0,index1)"
-															style="font-size: 30rpx;overflow: hidden;"
-															:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s` }">
-
-															<view class="title-time" v-if="item1.startTime"
-																style="flex-direction: column;">
-																<image v-show="item1.startTime"
-																	style="width: 50rpx;height: 50rpx;margin: 0 auto;margin-top: 20rpx"
-																	:src="item1.netImmediateFile?item1.netImmediateFile:`/static/logo.png`" />
-																<view class="title-time-time" style="font-size: 30rpx;">
-																	{{item1.startTime + `-` + item1.endTime}}
-																</view>
-																<image class="title-time-button"
-																	style="width: 80rpx;height: 50rpx;"
-																	v-if="item1.cycleTypeId!=1"
-																	src="/static/index/newruler/jiao.png" />
-																<view class="title-time-font"
-																	style="right: 10rpx;top: 5rpx;"
-																	v-if="item1.cycleTypeId!=1">
-																	{{item1.cycleType}}
-																</view>
-															</view>
-															<view v-if="item1.startTime" class="title-time-font-rel">
-																{{splitString(item1.directiveName)[0]}}
-															</view>
-															<view
-																v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule && !item1.startTime"
-																class="pulic-time">
-																{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
-															</view>
-														</view>
-													</view>
-												</view>
-											</view>
-										</view>
-									</view>
-								</scroll-view>
-							</view>
-						</scroll-view>
-					</view>
-					<view class="right-cards">
-						<view style="margin-top: 20rpx;margin-left: 30rpx;">
-							<view class="">
-								即时指令
-							</view>
-							<view
-								style="width: 30rpx;height: 6rpx;background-color: black;margin-left: 40rpx;margin-top: 3rpx;border-radius: 20rpx;">
-							</view>
-						</view>
-						<scroll-view scroll-x class="scroll-box" :scroll-left="scrollLeft">
-							<view class="right-box">
-								<view v-for="(item,index) in bottomItems" :key="index">
-									<view class="right-box-item" @touchstart="bottomTouchStart"
-										@touchmove="bottomTouchMove" @touchend="bottomTouchEnd"
-										:style="item.target?{background: item.target,transition:`all 1.5s ease-in-out`}:{transition:`all 1.5s ease-in-out`}">
-										<view :style="{ animationDelay:`-${index * 0.1}s` }"
-											:class="bottomisShaking?`super-end-items-img-father-active`:`super-end-items-img-father`">
-											<image class="right-box-img" :src="item.netImmediateFile" />
-											<view class="right-box-font"
-												:style="{fontSize: (item.directiveName?.trim().length > 6) ? '25rpx' : '27rpx' }">
-												{{item.directiveName}}
-											</view>
-										</view>
-										<view class="super-end-items-father-close-father" v-show="bottomisShaking"
-											@click.stop="bottomItems.splice(index, 1);killjishi(item.id)">
-											-
-										</view>
-									</view>
-								</view>
-							</view>
-						</scroll-view>
-						<view class="middle-box" v-show="!iszhiling">
-							<view class="middle-left-box">
-								<view class="first-contant">
-									<view class="time-father" v-show="iszhouqi">
-										<view class="time-button" v-show="isweek">
-											<view class="time-button-month">周</view>
-											<view class="time-button-week"
-												@click="isweek=false;weekIndex = -1;weekValue = ''">月</view>
-										</view>
-										<view class="time-button" v-show="!isweek">
-											<view class="time-button-month-target"
-												@click="isweek=true;monthIndex = -1;monthValue = ''">周</view>
-											<view class="time-button-week-target">月</view>
-										</view>
-										<scroll-view scroll-y style="width: 100%;height: 600rpx;"
-											:show-scrollbar="false" :scroll-top="firsttop">
-											<view v-for="(item,index) in weekDays" :key="index"
-												@click="clickWeek(item,index)" v-if="isweek">
-												<view :class="weekIndex===index?`items-card-target`:`items-card`">
-													{{item}}
-												</view>
-											</view>
-
-											<view v-for="(item,index) in days" :key="index"
-												@click="clickMonth(item,index)" v-if="!isweek">
-												<view :class="monthIndex===index?`items-card-target`:`items-card`">
-													{{item}}
-												</view>
-											</view>
-											<view style="height: 40rpx;"></view>
-										</scroll-view>
-									</view>
-
-									<scroll-view scroll-y style="height: 100%;width:100%;" :show-scrollbar="false"
-										:scroll-top="firsttop" v-show="!iszhouqi">
-										<view
-											v-for="(item,index) in bigArray[upmenuIndex]?.children[downmenuIndex]?.children"
-											:key="index" @click="onTap(index)">
-
-											<view class="right-box-item"
-												:style="thirdmenuIndex==index?{border: `2rpx solid rgb(229, 233, 249)`,backgroundColor:`#fff`}:{border: `2rpx solid rgb(229, 233, 249)`}">
-												<view class="title-time-button-font" v-show="item.cycleTypeId ==2">
-													周期
-												</view>
-												<view class="title-time-button-font" v-show="item.cycleTypeId ==3">
-													即时
-												</view>
-												<image class="title-time-button" v-show="item.cycleTypeId ==2"
-													src="/static/index/newruler/jiao.png" />
-												<image class="title-time-button" v-show="item.cycleTypeId ==3"
-													src="/static/index/newruler/jiao.png" />
-												<image class="right-box-img"
-													:src="thirdmenuIndex==index?item.netImmediateFileFocus :item.netImmediateFile " />
-												<view class="right-box-font" :style="[
-												        { marginTop: '2rpx', fontSize: (item.title?.trim().length > 6) ? '20rpx' : '25rpx' },
-												        thirdmenuIndex === index ? { color: 'rgb(54,159,239)' } : {}
-												      ]">
-													{{ item.title }}
-												</view>
-											</view>
-										</view>
-										<view style="height: 20rpx;"></view>
-									</scroll-view>
-								</view>
-								<view class="second-contant">
-									<scroll-view scroll-y style="height: 100%;width:100%;" :show-scrollbar="false"
-										:scroll-top="secondtop">
-										<view v-for="(item,index) in downList" :key="index">
-											<view :class="downdonghua==index? `downList-box-target` : `downList-box`"
-												@click="secondContant(index)">
-
-												<donghua :width="`60rpx`" :height="`60rpx`" :links="item.url"
-													:playing="downdonghua==index" :interval="120" />
-												<view class="downList-box-text">
-													{{ item.title }}
-												</view>
-
-											</view>
-										</view>
-										<view style="height: 20rpx;"></view>
-									</scroll-view>
-								</view>
-							</view>
-							<view class="middle-right-box">
-								<view v-for="(item,index) in bigArray" :key="index" @click="changLeft(index)">
-									<view class="doctorsay-container-card">
-										<donghua :width="`60rpx`" :height="`60rpx`" :links="item.url"
-											:playing="index === upmenuIndex" :interval="120" />
-										<view
-											:class="(index === upmenuIndex) ? `doctorsay-container-card-font-dark`:`doctorsay-container-card-font`">
-											{{ item.title }}
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="middle-box" v-show="iszhiling">
-							<scroll-view scroll-y style="height: 100%;width:100%;" :show-scrollbar="false">
-								<view class="zhiling-card" :style="forthmenuIndex==index?{backgroundColor:`#fff`}:{}"
-									v-for="(item,index) in savePackagelist" :key="index"
-									@click="clickzhilingbao(index)">
-									<image class="zhiling-card-button" src="/static/index/newruler/jiao.png" />
-									<view class="zhiling-card-font">
-										指令包
-									</view>
-									<view class="">
-										包名：{{ item.packageName }}
-									</view>
-									<view class="bag">
-										<text>
-											包含：
-										</text>
-										<view class="bag-one" v-for="(item1,index1) in item.directivesList"
-											:key="index">
-											<text v-if="index1">、</text>
-											{{ item1.directiveName }}
-										</view>
-									</view>
-								</view>
-							</scroll-view>
-						</view>
-						<view class="under-button">
-							<view class="under-button-black" v-if="isop">
-								不能重复添加相同的即时服务指令
-							</view>
-							<view class="under-button-black" v-if="isempty">
-								请选择服务指令来进行操作
-							</view>
-							<view class="white-circle" @click="changecard">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/movebutton${isMove ? 'blue' : ''}.png`" />
-							</view>
-							<view class="white-circle" @click="openDelete">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/deletebutton${isDelete ? 'blue' : ''}.png`" />
-							</view>
-							<view class="white-circle" @click="opensay">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/notebutton${sayisopen ? 'blue' : ''}.png`" />
-							</view>
-							<view class="white-circle"
-								@click="open = !open;isMove=false;flyNumber.index0 = -1;flyNumber.index1 = -1;">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/open${open ? 'blue' : ''}.png`" />
-							</view>
-							<view style="position: relative;">
-								<view class="white-circle-click-father" :style="{color:buttonBlue?`#fff`:``}"
-									:class="{ anim: buttonBlue }" @click="addnewbutton">
-									<view style="z-index: 999;">
-										确定
-									</view>
-								</view>
-								<view class="white-circle-click-father-spec" @click="changLeft(5)" v-show="!iszhiling">
-									<view class="other-father">
-										<image style="width: 55rpx;height: 55rpx;"
-											src="/static/index/newruler/monitor_1.png" />
-										<view style="z-index: 999;font-size: 25rpx;">
-											监控
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 点击的弹出层 -->
-		<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
-			<view class="popup-overlay-content" style="height: 390rpx;" popup-overlay:class="getjiao"
-				v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'"
-				:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
-				@click.stop>
-				<view class="popup-overlay-content-left">
-					<image class="popup-overlay-content-left-img"
-						:src="timearr[showDetail[0]]?.children[showDetail[1]]?.netImmediateFileFocus" />
-				</view>
-				<view class="popup-overlay-content-right">
-					<view class="time-font">
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.startTime }} -
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.endTime }}
-					</view>
-					<view class="time-text">
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.directiveName }}
-					</view>
-				</view>
-			</view>
-			<view class="popup-overlay-content" :class="getjiao" v-else
-				:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
-				@click.stop>
-				<view class="specia-onshow">
-					<view class="specia-title">
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.startTime }} -
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.endTime }}
-					</view>
-					<view class="specia-cards" v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.directivesList">
-						<view class="title-time-border-yellow"
-							style="font-size: 30rpx;overflow: hidden;width: 232rpx;height: 150rpx;"
-							v-for="(item1,index1) in timearr[showDetail[0]]?.children[showDetail[1]]?.directivesList"
-							:key="index1">
-
-							<view class="title-time" style="flex-direction: column;">
-								<image style="width: 60rpx;height: 60rpx;margin: 0 auto;margin-top: 10rpx"
-									:src="item1.netImmediateFile" />
-								<view class="title-time-time" style="font-size: 30rpx;">
-									{{item1.serviceDuration + "分钟"}}
-								</view>
-								<image class="title-time-button" style="width: 80rpx;height: 48rpx;"
-									src="/static/index/newruler/jiao.png" />
-								<view class="title-time-font" style="right: 10rpx;top: 5rpx;font-size: 23rpx;">
-									{{ item1.cycleType }}
-								</view>
-							</view>
-							<view class="title-time-font-rel">
-								{{splitString(item1.directiveName)[0]}}
-							</view>
-
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 替换表格的的弹出层 -->
-		<view v-show="sayisopen" class="popup-say" @click="sayisopen=false">
-			<view class="popup-say-content" style="padding: 30rpx 0;" :style="{ opacity: sayisopacity ? 1 : 0 }"
-				@click.stop>
-				<view style="margin-top: 20rpx;margin-bottom: 20rpx;;margin-left: 30rpx;font-size: 32rpx;">
-					<view>
-						体型标签
-					</view>
-				</view>
-				<view style="display: flex;flex-wrap: wrap;">
-					<view v-for="(item,index) in nameArray.slice(0,5)" :key="index">
-						<view class="tags-father">
-							<image class="tags-img" :src="`/static/index/tagNames/${index}0.png`" />
-							<view class="tags-font">{{item}}</view>
-						</view>
-					</view>
-				</view>
-				<view style="margin-top: 40rpx;margin-bottom: 20rpx;;margin-left: 30rpx;font-size: 32rpx;">
-					<view>
-						情绪标签
-					</view>
-				</view>
-				<view style="display: flex;flex-wrap: wrap;">
-					<view v-for="(item,index) in nameArray.slice(5,12)" :key="index">
-						<view class="tags-father">
-							<image class="tags-img" :src="`/static/index/tagNames/${index+5}0.png`" />
-							<view class="tags-font">{{item}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="popup-say-three"></view>
-			</view>
-		</view>
-		<!-- 分享的弹出层 -->
-		<view v-show="shareShow" class="popup-share" @click="shareShow=false">
-			<view class="popup-share-content" :style="{ opacity: deletedownisopacity ? 1 : 0 }" @click.stop>
-				<view class="share-other">
-					<view class="share-title">
-						<image style="width: 50rpx;height: 50rpx;" src="/static/index/sharelogo.png" />
-						<view style="font-weight: 600;margin-left: 15rpx;">
-							护理单元
-						</view>
-					</view>
-					<view class="share-others">
-						<view style="font-weight: 600;font-size: 45rpx;">
-							护理流程
-						</view>
-						<view style="margin-top: 30rpx;">
-							{{uni.getStorageSync('nuName')}}
-							<text style="color: #1083F8;">
-								{{uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo.name:""}}
-							</text>
-						</view>
-						<view class="blue-button">
-							分享
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view :class="['neuro-wrapper', deletedonghua ? 'is-active' : '']" v-if="isDelete">
-			<!-- 遮罩层，点击触发关闭 -->
-			<view class="neuro-mask" @click="isDelete=false"></view>
-			<!-- 拟态框，阻止冒泡点击 -->
-			<view class="neuro-box" @click.stop>
-
-				<view class="delete-button-father">
-					<view class="button-white" @click="isDelete=false">取消</view>
-					<view class="button" @click="openDelete()">确定</view>
-				</view>
-
-				<view class="title">确定要删除指令吗</view>
-				<view class="title-time-border-yellow"
-					style="font-size: 30rpx;overflow: hidden;width: 240rpx;height: 170rpx;">
-
-					<view class="title-time" style="flex-direction: column;">
-						<image style="width: 60rpx;height: 60rpx;margin: 0 auto;margin-top: 10rpx"
-							:src="timearr[saveEditIndex.index0].children[saveEditIndex.index1].netImmediateFile?timearr[saveEditIndex.index0].children[saveEditIndex.index1].netImmediateFile:`/static/logo.png`" />
-						<view class="title-time-time" style="font-size: 30rpx;">
-							{{timearr[saveEditIndex.index0].children[saveEditIndex.index1].startTime + `-` + timearr[saveEditIndex.index0].children[saveEditIndex.index1].endTime}}
-						</view>
-						<image class="title-time-button" style="width: 80rpx;height: 48rpx;"
-							v-if="timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleTypeId!=1"
-							src="/static/index/newruler/jiao.png" />
-						<view class="title-time-font" style="right: 10rpx;top: 5rpx;font-size: 23rpx;"
-							v-if="timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleTypeId!=1">
-							{{ timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleType   }}
-						</view>
-					</view>
-					<view class="title-time-font-rel">
-						{{splitString(timearr[saveEditIndex.index0].children[saveEditIndex.index1].directiveName)[0]}}
-					</view>
-
-				</view>
-			</view>
-		</view>
-		<severcard></severcard>
-	</view>
-</template>
-
-<script setup lang="ts">
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
-	import { onShow, onHide } from '@dcloudio/uni-app';
-	import { getNclist, addBatch, addDirective, addInstant, deleteDirective, deleteInstant, editDirective } from "./api.js";
-	import { myArray } from './yaoshandiao.js';
-
-	const props = defineProps({
-		isshow: {
-			type: Boolean,
-			required: true,
-		},
-	});
-	watch(
-		() => props.isshow,
-		(newVal, oldVal) => {
-			// 只有当新旧值不相同时才执行
-			if (newVal !== oldVal) {
-				bottomisShaking.value = false
-				shakyTable.value = false
-				if (solveWatch.value) {
-					solveWatch.value--
-				} else {
-					centerCell();
-					cardLeft.value = 1
-					scrollTop.value = 1
-
-					nextTick(() => {
-						scrollTop.value = 0
-						cardLeft.value = 775
-					})
-				}
-				upmenuIndex.value = 0
-			}
-		}
-	)
-	const bodystatus = ref(false);
-	const bodystatustarget = ref(-1);
-	const facestatus = ref(false);
-	const facestatustarget = ref(-1);
-
-	/* ---- 用于 transform 的响应式字符串 ----
-	   注意：虽然这是响应式，但我们只在 rAF 里更新它（受控更新），避免频繁触发 Vue 渲染 */
-	const transformStyle = ref('translate3d(0, 0, 0)');
-	/* rAF / 计数器变量 */
-	let lastY = 0;
-	let ticking = false;
-
-	const bodydonghua = ref(false)
-	const openbody = ref(false)
-	const openface = ref(false)
-	watch(
-		() => openbody.value,
-		() => {
-			setTimeout(() => {
-				bodydonghua.value = openbody.value
-			}, 50)
-		}
-	)
-	const facedonghua = ref(false)
-	watch(
-		() => openface.value,
-		() => {
-			setTimeout(() => {
-				facedonghua.value = openface.value
-			}, 50)
-		}
-	)
-
-	const bodytarget = ref([]);
-	const facetarget = ref([]);
-	const addbody = (index : number) => {
-		if (bodyTagList.value[index].izSelected == 'Y') {
-			bodyTagList.value[index].izSelected = 'N';
-		} else {
-			let targetNumber = 0;
-			bodyTagList.value.forEach((element : any) => {
-				if (element.izSelected == 'Y') {
-					targetNumber++
-				}
-			})
-
-			if (targetNumber > 1) {
-				uni.showToast({
-					title: "每种标签最多只能添加两个",
-					icon: 'none',
-					duration: 3000
-				})
-				return
-			} else {
-				bodyTagList.value[index].izSelected = 'Y';
-			}
-		}
-		saveAll()
-	}
-	const addface = (index : number) => {
-		if (emotionTagList.value[index].izSelected == 'Y') {
-			emotionTagList.value[index].izSelected = 'N'
-		} else {
-			let targetNumber = 0;
-			emotionTagList.value.forEach((element : any) => {
-				if (element.izSelected == 'Y') {
-					targetNumber++
-				}
-			})
-
-			if (targetNumber > 1) {
-				uni.showToast({
-					title: "标签最多只能添加两个",
-					icon: 'none',
-					duration: 3000
-				})
-				return
-			} else {
-				emotionTagList.value[index].izSelected = 'Y';
-			}
-		}
-		saveAll()
-	}
-
-	const open = ref(false);
-
-	const bottomItems = ref([])
-	const nameArray = [
-		`标准`, `超重`, `强直`, `偏瘫`, `佝偻`, `稳定`, `焦虑`, `抑郁`, `暴力`, `恐惧`, `烦躁`, `易怒`, `臆想`,
-	]
-	const timeArray = [
-		`00`, `05`, `10`, `15`, `20`, `25`, `30`, `35`, `40`, `45`, `50`, `55`
-	];
-	const weekDays = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"];
-	const days = Array.from({ length: 31 }, (_, i) => (i + 1).toString().padStart(2, "0"));
-	const isweek = ref(true);
-	// 是否周期
-	const iszhouqi = ref(false);
-	//高度回到最高
-	const firsttop = ref(0);
-	const secondtop = ref(0);
-	const scrollLeft = ref(0);
-	const cardLeft = ref(678);
-	//移动表格
-	const scrollTop = ref(0)
-	//左下的数组
-	const downList = ref<any>()
-	const isop = ref(false);
-	const bigArray = ref([]);
-	const isopen = ref(false)
-	const songisopen = ref(false)
-	const isopacity = ref(false)
-	const songisopacity = ref(false)
-	// 删除表格弹窗
-	const deleteisopen = ref(false);
-	const deletename = ref("")
-	const deleteisopacity = ref(false)
-	// 解释图标弹窗
-	const sayisopen = ref(false);
-	const sayname = ref("")
-	const sayisopacity = ref(false)
-
-	const saveleft = ref(6);
-	const saveright = ref(11);
-	const savetop = ref(0);
-	const savebottom = ref(3);
-	const isMove = ref(false);
-
-	const getjiao = computed(() => {
-		if (jiao.value[0] && jiao.value[1]) {
-			return "left-bottom"
-		} else if (!jiao.value[0] && jiao.value[1]) {
-			return "right-bottom"
-		} else if (jiao.value[0] && !jiao.value[1]) {
-			return "left-top"
-		} else {
-			return "right-top"
-		}
-	})
-	// 这是二级菜单的动画的模板
-	const secondtemp = ref([])
-	// 上次点击时间
-	const lastTap = ref(0)
-	// 双击的最大间隔（ms），可根据体验调整
-	const DOUBLE_TAP_DELAY = 300
-
-	function onTap(e) {
-		const now = Date.now()
-		thirdmenuIndex.value = e
-		// console.log("????",thirdmenuIndex.value)
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			thirdmenuIndex.value = e
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			thirdmenuIndex.value = e
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-
-	// 替换新的
-	const getNew = () => {
-		if (flyNumber.value.index0 === saveEditIndex.value.index0 && flyNumber.value.index1 === saveEditIndex.value.index1) {
-			isMove.value = false;
-			flyNumber.value.index0 = -1;
-			flyNumber.value.index1 = -1;
-			return
-		}
-		if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id) {
-			deleteDirective(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1]).then((res : any) => {
-				doChangeNew()
-			})
-		} else {
-			doChangeNew()
-		}
-	}
-	const doChangeNew = () => {
-		let object = JSON.parse(JSON.stringify(timearr.value[flyNumber.value.index0].children[flyNumber.value.index1]))
-		indexsave.value = [saveEditIndex.value.index0, saveEditIndex.value.index1]
-		// 旧的tagName保存了
-		let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName
-		timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', tagName: tagName }
-		//然后保存新的
-		let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName
-		let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
-		let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
-		let positioning = timearr.value[indexsave.value[0]].positioning;
-
-		// 解析原始时间（健壮地 trim）
-		const parseTime = (t) => {
-			const parts = String(t || '').split(':').map(s => s.trim());
-			const h = Number(parts[0] ?? 0);
-			const m = Number(parts[1] ?? 0);
-			return {
-				hour: Number.isFinite(h) ? h : 0,
-				minute: Number.isFinite(m) ? m : 0
-			};
-		};
-
-		const sOrig = parseTime(startTime);
-		const eOrig = parseTime(endTime);
-
-		// 计算时长（分钟）。若发生负值，认为跨天（加 24*60）
-		let duration = (eOrig.hour * 60 + eOrig.minute) - (sOrig.hour * 60 + sOrig.minute);
-		if (duration < 0) duration += 24 * 60; // 假设结束是在次日或跨日
-
-		// 解析新的起始分钟和小时（positioning 可能是字符串）
-		const newStartMin = Number(String(newtagName).trim());
-		const newHour = Number(String(positioning).trim());
-
-		// 校验
-		if (!Number.isFinite(newStartMin) || newStartMin < 0 || newStartMin >= 60) {
-			throw new Error('newtagName 必须是 0-59 的数字字符串或数字');
-		}
-		if (!Number.isFinite(newHour) || newHour < 0) {
-			throw new Error('positioning 必须是有效小时（数字或数字字符串）');
-		}
-
-		// 计算新的起止总分钟
-		const newStartTotal = newHour * 60 + newStartMin;
-		const newEndTotal = newStartTotal + duration;
-
-		// 处理跨小时/跨天
-		const newEndHour = Math.floor(newEndTotal / 60) % 24; // 保持在 0-23
-		const newEndMin = newEndTotal % 60;
-
-		// 格式化字符串
-		const pad2 = (n) => String(n).padStart(2, '0');
-
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime =
-			`${String(newHour)}:${pad2(newStartMin)}`;
-
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime =
-			`${String(newEndHour)}:${pad2(newEndMin)}`;
-		flyNumber.value.index1 = -1;
-		isMove.value = false;
-		let data = {
-			index0: saveEditIndex.value.index0,
-			index1: saveEditIndex.value.index1
-		}
-		whereEvent(data);
-		let infoValue = timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1]
-		infoValue.positioning = saveEditIndex.value.index0;
-		infoValue.positioningLong = saveEditIndex.value.index1;
-		editDirective(infoValue).then((res : any) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-	//变更左侧菜单
-	const changLeft = (index : number) => {
-		if (index === 5) {
-			uni.navigateTo({
-				url: "/pages/watch/full"
-			})
-			return
-		}
-		iszhouqi.value = false;
-		weekIndex.value = -1;
-		monthIndex.value = -1;
-		weekValue.value = "";
-		monthValue.value = "";
-		secondtop.value = 0.01
-		firsttop.value = 0.01
-		//这个东西完全是为了给动画用的，因为downmenuIndex这个吊东西其他地方在用，所以需要再整一个属性。
-		downdonghua.value = -1;
-
-		nextTick(() => {
-			secondtop.value = 0
-			firsttop.value = 0
-			downdonghua.value = 0;
-		})
-		downmenuIndex.value = 0;
-		upmenuIndex.value = index
-		downList.value = bigArray.value[index]?.children
-		thirdmenuIndex.value = 0;
-	}
-	const isempty = ref(false);
-	const changecard = () => {
-		isDelete.value = false;
-		open.value = false;
-		if (isMove.value) {
-			getNew()
-		} else {
-			if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].directiveName) {
-				flyNumber.value.index0 = saveEditIndex.value.index0;
-				flyNumber.value.index1 = saveEditIndex.value.index1;
-				isMove.value = true
-			}
-			else {
-				isempty.value = true;
-				setTimeout(() => {
-					isempty.value = false;
-				}, 1500)
-			}
-		}
-	}
-
-	const isRule = ref(false);
-	const topindex = ref(-1)
-
-	const weekValue = ref("");
-	const weekIndex = ref(-1);
-	const monthValue = ref("");
-	const monthIndex = ref(-1);
-	const clickWeek = (item, index) => {
-		const now = Date.now()
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			weekValue.value = item;
-			weekIndex.value = index;
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			weekValue.value = item;
-			weekIndex.value = index;
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-	const clickMonth = (item, index) => {
-		const now = Date.now()
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			monthValue.value = item;
-			monthIndex.value = index;
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			monthValue.value = item;
-			monthIndex.value = index;
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-	const isDelete = ref(false);
-	const openDelete = () => {
-		flyNumber.value.index0 = -1
-		flyNumber.value.index1 = -1
-		isMove.value = false;
-		open.value = false
-		if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].directiveName) {
-			if (!isDelete.value) {
-				isDelete.value = true;
-				setTimeout(() => deletedonghua.value = true, 50)
-
-			} else {
-				isDelete.value = false;
-				deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
-			}
-		} else {
-			isempty.value = true;
-			setTimeout(() => {
-				isempty.value = false;
-			}, 1500)
-		}
-
-	}
-
-	// 给抖动用的
-	function pseudoRandom(index0, index1) {
-		const seed = index0 * 55.9898 + index1 * 78.233;
-		// 产生一个伪随机数，取小数部分
-		return Math.abs(Math.sin(seed) * 43758.5453) % 1;
-	}
-	function computeDelay(index0, index1) {
-		const range = 2; // 延迟范围 0 ~ 2 秒
-		return pseudoRandom(index0, index1) * range;
-	}
-	// 在作用域中声明一个定时器变量
-	let throttleTimer = null;
-	//监听拖拽
-	/* 兼容：如果不支持 requestAnimationFrame，就用 setTimeout */
-	const requestAnimationFrame =
-		typeof window !== 'undefined' && window.requestAnimationFrame
-			? window.requestAnimationFrame
-			: (cb) => setTimeout(cb, 16);
-	function handleScrolltime(e) {
-		// uni-app 的 scroll 事件通常把位置放在 e.detail.scrollTop
-		// 为保险，先做容错判断
-		const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
-		lastY = scrollTop;
-
-		// 如果还在等待上一帧更新，就直接返回；否则安排下一帧更新
-		if (!ticking) {
-			ticking = true;
-			requestAnimationFrame(() => {
-				// 把 transform 更新为负的 scrollTop（向上平移）
-				// 使用 translate3d 触发 GPU 合成层
-				transformStyle.value = `translate3d(0, -${lastY}px, 0)`;
-				ticking = false;
-			});
-		}
-	}
-	const leftIn = ref(0)
-	function handleTop(e) {
-		leftIn.value = e.detail.scrollLeft
-	}
-	// 方法：根据条件返回不同的类名
-	const getClass = (item, index0, index1) => {
-		if (item.startTime) {
-			if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
-				return 'title-time-border-yellow-active-transparent';
-			} else if (shakyTable.value) {
-				return 'title-time-border-yellow-active';
-			} else {
-				return 'title-time-border-yellow';
-			}
-		}
-		return 'title-time-border';
-	}
-	// 通用的生成函数
-	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
-		return Array.from({ length: count }, (_, i) => {
-			const idx = pad
-				? String(i + startIndex).padStart(2, '0')
-				: i + startIndex
-			return `${base}/${prefix}${idx}.${ext}`
-		})
-	}
-	// 初始化下面侧单列表 ---这是一级菜单的模版
-	const doctorsayList = ref([
-		{
-			url: genPaths(
-				'/static/index/newruler',
-				'daily_',
-				6,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '日常'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newruler',
-				'clean_',
-				8,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '清洁'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newruler',
-				'diet_',
-				7,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '饮食'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newruler',
-				'sleep_',
-				5,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '睡眠'
-
-		},
-		{
-			url: genPaths(
-				'/static/index/newruler',
-				'defecate_',
-				5,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '排泄'
-
-		},
-	]);
-	// 当前选中的菜单索引
-	const upmenuIndex = ref<number>(1);
-	const downmenuIndex = ref<number>(0);
-	const downdonghua = ref(-1);
-	const thirdmenuIndex = ref<number>(0);
-	const forthmenuIndex = ref<number>(0);
-
-	const clickzhilingbao = (e : number) => {
-		const now = Date.now()
-		forthmenuIndex.value = e
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-
-	const saveEditIndex = ref({
-		index0: -1,
-		index1: -1
-	})
-
-	const secondContant = (index : number) => {
-		iszhouqi.value = false;
-		weekIndex.value = -1;
-		monthIndex.value = -1;
-		weekValue.value = "";
-		monthValue.value = "";
-		downmenuIndex.value = index;
-		downdonghua.value = index;
-		thirdmenuIndex.value = 0;
-		firsttop.value = 0.01;
-		nextTick(() => {
-			firsttop.value = 0;
-		})
-	}
-
-	const timer = ref(null);//计时器
-	const elementsInfo = ref({})//所有表格的信息
-	const moveX = ref(0)
-	const moveY = ref(0)
-	const openX = ref(0)
-	const openY = ref(0)
-	const flyNumber = ref({
-		index0: 999,
-		index1: 999,
-		tagName: ''
-	})
-
-	const deletedownisopacity = ref(false);
-
-	const touchindex1 = ref(-1);
-	// 分享矩阵到微信
-	const shareShow = ref(false);
-	const shareToWeixin = () => {
-		shareShow.value = true;
-		deletedownisopacity.value = false;
-		setTimeout(() => {
-			deletedownisopacity.value = true
-		}, 100)
-
-	}
-	const clickshare = () => {
-		uni.share({
-			provider: "weixin",
-			scene: "WXSceneSession",
-			type: 0,
-			href: "http://192.168.2.31:3101/daytoday",
-			title: "护理日程分享",
-			summary: "九泰护理日程测试",
-			imageUrl: "https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png",
-			success: function (res) {
-				console.log("success:");
-			},
-			fail: function (err) {
-				console.log("fail:");
-			}
-		});
-	}
-	const jiao = ref([false, false])
-	//表格点击开始
-	const showDetail = ref([-1, -1])
-	const rulerTouchClick = (item : any, index0 : number, index1 : number) => {
-		isDelete.value = false;
-		saveEditIndex.value.index0 = index0;
-		saveEditIndex.value.index1 = index1;
-		centerCell();
-		isRule.value = true;
-		setTimeout(() => {
-			if (item.directiveName && open.value) {
-				touchindex1.value = index1;
-				const query = uni.createSelectorQuery()
-				query
-					.selectAll('.super-card-time-card')
-					.boundingClientRect((data : any) => {
-						data.forEach(async (res : any) => {
-							// 根据你的条件筛选元素
-							if (res.left > 100 && res.left < 1067 && res.top < 670 && res.top > 50 && res.dataset.index0 == index0 && res.dataset.index1 == index1) {
-								if (res.left > 100 && res.left < 500) {
-									// 表格太靠左侧，修改到右面
-									openX.value = Math.floor(res.left) + 528;
-									jiao.value[0] = true
-								} else {
-									openX.value = Math.floor(res.left) - 18
-									jiao.value[0] = false
-								}
-								if (res.top > 300) {
-									// 表格太靠上侧，修改到下面
-									openY.value = Math.floor(res.top) + 100;
-									jiao.value[1] = true
-								} else {
-									openY.value = Math.floor(res.top) + 180
-									jiao.value[1] = false
-								}
-								await nextTick()
-								isopen.value = true;
-
-								showDetail.value[0] = index0;
-								showDetail.value[1] = index1;
-								// console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
-								isopacity.value = false;
-								//加动画
-								setTimeout(() => {
-									isopacity.value = true;
-								}, 100)
-							}
-						})
-					})
-					.exec()
-			}
-		}, 400)
-	}
-	const shakyTable = ref(false);
-	const reldata = ref([]);
-	const deleteRuler = (index0 : number, index1 : number) => {
-		deleteDirective(timearr.value[index0].children[index1]).then((res : any) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-
-	const saveX = ref(0);
-	const saveY = ref(0);
-
-	const bottomTimer = ref(null);
-	const bottomisShaking = ref(false);
-	const bottomTouchStart = (e) => {
-		saveX.value = Math.floor(e.touches[0].pageX);
-		saveY.value = Math.floor(e.touches[0].pageY);
-		// 2秒后触发抖动效果
-		bottomTimer.value = setTimeout(() => {
-			bottomisShaking.value = true
-		}, 500)
-	}
-	const bottomTouchMove = (e) => {
-		const moveX = Math.floor(e.touches[0].pageX);
-		const moveY = Math.floor(e.touches[0].pageY);
-		// 计算移动距离
-		if (
-			Math.abs(moveX - saveX.value) > 0 ||
-			Math.abs(moveY - saveY.value) > 0
-		) {
-			if (bottomTimer.value) {
-				clearTimeout(bottomTimer.value)
-				bottomTimer.value = null
-			}
-		}
-	}
-	const bottomTouchEnd = () => {
-		if (bottomTimer.value) {
-			clearTimeout(bottomTimer.value)
-			bottomTimer.value = null
-		}
-	}
-
-	const indexsave = ref([-1, -1]);
-	const opensay = () => {
-		sayisopacity.value = false;
-		sayisopen.value = true;
-		setTimeout(() => {
-			sayisopacity.value = true
-		}, 50)
-	}
-	const buttonBlue = ref(false)
-	let animTimer = null
-
-	async function addnewbutton() {
-		// 清定时器（防止残留）
-		if (animTimer) {
-			clearTimeout(animTimer)
-			animTimer = null
-		}
-
-		// 先把状态设为 false，等待 DOM 更新后再设为 true —— 达到重启动画的效果
-		buttonBlue.value = false
-		await nextTick() // 等待下一帧，确保样式被移除
-
-		// 重新打开动画
-		buttonBlue.value = true
-		addnew()
-		// 1s 后还原（与动画时长保持一致）
-		animTimer = setTimeout(() => {
-			buttonBlue.value = false
-			animTimer = null
-		}, 1000)
-	}
-
-	const doaddDirective = (element : any) => {
-		addDirective(element).then((res) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-
-	const killjishi = (id : string) => {
-		deleteInstant({ id: id }).then((res) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-
-	const addnew = () => {
-
-		if (isDelete.value) {
-			isDelete.value = false;
-			deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
-			return
-		}
-		if (isMove.value) {
-			getNew()
-			return
-		}
-		let haveValue = false;
-		if (timearr.value[saveEditIndex.value.index0]?.children[saveEditIndex.value.index1].directiveName) {
-			haveValue = true
-		}
-		// return
-		if (iszhiling.value) {
-
-			let allobject = savePackagelist.value[forthmenuIndex.value];
-
-			if (saveEditIndex.value.index1 === -1 && saveEditIndex.value.index0 === -1) {
-				return
-			}
-			if (isDelete.value) {
-				isDelete.value = false;
-				deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
-				return
-			}
-			if (isMove.value) {
-				getNew()
-				return
-			}
-			flyNumber.value.index0 = -1;
-			flyNumber.value.index1 = -1;
-			isMove.value = false;
-			let cycleType = `打包`;
-			let cycleValue = "";
-			const startHour = Number(saveEditIndex.value.index0)
-			const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName)
-			const endMinute = startMinute + Number(allobject.serviceDuration)
-			const endHour = startHour + Math.floor(endMinute / 60)
-			const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
-			const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
-
-			let param = {
-				id: haveValue ? timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id : "",
-				nuId: uni.getStorageSync('nuId'),
-				nuName: uni.getStorageSync('nuName'),
-				elderId: uni.getStorageSync('elderId'),
-				elderName: uni.getStorageSync('NUall').elderInfo.name,
-				directiveId: allobject.id,
-				directiveName: allobject.packageName,
-				typeId: "",
-				typeName: "",
-				categoryId: "",
-				categoryName: "",
-				cycleTypeId: "",
-				cycleType: cycleType,
-				cycleValue: cycleValue,
-				startTime: formattedStart,
-				endTime: formattedEnd,
-				serviceDuration: allobject.serviceDuration,
-				positioning: saveEditIndex.value.index0.toString(),
-				positioningLong: saveEditIndex.value.index1.toString(),
-				izPackage: 'Y',
-				previewFile: "",
-				previewFileSmall: "",
-				netPreviewFile: "",
-				netPreviewFileSmall: "",
-				immediateFile: "",
-				immediateFileFocus: "",
-				netImmediateFileFocus: "",
-				netImmediateFile: "",
-				tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
-				mp3File: allobject.mp3File,
-				netMp3File: allobject.netMp3File,
-				mp4File: allobject.mp4File,
-				netMp4File: allobject.netMp4File,
-				serviceContent: allobject.serviceContent,
-			}
-			//给表格赋值
-			timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
-			let data = {
-				index0: saveEditIndex.value.index0,
-				index1: saveEditIndex.value.index1
-			}
-			whereEvent(data);
-			if (haveValue) {
-				editDirective(param).then((res : any) => {
-					if (res.success) {
-						geteverything()
-					}
-				})
-			} else {
-				doaddDirective(param);
-			}
-
-			return
-		}
-
-		let stopIt = false;
-		let allobject = bigArray.value[upmenuIndex.value].children[downmenuIndex.value].children[thirdmenuIndex.value]
-
-		if (allobject.cycleTypeId == 3) {
-			scrollLeft.value = 1;
-			bottomItems.value.forEach((element : any, index : number) => {
-				if (element.directiveName == allobject.title) {
-					stopIt = true
-				}
-			})
-			nextTick(() => {
-				if (!stopIt) {
-					scrollLeft.value = 0;
-					if (bottomItems.value.length && bottomItems.value[0].target === "#03a4ff") {
-						bottomItems.value[0].target = "#fff"
-						clearTimeout(cleansettimeout.value);
-					}
-					let pushValue = allobject;
-					pushValue.directiveId = allobject.id;
-					pushValue.directiveName = allobject.title;
-					pushValue.serviceDuration = allobject.serviceDuration;
-
-					pushValue.target = `#03a4ff`
-					pushValue.id = ""
-					pushValue.nuId = uni.getStorageSync('nuId');
-					pushValue.nuName = uni.getStorageSync('nuName');
-					pushValue.elderId = uni.getStorageSync('elderId');
-					pushValue.elderName = uni.getStorageSync('NUall').elderInfo.name;
-					bottomItems.value.unshift(pushValue)
-					// 实现即时指令动画
-					cleansettimeout.value = setTimeout(() => {
-						bottomItems.value[0].target = `#fff`;
-						console.log("即时指令看看进入了啥", pushValue)
-						addInstant(pushValue).then((res : any) => {
-							if (res.success) {
-								geteverything()
-							}
-						})
-					}, 1500)
-				} else {
-					clearTimeout(cleansettimeoutrel.value);
-					isop.value = true;
-					cleansettimeoutrel.value = setTimeout(() => {
-						isop.value = false;
-						// saveAll()
-					}, 1500)
-				}
-			})
-			return
-		}
-		if (saveEditIndex.value.index1 === -1 && saveEditIndex.value.index0 === -1) {
-			return
-		}
-		flyNumber.value.index0 = -1;
-		flyNumber.value.index1 = -1;
-		isMove.value = false;
-
-		if (allobject.cycleTypeId == 2 && iszhouqi.value && weekIndex.value == -1 && monthIndex.value == -1) {
-			return
-		}
-		else if (allobject.cycleTypeId == 2 && !iszhouqi.value) {
-			iszhouqi.value = true
-			return
-		}
-		let cycleType = "";
-		let cycleValue = "";
-		if (allobject.cycleTypeId == 1) {
-			cycleType = "日常"
-		} else {
-			if (weekIndex.value != -1) {
-				cycleType = weekValue.value
-				let cycleTypeIndex = 0;
-				weekDays.forEach((element : any, index : any) => {
-					if (element == weekValue.value) {
-						cycleTypeIndex = index
-					}
-				})
-				cycleValue = cycleTypeIndex.toString()
-
-			} else {
-				cycleType = monthValue.value + "号";
-				cycleValue = monthValue.value
-			}
-			iszhouqi.value = false;
-			weekIndex.value = -1;
-			monthIndex.value = -1;
-			weekValue.value = "";
-			monthValue.value = "";
-		}
-		const startHour = Number(saveEditIndex.value.index0)
-		const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName)
-		const endMinute = startMinute + Number(allobject.serviceDuration)
-		const endHour = startHour + Math.floor(endMinute / 60)
-		const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
-		const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
-		let param = {
-			id: haveValue ? timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id : "",
-			nuId: uni.getStorageSync('nuId'),
-			nuName: uni.getStorageSync('nuName'),
-			elderId: uni.getStorageSync('elderId'),
-			elderName: uni.getStorageSync('NUall').elderInfo.name,
-			directiveId: allobject.id,
-			directiveName: allobject.title,
-			typeId: allobject.typeId,
-			typeName: allobject.typeName,
-			categoryId: allobject.categoryId,
-			categoryName: allobject.categoryName,
-			cycleTypeId: allobject.cycleTypeId,
-			cycleType: cycleType,
-			cycleValue: cycleValue,
-			startTime: formattedStart,
-			endTime: formattedEnd,
-			positioning: saveEditIndex.value.index0.toString(),
-			positioningLong: saveEditIndex.value.index1.toString(),
-			izPackage: 'N',
-			previewFile: allobject.previewFile,
-			previewFileSmall: allobject.previewFileSmall,
-			serviceDuration: allobject.serviceDuration,
-			immediateFile: allobject.immediateFile,
-			immediateFileFocus: allobject.immediateFileFocus,
-			netImmediateFileFocus: allobject.netImmediateFileFocus,
-			netImmediateFile: allobject.netImmediateFile,
-			tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
-			mp3File: allobject.mp3File,
-			netMp3File: allobject.netMp3File,
-			mp4File: allobject.mp4File,
-			netMp4File: allobject.netMp4File,
-			serviceContent: allobject.serviceContent,
-			netPreviewFile: allobject.netPreviewFile,
-			netPreviewFileSmall: allobject.netPreviewFileSmall,
-		}
-		//给表格赋值
-		timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
-		let data = {
-			index0: saveEditIndex.value.index0,
-			index1: saveEditIndex.value.index1
-		}
-		whereEvent(data);
-		if (haveValue) {
-			editDirective(param).then((res : any) => {
-				if (res.success) {
-					geteverything()
-				}
-			})
-		} else {
-			doaddDirective(param);
-		}
-
-	}
-	const cleansettimeout = ref(null);
-	const cleansettimeoutrel = ref(null);
-	const saveAll = () => {
-		if (!cansumit.value) {
-			return
-		}
-		let info = []
-
-		bodyTagList.value.forEach((element : any) => {
-			if (element.izSelected == 'Y') {
-				info.push(element)
-			}
-		})
-		emotionTagList.value.forEach((element : any) => {
-			if (element.izSelected == 'Y') {
-				info.push(element)
-			}
-		})
-
-		let allvalue = {
-			nuId: uni.getStorageSync('nuId'),
-			nuName: uni.getStorageSync('nuName'),
-			elderId: uni.getStorageSync('elderId'),
-			elderName: uni.getStorageSync('NUall').elderInfo.name,
-			tagList: info
-		}
-
-		addBatch(allvalue).then(() => {
-			geteverything()
-		})
-	}
-	const routerPush = () => {
-		uni.navigateTo({
-			url: `/pages/timeMatrix/indexnew`
-		})
-	}
-	// 暂存器
-	const saveRulerTime = ref({
-		index0: -1,
-		index1: -1
-	})
-	const targetRuler = ref({
-		index0: -1,
-		index1: -1,
-		current: -1,
-		bordershow: true
-	})
-	const solveWatch = ref(0)
-	const whereEvent = (data : any) => {
-		saveEditIndex.value.index0 = data.index0;
-		saveEditIndex.value.index1 = data.index1;
-		centerCell();
-		targetRuler.value.index0 = data.index0;
-		targetRuler.value.index1 = data.index1;
-		saveRulerTime.value.index0 = targetRuler.value.index0;
-		saveRulerTime.value.index1 = targetRuler.value.index1;
-		targetRuler.value.bordershow = false;
-		setTimeout(() => {
-			targetRuler.value.index0 = -1;
-			targetRuler.value.index1 = -1;
-			targetRuler.value.current = -1
-		}, 400)
-		setTimeout(() => {
-			targetRuler.value.bordershow = true;
-			saveRulerTime.value.index0 = -1;
-			saveRulerTime.value.index1 = -1;
-		}, 1000)
-	}
-	// 定义每小时中的分钟数组，表示每 5 分钟一个时间段，总共 12 个
-	const minuteArr = ['00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55']
-	const timearr = ref(
-		Array.from({ length: 24 }, (_, hour) => ({
-			positioning: hour.toString(),
-			children: minuteArr.map(time => ({
-				tagName: time,           // 表示分钟，如 '00', '05' 等
-				directiveName: '' // 默认的 directiveName
-			}))
-		}))
-	)
-	const emotionTagList = ref([]);
-	const bodyTagList = ref([]);
-	const geteverything = () => {
-		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
-			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
-				timearr.value = Array.from({ length: 24 }, (_, hour) => ({
-					positioning: hour.toString(),
-					children: minuteArr.map(time => ({
-						tagName: time,           // 表示分钟，如 '00', '05' 等
-						directiveName: '' // 默认的 directiveName
-					}))
-				}))
-				res.result.serviceList.forEach((res : any) => {
-					timearr.value[res.positioning].children[res.positioningLong] = res;
-				})
-				bottomItems.value = res.result.instantList
-				cansumit.value = true;
-				emotionTagList.value = res.result.emotionTagList;
-				emotionTagListLook.value = []
-				bodyTagListLook.value = []
-				res.result.emotionTagList.forEach((res : any) => {
-					if (res.izSelected == 'Y') {
-						emotionTagListLook.value.push(res.netPic)
-					}
-				})
-				bodyTagList.value = res.result.bodyTagList
-				res.result.bodyTagList.forEach((res : any) => {
-					if (res.izSelected == 'Y') {
-						bodyTagListLook.value.push(res.netPic)
-					}
-				})
-			})
-		}
-	}
-	const savePackagelist = ref([]);
-	onMounted(() => {
-		savePackagelist.value = uni.getStorageSync('Packagelist2') || []
-		let res = uni.getStorageSync('saveTree2')
-		let goodArray = []
-		myArray.forEach((element : any) => {
-			element.children.forEach((element1 : any) => {
-				goodArray.push({
-					name: element1.title,
-					url: element1.url,
-				})
-			})
-		})
-		secondtemp.value = goodArray
-		if (res.result) {
-			res.result.forEach((element : any) => {
-				if (element.netFlag == '0') {
-					doctorsayList.value.forEach((res : any) => {
-						if (res.name == element.title) {
-							element.url = res.url
-						}
-					})
-				} else {
-					element.url = element.animationPath
-				}
-				element.children.forEach((res1 : any) => {
-					if (res1.netFlag == '0') {
-						secondtemp.value.forEach((res2 : any) => {
-							if (res2.name == res1.title) {
-								res1.url = res2.url
-							}
-						})
-					} else {
-						res1.url = res1.animationPath
-					}
-
-				})
-			})
-			bigArray.value = res.result;
-		}
-		downList.value = bigArray.value[0].children
-		upmenuIndex.value = -1;
-		downdonghua.value = -1;
-		setTimeout(() => {
-			upmenuIndex.value = 0;
-			downdonghua.value = 0;
-		}, 50)
-		uni.$on('where', findback);
-		downdonghua.value = 0;
-		geteverything()
-	})
-
-	const bodyTagListLook = ref([]);
-	const emotionTagListLook = ref([]);
-	const cansumit = ref(false);
-
-	onBeforeUnmount(() => {
-		if (animTimer) clearTimeout(animTimer)
-		uni.$off('where', findback);
-		ticking = false;
-
-	})
-	function findback(data : any) {
-		solveWatch.value = 3;
-		whereEvent(data)
-	}
-	// 切割bigArray
-	function splitString(str) {
-		// 使用正则表达式找到所有括号的内容
-		let result = [];
-		let remainingStr = str;
-		// 正则匹配最外层括号（支持全角和半角）
-		let regex = /([^（(]*)[（(]([^）)]+)[）)]/;
-		while (regex.test(remainingStr)) {
-			let match = remainingStr.match(regex);
-			if (match) {
-				// 添加括号前的部分（去掉空白）
-				if (match[1].trim()) {
-					result.push(match[1].trim());
-				}
-				// 添加括号内的内容
-				if (match[2].trim()) {
-					result.push(match[2].trim());
-				}
-				// 更新剩余的字符串
-				remainingStr = remainingStr.replace(match[0], '').trim();
-			}
-		}
-		// 如果最后还有剩余部分，也加入结果
-		if (remainingStr.trim()) {
-			result.push(remainingStr.trim());
-		}
-		return result;
-	}
-
-	const totalColumns = 24; // 总列数
-	const totalRows = 11;    // 总行数
-	const visibleWidth = 1300;  // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220
-	const visibleHeight = 400; // 可视区域高度 (rpx)，假设显示约5行时 heightType = 102.5
-	function centerCell() {
-		if (saveEditIndex.value.index0 >= 0 && saveEditIndex.value.index0 <= totalColumns && saveEditIndex.value.index1 >= 0 && saveEditIndex.value.index1 <= totalRows) {
-			// 计算点击格子的中心位置 (rpx)
-			const cellCenterX = (saveEditIndex.value.index0 + 0.5) * 259;
-			const cellCenterY = (saveEditIndex.value.index1 - 1) * 200;
-			// 计算 scrollLeft 和 scrollTop，使格子中心位于可视区域中心
-			cardLeft.value = cellCenterX - visibleWidth / 2;
-			scrollTop.value = cellCenterY - visibleHeight / 2;
-			// 计算网格总宽高
-			const totalWidth = totalColumns * 259;
-			const totalHeight = totalRows * 200;
-			// 限制 scrollLeft 和 scrollTop 在有效范围内
-			cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2;
-			// scrollTop.value =  0
-			scrollTop.value = Math.max(0, Math.min(scrollTop.value, totalHeight - visibleHeight)) / 2;
-		}
-	}
-	const iszhiling = ref(false)
-	const zhilingbao = () => {
-		iszhiling.value = !iszhiling.value
-		forthmenuIndex.value = 0;
-	}
-	const deletedonghua = ref(false);
-</script>
-
-<style lang="less" scoped>
-	// 主页的css
-	@import './index';
-</style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/logistics/newindex.vue b/pages/NursingNew/component/logistics/newindex.vue
index 4798b82..68bb558 100644
--- a/pages/NursingNew/component/logistics/newindex.vue
+++ b/pages/NursingNew/component/logistics/newindex.vue
@@ -1698,10 +1698,10 @@
 	const emotionTagList = ref([]);
 	const bodyTagList = ref([]);
 	const geteverything = () => {
-
+		console.log("为啥",uni.getStorageSync('nuId'))
 		if (uni.getStorageSync('nuId')) {
 			getNclist(uni.getStorageSync('nuId')).then((res : any) => {
-				// console.log("通了吗",res)
+				console.log("通了吗",res)
 				timearr.value = Array.from({ length: 24 }, (_, hour) => ({
 					positioning: hour.toString(),
 					children: minuteArr.map(time => ({
@@ -2100,6 +2100,7 @@
 	const lastClick = ref(0)
 	let singleTimer = null
 	const clickaddnew = (item, index) => {
+	
 		isTuoing.value = false
 		killbaddata.value = true
 		thirdmenuIndex.value = index
@@ -2210,6 +2211,7 @@
 				})
 		} else {
 			addDirective(postdata).then((res) => {
+				console.log("wtf",res)
 				if (res.success) {
 					geteverything()
 					setTimeout(() => {
diff --git a/pages/NursingNew/component/nurse/bigindex.css b/pages/NursingNew/component/nurse/bigindex.css
index a4a2706..ec7cb51 100644
--- a/pages/NursingNew/component/nurse/bigindex.css
+++ b/pages/NursingNew/component/nurse/bigindex.css
@@ -609,22 +609,32 @@
 				}
 
 				font-size: 33rpx;
-				margin-top: 10rpx;
+				margin-top: 5rpx;
 				display:flex;
 				position: relative;
 			}
 
-			.history-right {
+			.blue-button-left {
+				border: 2rpx solid #fff;
+				border-radius: 50%;
+				width: 2.5vw;
+				height: 2.5vw;
+				position: absolute;
+				left: -0.8vw;
+				top: 0;
+			}
 
-				width: 7vw;
-				height: 2.8vw;
+			.history-right {
+				width: 7.7vw;
+				height: 2.5vw;
 				background: linear-gradient(to bottom, #009DEF, #0076FF);
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				border-radius: 10rpx;
+				border-radius: 30rpx;
 				color: #fff;
-				font-size: 30rpx;
+				padding-left: 1.4vw;
+				font-size: 26rpx;
 				position: relative;
 			}
 		}
@@ -686,7 +696,7 @@
 					margin-left: 6rpx;
 					margin-top: 15rpx;
 					margin-bottom: 10rpx;
-					
+
 				}
 
 				.history-name {
@@ -1027,25 +1037,26 @@
 	background-color: red;
 }
 
-.que-nomessage{
+.que-nomessage {
 	width: 25.2vw;
 	height: 26vw;
 	position: absolute;
-	top: 58%;
+	top: 55%;
 	left: 50%;
-	transform: translate(-50%,-50%);
+	transform: translate(-50%, -50%);
 	border-radius: 30rpx;
 	border: 1rpx solid #d9d9d9;
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 	align-items: center;
-	
-	image{
+
+	image {
 		width: 10vw;
 		height: 10vw;
 	}
-	view{
+
+	view {
 		width: 100%;
 		text-align: center;
 		font-weight: 300;
diff --git a/pages/NursingNew/component/nurse/bigindex.vue b/pages/NursingNew/component/nurse/bigindex.vue
index 93ae534..d0cce4d 100644
--- a/pages/NursingNew/component/nurse/bigindex.vue
+++ b/pages/NursingNew/component/nurse/bigindex.vue
@@ -250,10 +250,11 @@
 									服务指令
 								</view>
 								<view class="history-right">
+									<image class="blue-button-left" src="/static/index/newindex/leftmenu/zzbq.png" mode="aspectFill"></image>
 									长者标签
 								</view>
 							</view>
-							<view class="que-nomessage">
+							<view class="que-nomessage" v-if="!downmenuarray.length">
 								<image src="/static/index/procurement/haven.png" mode="aspectFill"></image>
 								<view>暂无数据</view>
 							</view>
diff --git a/pages/NursingNew/component/nurse/component/default.vue b/pages/NursingNew/component/nurse/component/default.vue
index 3c94bba..50654f0 100644
--- a/pages/NursingNew/component/nurse/component/default.vue
+++ b/pages/NursingNew/component/nurse/component/default.vue
@@ -18,7 +18,7 @@
 <style scoped lang="less">
 .que{
 	width: 25.2vw;
-	height: 21vw;
+	height: 22.5vw;
 	position: absolute;
 	top: 48%;
 	left: 50%;
diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index d1fdee6..4cae836 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -353,9 +353,9 @@
 		left: 0;
 
 		.cardp {
-			position: absolute;
-			left: 0;
-			top: 11vw;
+			// position: absolute;
+			// left: 0;
+			// top: 11vw;
 			width: 15vw;
 			display: flex;
 			margin: 0.3vw auto;
@@ -382,19 +382,22 @@
 		}
 
 		.imgs {
-			width: 11vw;
-			height: 11vw;
+			width: 12vw;
+			height: 12vw;
 			// background: #fff;
+			
 			border-radius: 1.1vw;
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			margin: 0.8vw auto 0;
-			padding: 0.3vw;
-
+			margin: 1.2vw auto 0;
+			// padding: 0.3vw;
+			// background-color: red;
+			
 			>image {
 				width: 100%;
 				height: 100%;
+				
 			}
 		}
 	}
diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue
index 24d4ee8..75339e9 100644
--- a/pages/NursingNew/component/pleasetake/common/submits.vue
+++ b/pages/NursingNew/component/pleasetake/common/submits.vue
@@ -263,8 +263,10 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							margin: 0.5vw auto 0;
-							padding: 0.2vw;
+							margin: 1.2vw auto 0;
+							// padding: 0.2vw;
+							
+							// background-color: red;
 							>image {
 								width: 100%;
 								height: 100%;
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 76f0eb8..8c2a188 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -1128,15 +1128,16 @@
 							padding: 0.5vw 0;
 
 							.bgimg {
-								width: 8vw;
-								height: 8vw;
-								margin: 0.3vw auto 0.25vw;
+								width: 7vw;
+								height: 7vw;
+								margin: 1.5vw auto 0.25vw;
 								border-radius: 1.1vw;
 								background: #fff;
 								display: flex;
 								justify-content: center;
 								align-items: center;
 								padding: 0.2vw;
+								// background-color: red;
 
 								>image {
 									width: 100%;
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 8109817..fe4f3c7 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -180,11 +180,7 @@
 		}
 		queryGwcInfo(obj).then(res => {
 			addMaterial.value = res.result;
-			if(!addMaterial.value.length){
-				isemity.value = true
-			}else{
-				isemity.value = false
-			}
+			
 			// console.log("看看数组",addMaterial.value)
 		})
 	}
@@ -197,6 +193,12 @@
 				item.zk = false;
 				item.scrollleft = 0;
 			})
+			// console.log("数据干哪去了啊",res)
+			if(!res.result.records.length && form.pageNo == 1){
+				isemity.value = true
+			}else{
+				isemity.value = false
+			}
 			listarr.value.push(...res.result.records)
 			status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
 		})
diff --git a/pages/NursingNew/component/warehousematrix/api.js b/pages/NursingNew/component/warehousematrix/api.js
index 7196736..c614b78 100644
--- a/pages/NursingNew/component/warehousematrix/api.js
+++ b/pages/NursingNew/component/warehousematrix/api.js
@@ -11,7 +11,7 @@ export const getServiceTree = () => {
 	})
 }
 // 查询表格
-export const getNclist = (nuId,elderId) => {
+export const getNclist = (nuId) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/getNclist?nuId=${nuId}&elderId=${``}`,
 		method: 'get',
diff --git a/pages/NursingNew/component/warehousematrix/index.vue b/pages/NursingNew/component/warehousematrix/index.vue
deleted file mode 100644
index 9cb2176..0000000
--- a/pages/NursingNew/component/warehousematrix/index.vue
+++ /dev/null
@@ -1,1817 +0,0 @@
-<!-- 护嘱 -->
-<template>
-	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}"
-		@click="bottomisShaking=false;shakyTable = false">
-		<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 style="display: flex;align-items: center;margin-right: 25rpx;padding: 0 15rpx;"
-					:class="!topindex&&!bodystatus&&!facestatus?'firsttarget':''">
-					<view class="mark">
-						<view style="margin-right: 15rpx;">
-							老人标签:
-						</view>
-						<view class="overlay" v-show="openbody" @click="openbody=false"></view>
-					</view>
-					<view class="marknone" @click="openbody=!openbody;openface=false">
-						<view v-if="!bodyTagListLook.length&&!emotionTagListLook.length" style="margin-top: -3rpx;">
-							未选择
-						</view>
-						<view v-for="(item,index) in bodyTagListLook" :key="index">
-							<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
-						</view>
-						<view v-for="(item,index) in emotionTagListLook" :key="index">
-							<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
-						</view>
-					</view>
-					<view class="tri-down" @click="openbody=!openbody;openface=false">
-
-						<view class="mark-bgc" v-show="openbody" :style="{opacity:bodydonghua?1:0}" @click.stop>
-							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
-								<view>
-									体型标签
-								</view>
-							</view>
-							<view style="display: flex;flex-wrap: wrap;">
-								<view v-for="(item,index) in bodyTagList" :key="index" @click="addbody(index)">
-									<view class="tags-father" :class="bodystatustarget===index?'secondtarget':''">
-										<image class="tags-img"
-											:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
-										<view class="tags-font"
-											:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
-											{{item.tagName}}
-										</view>
-									</view>
-								</view>
-							</view>
-							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
-								<view>
-									情绪标签
-								</view>
-							</view>
-							<view style="display: flex;flex-wrap: wrap;">
-								<view v-for="(item,index) in emotionTagList" :key="index" @click="addface(index)">
-									<view class="tags-father" :class="facestatustarget===index?'secondtarget':''">
-										<image class="tags-img"
-											:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
-										<view class="tags-font"
-											:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
-											{{item.tagName}}
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- <view style="display: flex;align-items: center;margin-right: 15rpx;padding: 0 15rpx;"
-					:class="topindex===1&&!bodystatus&&!facestatus?'firsttarget':''">
-					<view class="mark">
-						情绪标签：
-						<view class="overlay" v-show="openface" @click="openface=false"></view>
-						<view class="mark-bgc" v-show="openface" :style="{opacity:facedonghua?1:0}" @click.stop>
-							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
-								<view>
-									情绪标签
-								</view>
-							</view>
-							<view style="display: flex;flex-wrap: wrap;">
-								<view v-for="(item,index) in emotionTagList" :key="index" @click="addface(index)">
-									<view class="tags-father" :class="facestatustarget===index?'secondtarget':''">
-										<image class="tags-img"
-											:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
-										<view class="tags-font"
-											:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
-											{{item.tagName}}
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="marknone" @click="openface=!openface;openbody=false">
-						<view v-if="!emotionTagListLook.length" style="margin-top: -3rpx;">
-							未选择
-						</view>
-						<view v-for="(item,index) in emotionTagListLook" :key="index">
-							<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
-						</view>
-					</view>
-
-					<view class="tri-down" @click="openface=!openface;openbody=false"></view>
-				</view> -->
-				<view class="white-button" @click="routerPush">
-					<image class="white-img" :src="`/static/index/newruler/yulan.png`" />
-					预览
-				</view>
-				<view class="white-button" @click="shareToWeixin">
-					<image class="white-img" :src="`/static/index/newruler/fenxiang.png`" />
-					分享
-				</view>
-				<view class="white-button" @click="changLeft(5)">
-					<image class="white-img" style="width: 45rpx;height: 45rpx;"
-						:src="`/static/index/newruler/watch.png`" />
-					监控
-				</view>
-			</view>
-		</view>
-		<view class="doctorsay-container-view">
-			<view class="doctorsay-container-container">
-				<view class="super-card">
-					<view class="boom-father">
-						<view class="boom" :style="{ transform: transformStyle }">
-							<view>
-								<view v-for="(item,index) in timearr[0].children" :key="index">
-									<view class="boom-son" v-show="item.tagName">
-										<text class="boom-text">
-											{{item.tagName}}
-										</text>
-
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="super-card-container">
-						<scroll-view style="height: 100%" scroll-with-animation :scroll-left="cardLeft" scroll-x
-							@scroll="handleTop" :show-scrollbar="false">
-							<view style="display: flex;width:4824rpx;">
-								<view v-for="(item0,index0) in timearr" :key="index0">
-									<view class="super-card-time">
-										{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
-									</view>
-								</view>
-							</view>
-							<view style="display: flex;height: calc(100% - 330rpx);position: relative;">
-								<view class="xian-bian"></view>
-								<scroll-view style="height: 100%;width:6744rpx;" :scroll-top="scrollTop"
-									scroll-with-animation :scroll-y="true" @scroll="handleScrolltime"
-									:show-scrollbar="false">
-									<view style="display: flex;height: 100%;">
-										<view v-for="(item0,index0) in timearr" :key="index0">
-											<view class="super-card-time-und">
-												<view v-for="(item1,index1) in item0.children" style="width: 100%;"
-													:key="index1">
-													<view
-														:class=" targetRuler.index0 === index0 && targetRuler.index1 === index1 ? targetRuler.index1 ?`title-time-border-big`:`title-time-border-big-top` : `super-card-time-card` "
-														:style="!targetRuler.bordershow && saveRulerTime.index0 === index0 && saveRulerTime.index1 === index1 ? {zIndex:999} : {borderBottom: '1rpx solid transparent'}"
-														:id="`a${index0}_${index1}`" style="position: relative;"
-														@click="rulerTouchClick(item1,index0,index1)"
-														:data-index0="index0" :data-index1="index1">
-														<view class="time-button-orange-spe"
-															:style="{left:flyNumber.index0?`-130rpx`:`0`}"
-															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1==0">
-															请选择服务指令迁移的目标单元格
-
-														</view>
-														<view class="time-button-orange"
-															:style="{left:flyNumber.index0?`-130rpx`:`0`}"
-															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1">
-															请选择服务指令迁移的目标单元格
-
-														</view>
-														<view class="title-time-blue"
-															v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
-														</view>
-														
-														<view :class="getClass(item1,index0,index1)"
-															style="font-size: 30rpx;overflow: hidden;"
-															:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s` }">
-
-															<view class="title-time" v-if="item1.startTime"
-																style="flex-direction: column;">
-																<image v-show="item1.startTime"
-																	style="width: 50rpx;height: 50rpx;margin: 0 auto;margin-top: 20rpx"
-																	:src="item1.netImmediateFile?item1.netImmediateFile:`/static/logo.png`" />
-																<view class="title-time-time" style="font-size: 30rpx;">
-																	{{item1.startTime + `-` + item1.endTime}}
-																</view>
-																<image class="title-time-button"
-																	style="width: 80rpx;height: 50rpx;"
-																	v-if="item1.cycleTypeId!=1"
-																	src="/static/index/newruler/jiao.png" />
-																<view class="title-time-font"
-																	style="right: 10rpx;top: 5rpx;"
-																	v-if="item1.cycleTypeId!=1">
-																	{{item1.cycleType}}
-																</view>
-															</view>
-															<view v-if="item1.startTime" class="title-time-font-rel">
-																{{splitString(item1.directiveName)[0]}}
-															</view>
-															<view
-																v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule && !item1.startTime"
-																class="pulic-time">
-																{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
-															</view>
-														</view>
-													</view>
-												</view>
-											</view>
-										</view>
-									</view>
-								</scroll-view>
-							</view>
-						</scroll-view>
-					</view>
-					<view class="right-cards">
-						<view style="margin-top: 20rpx;margin-left: 30rpx;">
-							<view class="">
-								即时指令
-							</view>
-							<view
-								style="width: 30rpx;height: 6rpx;background-color: black;margin-left: 40rpx;margin-top: 3rpx;border-radius: 20rpx;">
-							</view>
-						</view>
-						<scroll-view scroll-x class="scroll-box" :scroll-left="scrollLeft">
-							<view class="right-box">
-								<view v-for="(item,index) in bottomItems" :key="index">
-									<view class="right-box-item" @touchstart="bottomTouchStart"
-										@touchmove="bottomTouchMove" @touchend="bottomTouchEnd"
-										:style="item.target?{background: item.target,transition:`all 1.5s ease-in-out`}:{transition:`all 1.5s ease-in-out`}">
-										<view :style="{ animationDelay:`-${index * 0.1}s` }"
-											:class="bottomisShaking?`super-end-items-img-father-active`:`super-end-items-img-father`">
-											<image class="right-box-img" :src="item.netImmediateFile" />
-											<view class="right-box-font"
-												:style="{fontSize: (item.directiveName?.trim().length > 6) ? '25rpx' : '27rpx' }">
-												{{item.directiveName}}
-											</view>
-										</view>
-										<view class="super-end-items-father-close-father" v-show="bottomisShaking"
-											@click.stop="bottomItems.splice(index, 1);killjishi(item.id)">
-											-
-										</view>
-									</view>
-								</view>
-							</view>
-						</scroll-view>
-						<view class="middle-box" v-show="!iszhiling">
-							<view class="middle-left-box">
-								<view class="first-contant">
-									<view class="time-father" v-show="iszhouqi">
-										<view class="time-button" v-show="isweek">
-											<view class="time-button-month">周</view>
-											<view class="time-button-week"
-												@click="isweek=false;weekIndex = -1;weekValue = ''">月</view>
-										</view>
-										<view class="time-button" v-show="!isweek">
-											<view class="time-button-month-target"
-												@click="isweek=true;monthIndex = -1;monthValue = ''">周</view>
-											<view class="time-button-week-target">月</view>
-										</view>
-										<scroll-view scroll-y style="width: 100%;height: 600rpx;"
-											:show-scrollbar="false" :scroll-top="firsttop">
-											<view v-for="(item,index) in weekDays" :key="index"
-												@click="clickWeek(item,index)" v-if="isweek">
-												<view :class="weekIndex===index?`items-card-target`:`items-card`">
-													{{item}}
-												</view>
-											</view>
-
-											<view v-for="(item,index) in days" :key="index"
-												@click="clickMonth(item,index)" v-if="!isweek">
-												<view :class="monthIndex===index?`items-card-target`:`items-card`">
-													{{item}}
-												</view>
-											</view>
-											<view style="height: 40rpx;"></view>
-										</scroll-view>
-									</view>
-
-									<scroll-view scroll-y style="height: 100%;width:100%;" :show-scrollbar="false"
-										:scroll-top="firsttop" v-show="!iszhouqi">
-										<view
-											v-for="(item,index) in bigArray[upmenuIndex]?.children[downmenuIndex]?.children"
-											:key="index" @click="onTap(index)">
-
-											<view class="right-box-item"
-												:style="thirdmenuIndex==index?{border: `2rpx solid rgb(229, 233, 249)`,backgroundColor:`#fff`}:{border: `2rpx solid rgb(229, 233, 249)`}">
-												<view class="title-time-button-font" v-show="item.cycleTypeId ==2">
-													周期
-												</view>
-												<view class="title-time-button-font" v-show="item.cycleTypeId ==3">
-													即时
-												</view>
-												<image class="title-time-button" v-show="item.cycleTypeId ==2"
-													src="/static/index/newruler/jiao.png" />
-												<image class="title-time-button" v-show="item.cycleTypeId ==3"
-													src="/static/index/newruler/jiao.png" />
-												<image class="right-box-img"
-													:src="thirdmenuIndex==index?item.netImmediateFileFocus :item.netImmediateFile " />
-												<view class="right-box-font" :style="[
-												        { marginTop: '2rpx', fontSize: (item.title?.trim().length > 6) ? '20rpx' : '25rpx' },
-												        thirdmenuIndex === index ? { color: 'rgb(54,159,239)' } : {}
-												      ]">
-													{{ item.title }}
-												</view>
-											</view>
-										</view>
-										<view style="height: 20rpx;"></view>
-									</scroll-view>
-								</view>
-								<view class="second-contant">
-									<scroll-view scroll-y style="height: 100%;width:100%;" :show-scrollbar="false"
-										:scroll-top="secondtop">
-										<view v-for="(item,index) in downList" :key="index">
-											<view :class="downdonghua==index? `downList-box-target` : `downList-box`"
-												@click="secondContant(index)">
-
-												<donghua :width="`55rpx`" :height="`55rpx`" :links="item.url"
-													:playing="downdonghua==index" :interval="120" />
-												<view class="downList-box-text">
-													{{ item.title }}
-												</view>
-
-											</view>
-										</view>
-										<view style="height: 20rpx;"></view>
-									</scroll-view>
-								</view>
-							</view>
-							<view class="middle-right-box">
-								<view v-for="(item,index) in bigArray" :key="index" @click="changLeft(index)">
-									<view class="doctorsay-container-card">
-										<donghua :width="`50rpx`" :height="`50rpx`" :links="item.url"
-											:playing="index === upmenuIndex" :interval="120" />
-										<view
-											:class="(index === upmenuIndex) ? `doctorsay-container-card-font-dark`:`doctorsay-container-card-font`">
-											{{ item.title }}
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="middle-box" v-show="iszhiling">
-							<scroll-view scroll-y style="height: 100%;width:100%;" :show-scrollbar="false">
-								<view class="zhiling-card" :style="forthmenuIndex==index?{backgroundColor:`#fff`}:{}"
-									v-for="(item,index) in savePackagelist" :key="index"
-									@click="clickzhilingbao(index)">
-									<image class="zhiling-card-button" src="/static/index/newruler/jiao.png" />
-									<view class="zhiling-card-font">
-										指令包
-									</view>
-									<view class="">
-										包名：{{ item.packageName }}
-									</view>
-									<view class="bag">
-										<text>
-											包含：
-										</text>
-										<view class="bag-one" v-for="(item1,index1) in item.directivesList"
-											:key="index">
-											<text v-if="index1">、</text>
-											{{ item1.directiveName }}
-										</view>
-									</view>
-								</view>
-							</scroll-view>
-						</view>
-						<view class="under-button">
-							<view class="under-button-black" v-if="isop">
-								不能重复添加相同的即时服务指令
-							</view>
-							<view class="under-button-black" v-if="isempty">
-								请选择服务指令来进行操作
-							</view>
-							<view class="white-circle" @click="changecard">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/movebutton${isMove ? 'blue' : ''}.png`" />
-							</view>
-							<view class="white-circle" @click="openDelete">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/deletebutton${isDelete ? 'blue' : ''}.png`" />
-							</view>
-							<view class="white-circle" @click="opensay">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/notebutton${sayisopen ? 'blue' : ''}.png`" />
-							</view>
-							<view class="white-circle"
-								@click="open = !open;isMove=false;flyNumber.index0 = -1;flyNumber.index1 = -1;">
-								<image class="white-circle-img"
-									:src="`/static/index/keyimg/open${open ? 'blue' : ''}.png`" />
-							</view>
-							<view style="position: relative;">
-								<view class="white-circle-click-father" :style="{color:buttonBlue?`#fff`:``}"
-									:class="{ anim: buttonBlue }" @click="addnewbutton">
-									<view style="z-index: 999;">
-										确定
-									</view>
-								</view>
-								<view class="white-circle-click-father-spec" @click="changLeft(5)" v-show="!iszhiling">
-									<view class="other-father">
-										<image style="width: 55rpx;height: 55rpx;"
-											src="/static/index/newruler/monitor_1.png" />
-										<view style="z-index: 999;font-size: 25rpx;">
-											监控
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 点击的弹出层 -->
-		<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
-			<view class="popup-overlay-content" style="height: 390rpx;" popup-overlay:class="getjiao"
-				v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'"
-				:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
-				@click.stop>
-				<view class="popup-overlay-content-left">
-					<image class="popup-overlay-content-left-img"
-						:src="timearr[showDetail[0]]?.children[showDetail[1]]?.netImmediateFileFocus" />
-				</view>
-				<view class="popup-overlay-content-right">
-					<view class="time-font">
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.startTime }} -
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.endTime }}
-					</view>
-					<view class="time-text">
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.directiveName }}
-					</view>
-				</view>
-			</view>
-			<view class="popup-overlay-content" :class="getjiao" v-else
-				:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
-				@click.stop>
-				<view class="specia-onshow">
-					<view class="specia-title">
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.startTime }} -
-						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.endTime }}
-					</view>
-					<view class="specia-cards" v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.directivesList">
-						<view class="title-time-border-yellow"
-							style="font-size: 30rpx;overflow: hidden;width: 232rpx;height: 150rpx;"
-							v-for="(item1,index1) in timearr[showDetail[0]]?.children[showDetail[1]]?.directivesList"
-							:key="index1">
-
-							<view class="title-time" style="flex-direction: column;">
-								<image style="width: 60rpx;height: 60rpx;margin: 0 auto;margin-top: 10rpx"
-									:src="item1.netImmediateFile" />
-								<view class="title-time-time" style="font-size: 30rpx;">
-									{{item1.serviceDuration + "分钟"}}
-								</view>
-								<image class="title-time-button" style="width: 80rpx;height: 48rpx;"
-									src="/static/index/newruler/jiao.png" />
-								<view class="title-time-font" style="right: 10rpx;top: 5rpx;font-size: 23rpx;">
-									{{ item1.cycleType }}
-								</view>
-							</view>
-							<view class="title-time-font-rel">
-								{{splitString(item1.directiveName)[0]}}
-							</view>
-
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 替换表格的的弹出层 -->
-		<view v-show="sayisopen" class="popup-say" @click="sayisopen=false">
-			<view class="popup-say-content" style="padding: 30rpx 0;" :style="{ opacity: sayisopacity ? 1 : 0 }"
-				@click.stop>
-				<view style="margin-top: 20rpx;margin-bottom: 20rpx;;margin-left: 30rpx;font-size: 32rpx;">
-					<view>
-						体型标签
-					</view>
-				</view>
-				<view style="display: flex;flex-wrap: wrap;">
-					<view v-for="(item,index) in nameArray.slice(0,5)" :key="index">
-						<view class="tags-father">
-							<image class="tags-img" :src="`/static/index/tagNames/${index}0.png`" />
-							<view class="tags-font">{{item}}</view>
-						</view>
-					</view>
-				</view>
-				<view style="margin-top: 40rpx;margin-bottom: 20rpx;;margin-left: 30rpx;font-size: 32rpx;">
-					<view>
-						情绪标签
-					</view>
-				</view>
-				<view style="display: flex;flex-wrap: wrap;">
-					<view v-for="(item,index) in nameArray.slice(5,12)" :key="index">
-						<view class="tags-father">
-							<image class="tags-img" :src="`/static/index/tagNames/${index+5}0.png`" />
-							<view class="tags-font">{{item}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="popup-say-three"></view>
-			</view>
-		</view>
-		<!-- 分享的弹出层 -->
-		<view v-show="shareShow" class="popup-share" @click="shareShow=false">
-			<view class="popup-share-content" :style="{ opacity: deletedownisopacity ? 1 : 0 }" @click.stop>
-				<view class="share-other">
-					<view class="share-title">
-						<image style="width: 50rpx;height: 50rpx;" src="/static/index/sharelogo.png" />
-						<view style="font-weight: 600;margin-left: 15rpx;">
-							护理单元
-						</view>
-					</view>
-					<view class="share-others">
-						<view style="font-weight: 600;font-size: 45rpx;">
-							护理流程
-						</view>
-						<view style="margin-top: 30rpx;">
-							{{uni.getStorageSync('nuName')}}
-							<text style="color: #1083F8;">
-								{{uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo.name:""}}
-							</text>
-						</view>
-						<view class="blue-button">
-							分享
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view :class="['neuro-wrapper', deletedonghua ? 'is-active' : '']" v-if="isDelete">
-			<!-- 遮罩层，点击触发关闭 -->
-			<view class="neuro-mask" @click="isDelete=false"></view>
-			<!-- 拟态框，阻止冒泡点击 -->
-			<view class="neuro-box" @click.stop>
-
-				<view class="delete-button-father">
-					<view class="button-white" @click="isDelete=false">取消</view>
-					<view class="button" @click="openDelete()">确定</view>
-				</view>
-
-				<view class="title">确定要删除指令吗</view>
-				<view class="title-time-border-yellow"
-					style="font-size: 30rpx;overflow: hidden;width: 240rpx;height: 170rpx;">
-
-					<view class="title-time" style="flex-direction: column;">
-						<image style="width: 60rpx;height: 60rpx;margin: 0 auto;margin-top: 10rpx"
-							:src="timearr[saveEditIndex.index0].children[saveEditIndex.index1].netImmediateFile?timearr[saveEditIndex.index0].children[saveEditIndex.index1].netImmediateFile:`/static/logo.png`" />
-						<view class="title-time-time" style="font-size: 30rpx;">
-							{{timearr[saveEditIndex.index0].children[saveEditIndex.index1].startTime + `-` + timearr[saveEditIndex.index0].children[saveEditIndex.index1].endTime}}
-						</view>
-						<image class="title-time-button" style="width: 80rpx;height: 48rpx;"
-							v-if="timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleTypeId!=1"
-							src="/static/index/newruler/jiao.png" />
-						<view class="title-time-font" style="right: 10rpx;top: 5rpx;font-size: 23rpx;"
-							v-if="timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleTypeId!=1">
-							{{ timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleType   }}
-						</view>
-					</view>
-					<view class="title-time-font-rel">
-						{{splitString(timearr[saveEditIndex.index0].children[saveEditIndex.index1].directiveName)[0]}}
-					</view>
-
-				</view>
-			</view>
-		</view>
-		<severcard></severcard>
-	</view>
-</template>
-
-<script setup lang="ts">
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
-	import { onShow, onHide } from '@dcloudio/uni-app';
-	import { getNclist, addBatch, addDirective, addInstant, deleteDirective, deleteInstant, editDirective } from "./api.js";
-	import { myArray } from './yaoshandiao.js';
-
-	const props = defineProps({
-		isshow: {
-			type: Boolean,
-			required: true,
-		},
-	});
-	watch(
-		() => props.isshow,
-		(newVal, oldVal) => {
-			// 只有当新旧值不相同时才执行
-			if (newVal !== oldVal) {
-				bottomisShaking.value = false
-				shakyTable.value = false
-				if (solveWatch.value) {
-					solveWatch.value--
-				} else {
-					centerCell();
-					cardLeft.value = 1
-					scrollTop.value = 1
-
-					nextTick(() => {
-						scrollTop.value = 0
-						cardLeft.value = 775
-					})
-				}
-				upmenuIndex.value = 0
-			}
-		}
-	)
-	const bodystatus = ref(false);
-	const bodystatustarget = ref(-1);
-	const facestatus = ref(false);
-	const facestatustarget = ref(-1);
-
-	/* ---- 用于 transform 的响应式字符串 ----
-	   注意：虽然这是响应式，但我们只在 rAF 里更新它（受控更新），避免频繁触发 Vue 渲染 */
-	const transformStyle = ref('translate3d(0, 0, 0)');
-	/* rAF / 计数器变量 */
-	let lastY = 0;
-	let ticking = false;
-
-	const bodydonghua = ref(false)
-	const openbody = ref(false)
-	const openface = ref(false)
-	watch(
-		() => openbody.value,
-		() => {
-			setTimeout(() => {
-				bodydonghua.value = openbody.value
-			}, 50)
-		}
-	)
-	const facedonghua = ref(false)
-	watch(
-		() => openface.value,
-		() => {
-			setTimeout(() => {
-				facedonghua.value = openface.value
-			}, 50)
-		}
-	)
-
-	const bodytarget = ref([]);
-	const facetarget = ref([]);
-	const addbody = (index : number) => {
-		if (bodyTagList.value[index].izSelected == 'Y') {
-			bodyTagList.value[index].izSelected = 'N';
-		} else {
-			let targetNumber = 0;
-			bodyTagList.value.forEach((element : any) => {
-				if (element.izSelected == 'Y') {
-					targetNumber++
-				}
-			})
-
-			if (targetNumber > 1) {
-				uni.showToast({
-					title: "每种标签最多只能添加两个",
-					icon: 'none',
-					duration: 3000
-				})
-				return
-			} else {
-				bodyTagList.value[index].izSelected = 'Y';
-			}
-		}
-		saveAll()
-	}
-	const addface = (index : number) => {
-		if (emotionTagList.value[index].izSelected == 'Y') {
-			emotionTagList.value[index].izSelected = 'N'
-		} else {
-			let targetNumber = 0;
-			emotionTagList.value.forEach((element : any) => {
-				if (element.izSelected == 'Y') {
-					targetNumber++
-				}
-			})
-
-			if (targetNumber > 1) {
-				uni.showToast({
-					title: "标签最多只能添加两个",
-					icon: 'none',
-					duration: 3000
-				})
-				return
-			} else {
-				emotionTagList.value[index].izSelected = 'Y';
-			}
-		}
-		saveAll()
-	}
-
-	const open = ref(false);
-
-	const bottomItems = ref([])
-	const nameArray = [
-		`标准`, `超重`, `强直`, `偏瘫`, `佝偻`, `稳定`, `焦虑`, `抑郁`, `暴力`, `恐惧`, `烦躁`, `易怒`, `臆想`,
-	]
-	const timeArray = [
-		`00`, `05`, `10`, `15`, `20`, `25`, `30`, `35`, `40`, `45`, `50`, `55`
-	];
-	const weekDays = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"];
-	const days = Array.from({ length: 31 }, (_, i) => (i + 1).toString().padStart(2, "0"));
-	const isweek = ref(true);
-	// 是否周期
-	const iszhouqi = ref(false);
-	//高度回到最高
-	const firsttop = ref(0);
-	const secondtop = ref(0);
-	const scrollLeft = ref(0);
-	const cardLeft = ref(678);
-	//移动表格
-	const scrollTop = ref(0)
-	//左下的数组
-	const downList = ref<any>()
-	const isop = ref(false);
-	const bigArray = ref([]);
-	const isopen = ref(false)
-	const songisopen = ref(false)
-	const isopacity = ref(false)
-	const songisopacity = ref(false)
-	// 删除表格弹窗
-	const deleteisopen = ref(false);
-	const deletename = ref("")
-	const deleteisopacity = ref(false)
-	// 解释图标弹窗
-	const sayisopen = ref(false);
-	const sayname = ref("")
-	const sayisopacity = ref(false)
-
-	const saveleft = ref(6);
-	const saveright = ref(11);
-	const savetop = ref(0);
-	const savebottom = ref(3);
-	const isMove = ref(false);
-
-	const getjiao = computed(() => {
-		if (jiao.value[0] && jiao.value[1]) {
-			return "left-bottom"
-		} else if (!jiao.value[0] && jiao.value[1]) {
-			return "right-bottom"
-		} else if (jiao.value[0] && !jiao.value[1]) {
-			return "left-top"
-		} else {
-			return "right-top"
-		}
-	})
-	// 这是二级菜单的动画的模板
-	const secondtemp = ref([])
-	// 上次点击时间
-	const lastTap = ref(0)
-	// 双击的最大间隔（ms），可根据体验调整
-	const DOUBLE_TAP_DELAY = 300
-
-	function onTap(e) {
-		const now = Date.now()
-		thirdmenuIndex.value = e
-		// console.log("????",thirdmenuIndex.value)
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			thirdmenuIndex.value = e
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			thirdmenuIndex.value = e
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-
-	// 替换新的
-	const getNew = () => {
-		if (flyNumber.value.index0 === saveEditIndex.value.index0 && flyNumber.value.index1 === saveEditIndex.value.index1) {
-			isMove.value = false;
-			flyNumber.value.index0 = -1;
-			flyNumber.value.index1 = -1;
-			return
-		}
-		if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id) {
-			deleteDirective(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1]).then((res : any) => {
-				doChangeNew()
-			})
-		} else {
-			doChangeNew()
-		}
-	}
-	const doChangeNew = () => {
-		let object = JSON.parse(JSON.stringify(timearr.value[flyNumber.value.index0].children[flyNumber.value.index1]))
-		indexsave.value = [saveEditIndex.value.index0, saveEditIndex.value.index1]
-		// 旧的tagName保存了
-		let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName
-		timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', tagName: tagName }
-		//然后保存新的
-		let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName
-		let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
-		let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
-		let positioning = timearr.value[indexsave.value[0]].positioning;
-
-		// 解析原始时间（健壮地 trim）
-		const parseTime = (t) => {
-			const parts = String(t || '').split(':').map(s => s.trim());
-			const h = Number(parts[0] ?? 0);
-			const m = Number(parts[1] ?? 0);
-			return {
-				hour: Number.isFinite(h) ? h : 0,
-				minute: Number.isFinite(m) ? m : 0
-			};
-		};
-
-		const sOrig = parseTime(startTime);
-		const eOrig = parseTime(endTime);
-
-		// 计算时长（分钟）。若发生负值，认为跨天（加 24*60）
-		let duration = (eOrig.hour * 60 + eOrig.minute) - (sOrig.hour * 60 + sOrig.minute);
-		if (duration < 0) duration += 24 * 60; // 假设结束是在次日或跨日
-
-		// 解析新的起始分钟和小时（positioning 可能是字符串）
-		const newStartMin = Number(String(newtagName).trim());
-		const newHour = Number(String(positioning).trim());
-
-		// 校验
-		if (!Number.isFinite(newStartMin) || newStartMin < 0 || newStartMin >= 60) {
-			throw new Error('newtagName 必须是 0-59 的数字字符串或数字');
-		}
-		if (!Number.isFinite(newHour) || newHour < 0) {
-			throw new Error('positioning 必须是有效小时（数字或数字字符串）');
-		}
-
-		// 计算新的起止总分钟
-		const newStartTotal = newHour * 60 + newStartMin;
-		const newEndTotal = newStartTotal + duration;
-
-		// 处理跨小时/跨天
-		const newEndHour = Math.floor(newEndTotal / 60) % 24; // 保持在 0-23
-		const newEndMin = newEndTotal % 60;
-
-		// 格式化字符串
-		const pad2 = (n) => String(n).padStart(2, '0');
-
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime =
-			`${String(newHour)}:${pad2(newStartMin)}`;
-
-		timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime =
-			`${String(newEndHour)}:${pad2(newEndMin)}`;
-		flyNumber.value.index1 = -1;
-		isMove.value = false;
-		let data = {
-			index0: saveEditIndex.value.index0,
-			index1: saveEditIndex.value.index1
-		}
-		whereEvent(data);
-		let infoValue = timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1]
-		infoValue.positioning = saveEditIndex.value.index0;
-		infoValue.positioningLong = saveEditIndex.value.index1;
-		editDirective(infoValue).then((res : any) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-	//变更左侧菜单
-	const changLeft = (index : number) => {
-		if (index === 5) {
-			uni.navigateTo({
-				url: "/pages/watch/full"
-			})
-			return
-		}
-		iszhouqi.value = false;
-		weekIndex.value = -1;
-		monthIndex.value = -1;
-		weekValue.value = "";
-		monthValue.value = "";
-		secondtop.value = 0.01
-		firsttop.value = 0.01
-		//这个东西完全是为了给动画用的，因为downmenuIndex这个吊东西其他地方在用，所以需要再整一个属性。
-		downdonghua.value = -1;
-
-		nextTick(() => {
-			secondtop.value = 0
-			firsttop.value = 0
-			downdonghua.value = 0;
-		})
-		downmenuIndex.value = 0;
-		upmenuIndex.value = index
-		downList.value = bigArray.value[index]?.children
-		thirdmenuIndex.value = 0;
-	}
-	const isempty = ref(false);
-	const changecard = () => {
-		isDelete.value = false;
-		open.value = false;
-		if (isMove.value) {
-			getNew()
-		} else {
-			if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].directiveName) {
-				flyNumber.value.index0 = saveEditIndex.value.index0;
-				flyNumber.value.index1 = saveEditIndex.value.index1;
-				isMove.value = true
-			}
-			else {
-				isempty.value = true;
-				setTimeout(() => {
-					isempty.value = false;
-				}, 1500)
-			}
-		}
-	}
-
-	const isRule = ref(false);
-	const topindex = ref(-1)
-
-	const weekValue = ref("");
-	const weekIndex = ref(-1);
-	const monthValue = ref("");
-	const monthIndex = ref(-1);
-	const clickWeek = (item, index) => {
-		const now = Date.now()
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			weekValue.value = item;
-			weekIndex.value = index;
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			weekValue.value = item;
-			weekIndex.value = index;
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-	const clickMonth = (item, index) => {
-		const now = Date.now()
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			monthValue.value = item;
-			monthIndex.value = index;
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			monthValue.value = item;
-			monthIndex.value = index;
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-	const isDelete = ref(false);
-	const openDelete = () => {
-		flyNumber.value.index0 = -1
-		flyNumber.value.index1 = -1
-		isMove.value = false;
-		open.value = false
-		if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].directiveName) {
-			if (!isDelete.value) {
-				isDelete.value = true;
-				setTimeout(() => deletedonghua.value = true, 50)
-
-			} else {
-				isDelete.value = false;
-				deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
-			}
-		} else {
-			isempty.value = true;
-			setTimeout(() => {
-				isempty.value = false;
-			}, 1500)
-		}
-
-	}
-
-	// 给抖动用的
-	function pseudoRandom(index0, index1) {
-		const seed = index0 * 55.9898 + index1 * 78.233;
-		// 产生一个伪随机数，取小数部分
-		return Math.abs(Math.sin(seed) * 43758.5453) % 1;
-	}
-	function computeDelay(index0, index1) {
-		const range = 2; // 延迟范围 0 ~ 2 秒
-		return pseudoRandom(index0, index1) * range;
-	}
-	// 在作用域中声明一个定时器变量
-	let throttleTimer = null;
-	//监听拖拽
-	/* 兼容：如果不支持 requestAnimationFrame，就用 setTimeout */
-	const requestAnimationFrame =
-		typeof window !== 'undefined' && window.requestAnimationFrame
-			? window.requestAnimationFrame
-			: (cb) => setTimeout(cb, 16);
-	function handleScrolltime(e) {
-		// uni-app 的 scroll 事件通常把位置放在 e.detail.scrollTop
-		// 为保险，先做容错判断
-		const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
-		lastY = scrollTop;
-
-		// 如果还在等待上一帧更新，就直接返回；否则安排下一帧更新
-		if (!ticking) {
-			ticking = true;
-			requestAnimationFrame(() => {
-				// 把 transform 更新为负的 scrollTop（向上平移）
-				// 使用 translate3d 触发 GPU 合成层
-				transformStyle.value = `translate3d(0, -${lastY}px, 0)`;
-				ticking = false;
-			});
-		}
-	}
-	const leftIn = ref(0)
-	function handleTop(e) {
-		leftIn.value = e.detail.scrollLeft
-	}
-	// 方法：根据条件返回不同的类名
-	const getClass = (item, index0, index1) => {
-		if (item.startTime) {
-			if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
-				return 'title-time-border-yellow-active-transparent';
-			} else if (shakyTable.value) {
-				return 'title-time-border-yellow-active';
-			} else {
-				return 'title-time-border-yellow';
-			}
-		}
-		return 'title-time-border';
-	}
-	// 通用的生成函数
-	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
-		return Array.from({ length: count }, (_, i) => {
-			const idx = pad
-				? String(i + startIndex).padStart(2, '0')
-				: i + startIndex
-			return `${base}/${prefix}${idx}.${ext}`
-		})
-	}
-	// 初始化下面侧单列表 ---这是一级菜单的模版
-	const doctorsayList = ref([
-		{
-			url: genPaths(
-				'/static/index/newruler',
-				'daily_',
-				6,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '日常'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newruler',
-				'clean_',
-				8,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '清洁'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newruler',
-				'diet_',
-				7,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '饮食'
-
-		},
-		{
-
-			url: genPaths(
-				'/static/index/newruler',
-				'sleep_',
-				5,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '睡眠'
-
-		},
-		{
-			url: genPaths(
-				'/static/index/newruler',
-				'defecate_',
-				5,     // 张数
-				'png',
-				1,     // 起始索引
-				false  // 不补零
-			), name: '排泄'
-
-		},
-	]);
-	// 当前选中的菜单索引
-	const upmenuIndex = ref<number>(1);
-	const downmenuIndex = ref<number>(0);
-	const downdonghua = ref(-1);
-	const thirdmenuIndex = ref<number>(0);
-	const forthmenuIndex = ref<number>(0);
-
-	const clickzhilingbao = (e : number) => {
-		const now = Date.now()
-		forthmenuIndex.value = e
-		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-			// 双击成立
-			addnew()
-			// 重置，避免多次触发
-			lastTap.value = 0
-		} else {
-			// 记录本次时间，等待下次点击
-			lastTap.value = now
-		}
-	}
-
-	const saveEditIndex = ref({
-		index0: -1,
-		index1: -1
-	})
-
-	const secondContant = (index : number) => {
-		iszhouqi.value = false;
-		weekIndex.value = -1;
-		monthIndex.value = -1;
-		weekValue.value = "";
-		monthValue.value = "";
-		downmenuIndex.value = index;
-		downdonghua.value = index;
-		thirdmenuIndex.value = 0;
-		firsttop.value = 0.01;
-		nextTick(() => {
-			firsttop.value = 0;
-		})
-	}
-
-	const timer = ref(null);//计时器
-	const elementsInfo = ref({})//所有表格的信息
-	const moveX = ref(0)
-	const moveY = ref(0)
-	const openX = ref(0)
-	const openY = ref(0)
-	const flyNumber = ref({
-		index0: 999,
-		index1: 999,
-		tagName: ''
-	})
-
-	const deletedownisopacity = ref(false);
-
-	const touchindex1 = ref(-1);
-	// 分享矩阵到微信
-	const shareShow = ref(false);
-	const shareToWeixin = () => {
-		shareShow.value = true;
-		deletedownisopacity.value = false;
-		setTimeout(() => {
-			deletedownisopacity.value = true
-		}, 100)
-
-	}
-	const clickshare = () => {
-		uni.share({
-			provider: "weixin",
-			scene: "WXSceneSession",
-			type: 0,
-			href: "http://192.168.2.31:3101/daytoday",
-			title: "护理日程分享",
-			summary: "九泰护理日程测试",
-			imageUrl: "https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png",
-			success: function (res) {
-				console.log("success:");
-			},
-			fail: function (err) {
-				console.log("fail:");
-			}
-		});
-	}
-	const jiao = ref([false, false])
-	//表格点击开始
-	const showDetail = ref([-1, -1])
-	const rulerTouchClick = (item : any, index0 : number, index1 : number) => {
-		isDelete.value = false;
-		saveEditIndex.value.index0 = index0;
-		saveEditIndex.value.index1 = index1;
-		centerCell();
-		isRule.value = true;
-		setTimeout(() => {
-			if (item.directiveName && open.value) {
-				touchindex1.value = index1;
-				const query = uni.createSelectorQuery()
-				query
-					.selectAll('.super-card-time-card')
-					.boundingClientRect((data : any) => {
-						data.forEach(async (res : any) => {
-							// 根据你的条件筛选元素
-							if (res.left > 100 && res.left < 1067 && res.top < 670 && res.top > 50 && res.dataset.index0 == index0 && res.dataset.index1 == index1) {
-								if (res.left > 100 && res.left < 500) {
-									// 表格太靠左侧，修改到右面
-									openX.value = Math.floor(res.left) + 528;
-									jiao.value[0] = true
-								} else {
-									openX.value = Math.floor(res.left) - 18
-									jiao.value[0] = false
-								}
-								if (res.top > 300) {
-									// 表格太靠上侧，修改到下面
-									openY.value = Math.floor(res.top) + 100;
-									jiao.value[1] = true
-								} else {
-									openY.value = Math.floor(res.top) + 180
-									jiao.value[1] = false
-								}
-								await nextTick()
-								isopen.value = true;
-
-								showDetail.value[0] = index0;
-								showDetail.value[1] = index1;
-								// console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
-								isopacity.value = false;
-								//加动画
-								setTimeout(() => {
-									isopacity.value = true;
-								}, 100)
-							}
-						})
-					})
-					.exec()
-			}
-		}, 400)
-	}
-	const shakyTable = ref(false);
-	const reldata = ref([]);
-	const deleteRuler = (index0 : number, index1 : number) => {
-		deleteDirective(timearr.value[index0].children[index1]).then((res : any) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-
-	const saveX = ref(0);
-	const saveY = ref(0);
-
-	const bottomTimer = ref(null);
-	const bottomisShaking = ref(false);
-	const bottomTouchStart = (e) => {
-		saveX.value = Math.floor(e.touches[0].pageX);
-		saveY.value = Math.floor(e.touches[0].pageY);
-		// 2秒后触发抖动效果
-		bottomTimer.value = setTimeout(() => {
-			bottomisShaking.value = true
-		}, 500)
-	}
-	const bottomTouchMove = (e) => {
-		const moveX = Math.floor(e.touches[0].pageX);
-		const moveY = Math.floor(e.touches[0].pageY);
-		// 计算移动距离
-		if (
-			Math.abs(moveX - saveX.value) > 0 ||
-			Math.abs(moveY - saveY.value) > 0
-		) {
-			if (bottomTimer.value) {
-				clearTimeout(bottomTimer.value)
-				bottomTimer.value = null
-			}
-		}
-	}
-	const bottomTouchEnd = () => {
-		if (bottomTimer.value) {
-			clearTimeout(bottomTimer.value)
-			bottomTimer.value = null
-		}
-	}
-
-	const indexsave = ref([-1, -1]);
-	const opensay = () => {
-		sayisopacity.value = false;
-		sayisopen.value = true;
-		setTimeout(() => {
-			sayisopacity.value = true
-		}, 50)
-	}
-	const buttonBlue = ref(false)
-	let animTimer = null
-
-	async function addnewbutton() {
-		// 清定时器（防止残留）
-		if (animTimer) {
-			clearTimeout(animTimer)
-			animTimer = null
-		}
-
-		// 先把状态设为 false，等待 DOM 更新后再设为 true —— 达到重启动画的效果
-		buttonBlue.value = false
-		await nextTick() // 等待下一帧，确保样式被移除
-
-		// 重新打开动画
-		buttonBlue.value = true
-		addnew()
-		// 1s 后还原（与动画时长保持一致）
-		animTimer = setTimeout(() => {
-			buttonBlue.value = false
-			animTimer = null
-		}, 1000)
-	}
-
-	const doaddDirective = (element : any) => {
-		addDirective(element).then((res) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-
-	const killjishi = (id : string) => {
-		deleteInstant({ id: id }).then((res) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
-
-	const addnew = () => {
-
-		if (isDelete.value) {
-			isDelete.value = false;
-			deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
-			return
-		}
-		if (isMove.value) {
-			getNew()
-			return
-		}
-		let haveValue = false;
-		if (timearr.value[saveEditIndex.value.index0]?.children[saveEditIndex.value.index1].directiveName) {
-			haveValue = true
-		}
-		// return
-		if (iszhiling.value) {
-
-			let allobject = savePackagelist.value[forthmenuIndex.value];
-
-			if (saveEditIndex.value.index1 === -1 && saveEditIndex.value.index0 === -1) {
-				return
-			}
-			if (isDelete.value) {
-				isDelete.value = false;
-				deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
-				return
-			}
-			if (isMove.value) {
-				getNew()
-				return
-			}
-			flyNumber.value.index0 = -1;
-			flyNumber.value.index1 = -1;
-			isMove.value = false;
-			let cycleType = `打包`;
-			let cycleValue = "";
-			const startHour = Number(saveEditIndex.value.index0)
-			const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName)
-			const endMinute = startMinute + Number(allobject.serviceDuration)
-			const endHour = startHour + Math.floor(endMinute / 60)
-			const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
-			const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
-
-			let param = {
-				id: haveValue ? timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id : "",
-				nuId: uni.getStorageSync('nuId'),
-				nuName: uni.getStorageSync('nuName'),
-				elderId: uni.getStorageSync('elderId'),
-				elderName: uni.getStorageSync('NUall').elderInfo.name,
-				directiveId: allobject.id,
-				directiveName: allobject.packageName,
-				typeId: "",
-				typeName: "",
-				categoryId: "",
-				categoryName: "",
-				cycleTypeId: "",
-				cycleType: cycleType,
-				cycleValue: cycleValue,
-				startTime: formattedStart,
-				endTime: formattedEnd,
-				serviceDuration: allobject.serviceDuration,
-				positioning: saveEditIndex.value.index0.toString(),
-				positioningLong: saveEditIndex.value.index1.toString(),
-				izPackage: 'Y',
-				previewFile: "",
-				previewFileSmall: "",
-				netPreviewFile: "",
-				netPreviewFileSmall: "",
-				immediateFile: "",
-				immediateFileFocus: "",
-				netImmediateFileFocus: "",
-				netImmediateFile: "",
-				tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
-				mp3File: allobject.mp3File,
-				netMp3File: allobject.netMp3File,
-				mp4File: allobject.mp4File,
-				netMp4File: allobject.netMp4File,
-				serviceContent: allobject.serviceContent,
-			}
-			//给表格赋值
-			timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
-			let data = {
-				index0: saveEditIndex.value.index0,
-				index1: saveEditIndex.value.index1
-			}
-			whereEvent(data);
-			if (haveValue) {
-				editDirective(param).then((res : any) => {
-					if (res.success) {
-						geteverything()
-					}
-				})
-			} else {
-				doaddDirective(param);
-			}
-
-			return
-		}
-
-		let stopIt = false;
-		let allobject = bigArray.value[upmenuIndex.value].children[downmenuIndex.value].children[thirdmenuIndex.value]
-
-		if (allobject.cycleTypeId == 3) {
-			scrollLeft.value = 1;
-			bottomItems.value.forEach((element : any, index : number) => {
-				if (element.directiveName == allobject.title) {
-					stopIt = true
-				}
-			})
-			nextTick(() => {
-				if (!stopIt) {
-					scrollLeft.value = 0;
-					if (bottomItems.value.length && bottomItems.value[0].target === "#03a4ff") {
-						bottomItems.value[0].target = "#fff"
-						clearTimeout(cleansettimeout.value);
-					}
-					let pushValue = allobject;
-					pushValue.directiveId = allobject.id;
-					pushValue.directiveName = allobject.title;
-					pushValue.serviceDuration = allobject.serviceDuration;
-
-					pushValue.target = `#03a4ff`
-					pushValue.id = ""
-					pushValue.nuId = uni.getStorageSync('nuId');
-					pushValue.nuName = uni.getStorageSync('nuName');
-					pushValue.elderId = uni.getStorageSync('elderId');
-					pushValue.elderName = uni.getStorageSync('NUall').elderInfo.name;
-					bottomItems.value.unshift(pushValue)
-					// 实现即时指令动画
-					cleansettimeout.value = setTimeout(() => {
-						bottomItems.value[0].target = `#fff`;
-						console.log("即时指令看看进入了啥", pushValue)
-						addInstant(pushValue).then((res : any) => {
-							if (res.success) {
-								geteverything()
-							}
-						})
-					}, 1500)
-				} else {
-					clearTimeout(cleansettimeoutrel.value);
-					isop.value = true;
-					cleansettimeoutrel.value = setTimeout(() => {
-						isop.value = false;
-						// saveAll()
-					}, 1500)
-				}
-			})
-			return
-		}
-		if (saveEditIndex.value.index1 === -1 && saveEditIndex.value.index0 === -1) {
-			return
-		}
-		flyNumber.value.index0 = -1;
-		flyNumber.value.index1 = -1;
-		isMove.value = false;
-
-		if (allobject.cycleTypeId == 2 && iszhouqi.value && weekIndex.value == -1 && monthIndex.value == -1) {
-			return
-		}
-		else if (allobject.cycleTypeId == 2 && !iszhouqi.value) {
-			iszhouqi.value = true
-			return
-		}
-		let cycleType = "";
-		let cycleValue = "";
-		if (allobject.cycleTypeId == 1) {
-			cycleType = "日常"
-		} else {
-			if (weekIndex.value != -1) {
-				cycleType = weekValue.value
-				let cycleTypeIndex = 0;
-				weekDays.forEach((element : any, index : any) => {
-					if (element == weekValue.value) {
-						cycleTypeIndex = index
-					}
-				})
-				cycleValue = cycleTypeIndex.toString()
-
-			} else {
-				cycleType = monthValue.value + "号";
-				cycleValue = monthValue.value
-			}
-			iszhouqi.value = false;
-			weekIndex.value = -1;
-			monthIndex.value = -1;
-			weekValue.value = "";
-			monthValue.value = "";
-		}
-		const startHour = Number(saveEditIndex.value.index0)
-		const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName)
-		const endMinute = startMinute + Number(allobject.serviceDuration)
-		const endHour = startHour + Math.floor(endMinute / 60)
-		const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
-		const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
-		let param = {
-			id: haveValue ? timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id : "",
-			nuId: uni.getStorageSync('nuId'),
-			nuName: uni.getStorageSync('nuName'),
-			elderId: uni.getStorageSync('elderId'),
-			elderName: uni.getStorageSync('NUall').elderInfo.name,
-			directiveId: allobject.id,
-			directiveName: allobject.title,
-			typeId: allobject.typeId,
-			typeName: allobject.typeName,
-			categoryId: allobject.categoryId,
-			categoryName: allobject.categoryName,
-			cycleTypeId: allobject.cycleTypeId,
-			cycleType: cycleType,
-			cycleValue: cycleValue,
-			startTime: formattedStart,
-			endTime: formattedEnd,
-			positioning: saveEditIndex.value.index0.toString(),
-			positioningLong: saveEditIndex.value.index1.toString(),
-			izPackage: 'N',
-			previewFile: allobject.previewFile,
-			previewFileSmall: allobject.previewFileSmall,
-			serviceDuration: allobject.serviceDuration,
-			immediateFile: allobject.immediateFile,
-			immediateFileFocus: allobject.immediateFileFocus,
-			netImmediateFileFocus: allobject.netImmediateFileFocus,
-			netImmediateFile: allobject.netImmediateFile,
-			tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
-			mp3File: allobject.mp3File,
-			netMp3File: allobject.netMp3File,
-			mp4File: allobject.mp4File,
-			netMp4File: allobject.netMp4File,
-			serviceContent: allobject.serviceContent,
-			netPreviewFile: allobject.netPreviewFile,
-			netPreviewFileSmall: allobject.netPreviewFileSmall,
-		}
-		//给表格赋值
-		timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
-		let data = {
-			index0: saveEditIndex.value.index0,
-			index1: saveEditIndex.value.index1
-		}
-		whereEvent(data);
-		if (haveValue) {
-			editDirective(param).then((res : any) => {
-				if (res.success) {
-					geteverything()
-				}
-			})
-		} else {
-			doaddDirective(param);
-		}
-
-	}
-	const cleansettimeout = ref(null);
-	const cleansettimeoutrel = ref(null);
-	const saveAll = () => {
-		if (!cansumit.value) {
-			return
-		}
-		let info = []
-
-		bodyTagList.value.forEach((element : any) => {
-			if (element.izSelected == 'Y') {
-				info.push(element)
-			}
-		})
-		emotionTagList.value.forEach((element : any) => {
-			if (element.izSelected == 'Y') {
-				info.push(element)
-			}
-		})
-
-		let allvalue = {
-			nuId: uni.getStorageSync('nuId'),
-			nuName: uni.getStorageSync('nuName'),
-			elderId: uni.getStorageSync('elderId'),
-			elderName: uni.getStorageSync('NUall').elderInfo.name,
-			tagList: info
-		}
-
-		addBatch(allvalue).then(() => {
-			geteverything()
-		})
-	}
-	const routerPush = () => {
-		uni.navigateTo({
-			url: `/pages/timeMatrix/indexnew`
-		})
-	}
-	// 暂存器
-	const saveRulerTime = ref({
-		index0: -1,
-		index1: -1
-	})
-	const targetRuler = ref({
-		index0: -1,
-		index1: -1,
-		current: -1,
-		bordershow: true
-	})
-	const solveWatch = ref(0)
-	const whereEvent = (data : any) => {
-		saveEditIndex.value.index0 = data.index0;
-		saveEditIndex.value.index1 = data.index1;
-		centerCell();
-		targetRuler.value.index0 = data.index0;
-		targetRuler.value.index1 = data.index1;
-		saveRulerTime.value.index0 = targetRuler.value.index0;
-		saveRulerTime.value.index1 = targetRuler.value.index1;
-		targetRuler.value.bordershow = false;
-		setTimeout(() => {
-			targetRuler.value.index0 = -1;
-			targetRuler.value.index1 = -1;
-			targetRuler.value.current = -1
-		}, 400)
-		setTimeout(() => {
-			targetRuler.value.bordershow = true;
-			saveRulerTime.value.index0 = -1;
-			saveRulerTime.value.index1 = -1;
-		}, 1000)
-	}
-	// 定义每小时中的分钟数组，表示每 5 分钟一个时间段，总共 12 个
-	const minuteArr = ['00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55']
-	const timearr = ref(
-		Array.from({ length: 24 }, (_, hour) => ({
-			positioning: hour.toString(),
-			children: minuteArr.map(time => ({
-				tagName: time,           // 表示分钟，如 '00', '05' 等
-				directiveName: '' // 默认的 directiveName
-			}))
-		}))
-	)
-	const emotionTagList = ref([]);
-	const bodyTagList = ref([]);
-	const geteverything = () => {
-		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
-			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
-				timearr.value = Array.from({ length: 24 }, (_, hour) => ({
-					positioning: hour.toString(),
-					children: minuteArr.map(time => ({
-						tagName: time,           // 表示分钟，如 '00', '05' 等
-						directiveName: '' // 默认的 directiveName
-					}))
-				}))
-				res.result.serviceList.forEach((res : any) => {
-					timearr.value[res.positioning].children[res.positioningLong] = res;
-				})
-				bottomItems.value = res.result.instantList
-				cansumit.value = true;
-				emotionTagList.value = res.result.emotionTagList;
-				emotionTagListLook.value = []
-				bodyTagListLook.value = []
-				res.result.emotionTagList.forEach((res : any) => {
-					if (res.izSelected == 'Y') {
-						emotionTagListLook.value.push(res.netPic)
-					}
-				})
-				bodyTagList.value = res.result.bodyTagList
-				res.result.bodyTagList.forEach((res : any) => {
-					if (res.izSelected == 'Y') {
-						bodyTagListLook.value.push(res.netPic)
-					}
-				})
-			})
-		}
-	}
-	const savePackagelist = ref([]);
-	onMounted(() => {
-		savePackagelist.value = uni.getStorageSync('Packagelist') || []
-		let res = uni.getStorageSync('saveTree0')
-		let goodArray = []
-		myArray.forEach((element : any) => {
-			element.children.forEach((element1 : any) => {
-				goodArray.push({
-					name: element1.title,
-					url: element1.url,
-				})
-			})
-		})
-		secondtemp.value = goodArray
-		if (res.result) {
-			res.result.forEach((element : any) => {
-				if (element.netFlag == '0') {
-					doctorsayList.value.forEach((res : any) => {
-						if (res.name == element.title) {
-							element.url = res.url
-						}
-					})
-				} else {
-					element.url = element.animationPath
-				}
-				element.children.forEach((res1 : any) => {
-					if (res1.netFlag == '0') {
-						secondtemp.value.forEach((res2 : any) => {
-							if (res2.name == res1.title) {
-								res1.url = res2.url
-							}
-						})
-					} else {
-						res1.url = res1.animationPath
-					}
-
-				})
-			})
-			bigArray.value = res.result;
-		}
-		downList.value = bigArray.value[0].children
-		upmenuIndex.value = -1;
-		downdonghua.value = -1;
-		setTimeout(() => {
-			upmenuIndex.value = 0;
-			downdonghua.value = 0;
-		}, 50)
-		uni.$on('where', findback);
-		downdonghua.value = 0;
-		geteverything()
-	})
-
-	const bodyTagListLook = ref([]);
-	const emotionTagListLook = ref([]);
-	const cansumit = ref(false);
-
-	onBeforeUnmount(() => {
-		if (animTimer) clearTimeout(animTimer)
-		uni.$off('where', findback);
-		ticking = false;
-
-	})
-	function findback(data : any) {
-		solveWatch.value = 3;
-		whereEvent(data)
-	}
-	// 切割bigArray
-	function splitString(str) {
-		// 使用正则表达式找到所有括号的内容
-		let result = [];
-		let remainingStr = str;
-		// 正则匹配最外层括号（支持全角和半角）
-		let regex = /([^（(]*)[（(]([^）)]+)[）)]/;
-		while (regex.test(remainingStr)) {
-			let match = remainingStr.match(regex);
-			if (match) {
-				// 添加括号前的部分（去掉空白）
-				if (match[1].trim()) {
-					result.push(match[1].trim());
-				}
-				// 添加括号内的内容
-				if (match[2].trim()) {
-					result.push(match[2].trim());
-				}
-				// 更新剩余的字符串
-				remainingStr = remainingStr.replace(match[0], '').trim();
-			}
-		}
-		// 如果最后还有剩余部分，也加入结果
-		if (remainingStr.trim()) {
-			result.push(remainingStr.trim());
-		}
-		return result;
-	}
-
-	const totalColumns = 24; // 总列数
-	const totalRows = 11;    // 总行数
-	const visibleWidth = 1300;  // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220
-	const visibleHeight = 400; // 可视区域高度 (rpx)，假设显示约5行时 heightType = 102.5
-	function centerCell() {
-		if (saveEditIndex.value.index0 >= 0 && saveEditIndex.value.index0 <= totalColumns && saveEditIndex.value.index1 >= 0 && saveEditIndex.value.index1 <= totalRows) {
-			// 计算点击格子的中心位置 (rpx)
-			const cellCenterX = (saveEditIndex.value.index0 + 0.5) * 259;
-			const cellCenterY = (saveEditIndex.value.index1 - 1) * 200;
-			// 计算 scrollLeft 和 scrollTop，使格子中心位于可视区域中心
-			cardLeft.value = cellCenterX - visibleWidth / 2;
-			scrollTop.value = cellCenterY - visibleHeight / 2;
-			// 计算网格总宽高
-			const totalWidth = totalColumns * 259;
-			const totalHeight = totalRows * 200;
-			// 限制 scrollLeft 和 scrollTop 在有效范围内
-			cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2;
-			// scrollTop.value =  0
-			scrollTop.value = Math.max(0, Math.min(scrollTop.value, totalHeight - visibleHeight)) / 2;
-		}
-	}
-	const iszhiling = ref(false)
-	const zhilingbao = () => {
-		iszhiling.value = !iszhiling.value
-		forthmenuIndex.value = 0;
-	}
-	const deletedonghua = ref(false);
-</script>
-
-<style lang="less" scoped>
-	// 主页的css
-	@import './index';
-</style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/warehousematrix/newindex.vue b/pages/NursingNew/component/warehousematrix/newindex.vue
index a62e518..e516402 100644
--- a/pages/NursingNew/component/warehousematrix/newindex.vue
+++ b/pages/NursingNew/component/warehousematrix/newindex.vue
@@ -1531,6 +1531,7 @@
 
 	const doaddDirective = (element : any) => {
 		addDirective(element).then((res) => {
+			// console.log("?????0",res)
 			if (res.success) {
 				geteverything()
 			}
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index 356d549..0146663 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -651,13 +651,15 @@
 							<view :class="v.status<2?`up-tags-target`: `up-tags`">
 								{{v.status_dictText}}
 							</view>
-							<image class="middle-img"
-								:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
-								mode="aspectFill"></image>
+							<view class="title-flex">
+								<image class="middle-img"
+									:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
+									mode="aspectFill"></image>
+									<view class="right-title">
+										{{ v.wlName }}
+									</view>
+							</view>
 							<view class="middle-right">
-								<view class="right-title">
-									{{ v.wlName }}
-								</view>
 								<view class="juzhong">
 									<view class="">
 										<text style="color: #888888;">
@@ -2332,7 +2334,7 @@
 						.pls-card-middle {
 							width: 100%;
 							height: 11vh;
-							margin-top: 2vh;
+							margin-top: 2.5vh;
 							display: flex;
 							position: relative;
 
@@ -2407,6 +2409,7 @@
 
 						.pls-card-end {
 							width: 100%;
+							margin-top: 20rpx;
 							height: 7.7vh;
 
 							display: flex;
@@ -2579,10 +2582,10 @@
 						// justify-content: space-around;
 
 						.middle-img {
-							margin-top: 10rpx;
-							width: 150rpx;
-							height: 150rpx;
+							max-width: 130rpx;
+							max-height: 130rpx;
 							border-radius: 1vw;
+							margin-right: 7rpx;
 						}
 
 						.middle-right {
@@ -2591,20 +2594,7 @@
 							flex-direction: column;
 							align-items: center;
 
-							.right-title {
-								width: 85%;
-								white-space: nowrap;
-								/* 不换行 */
-								overflow: hidden;
-								/* 超出隐藏 */
-								text-overflow: ellipsis;
-								/* 显示省略号 */
-								display: block;
-								font-weight: 800;
-								font-size: 30rpx;
-								margin-bottom: 20rpx;
-								text-align: center;
-							}
+							
 
 							.right-middle {
 								// margin-bottom: 7rpx;
@@ -2673,10 +2663,10 @@
 			padding-top: 30rpx;
 
 			.left-img {
-				width: 250rpx;
-				height: 250rpx;
-				margin-left: 50rpx;
-				margin-top: 2vw;
+				width: 280rpx;
+				height: 280rpx;
+				margin-left: 20rpx;
+				margin-top: 0.5vw;
 				border-radius: 1vw;
 			}
 
@@ -3112,8 +3102,8 @@
 
 	.juzhong {
 		align-items: center;
-		height: 40rpx;
-		font-size: 25rpx;
+		height: 45rpx;
+		font-size: 28rpx;
 		display: flex;
 		width: 335rpx;
 		color: black;
@@ -3123,22 +3113,22 @@
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
-			width: 210rpx;
+			width: 190rpx;
 			height: 40rpx;
 		}
 	}
 
 	.up-tags {
 		position: absolute;
-		right: 15rpx;
-		top: 15rpx;
-		width: 110rpx;
+		right: 120rpx;
+		top: 100rpx;
+		width: 120rpx;
 		height: 50rpx;
 		border-radius: 40rpx;
 		background-color: #fff;
 		color: #555555;
 		border: 1rpx solid #C3C3C3;
-		font-size: 24rpx;
+		font-size: 27rpx;
 		z-index: 2;
 		display: flex;
 		justify-content: center;
@@ -3147,15 +3137,15 @@
 
 	.up-tags-target {
 		position: absolute;
-		right: 15rpx;
-		top: 15rpx;
-		width: 110rpx;
+		right: 120rpx;
+		top: 100rpx;
+		width: 120rpx;
 		height: 50rpx;
 		border-radius: 40rpx;
 		background-color: #fff;
 		color: #1083F8;
 		border: 1rpx solid #A4D5FE;
-		font-size: 24rpx;
+		font-size: 27rpx;
 		z-index: 2;
 		display: flex;
 		justify-content: center;
@@ -3502,6 +3492,7 @@
 		width: 88%;
 		height: 110rpx;
 		display: flex;
+		margin-top: 10rpx;
 
 		.right-end {
 			// background-color: red;
@@ -3584,4 +3575,24 @@
 		border-radius: 30rpx;
 		z-index: 100;
 	}
+	.title-flex{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 20rpx 0;
+		padding-top: 30rpx;
+	}
+	.right-title {
+		width: 10vw;
+		white-space: nowrap;
+		/* 不换行 */
+		overflow: hidden;
+		/* 超出隐藏 */
+		text-overflow: ellipsis;
+		/* 显示省略号 */
+		display: block;
+		font-weight: 800;
+		font-size: 30rpx;
+		margin-bottom: 60rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 6278dea..ba98612 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -1340,7 +1340,7 @@
 			width: 14vw;
 			height: 2vw;
 			display: flex;
-			justify-content: space-around;
+			// justify-content: space-around;
 			margin-top: 2.5vw;
 
 			view {
diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue
index 7de3e1f..585c46e 100644
--- a/pages/Warehouse/index/index.vue
+++ b/pages/Warehouse/index/index.vue
@@ -65,7 +65,7 @@
 				</addtory>
 				<!-- <nurse :isshow="menuop == 7" v-if="swipdex==7&&uni.getStorageSync('nuId')" /> -->
 				<!-- <invoicing :isshow="menuop == 8" v-if="swipdex==8&&uni.getStorageSync('nuId')" /> -->
-				<logistics :isshow="menuop == 9" v-if="swipdex==9&&uni.getStorageSync('nuId')" />
+				<!-- <logistics :isshow="menuop == 9" v-if="swipdex==9&&uni.getStorageSync('nuId')" /> -->
 				<!-- <warehousematrix :isshow="menuop == 10" v-if="swipdex==10&&uni.getStorageSync('nuId')" /> -->
 				<warehousematrix :isshow="menuop==10" v-if="swipdex==10" :canmove="startmoveit" :sendxy="targetrule"
 					:isblue='isblue' :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend"
@@ -97,7 +97,7 @@
 
 	// import logistics from "@/pages/NursingNew/component/logistics/index.vue"
 	import warehousematrix from "@/pages/NursingNew/component/warehousematrix/newindex.vue"
-	import logistics from "@/pages/NursingNew/component/logistics/index.vue"
+	// import logistics from "@/pages/NursingNew/component/logistics/index.vue"
 	// import nurse from "@/pages/NursingNew/component/nurse/index.vue"
 
 	const tabbrarr = ref([
@@ -217,13 +217,13 @@
 					}, 100)
 					console.log('医疗矩阵')
 					break;
-				case 'kzgn_hqjz':
-					swipdex.value = 9;
-					setTimeout(() => {
-						menuop.value = 9;
-					}, 100)
-					console.log('后勤矩阵')
-					break;
+				// case 'kzgn_hqjz':
+				// 	swipdex.value = 9;
+				// 	setTimeout(() => {
+				// 		menuop.value = 9;
+				// 	}, 100)
+				// 	console.log('后勤矩阵')
+				// 	break;
 				case 'kzgn_kfjz':
 					swipdex.value = 10;
 					setTimeout(() => {
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index b11e596..77c86a1 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -4,7 +4,7 @@
 			:style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
 		</view>
-		<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0;top: -5vh;height: 110vh;"
+		<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top: -5vh;height: 110vh;"
 			v-if="nomessageshow">
 			<defaultr cont="暂无数据" style="z-index: 999;"></defaultr>
 		</view>
@@ -689,13 +689,17 @@
 							<view :class="v.status<2?`up-tags-target`: `up-tags`">
 								{{v.status_dictText}}
 							</view>
-							<image class="middle-img"
-								:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
-								mode="aspectFill"></image>
+							<view class="title-flex">
+								<image class="middle-img"
+									:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
+									mode="aspectFill"></image>
+									<view class="right-title">
+										{{ v.wlName }}
+									</view>
+							</view>
+							
 							<view class="middle-right">
-								<view class="right-title">
-									{{ v.wlName }}
-								</view>
+								
 								<view class="juzhong">
 									<view class="">
 										<text style="color: #888888;">
@@ -2513,10 +2517,10 @@
 				// justify-content: space-around;
 
 				.middle-img {
-					margin-top: 10rpx;
-					width: 150rpx;
-					height: 150rpx;
+					max-width: 130rpx;
+					max-height: 130rpx;
 					border-radius: 1vw;
+					margin-right: 7rpx;
 				}
 
 				.middle-right {
@@ -2525,20 +2529,7 @@
 					flex-direction: column;
 					align-items: center;
 
-					.right-title {
-						width: 85%;
-						white-space: nowrap;
-						/* 不换行 */
-						overflow: hidden;
-						/* 超出隐藏 */
-						text-overflow: ellipsis;
-						/* 显示省略号 */
-						display: block;
-						font-weight: 800;
-						font-size: 30rpx;
-						margin-bottom: 20rpx;
-						text-align: center;
-					}
+					
 
 					.right-middle {
 						// margin-bottom: 7rpx;
@@ -2548,7 +2539,20 @@
 			}
 		}
 	}
-
+	.right-title {
+		width: 10vw;
+		white-space: nowrap;
+		/* 不换行 */
+		overflow: hidden;
+		/* 超出隐藏 */
+		text-overflow: ellipsis;
+		/* 显示省略号 */
+		display: block;
+		font-weight: 800;
+		font-size: 30rpx;
+		margin-bottom: 60rpx;
+		// text-align: center;
+	}
 	.wuliao-title {
 		margin-top: 18rpx;
 		margin-left: 30rpx;
@@ -2596,12 +2600,11 @@
 			padding-top: 30rpx;
 
 			.left-img {
-				width: 250rpx;
-				height: 250rpx;
-				margin-left: 50rpx;
-				margin-top: 2vw;
+				width: 280rpx;
+				height: 280rpx;
+				margin-left: 20rpx;
+				margin-top: 0.5vw;
 				border-radius: 1vw;
-				// margin-right: 50rpx;
 			}
 
 			.left-tags {
@@ -2897,8 +2900,8 @@
 
 	.juzhong {
 		align-items: center;
-		height: 40rpx;
-		font-size: 25rpx;
+		height: 45rpx;
+		font-size: 28rpx;
 		display: flex;
 		width: 335rpx;
 		color: black;
@@ -2908,22 +2911,22 @@
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
-			width: 210rpx;
+			width: 190rpx;
 			height: 40rpx;
 		}
 	}
 
 	.up-tags {
 		position: absolute;
-		right: 15rpx;
-		top: 15rpx;
-		width: 110rpx;
+		right: 120rpx;
+		top: 100rpx;
+		width: 120rpx;
 		height: 50rpx;
 		border-radius: 40rpx;
 		background-color: #fff;
 		color: #555555;
 		border: 1rpx solid #C3C3C3;
-		font-size: 24rpx;
+		font-size: 27rpx;
 		z-index: 2;
 		display: flex;
 		justify-content: center;
@@ -2932,15 +2935,15 @@
 
 	.up-tags-target {
 		position: absolute;
-		right: 15rpx;
-		top: 15rpx;
-		width: 110rpx;
+		right: 120rpx;
+		top: 100rpx;
+		width: 120rpx;
 		height: 50rpx;
 		border-radius: 40rpx;
 		background-color: #fff;
 		color: #1083F8;
 		border: 1rpx solid #A4D5FE;
-		font-size: 24rpx;
+		font-size: 27rpx;
 		z-index: 2;
 		display: flex;
 		justify-content: center;
@@ -3349,7 +3352,8 @@
 		width: 88%;
 		height: 110rpx;
 		display: flex;
-
+		margin-top: 10rpx;
+		
 		.right-end {
 			// background-color: red;
 			width: 33%;
@@ -3417,4 +3421,11 @@
 		border-radius: 30rpx;
 		z-index: 100;
 	}
+	.title-flex{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 20rpx 0;
+		padding-top: 30rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue
index 8ead9ea..bd312e2 100644
--- a/pages/procurement/common/toryitem.vue
+++ b/pages/procurement/common/toryitem.vue
@@ -190,6 +190,7 @@
 		// console.log("啥啊",i)
 		v.zk = !v.zk;
 		havezk.value = v.zk
+		// console.log("头疼啊",havezk.value)
 		if (v.zk) {
 			if (props.pddType == '1') { uni.setStorageSync('valitem', v); }
 			setTimeout(() => {
@@ -343,7 +344,7 @@
 		return y <= (h * 1 / 2);
 	}
 	const isbottom = ref(false);
-	const clicklock = ref(false)
+	// const clicklock = ref(false)
 	/** 事件处理示例 */
 	function onTap(e) {
 		const top = isTopHalfApp(e);
@@ -352,19 +353,24 @@
 			return;
 		}
 		if (havezk.value) {
-
-			if (!clicklock.value) {
-				if (!top) {
-					isbottom.value = true
-					// console.log("开启了")
-				} else {
-					isbottom.value = false
-				}
-				clicklock.value = true
+			// console.log("top", top, clicklock.value)
+			// if (!clicklock.value) {
+			// 	if (!top) {
+			// 		isbottom.value = true
+			// 		// console.log("开启了")
+			// 	} else {
+			// 		isbottom.value = false
+			// 	}
+			// 	clicklock.value = true
+			// } 
+			if (!top) {
+				isbottom.value = true
+				// console.log("开启了")
+			} else {
+				isbottom.value = false
 			}
-
 		} else {
-			clicklock.value = false
+			// clicklock.value = false
 		}
 
 		// uni.showToast({ title: top ? '上半部分' : '下半部分', icon: 'none' });
@@ -780,7 +786,7 @@
 				height: 100%;
 				overflow: hidden;
 				position: absolute;
-				left: 18vw;
+				left: 15.5vw;
 				top: 0.5vw;
 
 				.wltwo {
@@ -863,7 +869,7 @@
 				display: flex;
 				flex-direction: column;
 				position: absolute;
-				left: 2vw;
+				left: 0.5vw;
 				top: 1.5vw;
 
 				.cardp {
@@ -902,22 +908,25 @@
 				}
 
 				.imgs {
-					width: 13vw;
-					height: 9vw;
+					width: 10vw;
+					height: 10vw;
 					// background: #F8F8F8;
 					border-radius: 1.1vw;
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					margin-top: 1.2vw;
+					// margin-top: 1.2vw;
+					// background-color: blue;
+					margin-left: 2.5vw;
+					margin-top: 0.5vw;
 
 					// margin: 0.8vw auto 0;
 					// padding: 0.5vw;
 					>image {
-						width: 9vw;
-						height: 9vw;
-						margin-left: 1vw;
-						border-radius: 0.4vw;
+						width: 100%;
+						height: 100%;
+						// margin-left: 1vw;
+						// border-radius: 0.4vw;
 					}
 				}
 
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index 3e74841..a4e0be3 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -27,7 +27,7 @@
 								<text style="white-space: nowrap;display: block;"> 规格型号: {{v.specificationModel}}</text>
 							</view>
 							<view>
-								<text v-if="v.multiUnitType=='1'">采购单价:
+								<text v-if="v.multiUnitType=='1'">采购单价:111111111111111
 									￥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}} </text>
 								<text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text>
 								<text v-if="v.multiUnitType=='2'">采购单价:
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index 35cc992..abb5530 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -467,12 +467,14 @@
 			.imghs {
 				width: 12vw;
 				height: 12vw;
-				margin: 0.8vw auto 0.25vw;
+				margin: 0vw auto 0.25vw;
 				padding: 0.2vw;
+				padding-top: 0;
 				background: #fff;
 				border-radius: 1.1vw;
 
 				>image {
+					margin-top: -0.6vw;
 					width: 100%;
 					height: 100%;
 					border-radius: 1.1vw;
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 6fe2025..6473ac8 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -920,9 +920,10 @@
 			image {
 				width: 7vw;
 				height: 7vw;
-				margin: 0.5vw auto 0.5vw;
+				margin: 1vw auto 0.3vw;
 				display: block;
 				border-radius: 0.7vw;
+				// background-color: red;
 			}
 
 			>view {
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index ecd7e13..791ce4a 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -197,7 +197,7 @@
 						<view class="right-one" v-for="(item,index) in rightarray" :key="index">
 							<view class="right-one-left">
 								<view class="bgimg">
-									<image class="left-image"
+									<image 
 										:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 										mode="aspectFill"></image>
 								</view>
@@ -1243,11 +1243,10 @@
 							padding: 0.5vw 0;
 
 							.bgimg {
-								width: 8vw;
-								height: 8vw;
-								margin: 0.3vw auto 0.25vw;
+								width: 7vw;
+								height: 7vw;
+								margin: 1.3vw auto 0.25vw;
 								border-radius: 1.1vw;
-								background: #fff;
 								display: flex;
 								justify-content: center;
 								align-items: center;
diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index 45ce3fb..74d9e3f 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -1123,8 +1123,9 @@
 							.middle-img {
 								width: 150rpx;
 								height: 150rpx;
-								margin: 0.3vw 0 0 0.15vw;
+								margin: 0vw 0 0 0.15vw;
 								border-radius: 1vw;
+								// background-color: red;
 							}
 
 							.middle-right {
@@ -1196,11 +1197,12 @@
 			padding-top: 30rpx;
 
 			.left-img {
-				width: 250rpx;
-				height: 250rpx;
-				margin-left: 50rpx;
-				margin-top: 2vw;
+				width: 280rpx;
+				height: 280rpx;
+				margin-left: 20rpx;
+				margin-top: 0.5vw;
 				border-radius: 1vw;
+				// background-color: blue;
 			}
 
 			.left-tags {
diff --git a/pages/watch/full.vue b/pages/watch/full.vue
index d94f810..33ecb09 100644
--- a/pages/watch/full.vue
+++ b/pages/watch/full.vue
@@ -349,7 +349,7 @@
 				}
 				break
 			case 8:
-				jumpopen.value = true
+				jumpopen.value = !jumpopen.value
 				break
 			case 9:
 			
@@ -546,7 +546,7 @@
 			height: 100%;
 			width: 100%;
 			position: relative;
-			padding: 60rpx;
+			padding: 50rpx;
 
 			.scroll-vi {
 				height: 100rpx;
@@ -584,7 +584,7 @@
 	}
 
 	.big-bgc {
-		margin-left: -15rpx;
+		// margin-left: -15rpx;
 		margin-top: 20rpx;
 		width: 1600rpx;
 		height: 1000rpx;
@@ -616,20 +616,20 @@
 
 	.right-right {
 		position: absolute;
-		right: -20rpx;
-		top: 60rpx;
+		right: -90rpx;
+		top: 27rpx;
 		height: calc(100% - 250rpx);
 		width: 570rpx;
 
 	}
 
 	.bottom-view {
-		margin-left: 90rpx;
+		// margin-left: 90rpx;
 		margin-top: 20rpx;
 		width: 440rpx;
 		height: 800rpx;
 		border-radius: 50rpx;
-		background-color: rgba(226, 227, 231, 0.5);
+		// background-color: rgba(226, 227, 231, 0.5);
 		position: relative;
 		display: flex;
 		flex-wrap: wrap;
@@ -640,7 +640,7 @@
 		.button-father {
 			margin-top: 20rpx;
 			margin-bottom: 0;
-			margin-left: 28rpx;
+			margin-left: 30rpx;
 			text-align: center;
 
 			.bottom-button {
@@ -648,8 +648,8 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				width: 110rpx;
-				height: 110rpx;
+				width: 115rpx;
+				height: 115rpx;
 				border: 1rpx solid #CDD3DD;
 				border-radius: 35rpx;
 				margin-bottom: 5rpx;
@@ -679,34 +679,34 @@
 
 	.picture {
 		display: flex;
-		margin-top: 40rpx;
+		margin-top: 25rpx;
 
 		.picture-card {
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
 			align-items: center;
-			margin-left: 20rpx;
-			margin-right: 10rpx;
+			margin-right: 25rpx;
+			// margin-right: 10rpx;
 			width: 200rpx;
-
+			// background-color: red;
 			.bgc-card {
 				width: 100%;
-				height: 130rpx;
+				height: 150rpx;
 				background-color: rgba(226, 227, 231, 0.5);
 				border-radius: 30rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				margin-bottom: 10rpx;
+				margin-bottom: 20rpx;
 			}
 		}
 	}
 
 	.jump-white {
 		position: absolute;
-		bottom: 20rpx;
-		left: 50rpx;
+		bottom: 35rpx;
+		left: 30rpx;
 		width: 300rpx;
 		height: 400rpx;
 		background-color: #fff;
diff --git a/static/index/procurement/k.png b/static/index/procurement/k.png
index 952fe2e..f5b365c 100644
Binary files a/static/index/procurement/k.png and b/static/index/procurement/k.png differ