From fec62e4525da85905addcad8a37ac0ff73f95314 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Tue, 6 Jan 2026 08:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E8=A1=A8=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/index.vue | 12 ++----
 pages/timeMatrix/indexnew.vue              | 46 ++++++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index 0624a70..688e536 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -1605,15 +1605,9 @@
 		})
 	}
 	const routerPush = () => {
-		uni.setStorage({
-			key: 'myArray',
-			data: timearr.value,
-			success: function () {
-				uni.navigateTo({
-					url: `/pages/timeMatrix/indexnew`
-				})
-			},
-		});
+		uni.navigateTo({
+			url: `/pages/timeMatrix/indexnew`
+		})
 	}
 	// 暂存器
 	const saveRulerTime = ref({
diff --git a/pages/timeMatrix/indexnew.vue b/pages/timeMatrix/indexnew.vue
index 3ca1391..34adac5 100644
--- a/pages/timeMatrix/indexnew.vue
+++ b/pages/timeMatrix/indexnew.vue
@@ -110,7 +110,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, reactive, watch } from 'vue';
 	import { onLoad } from '@dcloudio/uni-app';
-	import { getNclist } from "@/component/rightItemssecond/api.js";
+	import { getNclist } from "@/pages/NursingNew/component/nurse/api.js";
 	import specialDrawerVue from './drawer/specialDrawer.vue';
 	import rightroll from './drawer/index.vue';
 	// import addball from "./addball.vue"
@@ -120,7 +120,7 @@
 	// import joystick from '@/component/public/newgame/joysticknew.vue';
 	// 暗黑模式
 	const darkFans = ref(false);
-	const timearr = ref([]);
+	
 	type darkFanstype = {
 		darkFans : boolean
 	}
@@ -246,27 +246,33 @@
 	const heightType = ref(180);
 	const cardFont = ref(0);
 	const bili = ref(0)
-	// 生命周期钩子
-	onLoad((options) => {
-		let arr = uni.getStorageSync('myArray');
-		timearr.value = arr
-		if (timearr.value[0].children.length < 8) {
-			timearr.value.forEach((element : any) => {
-				// 循环直到长度达到 7
-				while (element.children.length < 8) {
-					element.children.push({ directiveName: "" });
-				}
-			});
+	// 定义每小时中的分钟数组，表示每 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')) {
+			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
+				res.result.serviceList.forEach((res : any) => {
+					timearr.value[res.positioning].children[res.positioningLong] = res;
+				})
+			})
 		}
-		changetimearr.value = JSON.parse(JSON.stringify(timearr.value));
-		// scrollLeft.value = 740
-
+		changetimearr.value = timearr.value;
+	}
+	// 生命周期钩子
+	onLoad(() => {
+		// 获得数据
+		geteverything()
 		scalcType.value = 7
 		centerCell()
-		// widthType.value = 247;
-		// scrollLeft.value = 740;
-		// heightType.value = 140
-
 	});
 
 	const changeType = (number : number) => {