From 5cfa85d0e80ce5d72ed5e1b2e3766b6684f8b591 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Fri, 9 Jan 2026 15:31:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E7=9F=A9=E9=98=B5=E7=9A=84?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/nurse/api.js    |    8 +
 pages/NursingNew/component/nurse/index.css | 1801 ++------------------
 pages/NursingNew/component/nurse/index.vue | 1449 +++-------------
 3 files changed, 367 insertions(+), 2891 deletions(-)

diff --git a/pages/NursingNew/component/nurse/api.js b/pages/NursingNew/component/nurse/api.js
index dc469a4..0583c95 100644
--- a/pages/NursingNew/component/nurse/api.js
+++ b/pages/NursingNew/component/nurse/api.js
@@ -105,4 +105,12 @@ export const editDirective = (params) => {
 		method: 'post',
 		data: params,
 	})
+}
+
+// 根据日期查询日程表
+export const getDirectiveOrders = (date) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getDirectiveOrders?nuId=${uni.getStorageSync('nuId')}&elderId=${uni.getStorageSync('elderId')}&queryDate=${date}`,
+		method: 'get',
+	})
 }
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index 8b6d9c4..1921599 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -1,550 +1,6 @@
 .super-card {
 	display: flex;
-	/* justify-content: center; */
-
 	width: 100%;
-	/* height: calc(100% - 400rpx); */
-
-	.scroll-x {
-		height: 100%;
-		width: 100%;
-	}
-
-	.right-cards {
-		width: 550rpx;
-		height: 1280rpx;
-
-		.scroll-box {
-			width: 100%;
-			height: 150rpx;
-			margin-top: 10rpx;
-			/* padding-right: 20rpx; */
-
-			.right-box {
-				height: 150rpx;
-				display: flex;
-				flex-direction: column;
-				flex-wrap: wrap;
-				align-content: flex-start;
-				/* padding-right: 10rpx; */
-
-				.right-box-item {
-					margin: 10rpx 10rpx 0 20rpx;
-					width: 250rpx;
-					height: 120rpx;
-					border-radius: 20rpx;
-					background-color: #fff;
-					position: relative;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					flex-direction: column;
-
-					.right-box-img {
-						width: 60rpx;
-						height: 60rpx;
-					}
-
-					.right-box-font {
-						font-size: 30rpx;
-						/* margin-top: 7rpx; */
-						/* margin-left: 10rpx; */
-					}
-
-					.right-box-items {
-						display: flex;
-						justify-content: space-around;
-						align-items: center;
-
-						.right-box-items-button {
-							width: 25rpx;
-							height: 25rpx;
-							margin: 0 3rpx;
-						}
-					}
-				}
-
-				.title-time-button {
-					position: absolute;
-					top: 0rpx;
-					right: 0rpx;
-					width: 200rpx;
-					height: 100rpx;
-					/* background-color: red; */
-				}
-
-				.title-time-font {
-					position: absolute;
-					top: 5rpx;
-					right: 3rpx;
-					font-size: 17rpx;
-					color: #fff;
-				}
-			}
-		}
-	}
-
-	.time-father {
-		border-radius: 20rpx;
-		height: 97%;
-		width: 95%;
-		margin-top: 6%;
-		margin-left: 6%;
-		background-color: rgba(255, 255, 255, 0.3);
-
-		.time-button {
-			width: 140rpx;
-			height: 60rpx;
-			margin-top: 30rpx;
-			margin-left: 30rpx;
-			border-radius: 20rpx;
-			background-color: rgb(54, 159, 239);
-			border: 5rpx solid rgb(54, 159, 239);
-			display: flex;
-
-			.time-button-month {
-				width: 50%;
-				height: 100%;
-				color: #fff;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.time-button-month-target {
-				width: 50%;
-				height: 100%;
-				background-color: #fff;
-				color: rgb(54, 159, 239);
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				border-bottom-left-radius: 15rpx;
-				border-top-left-radius: 15rpx;
-			}
-
-			.time-button-week-target {
-				width: 50%;
-				height: 100%;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				color: #fff;
-			}
-
-			.time-button-week {
-				width: 50%;
-				height: 100%;
-				color: rgb(54, 159, 239);
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				background-color: #fff;
-				border-bottom-right-radius: 15rpx;
-				border-top-right-radius: 15rpx;
-			}
-		}
-	}
-
-	.under-button {
-		width: 520rpx;
-		height: 95rpx;
-		margin-left: 35rpx;
-		margin-top: 0rpx;
-		border-radius: 20rpx;
-		/* background-color: rgb(229, 233, 249); */
-		display: flex;
-		align-items: center;
-		position: relative;
-
-		.under-button-black {
-			transition: all 1s;
-			position: absolute;
-			width: 300rpx;
-			height: 100rpx;
-			border-radius: 20rpx;
-			padding-left: 10rpx;
-			background-color: rgb(77, 77, 77);
-			top: -100rpx;
-			left: 0rpx;
-			color: #fff;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			.under-button-three {
-				position: absolute;
-				right: 13rpx;
-				bottom: -17rpx;
-				/* 元素本身不占任何宽高 */
-				width: 0;
-				height: 0;
-
-				/* 左右边框透明，宽度各 50px */
-				border-left: 15rpx solid transparent;
-				border-right: 15rpx solid transparent;
-
-				/* 上边框实色（高度 100px），形成向下的“倒三角” */
-				border-top: 20rpx solid rgb(77, 77, 77);
-			}
-		}
-
-		.other-father {
-			width: 100%;
-			height: 100%;
-			background-color: #fff;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.white-circle-click-father-spec {
-			position: absolute;
-			top: -160rpx;
-			right: 10rpx;
-			overflow: hidden;
-			/* background-color: #fff; */
-			/* 重要：让伪元素在圆角内显示 */
-			margin-left: 10rpx;
-			height: 130rpx;
-			width: 130rpx;
-			border-radius: 50%;
-			--color: #99C9FD;
-			--thick: 2px;
-			--radius: 50%;
-			border: var(--thick) dashed var(--color);
-			border-radius: var(--radius);
-
-			background:
-				/* 上边 */
-				repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / 100% var(--thick) no-repeat,
-				/* 下边 */
-				repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) bottom left / 100% var(--thick) no-repeat,
-				/* 左边 */
-				repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / var(--thick) 100% no-repeat,
-				/* 右边 */
-				repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top right / var(--thick) 100% no-repeat;
-
-
-		}
-
-		.white-circle-click-father {
-			position: relative;
-			overflow: hidden;
-			/* 重要：让伪元素在圆角内显示 */
-			margin-left: 10rpx;
-			height: 75rpx;
-			width: 150rpx;
-			border-radius: 40rpx;
-			background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
-			border: 2rpx solid #9AD1FF;
-			color: #007CFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			-webkit-tap-highlight-color: transparent;
-		}
-
-		/* 文本层级高于伪元素 */
-		.white-circle-click-father .label {
-			position: relative;
-			z-index: 2;
-		}
-
-		/* 伪元素作为点击时的覆盖渐变 */
-		.white-circle-click-father::before {
-			content: "";
-			position: absolute;
-			inset: 0;
-			z-index: 1;
-			pointer-events: none;
-			background: linear-gradient(to bottom, #bfe9ff, #4aa8ff);
-			/* 点击后的渐变（可替换） */
-			opacity: 0;
-			/* transform: scale(1.02); */
-		}
-
-		/* anim 类触发 1s 动画（淡入→停留→淡出） */
-		.white-circle-click-father.anim::before {
-
-			animation: coverFade 1s ease-in-out forwards;
-		}
-
-
-
-		/* keyframes：0-20% 淡入，20-80% 保持，80-100% 淡出 */
-		@keyframes coverFade {
-			0% {
-				opacity: 0;
-			}
-
-			20% {
-				opacity: 1;
-			}
-
-			80% {
-				opacity: 1;
-			}
-
-			100% {
-				opacity: 0;
-			}
-		}
-
-		.white-circle {
-			width: 70rpx;
-			height: 70rpx;
-			border-radius: 50%;
-			margin-left: 15rpx;
-			background-color: #fff;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			z-index: 99;
-
-			.white-circle-img {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
-
-	.middle-box {
-		width: 100%;
-		height: 840rpx;
-		/* background-color: red; */
-		display: flex;
-		overflow: hidden;
-
-		.middle-left-box {
-			margin-left: 0rpx;
-			width: 380rpx;
-			height: 800rpx;
-			/* background-color: red; */
-			border-radius: 20rpx;
-			/* background-color: rgb(229, 233, 249); */
-			display: flex;
-
-			.first-contant {
-				height: 100%;
-				width: 190rpx;
-
-				.right-box-item {
-					margin: 10rpx 0 0 20rpx;
-					width: 170rpx;
-					height: 120rpx;
-					border-radius: 20rpx;
-					background-color: rgba(255, 255, 255, 0.3);
-					position: relative;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					flex-direction: column;
-					white-space: nowrap;
-					/* 防止文本换行 */
-					overflow: hidden;
-					/* 超出部分隐藏 */
-					text-overflow: ellipsis;
-					/* 超出部分显示省略号 */
-
-					.right-box-img {
-						width: 60rpx;
-						height: 60rpx;
-					}
-
-					.title-time-button {
-						position: absolute;
-						top: -4rpx;
-						right: -4rpx;
-						width: 70rpx;
-						height: 40rpx;
-
-					}
-
-					.title-time-button-font {
-						color: #1083f8;
-						position: absolute;
-						top: 2rpx;
-						right: 8rpx;
-						font-size: 19rpx;
-						z-index: 99;
-					}
-
-					.right-box-font {
-						font-size: 23rpx;
-						/* margin-top: 10rpx; */
-					}
-
-					.title-time-zhejiao {
-						position: absolute;
-						top: 0rpx;
-						left: 5rpx;
-						width: 40rpx;
-						height: 40rpx;
-					}
-
-					.title-time-font {
-						position: absolute;
-						top: 3rpx;
-						right: 5rpx;
-						font-size: 20rpx;
-						color: #fff;
-						z-index: 999;
-					}
-
-					.right-box-items {
-						display: flex;
-						justify-content: space-around;
-						align-items: center;
-
-						.right-box-items-button {
-							width: 25rpx;
-							height: 25rpx;
-							margin: 0 3rpx;
-						}
-					}
-				}
-			}
-
-			.second-contant {
-				height: 100%;
-				width: 210rpx;
-
-				.downList-box-target {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					background-color: #fff;
-					margin-left: 15rpx;
-					width: 160rpx;
-					height: 120rpx;
-					border-radius: 20rpx;
-					/* margin-left: 10rpx; */
-					margin-top: 10rpx;
-
-					flex-direction: column;
-					/* box-shadow: 2rpx 2rpx 4rpx 2rpx rgba(54, 159, 239, 0.1);
-					border: 2rpx solid rgb(54, 159, 239); */
-					white-space: nowrap;
-					/* 防止文本换行 */
-					overflow: hidden;
-					/* 超出部分隐藏 */
-					text-overflow: ellipsis;
-					/* 超出部分显示省略号 */
-
-					.downList-box-img {
-						height: 50rpx;
-						width: 50rpx;
-					}
-
-					.downList-box-text {
-						font-size: 26rpx;
-						color: rgb(54, 159, 239);
-					}
-				}
-
-				.downList-box {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					margin-left: 15rpx;
-					border-radius: 20rpx;
-					background-color: rgba(255, 255, 255, 0.5);
-					width: 160rpx;
-					height: 120rpx;
-					/* border-radius: 20rpx; */
-					/* margin-left: 10rpx; */
-					/* margin-bottom: 20rpx; */
-					margin-top: 10rpx;
-					flex-direction: column;
-					white-space: nowrap;
-					/* 防止文本换行 */
-					overflow: hidden;
-					/* 超出部分隐藏 */
-					text-overflow: ellipsis;
-					/* 超出部分显示省略号 */
-					/* box-shadow: 2rpx 2rpx 4rpx 2rpx rgba(0, 0, 0, 0.1); */
-
-					.downList-box-img {
-						height: 50rpx;
-						width: 50rpx;
-					}
-
-					.downList-box-text {
-						font-size: 25rpx;
-					}
-				}
-			}
-		}
-
-		.middle-right-box {
-			height: 780rpx;
-			width: 90rpx;
-
-			/* overflow-y: hidden; */
-			.doctorsay-container-card {
-				position: relative;
-				display: flex;
-				/* flex-direction: column; */
-				justify-content: center;
-				align-items: center;
-				background-color: #fff;
-				width: 160rpx;
-				height: 100rpx;
-				/* margin: 0 0rpx 0rpx 0rpx; */
-				border-radius: 50rpx;
-				/* border-radius: 20rpx;
-				border: 2rpx solid rgb(221, 234, 250);
-				box-shadow: 5px 5px 10px rgba(105, 129, 178, 0.2); */
-				margin-left: 10rpx;
-				margin-top: 30rpx;
-
-				/* 右下角阴影 */
-				.doctorsay-container-card-img {
-					width: 55rpx;
-					height: 55rpx;
-				}
-
-				.doctorsay-container-card-font {
-					font-size: 30rpx;
-					/* margin-top: 20rpx; */
-				}
-
-			}
-
-			.doctorsay-container-card-target {
-				position: relative;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				background: linear-gradient(to left, #fff, rgb(229, 233, 249));
-				width: 115rpx;
-				height: 122rpx;
-				margin: 0 18rpx 10rpx 0rpx;
-				/* margin-left: -15rpx; */
-				/* border: 2rpx solid #fff; */
-				/* box-shadow: 5px 5px 10px rgba(105, 129, 178,0.2); */
-				border-top-right-radius: 20rpx;
-				border-bottom-right-radius: 20rpx;
-				/* border-radius: 20rpx; */
-				margin-left: -15rpx;
-
-				/* 右下角阴影 */
-				.doctorsay-container-card-img {
-					width: 55rpx;
-					height: 55rpx;
-					margin-left: 25rpx;
-				}
-
-
-
-			}
-
-			/* background-color: rgb(229,233,249); */
-		}
-	}
 
 	.super-card-container {
 		background-blend-mode: screen;
@@ -552,20 +8,18 @@
 		overflow: hidden;
 		margin-left: 10rpx;
 		width: 1455rpx;
-		/* height: 1460rpx; */
 		border-left: 0;
 		position: relative;
 		border-radius: 30rpx;
 		overflow: hidden;
 		border: 3rpx dashed #dde1e6;
-		
-		/* border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1; */
-		/* background-color: red; */
 	}
-	.super-card-right{
+
+	.super-card-right {
 		border-right: 1rpx solid transparent;
 		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 	}
+
 	.super-card-time {
 		display: flex;
 		justify-content: center;
@@ -588,7 +42,7 @@
 		align-items: center;
 		width: 290rpx;
 		flex-direction: column;
-		
+
 		border-right: 1rpx solid transparent;
 		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 
@@ -599,14 +53,23 @@
 		}
 
 		.title-time-font-rel {
-			font-size: 23rpx;
-			margin-bottom: 5rpx;
+			font-size: 32rpx;
+			font-weight: 600;
+			/* margin-bottom: 5rpx; */
 			overflow: hidden;
 			text-overflow: ellipsis;
 			white-space: nowrap;
-			color: #888888;
+			color: black;
+		}
+		.title-time-font-tags{
+			font-size: 24rpx;
+			font-weight: 600;
+			/* margin-bottom: 5rpx; */
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			color: #999;
 		}
-
 		.title-time-items {
 			display: flex;
 			justify-content: space-around;
@@ -624,13 +87,13 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		height: 227rpx;
+		height: 234rpx;
 		width: 100%;
 		transition: all 0.8s;
 		border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 		flex-direction: column;
 		position: relative;
-		/* background-color: #fff; */
+
 	}
 }
 
@@ -639,7 +102,7 @@
 	height: 100vh;
 	transition: opacity 1s ease;
 	position: relative;
-	margin-left: -30rpx;
+	margin-left: -50rpx;
 
 	.joystick {
 		position: absolute;
@@ -673,96 +136,13 @@
 		width: 100%;
 		height: 1350rpx;
 		display: flex;
-		margin-top: 80rpx;
+		margin-top: 62rpx;
 
 		.doctorsay-container-container {
 			width: 100%;
 			overflow: hidden;
-
-			.doctorsay-container-title {
-				width: 100%;
-				height: 105rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.doctorsay-container-left {
-					display: flex;
-				}
-			}
-
 		}
 	}
-
-	.right-container-title-nav {
-		/* margin-top: 75rpx; */
-		margin-bottom: 20rpx;
-		/* margin-left: 20rpx; */
-
-		.right-icons {
-			display: flex;
-			align-items: center;
-			float: right;
-			height: 70rpx;
-			margin-right: 40rpx;
-
-			.right-icons-font {
-				margin-left: 10rpx;
-				margin-right: 10rpx;
-				font-size: 35rpx;
-				margin-top: -30rpx;
-			}
-
-			.right-icons-img {
-				width: 80rpx;
-				height: 80rpx;
-				margin-left: 10rpx;
-				margin-right: 10rpx;
-				margin-top: -40rpx;
-
-			}
-
-			.right-icons-img-icon {
-				width: 60rpx;
-				height: 80rpx;
-				margin-top: -10rpx;
-				margin-left: 8rpx;
-			}
-		}
-
-		.right-container-title-class {
-			font-size: 35rpx;
-			font-weight: 800;
-			margin-left: 20rpx;
-		}
-
-		.right-container-title-class-dark {
-			font-size: 35rpx;
-			font-weight: 800;
-			margin-left: 20rpx;
-			background: linear-gradient(to bottom, #FFFFFF, #B2C8E2);
-			-webkit-background-clip: text;
-			color: transparent;
-		}
-	}
-}
-
-.title-time-delete {
-	width: 55rpx;
-	height: 55rpx;
-	border-radius: 50%;
-	display: flex;
-	background-color: #fff;
-	justify-content: center;
-	align-items: center;
-	position: absolute;
-	top: 0rpx;
-	right: 0rpx;
-	z-index: 10;
-	background-color: #02abfe;
-	color: #fff;
-	z-index: 999;
-	font-size: 50rpx;
 }
 
 .title-time-blue {
@@ -799,30 +179,24 @@
 	position: absolute;
 	width: 280rpx;
 	height: 100rpx;
-	/* padding-left: 10rpx; */
 	padding: 0 20rpx;
 	border-radius: 20rpx;
 	border-top-right-radius: 0rpx;
 	border: 2rpx solid #e8e9eb;
-	/* background-color: #55555555; */
 	background-color: #fff;
 	color: #545569;
 	bottom: -100rpx;
 	left: -130rpx;
-	/* color: #fff; */
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	z-index: 999;
-	/* box-shadow: 0 2px 6px #6981b2 ; */
-
 
 }
 
 .time-button-orange {
 	transition: all 1s;
 	position: absolute;
-
 	width: 280rpx;
 	height: 100rpx;
 	border-radius: 20rpx;
@@ -844,13 +218,20 @@
 	display: flex;
 	width: 100%;
 	position: relative;
+	height: 100%;
+	padding: 20rpx;
+	
+	.card-time{
+		position: absolute;
+		bottom: 20rpx;
+		left: 20rpx;
+		font-size: 25rpx;
+	}
 
 	.title-time-time {
 		font-size: 32rpx;
 		margin: 0 auto;
 		font-weight: 600;
-		/* margin-left: 10rpx; */
-		/* margin-top: 12rpx; */
 	}
 
 	.title-time-button {
@@ -861,14 +242,6 @@
 		height: 40rpx;
 	}
 
-	.title-time-zhejiao {
-		position: absolute;
-		top: 0rpx;
-		left: 5rpx;
-		width: 40rpx;
-		height: 40rpx;
-	}
-
 	.title-time-font {
 		position: absolute;
 		top: 0rpx;
@@ -878,450 +251,20 @@
 	}
 }
 
-.popup-say {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	backdrop-filter: blur(1rpx);
-	background-color: rgba(236, 237, 241, 0.4);
-	/* 添加毛玻璃效果 */
-	z-index: 999;
-
-	.popup-say-content {
-		position: absolute;
-		right: 65rpx;
-		bottom: 170rpx;
-		display: flex;
-		flex-direction: column;
-		width: 450rpx;
-		/* height: 800rpx; */
-		background-color: #fff;
-		border: 2rpx solid #fff;
-		border-radius: 30rpx;
-		box-shadow: 10rpx 10rpx 20rpx rgba(0, 0, 0, 0.1);
-		transition: opacity 0.4s ease;
-
-
-
-		.popup-say-content-flex {
-			display: flex;
-			margin-top: 7rpx;
-			margin-bottom: 10rpx;
-
-			.popup-say-content-gun {
-				margin-left: 40rpx;
-				margin-right: 20rpx;
-				width: 13rpx;
-				height: 35rpx;
-				background: linear-gradient(to bottom, #04BCED, #0160CE);
-				border-radius: 10rpx;
-			}
-
-			.popup-say-content-font {
-				font-size: 30rpx;
-				font-weight: 700;
-			}
-		}
-
-
-		.popup-say-three {
-			position: absolute;
-			left: 173rpx;
-			bottom: -39rpx;
-			/* 元素本身不占任何宽高 */
-			width: 0;
-			height: 0;
-
-			/* 左右边框透明，宽度各 50px */
-			border-left: 30rpx solid transparent;
-			border-right: 30rpx solid transparent;
-
-			/* 上边框实色（高度 100px），形成向下的“倒三角” */
-			border-top: 40rpx solid #fff;
-		}
-	}
-}
-
-
-
-.popup-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	/* 添加毛玻璃效果 */
-	z-index: 999;
-
-	.popup-overlay-content {
-		position: absolute;
-		display: flex;
-		// justify-content: center;
-		align-items: center;
-		width: 800rpx;
-
-		background-color: #fff;
-		border-radius: 30rpx;
-		box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
-		opacity: 0;
-		transition: opacity 0.4s ease;
-		overflow: hidden;
-
-		.popup-overlay-content-left {
-			// background-color: red;
-			height: 100%;
-			width: 350rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			flex-direction: column;
-
-			.popup-overlay-content-left-img {
-				width: 280rpx;
-				height: 240rpx;
-				margin-top: 0rpx;
-			}
-
-			.popup-overlay-content-left-font {
-				// margin-top: 20rpx;
-				font-size: 30rpx;
-			}
-		}
-
-		.popup-overlay-content-right {
-			height: 100%;
-			width: 450rpx;
-			position: relative;
-
-			.time-font {
-				font-size: 60rpx;
-				margin-top: 80rpx;
-				margin-bottom: 10rpx;
-				font-weight: 700;
-				background: linear-gradient(to bottom, #7080A1, #263556);
-				-webkit-background-clip: text;
-				color: transparent;
-			}
-
-			.time-text {
-				margin-left: 10rpx;
-				font-size: 32rpx;
-				// font-weight: 700;
-				width: 400rpx;
-				margin-bottom: 50rpx;
-				line-height: 35rpx;
-
-			}
-
-			.right-richang {
-				background-color: #FFC363;
-				position: absolute;
-				top: 108rpx;
-				right: 50rpx;
-				padding: 5rpx;
-				border-radius: 10rpx;
-			}
-
-			.right-richangnot {
-				background-color: #7B61FF;
-				position: absolute;
-				top: 108rpx;
-				right: 50rpx;
-				padding: 5rpx;
-				border-radius: 10rpx;
-				color: #fff;
-			}
-
-			.right-crush {
-				position: absolute;
-				top: 20rpx;
-				right: 20rpx;
-				width: 70rpx;
-				height: 70rpx;
-				animation: shake 0.5s 3;
-			}
-		}
-	}
-}
-
-.ri-img {
-	position: absolute;
-	top: -4rpx;
-	right: -4rpx;
-	width: 60rpx;
-	height: 60rpx;
-}
-
-.time-father {
-	display: flex;
-	width: 100%;
-	flex-wrap: wrap;
-	margin-left: 30rpx;
-	margin-right: 30rpx;
-
-	.time-one {
-		width: 100rpx;
-		height: 100rpx;
-		margin-left: 20rpx;
-		margin-top: 20rpx;
-		background-color: rgb(241, 245, 252);
-		border-radius: 20rpx;
-		border: 1rpx solid rgb(109, 131, 179);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 29rpx;
-		box-shadow: 5rpx 5rpx 10rpx rgba(105, 129, 178, 0.4)
-	}
-
-	.time-one-target {
-		width: 100rpx;
-		height: 100rpx;
-		margin-left: 20rpx;
-		margin-top: 20rpx;
-		background: linear-gradient(to right, #00c9ff, #0076ff);
-		color: #fff;
-		border-radius: 20rpx;
-		border: 1rpx solid #fff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 29rpx;
-		box-shadow: 5rpx 5rpx 10rpx rgba(105, 129, 178, 0.4)
-	}
-
-	.time-one-hui {
-		width: 100rpx;
-		height: 100rpx;
-		margin-left: 20rpx;
-		margin-top: 20rpx;
-		background-color: #c2c9d3;
-		// color: #fff;
-		border-radius: 20rpx;
-		border: 1rpx solid #fff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 29rpx;
-		box-shadow: 5rpx 5rpx 10rpx rgba(105, 129, 178, 0.4)
-	}
-}
-
-.items-card {
-	width: 100%;
-	height: 80rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.items-card-target {
-	width: 100%;
-	height: 80rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	color: rgb(54, 159, 239);
-	background: linear-gradient(to right,
-			rgba(54, 159, 239, 0) 0%,
-			rgba(54, 159, 239, 0.5) 50%,
-			rgba(54, 159, 239, 0) 100%);
-}
-
-.button-father {
-	height: 200rpx;
-	width: calc(100% - 80rpx);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	margin-left: 40rpx;
-	margin-right: 40rpx;
-	margin-top: 20rpx;
-	border-top: 1rpx solid rgb(230, 230, 230);
-
-	.button-father-right {
-		background: linear-gradient(to right, #00c9ff, #0076ff);
-		width: 200rpx;
-		height: 80rpx;
-		border-radius: 40rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		color: #fff;
-
-	}
-
-	.button-father-wrong {
-		background-color: #c2c9d3;
-		width: 200rpx;
-		height: 80rpx;
-		border-radius: 40rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-
-	}
-}
-
-.month-father {
-	display: flex;
-	width: calc(100% - 60rpx);
-	flex-wrap: wrap;
-	margin-left: 30rpx;
-	margin-right: 30rpx;
-	margin-top: 20rpx;
-	margin-bottom: 30rpx;
-
-	.month-one {
-		width: 75rpx;
-		height: 75rpx;
-		margin-left: 20rpx;
-		margin-top: 20rpx;
-		background-color: rgb(241, 245, 252);
-		border-radius: 20rpx;
-		border: 1rpx solid rgb(109, 131, 179);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 29rpx;
-	}
-
-	.month-one-target {
-		width: 75rpx;
-		height: 75rpx;
-		margin-left: 20rpx;
-		margin-top: 20rpx;
-		background: linear-gradient(to right, #00c9ff, #0076ff);
-		color: #fff;
-		border-radius: 20rpx;
-		border: 1rpx solid #fff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 29rpx;
-	}
-}
-
-.week-father {
-	display: flex;
-	width: 100%;
-	flex-wrap: wrap;
-	margin-left: 30rpx;
-	margin-right: 30rpx;
-	margin-top: 20rpx;
-	margin-bottom: 30rpx;
-
-	.week-one {
-		width: 200rpx;
-		height: 100rpx;
-		margin-left: 20rpx;
-		margin-top: 20rpx;
-		background-color: rgb(241, 245, 252);
-		border-radius: 20rpx;
-		border: 1rpx solid rgb(109, 131, 179);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 29rpx;
-	}
-
-	.week-one-target {
-		width: 200rpx;
-		height: 100rpx;
-		margin-left: 20rpx;
-		margin-top: 20rpx;
-		background: linear-gradient(to right, #00c9ff, #0076ff);
-		color: #fff;
-		border-radius: 20rpx;
-		border: 1rpx solid #fff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 29rpx;
-	}
-}
-
-.radio-father {
-	display: flex;
-	width: 100%;
-	flex-wrap: wrap;
-	margin-left: 75rpx;
-	margin-right: 30rpx;
-	/* margin-bottom: 30rpx; */
-
-	.radio-circle {
-		margin-top: 2rpx;
-		width: 30rpx;
-		height: 30rpx;
-		border-radius: 50%;
-		border: 2rpx solid black;
-		background-color: transparent;
-	}
-
-	.radio-circle-target {
-		position: relative;
-		margin-top: 2rpx;
-		width: 30rpx;
-		height: 30rpx;
-		border-radius: 50%;
-		border: 2rpx solid rgb(2, 171, 254);
-		background-color: transparent;
-	}
-
-	.radio-circle-target::after {
-		content: "";
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 20rpx;
-		height: 20rpx;
-		background-color: rgb(2, 171, 254);
-		border-radius: 50%;
-	}
-
-	.radio-font {
-		margin-left: 15rpx;
-		margin-right: 60rpx;
-		font-size: 29rpx;
-	}
-
-	.radio-font-target {
-		color: rgb(2, 171, 254);
-		;
-		margin-left: 15rpx;
-		margin-right: 60rpx;
-		font-size: 29rpx;
-	}
-}
-
 .title-time-border {
 	margin-top: 4rpx;
 	margin-left: 4rpx;
-	// border: 1rpx solid black;
 	width: calc(100% - 8rpx);
 	height: calc(100% - 8rpx);
 	border-radius: 20rpx;
 	display: flex;
-	// justify-content: center;
 	align-items: center;
 	flex-direction: column;
-	
 }
 
-
 .title-time-border-big {
 	transform: scale(1.3);
 	transform-origin: top;
-	/* 将页面内容放大1.2倍 */
 	border-top: 0rpx solid #fff;
 	transition: transform 0.5s ease-out, opacity 0.5s ease-out;
 	z-index: 999;
@@ -1338,7 +281,6 @@
 .title-time-border-big-top {
 	transform: scale(1.3);
 	transform-origin: top;
-	/* 将页面内容放大1.2倍 */
 	border-top: 0rpx solid #fff;
 	transition: transform 0.5s ease-out, opacity 0.5s ease-out;
 	z-index: 999;
@@ -1354,22 +296,52 @@
 
 .title-time-border-yellow {
 	margin: 10rpx;
-	border: 2rpx solid transparent;
-	/* background: linear-gradient(to bottom, #fff1db, #ffe2b2); */
+	border: 2rpx solid #e5e6e6;
 	width: calc(100% - 40rpx);
 	height: calc(100% - 40rpx);
 	border-radius: 20rpx;
 	display: flex;
 	align-items: center;
-	background-color: rgba(255, 255, 255, 0.5);
+	background-color: #f2f3f8;
+	flex-direction: column;
+	
+}
+.title-time-border-hisOk{
+	margin: 10rpx;
+	border: 2rpx solid #D4E4FE;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	background-color: #F6F9FF;
+	flex-direction: column;
+}
+.title-time-border-current{
+	margin: 10rpx;
+	border: 2rpx dashed #4690FF;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	background-color: #F6F9FF;
+	flex-direction: column;
+}
+.title-time-border-hisFaild{
+	margin: 10rpx;
+	border: 2rpx dashed #FFE2E2;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	background-color: #FFF8F8;
 	flex-direction: column;
-	/* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */
 }
 
 .title-time-border-yellow-active-transparent {
 	margin: 10rpx;
-	/* border: 4rpx dashed rgb(255, 138, 0); */
-	/* background: linear-gradient(to bottom, #fff1db, #ffe2b2); */
 	width: calc(100% - 40rpx);
 	height: calc(100% - 40rpx);
 	border-radius: 20rpx;
@@ -1378,13 +350,11 @@
 	flex-direction: column;
 	opacity: 0.3;
 	background-color: rgba(255, 255, 255, 0.5);
-	/* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */
 }
 
 .title-time-border-yellow-active {
 	margin: 10rpx;
 	border: 1rpx solid #dae8fa;
-	/* background: linear-gradient(to bottom, #fff1db, #ffe2b2); */
 	width: calc(100% - 40rpx);
 	height: calc(100% - 40rpx);
 	border-radius: 20rpx;
@@ -1395,84 +365,6 @@
 	background-color: rgba(255, 255, 255, 0.5);
 }
 
-.down-icons {
-	margin-top: 17rpx;
-	width: 100%;
-	height: 60rpx;
-	background-color: rgb(255, 216, 126);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	.icon {
-		margin: 0 5rpx;
-		font-size: 20rpx;
-		padding: 5rpx 10rpx;
-		background-color: rgb(255, 138, 0);
-		color: #fff;
-		border-radius: 5rpx;
-	}
-}
-
-.super-end-items-img-father {
-	/* width: 60rpx; */
-	/* height: 60rpx; */
-	border-radius: 50%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	text-align: center;
-	flex-direction: column;
-}
-
-.super-end-items-img-father-active {
-	text-align: center;
-	/* height: 60rpx; */
-	border-radius: 50%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-	animation: shake 0.5s infinite;
-}
-
-@keyframes shake {
-	0% {
-		transform: rotate(-10deg);
-	}
-
-	25% {
-		transform: rotate(10deg);
-	}
-
-	50% {
-		transform: rotate(-10deg);
-	}
-
-	75% {
-		transform: rotate(10deg);
-	}
-
-	100% {
-		transform: rotate(-10deg);
-	}
-}
-
-.super-end-items-father-close-father {
-	width: 40rpx;
-	height: 40rpx;
-	border-radius: 50%;
-	display: flex;
-	background-color: #0184db;
-	justify-content: center;
-	align-items: center;
-	position: absolute;
-	top: 0rpx;
-	right: 0rpx;
-	z-index: 10;
-	color: #fff;
-}
-
 @keyframes shakesmall {
 	0% {
 		transform: rotate(-2deg);
@@ -1495,38 +387,26 @@
 	}
 }
 
-
-
 .boom-father {
 	position: absolute;
-	top: 130rpx;
+	top: 110rpx;
 	left: -17rpx;
 	width: 60rpx;
-	height: 1130rpx;
+	height: 1170rpx;
 	margin-top: 0rpx;
 	overflow: hidden;
 	z-index: 999;
 }
 
-.doctorsay-container-card-font-dark {
-	font-size: 31rpx;
-	color: rgb(54, 159, 239);
-	/* margin-left: 25rpx; */
-	/* margin-top: 20rpx; */
-}
-
 .boom {
 	height: 3000rpx;
 	display: flex;
 	flex-direction: column;
-	/* // justify-content: center; */
-	/* align-items: center; */
 	overflow: hidden;
 	z-index: 0;
 
-
 	.boom-son {
-		height: 226rpx;
+		height: 234rpx;
 		width: 60rpx;
 		font-size: 30rpx;
 		display: flex;
@@ -1534,28 +414,20 @@
 		align-items: center;
 		text-align: center;
 		z-index: 10;
-		font-size: 25rpx;
+		font-size: 22rpx;
 		color: #A9ACB1;
 
 		.boom-text {
-			/* padding: 5rpx; */
-			width: 40rpx;
-			height: 40rpx;
-			border: 1rpx solid #A9ACB1;
-			border-radius: 50%;
+			width: 30rpx;
+			height: 50rpx;
+			border: 2rpx dashed #A9ACB1;
+			border-radius: 20rpx;
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			z-index: 1;
 			background-color: #eff0f4;
 		}
-
-		/* border: 1rpx solid #A9ACB1;
-		border-radius: 50%; */
-		/* font-weight: 700; */
-		/* border-top: 1rpx solid transparent; */
-		/* border-right: 1rpx solid transparent; */
-		/* border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1; */
 	}
 
 	.boom-son-target {
@@ -1570,487 +442,94 @@
 		font-weight: 700;
 		font-size: 25rpx;
 		color: #A9ACB1;
-
-		/* border-top: 1rpx solid transparent;
-		border-bottom: 1rpx solid transparent; */
-		/* border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1; */
-		/* 确保文字在容器内居中 */
 		background: linear-gradient(to bottom, #ff8a00, #eceaff);
-		/* border-bottom-right-radius: 40rpx;
-			border-top-right-radius: 40rpx; */
 	}
 }
 
-.popup-share {
-	position: fixed;
+
+.left-top {
+	border-top-left-radius: 0 !important;
+}
+
+.right-top {
+	border-top-right-radius: 0 !important;
+}
+
+.left-bottom {
+	border-bottom-left-radius: 0 !important
+}
+
+.right-bottom {
+	border-bottom-right-radius: 0 !important;
+}
+
+.xian-bian {
+	height: 100%;
+	position: absolute;
 	top: 0;
 	left: 0;
-	right: 0;
-	bottom: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	backdrop-filter: blur(1rpx);
-	background-color: rgba(236, 237, 241, 0.4);
-	/* 添加毛玻璃效果 */
 	z-index: 999;
-
-
-	.share-other {
-		z-index: 1;
-		width: 100%;
-		height: 100%;
-	}
-
-	.share-title {
-		padding-left: 50rpx;
-		height: 150rpx;
-		display: flex;
-		align-items: center;
-	}
-
-	.share-others {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		flex-direction: column;
-
-		.other-img {
-			width: 150rpx;
-			height: 150rpx;
-			margin-left: 100rpx;
-		}
-	}
-
-	.popup-share-content {
-		position: absolute;
-		display: flex;
-		flex-direction: column;
-		width: 800rpx;
-		height: 450rpx;
-		background-color: #fff;
-		border-radius: 30rpx;
-		transition: opacity 0.4s ease;
-
-		.popup-share-title {
-			margin: 30rpx 30rpx;
-			font-size: 40rpx;
-			position: relative;
-
-			.popup-share-img {
-				position: absolute;
-				top: 0;
-				right: 0;
-				width: 200rpx;
-				height: 200rpx;
-			}
-		}
-
-		.popup-share-upcontent {
-			margin: 0 30rpx;
-			display: flex;
-			justify-content: space-between;
-
-			.popup-share-font {
-				font-size: 35rpx;
-				color: gray;
-			}
-
-		}
-
-		.popup-share-gray {
-			background-color: #D3D3D3;
-			width: calc(100% - 60rpx);
-			height: 2rpx;
-			margin: 110rpx 30rpx 0 30rpx;
-		}
-
-		.popup-share-downcontent {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			height: 100%;
-			margin: 0 30rpx;
-
-			.popup-downcontent-img {
-				width: 70rpx;
-				height: 70rpx;
-			}
-
-			.popup-downcontent-font {
-				font-size: 27rpx;
-				margin-left: 20rpx;
-			}
-
-			.popup-share-downcontent-left {
-				display: flex;
-				align-items: center;
-			}
-
-			.popup-share-downcontent-button {
-				background: linear-gradient(to right bottom, #00c9ff, #0076ff);
-				color: #fff;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				padding: 15rpx 30rpx;
-				border-radius: 20rpx;
-				font-size: 32rpx;
-			}
-		}
-
-	}
-
+	border-right: 1rpx solid transparent;
+	border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 }
 
-.tags-father {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	/* margin-left: 23rpx; */
-	margin: 10rpx 14rpx;
-	margin-left: 30rpx;
-	/* margin-top: 15rpx; */
-	align-items: center;
-	width: 100rpx;
-	height: 110rpx;
-
-
-	.tags-font {
-		font-size: 25rpx;
-	}
-}
-
-.tags-img {
-	width: 50rpx;
-	height: 50rpx;
-	margin-bottom: 10rpx;
-}
-
-.specia-onshow {
-	background-color: rgb(241, 245, 252);
+.pulic-time {
 	width: 100%;
 	height: 100%;
-	padding: 20rpx;
-
-	.specia-title {
-		width: 100%;
-		height: 100rpx;
-		font-size: 40rpx;
-		font-weight: 600;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.specia-cards {
-		width: 100%;
-		display: flex;
-		flex-wrap: wrap;
-	}
-}
-
-/* 容器默认隐藏，透明度为 0，不接受点击 */
-.neuro-wrapper {
-	position: fixed;
-	inset: 0;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	z-index: 999;
-	opacity: 0;
-	pointer-events: none;
-	transition: opacity 0.3s ease;
-}
-
-/* 显示时透明度过渡到 1，可接受点击 */
-.neuro-wrapper.is-active {
-	opacity: 1;
-	pointer-events: auto;
-}
-
-/* 遮罩层，半透明黑色 */
-.neuro-mask {
-	position: absolute;
-	inset: 0;
-	background-color: rgba(0, 0, 0, 0.3);
-}
-
-/* 拟态框 固定尺寸 + 阴影样式 + 相对定位于 wrapper */
-.neuro-box {
-	position: relative;
-	width: 600rpx;
-	height: 450rpx;
-	border-radius: 30rpx;
-	background-color: #fff;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	z-index: 1;
-	padding: 0 5%;
-}
-
-.button {
-	width: 47%;
-	background-color: #ddf0ff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	color: #007CFF;
-	border: 1rpx solid #007CFF;
-	font-size: 25rpx;
-	border-radius: 30rpx;
-}
-
-.title {
-	margin-top: 70rpx;
-	font-size: 33rpx;
+	color: #99C9FD;
+	font-size: 35rpx;
 	font-weight: 600;
 }
 
-.card-font {
-	margin-top: 70rpx;
-	width: 600rpx;
-	justify-content: center;
-	display: flex;
-}
-
-.button-white {
-	width: 47%;
-	border: 2rpx solid #c3cacd;
-	background: linear-gradient(to bottom, #f3f3f5, #dee4e9);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 25rpx;
+.right-order{
+	position: fixed;
+	right: 20rpx;
+	top: 62rpx;
+	height: 1220rpx;
+	width: 430rpx;
+	background-color: #fff;
 	border-radius: 30rpx;
-}
-
-.delete-button-father {
-	position: absolute;
-	bottom: 60rpx;
-	left: 50%;
-	transform: translateX(-50%);
-	width: 100%;
-	height: 70rpx;
-	display: flex;
-	justify-content: space-between;
-	padding: 0 50rpx;
-}
-
-	.right-container-title-nav {
-		margin-top: 60rpx;
-		display: flex;
-		align-items: center;
-		height: 60rpx;
-		position: relative;
-		font-size: 28rpx;
-
-		.new-weight {
-			margin-left: 30rpx;
-			font-weight: 600;
-		}
-
-		.right-icons {
-			position: absolute;
-			right: 0;
-			top: 0;
-			display: flex;
-			align-items: center;
-			margin-top: -5rpx;
-		}
-	}
-
-	.white-button {
-		width: 160rpx;
-		height: 70rpx;
-		border-radius: 40rpx;
-		background-color: #E6E7EB;
-		margin-left: 20rpx;
-		margin-top: 10rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-
-		.white-img {
-			width: 35rpx;
-			height: 35rpx;
-			margin-right: 10rpx;
-		}
-	}
-
-	.left-top {
-		border-top-left-radius: 0 !important;
-	}
-
-	.right-top {
-		border-top-right-radius: 0 !important;
-	}
-
-	.left-bottom {
-		border-bottom-left-radius: 0 !important
-	}
-
-	.right-bottom {
-		border-bottom-right-radius: 0 !important;
-	}
-
-	.mark {
-		font-size: 29rpx;
-		position: relative;
-	}
-
-	.marknone {
-		font-size: 29rpx;
-		color: #999;
-		display: flex;
-		margin-top: 5rpx;
-	}
-
-	.tri-down {
-		width: 0;
-		height: 0;
-		border-left: 10rpx solid transparent;
-		/* s/2 */
-		border-right: 10rpx solid transparent;
-		/* s/2 */
-		border-top: 17.32rpx solid #999;
-		/* 0.866 * s */
-		margin: 0rpx 0rpx 0 15rpx;
-		position: relative;
-	}
-
-	.mark-bgc {
-		position: absolute;
-		top: 20rpx;
-		right: 0;
-		width: 450rpx;
-		background-color: #fff;
-		z-index: 999;
-		border-radius: 30rpx;
-		padding-bottom: 30rpx;
-		transition: opacity 0.3s ease;
-	}
-
-	.blue-button {
-		margin-top: 60rpx;
-		width: 150rpx;
-		height: 70rpx;
-		border-radius: 40rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		color: #007CFF;
-		font-size: 30rpx;
-		background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
-		border: 2rpx solid #9AD1FF;
-	}
-
-	.firsttarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 50rpx;
-		--outline-offset: 10rpx;
-		/* 外扩多少 */
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 999;
-	}
-
-	.secondtarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 10rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 999;
-	}
-
-	.xian-bian {
-		height: 100%;
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		border-right: 1rpx solid transparent;
-		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
-	}
-
-	.pulic-time {
+	.order-title{
 		width: 100%;
-		height: 100%;
+		height: 100rpx;
 		display: flex;
-		justify-content: center;
 		align-items: center;
-		color: #99C9FD;
-		font-size: 35rpx;
-		font-weight: 600;
-	}
-
-	.zhiling-card {
-		width: calc(100% - 20rpx);
-		height: 200rpx;
-		background-color: rgba(255, 255, 255, 0.3);
-		margin-left: 20rpx;
-		border-radius: 30rpx;
-		border: 2rpx solid rgb(229, 233, 249);
-		position: relative;
-		margin-bottom: 10rpx;
-		padding: 20rpx 30rpx;
-		overflow: hidden;
-
-		.zhiling-card-button {
-			position: absolute;
-			top: 0rpx;
-			right: 0rpx;
-			width: 120rpx;
-			height: 50rpx;
+		.order-month{
+			margin-left: 30rpx;
+			font-size: 30rpx;
+			font-weight: 600;
+			width: 80rpx;
 		}
-
-		.zhiling-card-font {
-			position: absolute;
-			top: 5rpx;
-			right: 20rpx;
-			/* width: 100rpx; */
-			/* height: 40rpx; */
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #1083f8;
-			font-size: 22rpx;
-		}
-
-		.bag {
-			display: flex;
-			flex-wrap: wrap;
-			margin-top: 20rpx;
-
-			.bag-one {
-				// margin-right: 10rpx;
+		.order-day{
+			width: 300rpx;
+			height: 100rpx;
+			.days-father{
+				display: flex;
+				align-items: center;
+				.days{
+					height: 100rpx;
+					min-width: 50rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 26rpx;
+					color: #BBBABA;
+				}
+				.targetdays{
+					height: 50rpx;
+					min-width: 50rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 26rpx;
+					color: #fff;
+					border-radius: 50%;
+					background-color: #4690FF;
+				}
 			}
 		}
 	}
-
-	.overlay {
-		position: fixed;
-		inset: 0;
-		background-color: rgba(236, 237, 241, 0.4);
-		/* 半透明黑色 */
-		z-index: 999;
-	}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index c97e3b0..d96a4de 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -1,17 +1,16 @@
 <!-- 护嘱 -->
 <template>
-	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}"
-		@click="bottomisShaking=false;shakyTable = false">
+	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}">
 		<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">
+								<view v-for="(item,index) in timeArray" :key="index">
+									<view class="boom-son">
 										<text class="boom-text">
-											{{item.tagName}}
+											{{item}}
 										</text>
 
 									</view>
@@ -21,8 +20,8 @@
 					</view>
 
 					<view class="super-card-container">
-						<scroll-view style="width: 100%;" scroll-with-animation
-							:scroll-left="cardLeft" scroll-x @scroll="handleTop" :show-scrollbar="false">
+						<scroll-view style="width: 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" class="super-card-right">
 									<view class="super-card-time">
@@ -30,12 +29,12 @@
 									</view>
 								</view>
 							</view>
-							<view style="display: flex;height: 1130rpx;position: relative;">
+							<view style="display: flex;height: 1165rpx;position: relative;">
 
 								<view class="xian-bian"></view>
-								<scroll-view style="height: 100%;width:6960rpx;background-color: #fff;" :scroll-top="scrollTop"
-									scroll-with-animation :scroll-y="true" @scroll="handleScrolltime"
-									:show-scrollbar="false">
+								<scroll-view style="height: 100%;width:6960rpx;background-color: #fff;"
+									: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">
@@ -47,7 +46,7 @@
 														:id="`a${index0}_${index1}`" style="position: relative;"
 														@click="rulerTouchClick(item1,index0,index1)"
 														:data-index0="index0" :data-index1="index1">
-														<view class="time-button-orange-spe"
+														<!-- <view class="time-button-orange-spe"
 															:style="{left:flyNumber.index0?`-130rpx`:`0`}"
 															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1==0">
 															请选择服务指令迁移的目标单元格
@@ -58,7 +57,7 @@
 															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1">
 															请选择服务指令迁移的目标单元格
 
-														</view>
+														</view> -->
 														<view class="title-time-blue"
 															v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
 														</view>
@@ -68,9 +67,25 @@
 															: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"
+																<view v-if="item1.startTime"
+																	class="title-time-font-rel">
+																	{{ item1.directiveName?splitString(item1.directiveName)[0]:""}}
+																</view>
+																<view
+																	v-if="item1.startTime&&splitString(item1.directiveName)[1]"
+																	class="title-time-font-tags">
+																	({{ item1.directiveName?splitString(item1.directiveName)[1]:""}})
+																</view>
+																<view v-if="item1.startTime" class="card-time" >
+																	{{ `${parseHourMinutestring(item1.startTime).hour}:${parseHourMinutestring(item1.startTime).minute}-${parseHourMinutestring(item1.endTime).hour}:${parseHourMinutestring(item1.endTime).minute}`  }}
+																</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> -->
+																<!-- <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;">
@@ -84,16 +99,16 @@
 																	style="right: 10rpx;top: 5rpx;"
 																	v-if="item1.cycleTypeId!=1">
 																	{{item1.cycleType}}
-																</view>
+																</view> -->
 															</view>
-															<view v-if="item1.startTime" class="title-time-font-rel">
-																{{splitString(item1.directiveName)[0]}}
+															<!-- <view v-if="item1.startTime" class="title-time-font-rel">
+																{{ item1.directiveName?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>
@@ -104,352 +119,22 @@
 							</view>
 						</scroll-view>
 					</view>
-					<!-- <view class="right-cards">
-						<view style="margin-top: 20rpx;margin-left: 30rpx;">
-							<view class="">
-								即时指令
+					<view class="right-order">
+						<view class="order-title">
+							<view class="order-month">
+								{{ selectdata.month }}月
 							</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>
+							<scroll-view class="order-day" scroll-with-animation :scroll-x="true"
+								:scroll-left="movetime">
+								<view class="days-father">
+									<view :class="daytarget===index? `targetdays` :`days`"
+										v-for="(item,index) in daysarray" :key="index" @click="clickday(item,index)">
+										{{ item }}
 									</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>
@@ -459,7 +144,7 @@
 <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 { getNclist, addBatch, addDirective, addInstant, deleteDirective, deleteInstant, editDirective, getDirectiveOrders } from "./api.js";
 	import { myArray } from './yaoshandiao.js';
 
 	const props = defineProps({
@@ -473,19 +158,13 @@
 		(newVal, oldVal) => {
 			// 只有当新旧值不相同时才执行
 			if (newVal !== oldVal) {
-				bottomisShaking.value = false
-				shakyTable.value = false
-				if (solveWatch.value) {
-					solveWatch.value--
-				} else {
-					scrollTop.value = 0.001
+				scrollTop.value = 0.001
+
+				nextTick(() => {
+					scrollTop.value = 0
+					timeNowMove()
+				})
 
-					nextTick(() => {
-						scrollTop.value = 0
-						timeNowMove()
-					})
-				}
-				upmenuIndex.value = 0
 			}
 		}
 	)
@@ -504,9 +183,74 @@
 	const bodydonghua = ref(false)
 	const openbody = ref(false)
 	const openface = ref(false)
-	
+
 	const hournow = ref(new Date().getHours());
-	
+
+	// 获得现在的年月日
+	const dateref = ref(getTodayObj())
+	function getTodayObj() {
+		const d = new Date()
+
+		const month = String(d.getMonth() + 1).padStart(2, '0')
+		const day = String(d.getDate()).padStart(2, '0')
+
+		return {
+			year: d.getFullYear(),
+			month,
+			day
+		}
+	}
+	const selectdata = ref({
+		year: 0,
+		month: "",
+		day: ""
+	})
+
+	const daysarray = ref([]);
+	const movetime = ref(0)
+
+	function generateDayArray() {
+		const selY = Number(selectdata.value.year)
+		const selM = Number(selectdata.value.month)
+
+		// 校验：年/月 必须是有效数字且月在1-12之间
+		if (!Number.isFinite(selY) || !Number.isFinite(selM) || selM < 1 || selM > 12) {
+			return []
+		}
+
+		const todayY = Number(dateref.value.year)
+		const todayM = Number(dateref.value.month) // dateref.month 可能是字符串 "01"
+		const todayD = Number(dateref.value.day)
+
+		let endDay = 0
+		if (selY === todayY && selM === todayM) {
+			// 同年同月：到今天为止
+			endDay = todayD;
+		} else {
+			// 不同：计算该月总天数。注意 new Date(year, month, 0).getDate()
+			// 这里 month 要传 1-12（这个构造会返回该月最后一天）
+			endDay = new Date(selY, selM, 0).getDate()
+		}
+		daysarray.value = Array.from({ length: endDay }, (_, i) => String(i + 1).padStart(2, '0'))
+		// console.log("看看生成的咋样", daysarray.value)
+		if (selY === todayY && selM === todayM) {
+			movetime.value = 9998;
+			daytarget.value = daysarray.value.length - 1
+
+		} else {
+			movetime.value = 0.001;
+			daytarget.value = 0
+			setTimeout(() => {
+				movetime.value = 0;
+			}, 50)
+		}
+		// 生成字符串数组 ["01","02",...]
+
+	}
+	const daytarget = ref(0)
+	const clickday = (item : string, index : number) => {
+		daytarget.value = index
+	}
 	watch(
 		() => openbody.value,
 		() => {
@@ -525,56 +269,6 @@
 		}
 	)
 
-	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);
 
@@ -637,227 +331,14 @@
 	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) {
@@ -901,13 +382,28 @@
 	// 方法：根据条件返回不同的类名
 	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';
+			switch (item.executeStatus) {
+				case 'hisOk':
+					return 'title-time-border-hisOk';
+
+				case 'hisFaild':
+					return 'title-time-border-hisFaild';
+
+				case 'current':
+					return 'title-time-border-current';
+				
+				case 'future':
+					return 'title-time-border-yellow';
+
 			}
+
+			// 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';
 	}
@@ -920,67 +416,7 @@
 			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);
@@ -988,40 +424,11 @@
 	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)
@@ -1031,39 +438,11 @@
 	const flyNumber = ref({
 		index0: 999,
 		index1: 999,
-		tagName: ''
+		// 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])
@@ -1073,427 +452,18 @@
 		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,
@@ -1505,7 +475,7 @@
 		current: -1,
 		bordershow: true
 	})
-	const solveWatch = ref(0)
+
 	const whereEvent = (data : any) => {
 		saveEditIndex.value.index0 = data.index0;
 		saveEditIndex.value.index1 = data.index1;
@@ -1532,47 +502,89 @@
 		Array.from({ length: 24 }, (_, hour) => ({
 			positioning: hour.toString(),
 			children: minuteArr.map(time => ({
-				tagName: time,           // 表示分钟，如 '00', '05' 等
+				// tagName: time,           // 表示分钟，如 '00', '05' 等
 				directiveName: '' // 默认的 directiveName
 			}))
 		}))
 	)
-	const emotionTagList = ref([]);
-	const bodyTagList = ref([]);
+
 	const geteverything = () => {
+		console.log("看一下", uni.getStorageSync('nuId'), uni.getStorageSync('elderId'))
 		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)
-					}
-				})
-			})
+			getTable()
+			// 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;
+			// 	console.log("res",res)
+			// })
 		}
 	}
+	// 处理分钟和小时的函数
+	function parseHourMinutestring(startTime) {
+		// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
+		const parts = startTime.split(' ');
+		if (parts.length < 2) return { hour: NaN, minute: NaN };
+
+		const [hh, mm] = parts[1].split(':');
+		return { hour: hh, minute: mm };
+	}
+	// 处理分钟和小时的函数(number)
+	function parseHourMinute(startTime) {
+		// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
+		const parts = startTime.split(' ');
+		if (parts.length < 2) return { hour: NaN, minute: NaN };
+
+		const [hh, mm] = parts[1].split(':');
+		return { hour: Number(hh), minute: Number(mm) };
+	}
+	const getTable = () => {
+		let time = `${selectdata.value.year}-${selectdata.value.month}-${selectdata.value.day}`
+		getDirectiveOrders(time).then((data) => {
+			// console.log("data",data.result.all)
+			timearr.value = Array.from({ length: 24 }, (_, hour) => ({
+				positioning: hour.toString(),
+				children: minuteArr.map(time => ({
+					// tagName: time,           // 表示分钟，如 '00', '05' 等
+					directiveName: '' // 默认的 directiveName
+				}))
+			}))
+			data.result.all.forEach((element : any) => {
+				element.positioning = parseHourMinute(element.startTime).hour;
+				element.positioningLong = parseHourMinute(element.startTime).minute / 5;
+				timearr.value[element.positioning].children[element.positioningLong] = element;
+				// console.log("element",element.positioning,element.positioningLong)
+			})
+			console.log("啥啊", timearr.value)
+			// setTimeout(()=>{
+			// 	data.result.all.forEach((element : any) => {
+			// 		element.positioning = parseHourMinute(element.startTime).hour;
+			// 		element.positioningLong = parseHourMinute(element.startTime).minute / 5 ;
+			// 		timearr.value[element.positioning].children[element.positioningLong] = element;
+			// 		console.log("element",element.positioning,element.positioningLong)
+			// 	})
+			// 	console.log("啥啊",timearr.value)
+			// },1000)
+
+
+			// res.result.serviceList.forEach((res : any) => {
+			// 	timearr.value[res.positioning].children[res.positioningLong] = res;
+			// })
+		})
+	}
 	const savePackagelist = ref([]);
 	onMounted(() => {
+		selectdata.value = dateref.value;
+		generateDayArray()
 		savePackagelist.value = uni.getStorageSync('Packagelist') || []
 		let res = uni.getStorageSync('saveTree0')
 		let goodArray = []
@@ -1586,29 +598,6 @@
 		})
 		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
@@ -1634,7 +623,7 @@
 
 	})
 	function findback(data : any) {
-		solveWatch.value = 3;
+		// solveWatch.value = 3;
 		whereEvent(data)
 	}
 	// 切割bigArray
@@ -1669,18 +658,18 @@
 	const totalColumns = 24; // 总列数
 	const totalRows = 11;    // 总行数
 	const visibleWidth = 1455;  // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220
-	const visibleHeight = 1130; // 可视区域高度 (rpx)，假设显示约5行时 heightType = 102.5
+	const visibleHeight = 1170; // 可视区域高度 (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) * 290;
-			const cellCenterY = (saveEditIndex.value.index1 + 0.5 ) * 227;
+			const cellCenterY = (saveEditIndex.value.index1 + 0.5) * 234;
 			// 计算 scrollLeft 和 scrollTop，使格子中心位于可视区域中心
 			cardLeft.value = cellCenterX - visibleWidth / 2;
 			scrollTop.value = cellCenterY - visibleHeight / 2;
 			// 计算网格总宽高
 			const totalWidth = totalColumns * 290;
-			const totalHeight = totalRows * 227;
+			const totalHeight = totalRows * 234;
 			// 限制 scrollLeft 和 scrollTop 在有效范围内
 			cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2 + 0.7;
 			// scrollTop.value =  0

From c64ff8db7bd5de4e89ef3d303da7bcfa5d00d264 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Fri, 9 Jan 2026 16:23:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/index.vue          |   12 +-
 pages/NursingNew/component/nurse/bigindex.css |  549 +++++
 pages/NursingNew/component/nurse/bigindex.vue |  619 ++++++
 .../component/nurse/index - 副本.vue          | 1816 ----------------
 pages/NursingNew/component/nurse/index.css    | 1835 +++++++++++++++--
 pages/NursingNew/component/nurse/index.vue    | 1583 +++++++++++---
 pages/NursingNew/index.vue                    |   24 +-
 7 files changed, 4215 insertions(+), 2223 deletions(-)
 create mode 100644 pages/NursingNew/component/nurse/bigindex.css
 create mode 100644 pages/NursingNew/component/nurse/bigindex.vue
 delete mode 100644 pages/NursingNew/component/nurse/index - 副本.vue

diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index ef907ec..e29c678 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -724,7 +724,7 @@
 	const openleft = ref(false)
 
 	const menutarget = ref(0)
-	const emit = defineEmits(['swip'])
+	const emit = defineEmits(['swip',"gospecial"])
 	const clickmenu = (index : number) => {
 		menutarget.value = index
 		let data = filteredMenu(0)[index]
@@ -985,15 +985,7 @@
 		}))
 	)
 	const nusing = ()=>{
-		uni.setStorage({
-			key: 'myArray',
-			data: timearr.value,
-			success: function () {
-				uni.navigateTo({
-					url: `/pages/timeMatrix/indexnew`
-				})
-			},
-		});
+		emit('gospecial',1)
 	}
 	const jszlshow = ref(false)
 	
diff --git a/pages/NursingNew/component/nurse/bigindex.css b/pages/NursingNew/component/nurse/bigindex.css
new file mode 100644
index 0000000..d340eb3
--- /dev/null
+++ b/pages/NursingNew/component/nurse/bigindex.css
@@ -0,0 +1,549 @@
+.super-card {
+	display: flex;
+	width: 100%;
+
+	.super-card-container {
+		background-blend-mode: screen;
+		isolation: isolate;
+		overflow: hidden;
+		margin-left: 10rpx;
+		width: 1455rpx;
+		border-left: 0;
+		position: relative;
+		border-radius: 30rpx;
+		overflow: hidden;
+		border: 3rpx dashed #dde1e6;
+	}
+
+	.super-card-right {
+		border-right: 1rpx solid transparent;
+		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+	}
+
+	.super-card-time {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		height: 50rpx;
+		width: 289.3rpx;
+		border-bottom: 1rpx solid transparent;
+		border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+		/* font-weight: 700; */
+		z-index: -1;
+		font-size: 25rpx;
+		color: #A9ACB1;
+		background-color: #EDF3FD;
+	}
+
+	.super-card-time-und {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 290rpx;
+		flex-direction: column;
+
+		border-right: 1rpx solid transparent;
+		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+
+		.title-time-img {
+			width: 65rpx;
+			height: 65rpx;
+			margin-top: -5rpx;
+		}
+
+		.title-time-font-rel {
+			font-size: 32rpx;
+			font-weight: 600;
+			/* margin-bottom: 5rpx; */
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			color: black;
+		}
+		.title-time-font-tags{
+			font-size: 24rpx;
+			font-weight: 600;
+			/* margin-bottom: 5rpx; */
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			color: #999;
+		}
+		.title-time-items {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+
+			.right-box-items-button {
+				width: 35rpx;
+				height: 35rpx;
+				margin: 0 5rpx;
+			}
+		}
+	}
+
+	.super-card-time-card {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 234rpx;
+		width: 100%;
+		transition: all 0.8s;
+		border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+		flex-direction: column;
+		position: relative;
+
+	}
+}
+
+.right-container {
+	width: calc(100% - 260rpx);
+	height: 100vh;
+	transition: opacity 1s ease;
+	position: relative;
+	margin-left: -50rpx;
+
+	.joystick {
+		position: absolute;
+		bottom: 200rpx;
+		left: 20rpx;
+		width: 300rpx;
+		height: 300rpx;
+		z-index: 9999;
+	}
+
+	.outer-circle {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		background-color: rgba(127, 127, 127, 0.1);
+		position: relative;
+	}
+
+	.inner-circle {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 50%;
+		background-color: rgba(127, 127, 127, 0.3);
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.doctorsay-container-view {
+		width: 100%;
+		height: 1350rpx;
+		display: flex;
+		margin-top: 62rpx;
+
+		.doctorsay-container-container {
+			width: 100%;
+			overflow: hidden;
+		}
+	}
+}
+
+.title-time-blue {
+	/* 你的定位与尺寸保持不变 */
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	width: 90%;
+	height: 88%;
+	z-index: 10;
+
+	--color: #99C9FD;
+	--thick: 2px;
+	--radius: 16px;
+
+	border: var(--thick) dashed var(--color);
+	border-radius: var(--radius);
+
+	background:
+		/* 上边 */
+		repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / 100% var(--thick) no-repeat,
+		/* 下边 */
+		repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) bottom left / 100% var(--thick) no-repeat,
+		/* 左边 */
+		repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / var(--thick) 100% no-repeat,
+		/* 右边 */
+		repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top right / var(--thick) 100% no-repeat;
+}
+
+
+.time-button-orange-spe {
+	transition: all 1s;
+	position: absolute;
+	width: 280rpx;
+	height: 100rpx;
+	padding: 0 20rpx;
+	border-radius: 20rpx;
+	border-top-right-radius: 0rpx;
+	border: 2rpx solid #e8e9eb;
+	background-color: #fff;
+	color: #545569;
+	bottom: -100rpx;
+	left: -130rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	z-index: 999;
+
+}
+
+.time-button-orange {
+	transition: all 1s;
+	position: absolute;
+	width: 280rpx;
+	height: 100rpx;
+	border-radius: 20rpx;
+	padding: 0 20rpx;
+	border: 2rpx solid #e8e9eb;
+	border-bottom-right-radius: 0rpx;
+	background-color: #fff;
+	top: -90rpx;
+	left: -130rpx;
+	color: #545569;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	z-index: 999;
+
+}
+
+.title-time {
+	display: flex;
+	width: 100%;
+	position: relative;
+	height: 100%;
+	padding: 20rpx;
+	
+	.card-time{
+		position: absolute;
+		bottom: 20rpx;
+		left: 20rpx;
+		font-size: 27rpx;
+	}
+	.card-time-red{
+		position: absolute;
+		bottom: 20rpx;
+		left: 20rpx;
+		font-size: 27rpx;
+		color: #E33B3B;
+	}
+	.card-time-blue{
+		position: absolute;
+		bottom: 20rpx;
+		left: 20rpx;
+		font-size: 27rpx;
+		color: #4690FF;
+	}
+
+	.title-time-time {
+		font-size: 32rpx;
+		margin: 0 auto;
+		font-weight: 600;
+	}
+
+	.title-time-button {
+		position: absolute;
+		top: -6rpx;
+		right: -4rpx;
+		width: 55rpx;
+		height: 40rpx;
+	}
+
+	.title-time-font {
+		position: absolute;
+		top: 0rpx;
+		right: 4rpx;
+		font-size: 20rpx;
+		color: #1083f8;
+	}
+}
+
+.title-time-border {
+	margin-top: 4rpx;
+	margin-left: 4rpx;
+	width: calc(100% - 8rpx);
+	height: calc(100% - 8rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+}
+
+.title-time-border-big {
+	transform: scale(1.3);
+	transform-origin: top;
+	border-top: 0rpx solid #fff;
+	transition: transform 0.5s ease-out, opacity 0.5s ease-out;
+	z-index: 999;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 226rpx;
+	width: 100%;
+	border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
+	flex-direction: column;
+	position: relative;
+}
+
+.title-time-border-big-top {
+	transform: scale(1.3);
+	transform-origin: top;
+	border-top: 0rpx solid #fff;
+	transition: transform 0.5s ease-out, opacity 0.5s ease-out;
+	z-index: 999;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 226rpx;
+	width: 100%;
+	border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
+	flex-direction: column;
+	position: relative;
+}
+
+.title-time-border-yellow {
+	margin: 10rpx;
+	border: 2rpx solid #e5e6e6;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	background-color: #F7F8F9;
+	flex-direction: column;
+	
+}
+.title-time-border-hisOk{
+	margin: 10rpx;
+	border: 2rpx solid #D4E4FE;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	background-color: #F6F9FF;
+	flex-direction: column;
+}
+.title-time-border-current{
+	margin: 10rpx;
+	border: 3rpx dashed #4690FF;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	background-color: #F6F9FF;
+	flex-direction: column;
+}
+.title-time-border-hisFaild{
+	margin: 10rpx;
+	border: 2rpx dashed #FFE2E2;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	background-color: #FFF8F8;
+	flex-direction: column;
+}
+
+.title-time-border-yellow-active-transparent {
+	margin: 10rpx;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	opacity: 0.3;
+	background-color: rgba(255, 255, 255, 0.5);
+}
+
+.title-time-border-yellow-active {
+	margin: 10rpx;
+	border: 1rpx solid #dae8fa;
+	width: calc(100% - 40rpx);
+	height: calc(100% - 40rpx);
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	animation: shakesmall 0.8s infinite;
+	background-color: rgba(255, 255, 255, 0.5);
+}
+
+@keyframes shakesmall {
+	0% {
+		transform: rotate(-2deg);
+	}
+
+	25% {
+		transform: rotate(2deg);
+	}
+
+	50% {
+		transform: rotate(-2deg);
+	}
+
+	75% {
+		transform: rotate(2deg);
+	}
+
+	100% {
+		transform: rotate(-2deg);
+	}
+}
+
+.boom-father {
+	position: absolute;
+	top: 110rpx;
+	left: -17rpx;
+	width: 60rpx;
+	height: 1170rpx;
+	margin-top: 0rpx;
+	overflow: hidden;
+	z-index: 999;
+}
+
+.boom {
+	height: 3000rpx;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+	z-index: 0;
+
+	.boom-son {
+		height: 234rpx;
+		width: 60rpx;
+		font-size: 30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		z-index: 10;
+		font-size: 22rpx;
+		color: #A9ACB1;
+
+		.boom-text {
+			width: 30rpx;
+			height: 50rpx;
+			border: 2rpx dashed #A9ACB1;
+			border-radius: 20rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			z-index: 1;
+			background-color: #eff0f4;
+		}
+	}
+
+	.boom-son-target {
+		height: 250rpx;
+		width: 60rpx;
+		font-size: 30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		z-index: 10;
+		font-weight: 700;
+		font-size: 25rpx;
+		color: #A9ACB1;
+		background: linear-gradient(to bottom, #ff8a00, #eceaff);
+	}
+}
+
+
+.left-top {
+	border-top-left-radius: 0 !important;
+}
+
+.right-top {
+	border-top-right-radius: 0 !important;
+}
+
+.left-bottom {
+	border-bottom-left-radius: 0 !important
+}
+
+.right-bottom {
+	border-bottom-right-radius: 0 !important;
+}
+
+.xian-bian {
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	border-right: 1rpx solid transparent;
+	border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+}
+
+.pulic-time {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: #99C9FD;
+	font-size: 35rpx;
+	font-weight: 600;
+}
+
+.right-order{
+	position: fixed;
+	right: 20rpx;
+	top: 62rpx;
+	height: 1220rpx;
+	width: 430rpx;
+	background-color: #fff;
+	border-radius: 30rpx;
+	.order-title{
+		width: 100%;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		.order-month{
+			margin-left: 30rpx;
+			font-size: 30rpx;
+			font-weight: 600;
+			width: 80rpx;
+		}
+		.order-day{
+			width: 300rpx;
+			height: 100rpx;
+			.days-father{
+				display: flex;
+				align-items: center;
+				.days{
+					height: 100rpx;
+					min-width: 50rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 26rpx;
+					color: #BBBABA;
+				}
+				.targetdays{
+					height: 50rpx;
+					min-width: 50rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 26rpx;
+					color: #fff;
+					border-radius: 50%;
+					background-color: #4690FF;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/bigindex.vue b/pages/NursingNew/component/nurse/bigindex.vue
new file mode 100644
index 0000000..a0b313b
--- /dev/null
+++ b/pages/NursingNew/component/nurse/bigindex.vue
@@ -0,0 +1,619 @@
+<!-- 护嘱 -->
+<template>
+	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}">
+		<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 timeArray" :key="index">
+									<view class="boom-son">
+										<text class="boom-text">
+											{{item}}
+										</text>
+
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="super-card-container">
+						<scroll-view style="width: 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" class="super-card-right">
+									<view class="super-card-time">
+										{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
+									</view>
+								</view>
+							</view>
+							<view style="display: flex;height: 1165rpx;position: relative;">
+
+								<view class="xian-bian"></view>
+								<scroll-view style="height: 100%;width:6960rpx;background-color: #fff;"
+									: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="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;">
+																<view v-if="item1.startTime"
+																	class="title-time-font-rel">
+																	{{ item1.directiveName?splitString(item1.directiveName)[0]:""}}
+																</view>
+																<view
+																	v-if="item1.startTime&&splitString(item1.directiveName)[1]"
+																	class="title-time-font-tags">
+																	({{ item1.directiveName?splitString(item1.directiveName)[1]:""}})
+																</view>
+																<view v-if="item1.startTime" :class="getFontClass(item1)" >
+																	{{ `${parseHourMinutestring(item1.startTime).hour}:${parseHourMinutestring(item1.startTime).minute}-${parseHourMinutestring(item1.endTime).hour}:${parseHourMinutestring(item1.endTime).minute}`  }}
+																</view>
+															</view>
+													
+														</view>
+													</view>
+												</view>
+											</view>
+										</view>
+									</view>
+								</scroll-view>
+							</view>
+						</scroll-view>
+					</view>
+					<view class="right-order">
+						<view class="order-title">
+							<view class="order-month">
+								{{ selectdata.month }}月
+							</view>
+							<scroll-view class="order-day" scroll-with-animation :scroll-x="true"
+								:scroll-left="movetime">
+								<view class="days-father">
+									<view :class="daytarget===index? `targetdays` :`days`"
+										v-for="(item,index) in daysarray" :key="index" @click="clickday(item,index)">
+										{{ item }}
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</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, getDirectiveOrders } from "./api.js";
+	import { myArray } from './yaoshandiao.js';
+
+	const props = defineProps({
+		isshow: {
+			type: Boolean,
+			required: true,
+		},
+	});
+	// watch(
+	// 	() => props.isshow,
+	// 	(newVal, oldVal) => {
+	// 		// 只有当新旧值不相同时才执行
+	// 		if (newVal !== oldVal) {
+				
+
+	// 		}
+	// 	}
+	// )
+	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)
+
+	const hournow = ref(new Date().getHours());
+
+	// 获得现在的年月日
+	const dateref = ref(getTodayObj())
+	function getTodayObj() {
+		const d = new Date()
+
+		const month = String(d.getMonth() + 1).padStart(2, '0')
+		const day = String(d.getDate()).padStart(2, '0')
+
+		return {
+			year: d.getFullYear(),
+			month,
+			day
+		}
+	}
+	const selectdata = ref({
+		year: 0,
+		month: "",
+		day: ""
+	})
+
+	const daysarray = ref([]);
+	const movetime = ref(0)
+
+	function generateDayArray() {
+		const selY = Number(selectdata.value.year)
+		const selM = Number(selectdata.value.month)
+
+		// 校验：年/月 必须是有效数字且月在1-12之间
+		if (!Number.isFinite(selY) || !Number.isFinite(selM) || selM < 1 || selM > 12) {
+			return []
+		}
+
+		const todayY = Number(dateref.value.year)
+		const todayM = Number(dateref.value.month) // dateref.month 可能是字符串 "01"
+		const todayD = Number(dateref.value.day)
+
+		let endDay = 0
+		if (selY === todayY && selM === todayM) {
+			// 同年同月：到今天为止
+			endDay = todayD;
+		} else {
+			// 不同：计算该月总天数。注意 new Date(year, month, 0).getDate()
+			// 这里 month 要传 1-12（这个构造会返回该月最后一天）
+			endDay = new Date(selY, selM, 0).getDate()
+		}
+		daysarray.value = Array.from({ length: endDay }, (_, i) => String(i + 1).padStart(2, '0'))
+		// console.log("看看生成的咋样", daysarray.value)
+		if (selY === todayY && selM === todayM) {
+			movetime.value = 9998;
+			daytarget.value = daysarray.value.length - 1
+
+		} else {
+			movetime.value = 0.001;
+			daytarget.value = 0
+			setTimeout(() => {
+				movetime.value = 0;
+			}, 50)
+		}
+		// 生成字符串数组 ["01","02",...]
+
+	}
+	const daytarget = ref(0)
+	const clickday = (item : string, index : number) => {
+		daytarget.value = index
+	}
+	const facedonghua = ref(false)
+
+	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 getFontClass = (item:any) => {
+		switch (item.executeStatus) {
+		
+			case 'hisFaild':
+				return 'card-time-red';
+		
+			case 'current':
+				return 'card-time-blue';
+			
+			default:
+				return 'card-time';
+		
+		}
+	}
+	// 这是二级菜单的动画的模板
+	const secondtemp = ref([])
+	// 上次点击时间
+	const lastTap = ref(0)
+	// 双击的最大间隔（ms），可根据体验调整
+	const DOUBLE_TAP_DELAY = 300
+	//变更左侧菜单
+	const isempty = ref(false);
+
+	const isRule = ref(false);
+	const topindex = ref(-1)
+
+	const isDelete = ref(false);
+
+
+	// 给抖动用的
+	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) {
+			switch (item.executeStatus) {
+				case 'hisOk':
+					return 'title-time-border-hisOk';
+
+				case 'hisFaild':
+					return 'title-time-border-hisFaild';
+
+				case 'current':
+					return 'title-time-border-current';
+				
+				case 'future':
+					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 upmenuIndex = ref<number>(1);
+	const downmenuIndex = ref<number>(0);
+	const downdonghua = ref(-1);
+	const thirdmenuIndex = ref<number>(0);
+	const forthmenuIndex = ref<number>(0);
+
+	const saveEditIndex = ref({
+		index0: -1,
+		index1: -1
+	})
+
+	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 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;
+	}
+	const shakyTable = ref(false);
+
+	const saveX = ref(0);
+	const saveY = ref(0);
+
+	const indexsave = ref([-1, -1]);
+
+	const buttonBlue = ref(false)
+	let animTimer = null
+
+
+	// 暂存器
+	const saveRulerTime = ref({
+		index0: -1,
+		index1: -1
+	})
+	const targetRuler = ref({
+		index0: -1,
+		index1: -1,
+		current: -1,
+		bordershow: true
+	})
+
+	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 geteverything = () => {
+		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
+			getTable()
+		}
+	}
+	// 处理分钟和小时的函数
+	function parseHourMinutestring(startTime) {
+		// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
+		const parts = startTime.split(' ');
+		if (parts.length < 2) return { hour: NaN, minute: NaN };
+
+		const [hh, mm] = parts[1].split(':');
+		return { hour: hh, minute: mm };
+	}
+	// 处理分钟和小时的函数(number)
+	function parseHourMinute(startTime) {
+		// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
+		const parts = startTime.split(' ');
+		if (parts.length < 2) return { hour: NaN, minute: NaN };
+
+		const [hh, mm] = parts[1].split(':');
+		return { hour: Number(hh), minute: Number(mm) };
+	}
+	const getTable = () => {
+		let time = `${selectdata.value.year}-${selectdata.value.month}-${selectdata.value.day}`
+		getDirectiveOrders(time).then((data) => {
+			// console.log("data",data.result.all)
+			timearr.value = Array.from({ length: 24 }, (_, hour) => ({
+				positioning: hour.toString(),
+				children: minuteArr.map(time => ({
+					// tagName: time,           // 表示分钟，如 '00', '05' 等
+					directiveName: '' // 默认的 directiveName
+				}))
+			}))
+			data.result.all.forEach((element : any) => {
+				element.positioning = parseHourMinute(element.startTime).hour;
+				element.positioningLong = parseHourMinute(element.startTime).minute / 5;
+				timearr.value[element.positioning].children[element.positioningLong] = element;
+			})
+
+		})
+	}
+	const savePackagelist = ref([]);
+	onMounted(() => {
+		selectdata.value = dateref.value;
+		generateDayArray()
+		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) {
+			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()
+		scrollTop.value = 0.001
+		
+		nextTick(() => {
+			scrollTop.value = 0
+			timeNowMove()
+		})
+	})
+
+	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 = 1455;  // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220
+	const visibleHeight = 1170; // 可视区域高度 (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) * 290;
+			const cellCenterY = (saveEditIndex.value.index1 + 0.5) * 234;
+			// 计算 scrollLeft 和 scrollTop，使格子中心位于可视区域中心
+			cardLeft.value = cellCenterX - visibleWidth / 2;
+			scrollTop.value = cellCenterY - visibleHeight / 2;
+			// 计算网格总宽高
+			const totalWidth = totalColumns * 290;
+			const totalHeight = totalRows * 234;
+			// 限制 scrollLeft 和 scrollTop 在有效范围内
+			cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2 + 0.7;
+			// scrollTop.value =  0
+			scrollTop.value = Math.max(0, Math.min(scrollTop.value, totalHeight - visibleHeight)) / 2;
+		}
+	}
+	// 表格进来就给我居中
+	function timeNowMove() {
+		const cellCenterX = (hournow.value + 0.5) * 290;
+		let width = cellCenterX - visibleWidth / 2;
+		const totalWidth = totalColumns * 290;
+		cardLeft.value = Math.max(0, Math.min(width, totalWidth - visibleWidth)) / 2 + 0.7;
+	}
+	const iszhiling = ref(false)
+	const zhilingbao = () => {
+		iszhiling.value = !iszhiling.value
+		forthmenuIndex.value = 0;
+	}
+	const deletedonghua = ref(false);
+</script>
+
+<style lang="less" scoped>
+	// 主页的css
+	@import './bigindex';
+</style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index - 副本.vue b/pages/NursingNew/component/nurse/index - 副本.vue
deleted file mode 100644
index abdd326..0000000
--- a/pages/NursingNew/component/nurse/index - 副本.vue	
+++ /dev/null
@@ -1,1816 +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: 1330rpx;width: 100%;border: 2rpx solid balck;" 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>
-	</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/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index 1921599..87da581 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -1,23 +1,560 @@
 .super-card {
 	display: flex;
+	/* justify-content: center; */
+
 	width: 100%;
+	/* height: calc(100% - 400rpx); */
+
+	.scroll-x {
+		height: 100%;
+		width: 100%;
+	}
+
+	.right-cards {
+		width: 550rpx;
+		height: 1280rpx;
+
+		.scroll-box {
+			width: 100%;
+			height: 150rpx;
+			margin-top: 10rpx;
+			/* padding-right: 20rpx; */
+
+			.right-box {
+				height: 150rpx;
+				display: flex;
+				flex-direction: column;
+				flex-wrap: wrap;
+				align-content: flex-start;
+				/* padding-right: 10rpx; */
+
+				.right-box-item {
+					margin: 10rpx 10rpx 0 20rpx;
+					width: 250rpx;
+					height: 120rpx;
+					border-radius: 20rpx;
+					background-color: #fff;
+					position: relative;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+
+					.right-box-img {
+						width: 60rpx;
+						height: 60rpx;
+					}
+
+					.right-box-font {
+						font-size: 30rpx;
+						/* margin-top: 7rpx; */
+						/* margin-left: 10rpx; */
+					}
+
+					.right-box-items {
+						display: flex;
+						justify-content: space-around;
+						align-items: center;
+
+						.right-box-items-button {
+							width: 25rpx;
+							height: 25rpx;
+							margin: 0 3rpx;
+						}
+					}
+				}
+
+				.title-time-button {
+					position: absolute;
+					top: 0rpx;
+					right: 0rpx;
+					width: 200rpx;
+					height: 100rpx;
+					/* background-color: red; */
+				}
+
+				.title-time-font {
+					position: absolute;
+					top: 5rpx;
+					right: 3rpx;
+					font-size: 17rpx;
+					color: #fff;
+				}
+			}
+		}
+	}
+
+	.time-father {
+		border-radius: 20rpx;
+		height: 97%;
+		width: 95%;
+		margin-top: 6%;
+		margin-left: 6%;
+		background-color: rgba(255, 255, 255, 0.3);
+
+		.time-button {
+			width: 140rpx;
+			height: 60rpx;
+			margin-top: 30rpx;
+			margin-left: 30rpx;
+			border-radius: 20rpx;
+			background-color: rgb(54, 159, 239);
+			border: 5rpx solid rgb(54, 159, 239);
+			display: flex;
+
+			.time-button-month {
+				width: 50%;
+				height: 100%;
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.time-button-month-target {
+				width: 50%;
+				height: 100%;
+				background-color: #fff;
+				color: rgb(54, 159, 239);
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-bottom-left-radius: 15rpx;
+				border-top-left-radius: 15rpx;
+			}
+
+			.time-button-week-target {
+				width: 50%;
+				height: 100%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #fff;
+			}
+
+			.time-button-week {
+				width: 50%;
+				height: 100%;
+				color: rgb(54, 159, 239);
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				background-color: #fff;
+				border-bottom-right-radius: 15rpx;
+				border-top-right-radius: 15rpx;
+			}
+		}
+	}
+
+	.under-button {
+		width: 520rpx;
+		height: 95rpx;
+		margin-left: 35rpx;
+		margin-top: 0rpx;
+		border-radius: 20rpx;
+		/* background-color: rgb(229, 233, 249); */
+		display: flex;
+		align-items: center;
+		position: relative;
+
+		.under-button-black {
+			transition: all 1s;
+			position: absolute;
+			width: 300rpx;
+			height: 100rpx;
+			border-radius: 20rpx;
+			padding-left: 10rpx;
+			background-color: rgb(77, 77, 77);
+			top: -100rpx;
+			left: 0rpx;
+			color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.under-button-three {
+				position: absolute;
+				right: 13rpx;
+				bottom: -17rpx;
+				/* 元素本身不占任何宽高 */
+				width: 0;
+				height: 0;
+
+				/* 左右边框透明，宽度各 50px */
+				border-left: 15rpx solid transparent;
+				border-right: 15rpx solid transparent;
+
+				/* 上边框实色（高度 100px），形成向下的“倒三角” */
+				border-top: 20rpx solid rgb(77, 77, 77);
+			}
+		}
+
+		.other-father {
+			width: 100%;
+			height: 100%;
+			background-color: #fff;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.white-circle-click-father-spec {
+			position: absolute;
+			top: -160rpx;
+			right: 10rpx;
+			overflow: hidden;
+			/* background-color: #fff; */
+			/* 重要：让伪元素在圆角内显示 */
+			margin-left: 10rpx;
+			height: 130rpx;
+			width: 130rpx;
+			border-radius: 50%;
+			--color: #99C9FD;
+			--thick: 2px;
+			--radius: 50%;
+			border: var(--thick) dashed var(--color);
+			border-radius: var(--radius);
+
+			background:
+				/* 上边 */
+				repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / 100% var(--thick) no-repeat,
+				/* 下边 */
+				repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) bottom left / 100% var(--thick) no-repeat,
+				/* 左边 */
+				repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / var(--thick) 100% no-repeat,
+				/* 右边 */
+				repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top right / var(--thick) 100% no-repeat;
+
+
+		}
+
+		.white-circle-click-father {
+			position: relative;
+			overflow: hidden;
+			/* 重要：让伪元素在圆角内显示 */
+			margin-left: 10rpx;
+			height: 75rpx;
+			width: 150rpx;
+			border-radius: 40rpx;
+			background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
+			border: 2rpx solid #9AD1FF;
+			color: #007CFF;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			-webkit-tap-highlight-color: transparent;
+		}
+
+		/* 文本层级高于伪元素 */
+		.white-circle-click-father .label {
+			position: relative;
+			z-index: 2;
+		}
+
+		/* 伪元素作为点击时的覆盖渐变 */
+		.white-circle-click-father::before {
+			content: "";
+			position: absolute;
+			inset: 0;
+			z-index: 1;
+			pointer-events: none;
+			background: linear-gradient(to bottom, #bfe9ff, #4aa8ff);
+			/* 点击后的渐变（可替换） */
+			opacity: 0;
+			/* transform: scale(1.02); */
+		}
+
+		/* anim 类触发 1s 动画（淡入→停留→淡出） */
+		.white-circle-click-father.anim::before {
+
+			animation: coverFade 1s ease-in-out forwards;
+		}
+
+
+
+		/* keyframes：0-20% 淡入，20-80% 保持，80-100% 淡出 */
+		@keyframes coverFade {
+			0% {
+				opacity: 0;
+			}
+
+			20% {
+				opacity: 1;
+			}
+
+			80% {
+				opacity: 1;
+			}
+
+			100% {
+				opacity: 0;
+			}
+		}
+
+		.white-circle {
+			width: 70rpx;
+			height: 70rpx;
+			border-radius: 50%;
+			margin-left: 15rpx;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			z-index: 99;
+
+			.white-circle-img {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+
+	.middle-box {
+		width: 100%;
+		height: 840rpx;
+		/* background-color: red; */
+		display: flex;
+		overflow: hidden;
+
+		.middle-left-box {
+			margin-left: 0rpx;
+			width: 380rpx;
+			height: 800rpx;
+			/* background-color: red; */
+			border-radius: 20rpx;
+			/* background-color: rgb(229, 233, 249); */
+			display: flex;
+
+			.first-contant {
+				height: 100%;
+				width: 190rpx;
+
+				.right-box-item {
+					margin: 10rpx 0 0 20rpx;
+					width: 170rpx;
+					height: 120rpx;
+					border-radius: 20rpx;
+					background-color: rgba(255, 255, 255, 0.3);
+					position: relative;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 超出部分隐藏 */
+					text-overflow: ellipsis;
+					/* 超出部分显示省略号 */
+
+					.right-box-img {
+						width: 60rpx;
+						height: 60rpx;
+					}
+
+					.title-time-button {
+						position: absolute;
+						top: -4rpx;
+						right: -4rpx;
+						width: 70rpx;
+						height: 40rpx;
+
+					}
+
+					.title-time-button-font {
+						color: #1083f8;
+						position: absolute;
+						top: 2rpx;
+						right: 8rpx;
+						font-size: 19rpx;
+						z-index: 99;
+					}
+
+					.right-box-font {
+						font-size: 23rpx;
+						/* margin-top: 10rpx; */
+					}
+
+					.title-time-zhejiao {
+						position: absolute;
+						top: 0rpx;
+						left: 5rpx;
+						width: 40rpx;
+						height: 40rpx;
+					}
+
+					.title-time-font {
+						position: absolute;
+						top: 3rpx;
+						right: 5rpx;
+						font-size: 20rpx;
+						color: #fff;
+						z-index: 999;
+					}
+
+					.right-box-items {
+						display: flex;
+						justify-content: space-around;
+						align-items: center;
+
+						.right-box-items-button {
+							width: 25rpx;
+							height: 25rpx;
+							margin: 0 3rpx;
+						}
+					}
+				}
+			}
+
+			.second-contant {
+				height: 100%;
+				width: 210rpx;
+
+				.downList-box-target {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background-color: #fff;
+					margin-left: 15rpx;
+					width: 160rpx;
+					height: 120rpx;
+					border-radius: 20rpx;
+					/* margin-left: 10rpx; */
+					margin-top: 10rpx;
+
+					flex-direction: column;
+					/* box-shadow: 2rpx 2rpx 4rpx 2rpx rgba(54, 159, 239, 0.1);
+					border: 2rpx solid rgb(54, 159, 239); */
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 超出部分隐藏 */
+					text-overflow: ellipsis;
+					/* 超出部分显示省略号 */
+
+					.downList-box-img {
+						height: 50rpx;
+						width: 50rpx;
+					}
+
+					.downList-box-text {
+						font-size: 26rpx;
+						color: rgb(54, 159, 239);
+					}
+				}
+
+				.downList-box {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-left: 15rpx;
+					border-radius: 20rpx;
+					background-color: rgba(255, 255, 255, 0.5);
+					width: 160rpx;
+					height: 120rpx;
+					/* border-radius: 20rpx; */
+					/* margin-left: 10rpx; */
+					/* margin-bottom: 20rpx; */
+					margin-top: 10rpx;
+					flex-direction: column;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 超出部分隐藏 */
+					text-overflow: ellipsis;
+					/* 超出部分显示省略号 */
+					/* box-shadow: 2rpx 2rpx 4rpx 2rpx rgba(0, 0, 0, 0.1); */
+
+					.downList-box-img {
+						height: 50rpx;
+						width: 50rpx;
+					}
+
+					.downList-box-text {
+						font-size: 25rpx;
+					}
+				}
+			}
+		}
+
+		.middle-right-box {
+			height: 780rpx;
+			width: 90rpx;
+
+			/* overflow-y: hidden; */
+			.doctorsay-container-card {
+				position: relative;
+				display: flex;
+				/* flex-direction: column; */
+				justify-content: center;
+				align-items: center;
+				background-color: #fff;
+				width: 160rpx;
+				height: 100rpx;
+				/* margin: 0 0rpx 0rpx 0rpx; */
+				border-radius: 50rpx;
+				/* border-radius: 20rpx;
+				border: 2rpx solid rgb(221, 234, 250);
+				box-shadow: 5px 5px 10px rgba(105, 129, 178, 0.2); */
+				margin-left: 10rpx;
+				margin-top: 30rpx;
+
+				/* 右下角阴影 */
+				.doctorsay-container-card-img {
+					width: 55rpx;
+					height: 55rpx;
+				}
+
+				.doctorsay-container-card-font {
+					font-size: 30rpx;
+					/* margin-top: 20rpx; */
+				}
+
+			}
+
+			.doctorsay-container-card-target {
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				background: linear-gradient(to left, #fff, rgb(229, 233, 249));
+				width: 115rpx;
+				height: 122rpx;
+				margin: 0 18rpx 10rpx 0rpx;
+				/* margin-left: -15rpx; */
+				/* border: 2rpx solid #fff; */
+				/* box-shadow: 5px 5px 10px rgba(105, 129, 178,0.2); */
+				border-top-right-radius: 20rpx;
+				border-bottom-right-radius: 20rpx;
+				/* border-radius: 20rpx; */
+				margin-left: -15rpx;
+
+				/* 右下角阴影 */
+				.doctorsay-container-card-img {
+					width: 55rpx;
+					height: 55rpx;
+					margin-left: 25rpx;
+				}
+
+
+
+			}
+
+			/* background-color: rgb(229,233,249); */
+		}
+	}
 
 	.super-card-container {
 		background-blend-mode: screen;
 		isolation: isolate;
 		overflow: hidden;
 		margin-left: 10rpx;
-		width: 1455rpx;
+		width: 1300rpx;
+		height: 1350rpx;
 		border-left: 0;
 		position: relative;
-		border-radius: 30rpx;
-		overflow: hidden;
-		border: 3rpx dashed #dde1e6;
-	}
-
-	.super-card-right {
-		border-right: 1rpx solid transparent;
-		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 	}
 
 	.super-card-time {
@@ -25,24 +562,22 @@
 		justify-content: center;
 		align-items: center;
 
-		height: 50rpx;
-		width: 289.3rpx;
+		height: 80rpx;
+		width: 259rpx;
 		border-bottom: 1rpx solid transparent;
 		border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 		/* font-weight: 700; */
 		z-index: -1;
 		font-size: 25rpx;
 		color: #A9ACB1;
-		background-color: #EDF3FD;
 	}
 
 	.super-card-time-und {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		width: 290rpx;
+		width: 259rpx;
 		flex-direction: column;
-
 		border-right: 1rpx solid transparent;
 		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 
@@ -53,23 +588,14 @@
 		}
 
 		.title-time-font-rel {
-			font-size: 32rpx;
-			font-weight: 600;
-			/* margin-bottom: 5rpx; */
+			font-size: 23rpx;
+			margin-bottom: 5rpx;
 			overflow: hidden;
 			text-overflow: ellipsis;
 			white-space: nowrap;
-			color: black;
-		}
-		.title-time-font-tags{
-			font-size: 24rpx;
-			font-weight: 600;
-			/* margin-bottom: 5rpx; */
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			color: #999;
+			color: #888888;
 		}
+
 		.title-time-items {
 			display: flex;
 			justify-content: space-around;
@@ -87,13 +613,12 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		height: 234rpx;
-		width: 100%;
+		height: 200rpx;
+		width: calc(100%);
 		transition: all 0.8s;
 		border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 		flex-direction: column;
 		position: relative;
-
 	}
 }
 
@@ -102,7 +627,6 @@
 	height: 100vh;
 	transition: opacity 1s ease;
 	position: relative;
-	margin-left: -50rpx;
 
 	.joystick {
 		position: absolute;
@@ -136,13 +660,97 @@
 		width: 100%;
 		height: 1350rpx;
 		display: flex;
-		margin-top: 62rpx;
+		/* background-color: red; */
+		/* margin-top: 10rpx; */
 
 		.doctorsay-container-container {
 			width: 100%;
 			overflow: hidden;
+
+			.doctorsay-container-title {
+				width: 100%;
+				height: 105rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.doctorsay-container-left {
+					display: flex;
+				}
+			}
+
 		}
 	}
+
+	.right-container-title-nav {
+		/* margin-top: 75rpx; */
+		margin-bottom: 20rpx;
+		/* margin-left: 20rpx; */
+
+		.right-icons {
+			display: flex;
+			align-items: center;
+			float: right;
+			height: 70rpx;
+			margin-right: 40rpx;
+
+			.right-icons-font {
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+				font-size: 35rpx;
+				margin-top: -30rpx;
+			}
+
+			.right-icons-img {
+				width: 80rpx;
+				height: 80rpx;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+				margin-top: -40rpx;
+
+			}
+
+			.right-icons-img-icon {
+				width: 60rpx;
+				height: 80rpx;
+				margin-top: -10rpx;
+				margin-left: 8rpx;
+			}
+		}
+
+		.right-container-title-class {
+			font-size: 35rpx;
+			font-weight: 800;
+			margin-left: 20rpx;
+		}
+
+		.right-container-title-class-dark {
+			font-size: 35rpx;
+			font-weight: 800;
+			margin-left: 20rpx;
+			background: linear-gradient(to bottom, #FFFFFF, #B2C8E2);
+			-webkit-background-clip: text;
+			color: transparent;
+		}
+	}
+}
+
+.title-time-delete {
+	width: 55rpx;
+	height: 55rpx;
+	border-radius: 50%;
+	display: flex;
+	background-color: #fff;
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	top: 0rpx;
+	right: 0rpx;
+	z-index: 10;
+	background-color: #02abfe;
+	color: #fff;
+	z-index: 999;
+	font-size: 50rpx;
 }
 
 .title-time-blue {
@@ -179,24 +787,30 @@
 	position: absolute;
 	width: 280rpx;
 	height: 100rpx;
+	/* padding-left: 10rpx; */
 	padding: 0 20rpx;
 	border-radius: 20rpx;
 	border-top-right-radius: 0rpx;
 	border: 2rpx solid #e8e9eb;
+	/* background-color: #55555555; */
 	background-color: #fff;
 	color: #545569;
 	bottom: -100rpx;
 	left: -130rpx;
+	/* color: #fff; */
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	z-index: 999;
+	/* box-shadow: 0 2px 6px #6981b2 ; */
+
 
 }
 
 .time-button-orange {
 	transition: all 1s;
 	position: absolute;
+
 	width: 280rpx;
 	height: 100rpx;
 	border-radius: 20rpx;
@@ -218,20 +832,13 @@
 	display: flex;
 	width: 100%;
 	position: relative;
-	height: 100%;
-	padding: 20rpx;
-	
-	.card-time{
-		position: absolute;
-		bottom: 20rpx;
-		left: 20rpx;
-		font-size: 25rpx;
-	}
 
 	.title-time-time {
 		font-size: 32rpx;
 		margin: 0 auto;
 		font-weight: 600;
+		/* margin-left: 10rpx; */
+		/* margin-top: 12rpx; */
 	}
 
 	.title-time-button {
@@ -242,6 +849,14 @@
 		height: 40rpx;
 	}
 
+	.title-time-zhejiao {
+		position: absolute;
+		top: 0rpx;
+		left: 5rpx;
+		width: 40rpx;
+		height: 40rpx;
+	}
+
 	.title-time-font {
 		position: absolute;
 		top: 0rpx;
@@ -251,28 +866,457 @@
 	}
 }
 
+.popup-say {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	backdrop-filter: blur(1rpx);
+	background-color: rgba(236, 237, 241, 0.4);
+	/* 添加毛玻璃效果 */
+	z-index: 999;
+
+	.popup-say-content {
+		position: absolute;
+		right: 65rpx;
+		bottom: 170rpx;
+		display: flex;
+		flex-direction: column;
+		width: 450rpx;
+		/* height: 800rpx; */
+		background-color: #fff;
+		border: 2rpx solid #fff;
+		border-radius: 30rpx;
+		box-shadow: 10rpx 10rpx 20rpx rgba(0, 0, 0, 0.1);
+		transition: opacity 0.4s ease;
+
+
+
+		.popup-say-content-flex {
+			display: flex;
+			margin-top: 7rpx;
+			margin-bottom: 10rpx;
+
+			.popup-say-content-gun {
+				margin-left: 40rpx;
+				margin-right: 20rpx;
+				width: 13rpx;
+				height: 35rpx;
+				background: linear-gradient(to bottom, #04BCED, #0160CE);
+				border-radius: 10rpx;
+			}
+
+			.popup-say-content-font {
+				font-size: 30rpx;
+				font-weight: 700;
+			}
+		}
+
+
+		.popup-say-three {
+			position: absolute;
+			left: 173rpx;
+			bottom: -39rpx;
+			/* 元素本身不占任何宽高 */
+			width: 0;
+			height: 0;
+
+			/* 左右边框透明，宽度各 50px */
+			border-left: 30rpx solid transparent;
+			border-right: 30rpx solid transparent;
+
+			/* 上边框实色（高度 100px），形成向下的“倒三角” */
+			border-top: 40rpx solid #fff;
+		}
+	}
+}
+
+
+
+.popup-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	/* 添加毛玻璃效果 */
+	z-index: 999;
+
+	.popup-overlay-content {
+		position: absolute;
+		display: flex;
+		// justify-content: center;
+		align-items: center;
+		width: 800rpx;
+
+		background-color: #fff;
+		border-radius: 30rpx;
+		box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1);
+		opacity: 0;
+		transition: opacity 0.4s ease;
+		overflow: hidden;
+
+		.popup-overlay-content-left {
+			// background-color: red;
+			height: 100%;
+			width: 350rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+
+			.popup-overlay-content-left-img {
+				width: 280rpx;
+				height: 240rpx;
+				margin-top: 0rpx;
+			}
+
+			.popup-overlay-content-left-font {
+				// margin-top: 20rpx;
+				font-size: 30rpx;
+			}
+		}
+
+		.popup-overlay-content-right {
+			height: 100%;
+			width: 450rpx;
+			position: relative;
+
+			.time-font {
+				font-size: 60rpx;
+				margin-top: 80rpx;
+				margin-bottom: 10rpx;
+				font-weight: 700;
+				background: linear-gradient(to bottom, #7080A1, #263556);
+				-webkit-background-clip: text;
+				color: transparent;
+			}
+
+			.time-text {
+				margin-left: 10rpx;
+				font-size: 32rpx;
+				// font-weight: 700;
+				width: 400rpx;
+				margin-bottom: 50rpx;
+				line-height: 35rpx;
+
+			}
+
+			.right-richang {
+				background-color: #FFC363;
+				position: absolute;
+				top: 108rpx;
+				right: 50rpx;
+				padding: 5rpx;
+				border-radius: 10rpx;
+			}
+
+			.right-richangnot {
+				background-color: #7B61FF;
+				position: absolute;
+				top: 108rpx;
+				right: 50rpx;
+				padding: 5rpx;
+				border-radius: 10rpx;
+				color: #fff;
+			}
+
+			.right-crush {
+				position: absolute;
+				top: 20rpx;
+				right: 20rpx;
+				width: 70rpx;
+				height: 70rpx;
+				animation: shake 0.5s 3;
+			}
+		}
+	}
+}
+
+.ri-img {
+	position: absolute;
+	top: -4rpx;
+	right: -4rpx;
+	width: 60rpx;
+	height: 60rpx;
+}
+
+.time-father {
+	display: flex;
+	width: 100%;
+	flex-wrap: wrap;
+	margin-left: 30rpx;
+	margin-right: 30rpx;
+
+	.time-one {
+		width: 100rpx;
+		height: 100rpx;
+		margin-left: 20rpx;
+		margin-top: 20rpx;
+		background-color: rgb(241, 245, 252);
+		border-radius: 20rpx;
+		border: 1rpx solid rgb(109, 131, 179);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 29rpx;
+		box-shadow: 5rpx 5rpx 10rpx rgba(105, 129, 178, 0.4)
+	}
+
+	.time-one-target {
+		width: 100rpx;
+		height: 100rpx;
+		margin-left: 20rpx;
+		margin-top: 20rpx;
+		background: linear-gradient(to right, #00c9ff, #0076ff);
+		color: #fff;
+		border-radius: 20rpx;
+		border: 1rpx solid #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 29rpx;
+		box-shadow: 5rpx 5rpx 10rpx rgba(105, 129, 178, 0.4)
+	}
+
+	.time-one-hui {
+		width: 100rpx;
+		height: 100rpx;
+		margin-left: 20rpx;
+		margin-top: 20rpx;
+		background-color: #c2c9d3;
+		// color: #fff;
+		border-radius: 20rpx;
+		border: 1rpx solid #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 29rpx;
+		box-shadow: 5rpx 5rpx 10rpx rgba(105, 129, 178, 0.4)
+	}
+}
+
+.items-card {
+	width: 100%;
+	height: 80rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.items-card-target {
+	width: 100%;
+	height: 80rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: rgb(54, 159, 239);
+	background: linear-gradient(to right,
+			rgba(54, 159, 239, 0) 0%,
+			rgba(54, 159, 239, 0.5) 50%,
+			rgba(54, 159, 239, 0) 100%);
+}
+
+.button-father {
+	height: 200rpx;
+	width: calc(100% - 80rpx);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-left: 40rpx;
+	margin-right: 40rpx;
+	margin-top: 20rpx;
+	border-top: 1rpx solid rgb(230, 230, 230);
+
+	.button-father-right {
+		background: linear-gradient(to right, #00c9ff, #0076ff);
+		width: 200rpx;
+		height: 80rpx;
+		border-radius: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #fff;
+
+	}
+
+	.button-father-wrong {
+		background-color: #c2c9d3;
+		width: 200rpx;
+		height: 80rpx;
+		border-radius: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+	}
+}
+
+.month-father {
+	display: flex;
+	width: calc(100% - 60rpx);
+	flex-wrap: wrap;
+	margin-left: 30rpx;
+	margin-right: 30rpx;
+	margin-top: 20rpx;
+	margin-bottom: 30rpx;
+
+	.month-one {
+		width: 75rpx;
+		height: 75rpx;
+		margin-left: 20rpx;
+		margin-top: 20rpx;
+		background-color: rgb(241, 245, 252);
+		border-radius: 20rpx;
+		border: 1rpx solid rgb(109, 131, 179);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 29rpx;
+	}
+
+	.month-one-target {
+		width: 75rpx;
+		height: 75rpx;
+		margin-left: 20rpx;
+		margin-top: 20rpx;
+		background: linear-gradient(to right, #00c9ff, #0076ff);
+		color: #fff;
+		border-radius: 20rpx;
+		border: 1rpx solid #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 29rpx;
+	}
+}
+
+.week-father {
+	display: flex;
+	width: 100%;
+	flex-wrap: wrap;
+	margin-left: 30rpx;
+	margin-right: 30rpx;
+	margin-top: 20rpx;
+	margin-bottom: 30rpx;
+
+	.week-one {
+		width: 200rpx;
+		height: 100rpx;
+		margin-left: 20rpx;
+		margin-top: 20rpx;
+		background-color: rgb(241, 245, 252);
+		border-radius: 20rpx;
+		border: 1rpx solid rgb(109, 131, 179);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 29rpx;
+	}
+
+	.week-one-target {
+		width: 200rpx;
+		height: 100rpx;
+		margin-left: 20rpx;
+		margin-top: 20rpx;
+		background: linear-gradient(to right, #00c9ff, #0076ff);
+		color: #fff;
+		border-radius: 20rpx;
+		border: 1rpx solid #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 29rpx;
+	}
+}
+
+.radio-father {
+	display: flex;
+	width: 100%;
+	flex-wrap: wrap;
+	margin-left: 75rpx;
+	margin-right: 30rpx;
+	/* margin-bottom: 30rpx; */
+
+	.radio-circle {
+		margin-top: 2rpx;
+		width: 30rpx;
+		height: 30rpx;
+		border-radius: 50%;
+		border: 2rpx solid black;
+		background-color: transparent;
+	}
+
+	.radio-circle-target {
+		position: relative;
+		margin-top: 2rpx;
+		width: 30rpx;
+		height: 30rpx;
+		border-radius: 50%;
+		border: 2rpx solid rgb(2, 171, 254);
+		background-color: transparent;
+	}
+
+	.radio-circle-target::after {
+		content: "";
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 20rpx;
+		height: 20rpx;
+		background-color: rgb(2, 171, 254);
+		border-radius: 50%;
+	}
+
+	.radio-font {
+		margin-left: 15rpx;
+		margin-right: 60rpx;
+		font-size: 29rpx;
+	}
+
+	.radio-font-target {
+		color: rgb(2, 171, 254);
+		;
+		margin-left: 15rpx;
+		margin-right: 60rpx;
+		font-size: 29rpx;
+	}
+}
+
 .title-time-border {
 	margin-top: 4rpx;
 	margin-left: 4rpx;
+	// border: 1rpx solid black;
 	width: calc(100% - 8rpx);
 	height: calc(100% - 8rpx);
 	border-radius: 20rpx;
 	display: flex;
+	// justify-content: center;
 	align-items: center;
 	flex-direction: column;
 }
 
+
 .title-time-border-big {
 	transform: scale(1.3);
 	transform-origin: top;
+	/* 将页面内容放大1.2倍 */
 	border-top: 0rpx solid #fff;
 	transition: transform 0.5s ease-out, opacity 0.5s ease-out;
 	z-index: 999;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	height: 226rpx;
-	width: 100%;
+	height: 200rpx;
+	width: calc(100%);
 	border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
 	flex-direction: column;
 	position: relative;
@@ -281,14 +1325,15 @@
 .title-time-border-big-top {
 	transform: scale(1.3);
 	transform-origin: top;
+	/* 将页面内容放大1.2倍 */
 	border-top: 0rpx solid #fff;
 	transition: transform 0.5s ease-out, opacity 0.5s ease-out;
 	z-index: 999;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	height: 226rpx;
-	width: 100%;
+	height: 200rpx;
+	width: calc(100%);
 	border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
 	flex-direction: column;
 	position: relative;
@@ -296,52 +1341,22 @@
 
 .title-time-border-yellow {
 	margin: 10rpx;
-	border: 2rpx solid #e5e6e6;
+	border: 2rpx solid transparent;
+	/* background: linear-gradient(to bottom, #fff1db, #ffe2b2); */
 	width: calc(100% - 40rpx);
 	height: calc(100% - 40rpx);
 	border-radius: 20rpx;
 	display: flex;
 	align-items: center;
-	background-color: #f2f3f8;
-	flex-direction: column;
-	
-}
-.title-time-border-hisOk{
-	margin: 10rpx;
-	border: 2rpx solid #D4E4FE;
-	width: calc(100% - 40rpx);
-	height: calc(100% - 40rpx);
-	border-radius: 20rpx;
-	display: flex;
-	align-items: center;
-	background-color: #F6F9FF;
-	flex-direction: column;
-}
-.title-time-border-current{
-	margin: 10rpx;
-	border: 2rpx dashed #4690FF;
-	width: calc(100% - 40rpx);
-	height: calc(100% - 40rpx);
-	border-radius: 20rpx;
-	display: flex;
-	align-items: center;
-	background-color: #F6F9FF;
-	flex-direction: column;
-}
-.title-time-border-hisFaild{
-	margin: 10rpx;
-	border: 2rpx dashed #FFE2E2;
-	width: calc(100% - 40rpx);
-	height: calc(100% - 40rpx);
-	border-radius: 20rpx;
-	display: flex;
-	align-items: center;
-	background-color: #FFF8F8;
+	background-color: rgba(255, 255, 255, 0.5);
 	flex-direction: column;
+	/* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */
 }
 
 .title-time-border-yellow-active-transparent {
 	margin: 10rpx;
+	/* border: 4rpx dashed rgb(255, 138, 0); */
+	/* background: linear-gradient(to bottom, #fff1db, #ffe2b2); */
 	width: calc(100% - 40rpx);
 	height: calc(100% - 40rpx);
 	border-radius: 20rpx;
@@ -350,11 +1365,13 @@
 	flex-direction: column;
 	opacity: 0.3;
 	background-color: rgba(255, 255, 255, 0.5);
+	/* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */
 }
 
 .title-time-border-yellow-active {
 	margin: 10rpx;
 	border: 1rpx solid #dae8fa;
+	/* background: linear-gradient(to bottom, #fff1db, #ffe2b2); */
 	width: calc(100% - 40rpx);
 	height: calc(100% - 40rpx);
 	border-radius: 20rpx;
@@ -365,6 +1382,84 @@
 	background-color: rgba(255, 255, 255, 0.5);
 }
 
+.down-icons {
+	margin-top: 17rpx;
+	width: 100%;
+	height: 60rpx;
+	background-color: rgb(255, 216, 126);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+
+	.icon {
+		margin: 0 5rpx;
+		font-size: 20rpx;
+		padding: 5rpx 10rpx;
+		background-color: rgb(255, 138, 0);
+		color: #fff;
+		border-radius: 5rpx;
+	}
+}
+
+.super-end-items-img-father {
+	/* width: 60rpx; */
+	/* height: 60rpx; */
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+	flex-direction: column;
+}
+
+.super-end-items-img-father-active {
+	text-align: center;
+	/* height: 60rpx; */
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	animation: shake 0.5s infinite;
+}
+
+@keyframes shake {
+	0% {
+		transform: rotate(-10deg);
+	}
+
+	25% {
+		transform: rotate(10deg);
+	}
+
+	50% {
+		transform: rotate(-10deg);
+	}
+
+	75% {
+		transform: rotate(10deg);
+	}
+
+	100% {
+		transform: rotate(-10deg);
+	}
+}
+
+.super-end-items-father-close-father {
+	width: 40rpx;
+	height: 40rpx;
+	border-radius: 50%;
+	display: flex;
+	background-color: #0184db;
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	top: 0rpx;
+	right: 0rpx;
+	z-index: 10;
+	color: #fff;
+}
+
 @keyframes shakesmall {
 	0% {
 		transform: rotate(-2deg);
@@ -387,26 +1482,43 @@
 	}
 }
 
+
+
 .boom-father {
 	position: absolute;
-	top: 110rpx;
+	top: 220rpx;
 	left: -17rpx;
 	width: 60rpx;
-	height: 1170rpx;
-	margin-top: 0rpx;
+	height: 1000rpx;
+	margin-top: 10rpx;
+	/* background-color: red; */
 	overflow: hidden;
 	z-index: 999;
+	/* background: linear-gradient(to bottom, #c4dbf4, #c9c2ef, #c6dcf3); */
+	/* border-bottom: 2rpx solid #fff; */
+	/* border-left: 2rpx solid #fff; */
+	/* border-bottom-left-radius: 20rpx; */
+}
+
+.doctorsay-container-card-font-dark {
+	font-size: 31rpx;
+	color: rgb(54, 159, 239);
+	/* margin-left: 25rpx; */
+	/* margin-top: 20rpx; */
 }
 
 .boom {
-	height: 3000rpx;
+	height: 2500rpx;
 	display: flex;
 	flex-direction: column;
+	/* // justify-content: center; */
+	/* align-items: center; */
 	overflow: hidden;
 	z-index: 0;
 
+
 	.boom-son {
-		height: 234rpx;
+		height: 200rpx;
 		width: 60rpx;
 		font-size: 30rpx;
 		display: flex;
@@ -414,20 +1526,28 @@
 		align-items: center;
 		text-align: center;
 		z-index: 10;
-		font-size: 22rpx;
+		font-size: 25rpx;
 		color: #A9ACB1;
 
 		.boom-text {
-			width: 30rpx;
-			height: 50rpx;
-			border: 2rpx dashed #A9ACB1;
-			border-radius: 20rpx;
+			/* padding: 5rpx; */
+			width: 40rpx;
+			height: 40rpx;
+			border: 1rpx solid #A9ACB1;
+			border-radius: 50%;
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			z-index: 1;
 			background-color: #eff0f4;
 		}
+
+		/* border: 1rpx solid #A9ACB1;
+		border-radius: 50%; */
+		/* font-weight: 700; */
+		/* border-top: 1rpx solid transparent; */
+		/* border-right: 1rpx solid transparent; */
+		/* border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1; */
 	}
 
 	.boom-son-target {
@@ -442,94 +1562,487 @@
 		font-weight: 700;
 		font-size: 25rpx;
 		color: #A9ACB1;
+
+		/* border-top: 1rpx solid transparent;
+		border-bottom: 1rpx solid transparent; */
+		/* border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1; */
+		/* 确保文字在容器内居中 */
 		background: linear-gradient(to bottom, #ff8a00, #eceaff);
+		/* border-bottom-right-radius: 40rpx;
+			border-top-right-radius: 40rpx; */
 	}
 }
 
-
-.left-top {
-	border-top-left-radius: 0 !important;
-}
-
-.right-top {
-	border-top-right-radius: 0 !important;
-}
-
-.left-bottom {
-	border-bottom-left-radius: 0 !important
-}
-
-.right-bottom {
-	border-bottom-right-radius: 0 !important;
-}
-
-.xian-bian {
-	height: 100%;
-	position: absolute;
+.popup-share {
+	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 999;
-	border-right: 1rpx solid transparent;
-	border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
-}
-
-.pulic-time {
-	width: 100%;
-	height: 100%;
+	right: 0;
+	bottom: 0;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	color: #99C9FD;
-	font-size: 35rpx;
+	backdrop-filter: blur(1rpx);
+	background-color: rgba(236, 237, 241, 0.4);
+	/* 添加毛玻璃效果 */
+	z-index: 999;
+
+
+	.share-other {
+		z-index: 1;
+		width: 100%;
+		height: 100%;
+	}
+
+	.share-title {
+		padding-left: 50rpx;
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.share-others {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+
+		.other-img {
+			width: 150rpx;
+			height: 150rpx;
+			margin-left: 100rpx;
+		}
+	}
+
+	.popup-share-content {
+		position: absolute;
+		display: flex;
+		flex-direction: column;
+		width: 800rpx;
+		height: 450rpx;
+		background-color: #fff;
+		border-radius: 30rpx;
+		transition: opacity 0.4s ease;
+
+		.popup-share-title {
+			margin: 30rpx 30rpx;
+			font-size: 40rpx;
+			position: relative;
+
+			.popup-share-img {
+				position: absolute;
+				top: 0;
+				right: 0;
+				width: 200rpx;
+				height: 200rpx;
+			}
+		}
+
+		.popup-share-upcontent {
+			margin: 0 30rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.popup-share-font {
+				font-size: 35rpx;
+				color: gray;
+			}
+
+		}
+
+		.popup-share-gray {
+			background-color: #D3D3D3;
+			width: calc(100% - 60rpx);
+			height: 2rpx;
+			margin: 110rpx 30rpx 0 30rpx;
+		}
+
+		.popup-share-downcontent {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 100%;
+			margin: 0 30rpx;
+
+			.popup-downcontent-img {
+				width: 70rpx;
+				height: 70rpx;
+			}
+
+			.popup-downcontent-font {
+				font-size: 27rpx;
+				margin-left: 20rpx;
+			}
+
+			.popup-share-downcontent-left {
+				display: flex;
+				align-items: center;
+			}
+
+			.popup-share-downcontent-button {
+				background: linear-gradient(to right bottom, #00c9ff, #0076ff);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 15rpx 30rpx;
+				border-radius: 20rpx;
+				font-size: 32rpx;
+			}
+		}
+
+	}
+
+}
+
+.tags-father {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	/* margin-left: 23rpx; */
+	margin: 10rpx 14rpx;
+	margin-left: 30rpx;
+	/* margin-top: 15rpx; */
+	align-items: center;
+	width: 100rpx;
+	height: 110rpx;
+
+
+	.tags-font {
+		font-size: 25rpx;
+	}
+}
+
+.tags-img {
+	width: 50rpx;
+	height: 50rpx;
+	margin-bottom: 10rpx;
+}
+
+.specia-onshow {
+	background-color: rgb(241, 245, 252);
+	width: 100%;
+	height: 100%;
+	padding: 20rpx;
+
+	.specia-title {
+		width: 100%;
+		height: 100rpx;
+		font-size: 40rpx;
+		font-weight: 600;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.specia-cards {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+	}
+}
+
+/* 容器默认隐藏，透明度为 0，不接受点击 */
+.neuro-wrapper {
+	position: fixed;
+	inset: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	z-index: 999;
+	opacity: 0;
+	pointer-events: none;
+	transition: opacity 0.3s ease;
+}
+
+/* 显示时透明度过渡到 1，可接受点击 */
+.neuro-wrapper.is-active {
+	opacity: 1;
+	pointer-events: auto;
+}
+
+/* 遮罩层，半透明黑色 */
+.neuro-mask {
+	position: absolute;
+	inset: 0;
+	background-color: rgba(0, 0, 0, 0.3);
+}
+
+/* 拟态框 固定尺寸 + 阴影样式 + 相对定位于 wrapper */
+.neuro-box {
+	position: relative;
+	width: 600rpx;
+	height: 450rpx;
+	border-radius: 30rpx;
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	z-index: 1;
+	padding: 0 5%;
+}
+
+.button {
+	width: 47%;
+	background-color: #ddf0ff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: #007CFF;
+	border: 1rpx solid #007CFF;
+	font-size: 25rpx;
+	border-radius: 30rpx;
+}
+
+.title {
+	margin-top: 70rpx;
+	font-size: 33rpx;
 	font-weight: 600;
 }
 
-.right-order{
-	position: fixed;
-	right: 20rpx;
-	top: 62rpx;
-	height: 1220rpx;
-	width: 430rpx;
-	background-color: #fff;
+.card-font {
+	margin-top: 70rpx;
+	width: 600rpx;
+	justify-content: center;
+	display: flex;
+}
+
+.button-white {
+	width: 47%;
+	border: 2rpx solid #c3cacd;
+	background: linear-gradient(to bottom, #f3f3f5, #dee4e9);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 25rpx;
 	border-radius: 30rpx;
-	.order-title{
-		width: 100%;
-		height: 100rpx;
+}
+
+.delete-button-father {
+	position: absolute;
+	bottom: 60rpx;
+	left: 50%;
+	transform: translateX(-50%);
+	width: 100%;
+	height: 70rpx;
+	display: flex;
+	justify-content: space-between;
+	padding: 0 50rpx;
+}
+
+	.right-container-title-nav {
+		margin-top: 60rpx;
 		display: flex;
 		align-items: center;
-		.order-month{
+		height: 60rpx;
+		position: relative;
+		font-size: 28rpx;
+
+		.new-weight {
 			margin-left: 30rpx;
-			font-size: 30rpx;
 			font-weight: 600;
-			width: 80rpx;
 		}
-		.order-day{
-			width: 300rpx;
-			height: 100rpx;
-			.days-father{
-				display: flex;
-				align-items: center;
-				.days{
-					height: 100rpx;
-					min-width: 50rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					font-size: 26rpx;
-					color: #BBBABA;
-				}
-				.targetdays{
-					height: 50rpx;
-					min-width: 50rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					font-size: 26rpx;
-					color: #fff;
-					border-radius: 50%;
-					background-color: #4690FF;
-				}
+
+		.right-icons {
+			position: absolute;
+			right: 0;
+			top: 0;
+			display: flex;
+			align-items: center;
+			margin-top: -5rpx;
+		}
+	}
+
+	.white-button {
+		width: 160rpx;
+		height: 70rpx;
+		border-radius: 40rpx;
+		background-color: #E6E7EB;
+		margin-left: 20rpx;
+		margin-top: 10rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.white-img {
+			width: 35rpx;
+			height: 35rpx;
+			margin-right: 10rpx;
+		}
+	}
+
+	.left-top {
+		border-top-left-radius: 0 !important;
+	}
+
+	.right-top {
+		border-top-right-radius: 0 !important;
+	}
+
+	.left-bottom {
+		border-bottom-left-radius: 0 !important
+	}
+
+	.right-bottom {
+		border-bottom-right-radius: 0 !important;
+	}
+
+	.mark {
+		font-size: 29rpx;
+		position: relative;
+	}
+
+	.marknone {
+		font-size: 29rpx;
+		color: #999;
+		display: flex;
+		margin-top: 5rpx;
+	}
+
+	.tri-down {
+		width: 0;
+		height: 0;
+		border-left: 10rpx solid transparent;
+		/* s/2 */
+		border-right: 10rpx solid transparent;
+		/* s/2 */
+		border-top: 17.32rpx solid #999;
+		/* 0.866 * s */
+		margin: 0rpx 0rpx 0 15rpx;
+		position: relative;
+	}
+
+	.mark-bgc {
+		position: absolute;
+		top: 20rpx;
+		right: 0;
+		width: 450rpx;
+		background-color: #fff;
+		z-index: 999;
+		border-radius: 30rpx;
+		padding-bottom: 30rpx;
+		transition: opacity 0.3s ease;
+	}
+
+	.blue-button {
+		margin-top: 60rpx;
+		width: 150rpx;
+		height: 70rpx;
+		border-radius: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #007CFF;
+		font-size: 30rpx;
+		background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
+		border: 2rpx solid #9AD1FF;
+	}
+
+	.firsttarget {
+		--color: #99C9FD;
+		--thick: 2px;
+		--radius: 50rpx;
+		--outline-offset: 10rpx;
+		/* 外扩多少 */
+		/* 内层虚线（你现在用的） */
+		border-radius: var(--radius);
+		/* 内部背景 */
+		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
+		/* 外层虚线：放在 outline（不会影响元素尺寸） */
+		outline: var(--thick) dashed var(--color);
+		outline-offset: var(--outline-offset);
+		/* 保证文本 / 子元素在最上层 */
+		position: relative;
+		z-index: 999;
+	}
+
+	.secondtarget {
+		--color: #99C9FD;
+		--thick: 2px;
+		--radius: 10rpx;
+		--outline-offset: 0rpx;
+		/* 外扩多少 */
+		/* 内层虚线（你现在用的） */
+		border-radius: var(--radius);
+		/* 内部背景 */
+		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
+		/* 外层虚线：放在 outline（不会影响元素尺寸） */
+		outline: var(--thick) dashed var(--color);
+		outline-offset: var(--outline-offset);
+		/* 保证文本 / 子元素在最上层 */
+		position: relative;
+		z-index: 999;
+	}
+
+	.xian-bian {
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		border-right: 1rpx solid transparent;
+		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+	}
+
+	.pulic-time {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #99C9FD;
+		font-size: 35rpx;
+		font-weight: 600;
+	}
+
+	.zhiling-card {
+		width: calc(100% - 20rpx);
+		height: 200rpx;
+		background-color: rgba(255, 255, 255, 0.3);
+		margin-left: 20rpx;
+		border-radius: 30rpx;
+		border: 2rpx solid rgb(229, 233, 249);
+		position: relative;
+		margin-bottom: 10rpx;
+		padding: 20rpx 30rpx;
+		overflow: hidden;
+
+		.zhiling-card-button {
+			position: absolute;
+			top: 0rpx;
+			right: 0rpx;
+			width: 120rpx;
+			height: 50rpx;
+		}
+
+		.zhiling-card-font {
+			position: absolute;
+			top: 5rpx;
+			right: 20rpx;
+			/* width: 100rpx; */
+			/* height: 40rpx; */
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #1083f8;
+			font-size: 22rpx;
+		}
+
+		.bag {
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 20rpx;
+
+			.bag-one {
+				// margin-right: 10rpx;
 			}
 		}
 	}
-}
\ No newline at end of file
+
+	.overlay {
+		position: fixed;
+		inset: 0;
+		background-color: rgba(236, 237, 241, 0.4);
+		/* 半透明黑色 */
+		z-index: 999;
+	}
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index d96a4de..abdd326 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -1,16 +1,134 @@
 <!-- 护嘱 -->
 <template>
-	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}">
+	<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 timeArray" :key="index">
-									<view class="boom-son">
+								<view v-for="(item,index) in timearr[0].children" :key="index">
+									<view class="boom-son" v-show="item.tagName">
 										<text class="boom-text">
-											{{item}}
+											{{item.tagName}}
 										</text>
 
 									</view>
@@ -20,21 +138,20 @@
 					</view>
 
 					<view class="super-card-container">
-						<scroll-view style="width: 100%;" scroll-with-animation :scroll-left="cardLeft" scroll-x
-							@scroll="handleTop" :show-scrollbar="false">
+						<scroll-view style="height: 1330rpx;width: 100%;border: 2rpx solid balck;" 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" class="super-card-right">
+								<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: 1165rpx;position: relative;">
-
+							<view style="display: flex;height: calc(100% - 330rpx);position: relative;">
 								<view class="xian-bian"></view>
-								<scroll-view style="height: 100%;width:6960rpx;background-color: #fff;"
-									:scroll-top="scrollTop" scroll-with-animation :scroll-y="true"
-									@scroll="handleScrolltime" :show-scrollbar="false">
+								<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">
@@ -46,7 +163,7 @@
 														:id="`a${index0}_${index1}`" style="position: relative;"
 														@click="rulerTouchClick(item1,index0,index1)"
 														:data-index0="index0" :data-index1="index1">
-														<!-- <view class="time-button-orange-spe"
+														<view class="time-button-orange-spe"
 															:style="{left:flyNumber.index0?`-130rpx`:`0`}"
 															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1==0">
 															请选择服务指令迁移的目标单元格
@@ -57,7 +174,7 @@
 															v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1">
 															请选择服务指令迁移的目标单元格
 
-														</view> -->
+														</view>
 														<view class="title-time-blue"
 															v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
 														</view>
@@ -67,25 +184,9 @@
 															:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s` }">
 
 															<view class="title-time" v-if="item1.startTime"
+																
 																style="flex-direction: column;">
-																<view v-if="item1.startTime"
-																	class="title-time-font-rel">
-																	{{ item1.directiveName?splitString(item1.directiveName)[0]:""}}
-																</view>
-																<view
-																	v-if="item1.startTime&&splitString(item1.directiveName)[1]"
-																	class="title-time-font-tags">
-																	({{ item1.directiveName?splitString(item1.directiveName)[1]:""}})
-																</view>
-																<view v-if="item1.startTime" class="card-time" >
-																	{{ `${parseHourMinutestring(item1.startTime).hour}:${parseHourMinutestring(item1.startTime).minute}-${parseHourMinutestring(item1.endTime).hour}:${parseHourMinutestring(item1.endTime).minute}`  }}
-																</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> -->
-																<!-- <image v-show="item1.startTime"
+																<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;">
@@ -99,16 +200,16 @@
 																	style="right: 10rpx;top: 5rpx;"
 																	v-if="item1.cycleTypeId!=1">
 																	{{item1.cycleType}}
-																</view> -->
+																</view>
 															</view>
-															<!-- <view v-if="item1.startTime" class="title-time-font-rel">
-																{{ item1.directiveName?splitString(item1.directiveName)[0]:""}}
+															<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>
@@ -119,32 +220,362 @@
 							</view>
 						</scroll-view>
 					</view>
-					<view class="right-order">
-						<view class="order-title">
-							<view class="order-month">
-								{{ selectdata.month }}月
+					<view class="right-cards">
+						<view style="margin-top: 20rpx;margin-left: 30rpx;">
+							<view class="">
+								即时指令
 							</view>
-							<scroll-view class="order-day" scroll-with-animation :scroll-x="true"
-								:scroll-left="movetime">
-								<view class="days-father">
-									<view :class="daytarget===index? `targetdays` :`days`"
-										v-for="(item,index) in daysarray" :key="index" @click="clickday(item,index)">
-										{{ item }}
+							<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>
 	</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, getDirectiveOrders } from "./api.js";
+	import { getNclist, addBatch, addDirective, addInstant, deleteDirective, deleteInstant, editDirective } from "./api.js";
 	import { myArray } from './yaoshandiao.js';
 
 	const props = defineProps({
@@ -158,13 +589,21 @@
 		(newVal, oldVal) => {
 			// 只有当新旧值不相同时才执行
 			if (newVal !== oldVal) {
-				scrollTop.value = 0.001
-
-				nextTick(() => {
-					scrollTop.value = 0
-					timeNowMove()
-				})
+				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
 			}
 		}
 	)
@@ -183,74 +622,6 @@
 	const bodydonghua = ref(false)
 	const openbody = ref(false)
 	const openface = ref(false)
-
-	const hournow = ref(new Date().getHours());
-
-	// 获得现在的年月日
-	const dateref = ref(getTodayObj())
-	function getTodayObj() {
-		const d = new Date()
-
-		const month = String(d.getMonth() + 1).padStart(2, '0')
-		const day = String(d.getDate()).padStart(2, '0')
-
-		return {
-			year: d.getFullYear(),
-			month,
-			day
-		}
-	}
-	const selectdata = ref({
-		year: 0,
-		month: "",
-		day: ""
-	})
-
-	const daysarray = ref([]);
-	const movetime = ref(0)
-
-	function generateDayArray() {
-		const selY = Number(selectdata.value.year)
-		const selM = Number(selectdata.value.month)
-
-		// 校验：年/月 必须是有效数字且月在1-12之间
-		if (!Number.isFinite(selY) || !Number.isFinite(selM) || selM < 1 || selM > 12) {
-			return []
-		}
-
-		const todayY = Number(dateref.value.year)
-		const todayM = Number(dateref.value.month) // dateref.month 可能是字符串 "01"
-		const todayD = Number(dateref.value.day)
-
-		let endDay = 0
-		if (selY === todayY && selM === todayM) {
-			// 同年同月：到今天为止
-			endDay = todayD;
-		} else {
-			// 不同：计算该月总天数。注意 new Date(year, month, 0).getDate()
-			// 这里 month 要传 1-12（这个构造会返回该月最后一天）
-			endDay = new Date(selY, selM, 0).getDate()
-		}
-		daysarray.value = Array.from({ length: endDay }, (_, i) => String(i + 1).padStart(2, '0'))
-		// console.log("看看生成的咋样", daysarray.value)
-		if (selY === todayY && selM === todayM) {
-			movetime.value = 9998;
-			daytarget.value = daysarray.value.length - 1
-
-		} else {
-			movetime.value = 0.001;
-			daytarget.value = 0
-			setTimeout(() => {
-				movetime.value = 0;
-			}, 50)
-		}
-		// 生成字符串数组 ["01","02",...]
-
-	}
-	const daytarget = ref(0)
-	const clickday = (item : string, index : number) => {
-		daytarget.value = index
-	}
 	watch(
 		() => openbody.value,
 		() => {
@@ -269,6 +640,56 @@
 		}
 	)
 
+	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);
 
@@ -331,14 +752,227 @@
 	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) {
@@ -382,28 +1016,13 @@
 	// 方法：根据条件返回不同的类名
 	const getClass = (item, index0, index1) => {
 		if (item.startTime) {
-			switch (item.executeStatus) {
-				case 'hisOk':
-					return 'title-time-border-hisOk';
-
-				case 'hisFaild':
-					return 'title-time-border-hisFaild';
-
-				case 'current':
-					return 'title-time-border-current';
-				
-				case 'future':
-					return 'title-time-border-yellow';
-
+			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';
 			}
-
-			// 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';
 	}
@@ -416,7 +1035,67 @@
 			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);
@@ -424,11 +1103,40 @@
 	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)
@@ -438,11 +1146,39 @@
 	const flyNumber = ref({
 		index0: 999,
 		index1: 999,
-		// tagName: ''
+		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])
@@ -452,18 +1188,427 @@
 		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 indexsave = ref([-1, -1]);
+	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,
@@ -475,7 +1620,7 @@
 		current: -1,
 		bordershow: true
 	})
-
+	const solveWatch = ref(0)
 	const whereEvent = (data : any) => {
 		saveEditIndex.value.index0 = data.index0;
 		saveEditIndex.value.index1 = data.index1;
@@ -502,89 +1647,47 @@
 		Array.from({ length: 24 }, (_, hour) => ({
 			positioning: hour.toString(),
 			children: minuteArr.map(time => ({
-				// tagName: time,           // 表示分钟，如 '00', '05' 等
+				tagName: time,           // 表示分钟，如 '00', '05' 等
 				directiveName: '' // 默认的 directiveName
 			}))
 		}))
 	)
-
+	const emotionTagList = ref([]);
+	const bodyTagList = ref([]);
 	const geteverything = () => {
-		console.log("看一下", uni.getStorageSync('nuId'), uni.getStorageSync('elderId'))
 		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
-			getTable()
-			// 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;
-			// 	console.log("res",res)
-			// })
-		}
-	}
-	// 处理分钟和小时的函数
-	function parseHourMinutestring(startTime) {
-		// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
-		const parts = startTime.split(' ');
-		if (parts.length < 2) return { hour: NaN, minute: NaN };
-
-		const [hh, mm] = parts[1].split(':');
-		return { hour: hh, minute: mm };
-	}
-	// 处理分钟和小时的函数(number)
-	function parseHourMinute(startTime) {
-		// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
-		const parts = startTime.split(' ');
-		if (parts.length < 2) return { hour: NaN, minute: NaN };
-
-		const [hh, mm] = parts[1].split(':');
-		return { hour: Number(hh), minute: Number(mm) };
-	}
-	const getTable = () => {
-		let time = `${selectdata.value.year}-${selectdata.value.month}-${selectdata.value.day}`
-		getDirectiveOrders(time).then((data) => {
-			// console.log("data",data.result.all)
-			timearr.value = Array.from({ length: 24 }, (_, hour) => ({
-				positioning: hour.toString(),
-				children: minuteArr.map(time => ({
-					// tagName: time,           // 表示分钟，如 '00', '05' 等
-					directiveName: '' // 默认的 directiveName
+			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
+					}))
 				}))
-			}))
-			data.result.all.forEach((element : any) => {
-				element.positioning = parseHourMinute(element.startTime).hour;
-				element.positioningLong = parseHourMinute(element.startTime).minute / 5;
-				timearr.value[element.positioning].children[element.positioningLong] = element;
-				// console.log("element",element.positioning,element.positioningLong)
+				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)
+					}
+				})
 			})
-			console.log("啥啊", timearr.value)
-			// setTimeout(()=>{
-			// 	data.result.all.forEach((element : any) => {
-			// 		element.positioning = parseHourMinute(element.startTime).hour;
-			// 		element.positioningLong = parseHourMinute(element.startTime).minute / 5 ;
-			// 		timearr.value[element.positioning].children[element.positioningLong] = element;
-			// 		console.log("element",element.positioning,element.positioningLong)
-			// 	})
-			// 	console.log("啥啊",timearr.value)
-			// },1000)
-
-
-			// res.result.serviceList.forEach((res : any) => {
-			// 	timearr.value[res.positioning].children[res.positioningLong] = res;
-			// })
-		})
+		}
 	}
 	const savePackagelist = ref([]);
 	onMounted(() => {
-		selectdata.value = dateref.value;
-		generateDayArray()
 		savePackagelist.value = uni.getStorageSync('Packagelist') || []
 		let res = uni.getStorageSync('saveTree0')
 		let goodArray = []
@@ -598,6 +1701,29 @@
 		})
 		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
@@ -623,7 +1749,7 @@
 
 	})
 	function findback(data : any) {
-		// solveWatch.value = 3;
+		solveWatch.value = 3;
 		whereEvent(data)
 	}
 	// 切割bigArray
@@ -657,32 +1783,25 @@
 
 	const totalColumns = 24; // 总列数
 	const totalRows = 11;    // 总行数
-	const visibleWidth = 1455;  // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220
-	const visibleHeight = 1170; // 可视区域高度 (rpx)，假设显示约5行时 heightType = 102.5
+	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) * 290;
-			const cellCenterY = (saveEditIndex.value.index1 + 0.5) * 234;
+			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 * 290;
-			const totalHeight = totalRows * 234;
+			const totalWidth = totalColumns * 259;
+			const totalHeight = totalRows * 200;
 			// 限制 scrollLeft 和 scrollTop 在有效范围内
-			cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2 + 0.7;
+			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;
 		}
 	}
-	// 表格进来就给我居中
-	function timeNowMove() {
-		const cellCenterX = (hournow.value + 0.5) * 290;
-		cardLeft.value = cellCenterX - visibleWidth / 2;
-		const totalWidth = totalColumns * 290;
-		cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2 + 0.7;
-	}
 	const iszhiling = ref(false)
 	const zhilingbao = () => {
 		iszhiling.value = !iszhiling.value
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 45c0b91..841a879 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -3,7 +3,8 @@
 		<!-- 左侧菜单 -->
 		<leftcontent :list="arrlist" @navurl="navurl"></leftcontent>
 		<!-- 主页 -->
-		<index :isShow="menuIndex==0" v-if="swipedex==0" @swip="swip"/>
+		<index :isShow="menuIndex==0" v-if="swipedex==0&&!specialPage" @swip="swip" @gospecial="gospecial" />
+		<bignurse :isshow="menuIndex==0" v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
 		<!-- 户嘱页 -->
 		<nurse :isshow="menuIndex==1" v-if="swipedex==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
 		<!-- 医嘱 -->
@@ -36,11 +37,22 @@
 	import requestform from "./component/pleasetake/takehome.vue"
 	import doctorask from "./component/doctorask/doctorask.vue"
 	import nurse from "./component/nurse/index.vue"
-	import { onShow } from '@dcloudio/uni-app';
+	import bignurse from "./component/nurse/bigindex.vue"
+	import { onBackPress,onShow } from '@dcloudio/uni-app';
 	import {  getNcPackagelist } from './component/nurse/api.js'
 	import leftcontent from "./component/leftcontent/leftcontent.vue"
 	import defaultr from '@/pages/procurement/components/default.vue';
 
+	onBackPress(() => {
+		if(specialPage.value){
+			specialPage.value --
+			return true; // 禁止返回手势返回
+		}else{
+			return false; // 禁止返回手势返回
+		}
+		
+	})
+	
 	const listarr = ref([]);
 	onMounted(() => {
 		menuIndex.value = 0;
@@ -55,7 +67,9 @@
 			listarr.value = res.result ;
 		})
 	})
-
+	const gospecial = (index:number) => {
+		specialPage.value = index
+	}
 	// 通用的生成函数
 	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
 		return Array.from({ length: count }, (_, i) => {
@@ -71,8 +85,10 @@
 		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_hqjz'},
 		{ name: '库房矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_kfjz'},
 	])
+	const specialPage = ref(0)
 	const navurl = (e,v) => {
 		swipedex.value = -1;
+		specialPage.value = 0
 		switch (v.type){
 			case 'hldy':
 			swipedex.value = 0;
@@ -278,7 +294,7 @@
 		position: relative;
 		width: 100%;
 		height: 100vh;
-		background-color: #eff0f4;
+		background-color: #f2f3f8;
 		overflow: hidden;
 		z-index: 12;
 	}