diff --git a/App.vue b/App.vue
index 4a59124..cd005d6 100644
--- a/App.vue
+++ b/App.vue
@@ -1,18 +1,32 @@
 <script>
+	import { connectWs, closeWs } from '@/common/websocketManager.js';
+	let globalWs = null;
+
 	export default {
-		onLaunch: function() {
-			console.log('App Launch')
+		onLaunch() {
+			console.log('App Launch');
+
 		},
-		onShow: function() {
-			console.log('App Show')
+
+		onShow() {
+			console.log('App Show');
+			if (uni.getStorageSync('userInfo')) {
+				// 重置重连计数，确保立即重连
+				connectWs()
+			}
 		},
-		onHide: function() {
-			console.log('App Hide')
+
+		onHide() {
+			console.log('App Hide');
+			if (uni.getStorageSync('userInfo')) {
+				// 可选择关闭 socket，或只是停止心跳
+				closeWs()
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
 	@import "./uni_modules/vk-uview-ui/index.scss";
-	/*每个页面公共css */
-</style>
+	/* 每个页面公共css */
+</style>
\ No newline at end of file
diff --git a/common/websocket.js b/common/websocket.js
new file mode 100644
index 0000000..76eec43
--- /dev/null
+++ b/common/websocket.js
@@ -0,0 +1,319 @@
+// common/websocket.js
+// 带中文日志与消息体打印选项的 WsRequest（替换你当前文件即可）
+
+class WsRequest {
+  constructor(url = '', options = {}) {
+    this.url = url || '';
+    this.options = Object.assign({
+      header: {},
+      protocols: [],
+      debug: true,
+      lang: 'zh',               // 'zh' 或 'en'，控制日志语言（默认中文）
+      showMessageBody: true,    // 是否在日志中显示收到消息的完整 JSON（默认 true）
+      filterPing: true,         // 是否过滤掉 ping/pong 日志（默认 true）
+      heartbeatInterval: 30000,
+      heartbeatTimeout: 15000,
+      pingMessage: { type: 'ping' },
+      parseJSON: true,
+      maxReconnectAttempts: 10,
+      reconnectDelayBase: 1000,
+      autoConnect: false,
+      bindGlobal: true
+    }, options);
+
+    this.socketTask = null;
+    this.connected = false;
+    this._msgQueue = [];
+    this.reconnectAttempts = 0;
+    this._lastPongAt = Date.now();
+    this._hbTimer = null;
+    this._hbTimeoutTimer = null;
+    this._subscriptions = new Map();
+
+    if (this.options.bindGlobal) this._bindGlobalSocketEvents();
+    if (this.options.autoConnect) setTimeout(() => this.open(), 0);
+  }
+
+  // 内部多语言 Label
+  _label(key) {
+    const zh = {
+      open: '打开连接 ->',
+      alreadyConnected: '已连接，忽略 open',
+      connectNoTask: 'connectSocket 未返回 task，使用全局回调',
+      onOpen: '连接已打开',
+      onMessage: '收到消息',
+      onClose: '连接已关闭',
+      onError: '连接错误',
+      globalOnOpen: '全局 onSocketOpen',
+      globalOnMessage: '全局 onSocketMessage',
+      hbTimeout: '心跳超时',
+      reconnectScheduled: '计划重连',
+      sendFailed: '发送失败',
+      closeError: '关闭错误'
+    };
+    const en = {
+      open: 'open ->',
+      alreadyConnected: 'already connected, ignore open',
+      connectNoTask: 'connectSocket returned no task (using global callbacks if available)',
+      onOpen: 'onOpen',
+      onMessage: 'onMessage',
+      onClose: 'onClose',
+      onError: 'onError',
+      globalOnOpen: 'global onSocketOpen',
+      globalOnMessage: 'global onSocketMessage',
+      hbTimeout: 'hb timeout',
+      reconnectScheduled: 'reconnect scheduled',
+      sendFailed: 'send failed',
+      closeError: 'close error'
+    };
+    return this.options.lang === 'zh' ? zh[key] || key : en[key] || key;
+  }
+
+  // 简单统一日志
+  log(...args) {
+    if (!this.options.debug) return;
+    // 如果是对象，格式化输出以便控制台可读
+    const out = args.map(a => {
+      if (typeof a === 'object') {
+        try { return JSON.stringify(a, null, 2); } catch (e) { return String(a); }
+      }
+      return String(a);
+    }).join(' ');
+    console.log('[WsRequest]', out);
+  }
+
+  // ---------- 对外控制 ----------
+  open() {
+    if (!this.url) { this.log(this._label('open'), this._label('noUrl') || 'no url'); return; }
+    if (this.connected) { this.log(this._label('alreadyConnected')); return; }
+    this.log(this._label('open'), this.url);
+    try {
+      const task = uni.connectSocket({ url: this.url, header: this.options.header, protocols: this.options.protocols });
+      if (task && typeof task.onOpen === 'function') {
+        this._bindSocketTask(task);
+      } else {
+        this.log(this._label('connectNoTask'));
+        // 依赖全局回调，_bindGlobalSocketEvents 已经绑定则会处理 onOpen/onMessage
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  close(code = 1000, reason = 'client close') {
+    this._stopHeartbeat();
+    try {
+      if (this.socketTask && typeof this.socketTask.close === 'function') {
+        this.socketTask.close({ code, reason });
+      } else if (typeof uni.closeSocket === 'function') {
+        uni.closeSocket();
+      }
+    } catch (e) {
+      this.log(this._label('closeError'), e);
+    }
+    this.connected = false;
+  }
+
+  send(payload) {
+    const data = typeof payload === 'string' ? payload : JSON.stringify(payload);
+    if (this.socketTask && typeof this.socketTask.send === 'function' && this.connected) {
+      try { this.socketTask.send({ data }); return; } catch (e) { this.log(this._label('sendFailed'), e); this._msgQueue.push(data); }
+    } else {
+      try { uni.sendSocketMessage({ data }); return; } catch (e) { this._msgQueue.push(data); }
+    }
+  }
+
+  _flushQueue() {
+    if (!this.connected) return;
+    while (this._msgQueue.length) {
+      const d = this._msgQueue.shift();
+      try {
+        if (this.socketTask && typeof this.socketTask.send === 'function') {
+          this.socketTask.send({ data: d });
+        } else {
+          uni.sendSocketMessage({ data: d });
+        }
+      } catch (e) { this._msgQueue.unshift(d); break; }
+    }
+  }
+
+  _bindSocketTask(task) {
+    this.socketTask = task;
+    if (task.__ws_bound__) return;
+    task.__ws_bound__ = true;
+
+    task.onOpen(res => {
+      this.log(this._label('onOpen'), res);
+      this.connected = true;
+      this.reconnectAttempts = 0;
+      this._lastPongAt = Date.now();
+      this._startHeartbeat();
+      this._flushQueue();
+      this.options.onOpen && this.options.onOpen(res);
+    });
+
+    task.onMessage(msg => {
+      this._handleIncoming(msg);
+    });
+
+    task.onClose(res => {
+      this.log(this._label('onClose'), res);
+      this.connected = false;
+      this._stopHeartbeat();
+      this.options.onClose && this.options.onClose(res);
+      this._tryReconnect();
+    });
+
+    task.onError(err => {
+      this.log(this._label('onError'), err);
+      this.connected = false;
+      this._stopHeartbeat();
+      this.options.onError && this.options.onError(err);
+      this._tryReconnect();
+    });
+  }
+
+  // 处理收到的消息（task 或 全局都使用）
+  _handleIncoming(msg) {
+    this._lastPongAt = Date.now();
+    let data = msg && msg.data;
+    if (this.options.parseJSON) {
+      try { data = JSON.parse(msg.data); } catch (e) { /* keep raw */ }
+    }
+    const type = (data && data.type) || '__default__';
+
+    // 过滤 ping/pong （若你想看 ping/pong，把 filterPing 设为 false）
+    const isPing = data && (data.type === 'ping' || data.type === 'pong' || (typeof data === 'string' && (data === 'ping' || data === 'pong')));
+    if (isPing && this.options.filterPing) {
+      // 仍更新 lastPong，但不打印消息体，除非 showMessageBody 强制 true
+      if (this.options.debug && this.options.showMessageBody === false) {
+        this.log(this._label('onMessage'), type);
+      }
+    } else {
+      // 打印消息类型与（可选）格式化消息体
+      if (this.options.debug) {
+        if (this.options.showMessageBody) {
+          let bodyStr;
+          try { bodyStr = JSON.stringify(data, null, 2); } catch (e) { bodyStr = String(data); }
+          this.log(this.options.lang === 'zh' ? `${this._label('onMessage')} (${type}):` : `${this._label('onMessage')} (${type}):`, '\n' + bodyStr);
+        } else {
+          this.log(this._label('onMessage'), type);
+        }
+      }
+    }
+
+    // 外部回调与订阅异步派发
+    if (this.options.onMessage) setTimeout(() => this.options.onMessage(data, msg), 0);
+    setTimeout(() => this._dispatch(type, data, msg), 0);
+  }
+
+  _bindGlobalSocketEvents() {
+    // 解绑默认全局再绑定，避免重复
+    try { uni.offSocketOpen && uni.offSocketOpen(); } catch (e) {}
+    try { uni.offSocketMessage && uni.offSocketMessage(); } catch (e) {}
+    try { uni.offSocketClose && uni.offSocketClose(); } catch (e) {}
+    try { uni.offSocketError && uni.offSocketError(); } catch (e) {}
+
+    try {
+      uni.onSocketOpen(res => {
+        this.log(this._label('globalOnOpen'), res);
+        this.connected = true;
+        this.reconnectAttempts = 0;
+        this._lastPongAt = Date.now();
+        this._startHeartbeat();
+        this._flushQueue();
+        this.options.onOpen && this.options.onOpen(res);
+      });
+    } catch (e) {}
+
+    try {
+      uni.onSocketMessage(msg => {
+        // 全局收到消息也走统一处理
+        if (this.options.debug) this.log(this._label('globalOnMessage'));
+        this._handleIncoming(msg);
+      });
+    } catch (e) {}
+
+    try {
+      uni.onSocketClose(res => {
+        this.log(this._label('globalOnClose'), res);
+        this.connected = false;
+        this._stopHeartbeat();
+        this.options.onClose && this.options.onClose(res);
+        this._tryReconnect();
+      });
+    } catch (e) {}
+
+    try {
+      uni.onSocketError(err => {
+        this.log(this._label('globalOnError'), err);
+        this.connected = false;
+        this._stopHeartbeat();
+        this.options.onError && this.options.onError(err);
+        this._tryReconnect();
+      });
+    } catch (e) {}
+  }
+
+  _startHeartbeat() {
+    this._stopHeartbeat();
+    if (!this.options.heartbeatInterval) return;
+    const pingData = typeof this.options.pingMessage === 'string' ? this.options.pingMessage : JSON.stringify(this.options.pingMessage);
+    this._hbTimer = setInterval(() => {
+      if (!this.connected) return;
+      try { this.send(pingData); } catch (e) { this.log('hb send err', e); }
+      clearTimeout(this._hbTimeoutTimer);
+      this._hbTimeoutTimer = setTimeout(() => {
+        const since = Date.now() - this._lastPongAt;
+        if (since > this.options.heartbeatTimeout) {
+          this.log(this._label('hbTimeout'), since);
+          try { this.close(); } catch (e) { this.log('hb close fail', e); }
+        }
+      }, this.options.heartbeatTimeout);
+    }, this.options.heartbeatInterval);
+  }
+
+  _stopHeartbeat() {
+    if (this._hbTimer) { clearInterval(this._hbTimer); this._hbTimer = null; }
+    if (this._hbTimeoutTimer) { clearTimeout(this._hbTimeoutTimer); this._hbTimeoutTimer = null; }
+  }
+
+  _tryReconnect() {
+    if (this.reconnectAttempts >= this.options.maxReconnectAttempts) { this.log(this._label('reconnectScheduled'), 'exhausted'); return; }
+    this.reconnectAttempts++;
+    const delay = Math.min(this.options.reconnectDelayBase * Math.pow(1.5, this.reconnectAttempts - 1), 30000);
+    this.log(this._label('reconnectScheduled'), delay + 'ms', 'attempt', this.reconnectAttempts);
+    setTimeout(() => {
+      this.socketTask = null;
+      this.connectIfForeground();
+    }, delay);
+  }
+
+  connectIfForeground() {
+    // 如果你在项目中有前台检测，这里可改为判断前台才 open()
+    this.open();
+  }
+
+  subscribe(type, handler) {
+    if (!this._subscriptions) this._subscriptions = new Map();
+    if (!this._subscriptions.has(type)) this._subscriptions.set(type, new Set());
+    this._subscriptions.get(type).add(handler);
+    return () => this.unsubscribe(type, handler);
+  }
+
+  unsubscribe(type, handler) {
+    if (!this._subscriptions) return;
+    const s = this._subscriptions.get(type); if (!s) return; s.delete(handler);
+    if (s.size === 0) this._subscriptions.delete(type);
+  }
+
+  _dispatch(type, data, raw) {
+    if (!this._subscriptions) return;
+    const handlers = this._subscriptions.get(type);
+    if (handlers) for (const h of Array.from(handlers)) try { h(data, raw); } catch (e) { this.log('handler err', e); }
+    const def = this._subscriptions.get('__default__');
+    if (def) for (const h of Array.from(def)) try { h(data, raw); } catch (e) { this.log('default handler err', e); }
+  }
+}
+
+export default WsRequest;
diff --git a/common/websocketManager.js b/common/websocketManager.js
new file mode 100644
index 0000000..9e1c30b
--- /dev/null
+++ b/common/websocketManager.js
@@ -0,0 +1,27 @@
+// websocketManager.js
+import WsRequest from '@/common/websocket.js';
+
+let globalWs = null;
+
+const initWs = (url, options) => {
+  // 如果已经有 WebSocket 实例，直接返回
+  if (globalWs) return globalWs;
+
+  globalWs = new WsRequest(url, options);
+  return globalWs;
+};
+
+const connectWs = () => {
+  if (globalWs) {
+    globalWs.reconnectAttempts = 0;  // 重置重连计数
+    globalWs.open();  // 打开 WebSocket 连接
+  }
+};
+
+const closeWs = () => {
+  if (globalWs) {
+    globalWs.close();  // 关闭 WebSocket 连接
+  }
+};
+
+export { initWs, connectWs, closeWs };
diff --git a/component/public/exit.vue b/component/public/exit.vue
index 486149e..8295eb0 100644
--- a/component/public/exit.vue
+++ b/component/public/exit.vue
@@ -53,6 +53,7 @@
 	}
 	const go = () => {
 		uni.setStorageSync('token', 1);
+		uni.setStorageSync('userInfo', null);
 		
 		uni.redirectTo({
 			url: '/pages/login/login'
diff --git a/main.js b/main.js
index 60486b4..a3c8d2c 100644
--- a/main.js
+++ b/main.js
@@ -1,40 +1,32 @@
-import App from './App'
-// 引入 uView UI
-import uView from './uni_modules/vk-uview-ui';
-
-
-// #ifndef VUE3
-import Vue from 'vue'
-import './uni.promisify.adaptor'
-Vue.config.productionTip = false
-App.mpType = 'app'
-const app = new Vue({
-	...App
-})
-app.$mount()
-// #endif
-
 // #ifdef VUE3
-import {
-	createSSRApp
-} from 'vue'
+import { createSSRApp } from 'vue'
+import App from './App'
+import uView from './uni_modules/vk-uview-ui'
 import donghua from '@/component/public/donghua.vue'
 import errorshow from '@/component/public/errorshow.vue'
-import tanchuang from '@/pages/procurement/components/tanchuang.vue';
-// import arrowkeys from '@/component/public/newgame/arrowkeys.vue'
-export function createApp() {
-	const app = createSSRApp(App)
+import tanchuang from '@/pages/procurement/components/tanchuang.vue'
+// import WsRequest from '@/common/websocket.js' // default 导入，文件必须有 export default
 
-	// 使用 uView UI
-	app.use(uView)
-	app.component('donghua', donghua)
-	app.component('tanchuang', tanchuang)
-	app.component('errorshow', errorshow)
-	
-	
-	// app.component('arrowkeys', arrowkeys)
-	return {
-		app
-	}
+export function createApp() {
+  const app = createSSRApp(App)
+
+  // // 延后创建实例（构造不会阻塞主线程）
+  // const websocket = new WsRequest(
+  //   'wss://www.focusnu.com/ws101/sdWebsocket/1942419556028956674',
+  //   {
+  //     debug: true,
+  //     heartbeatInterval: 25000
+  //   }
+  // )
+
+  // app.config.globalProperties.$socket = websocket
+  // app.provide('socket', websocket)
+
+  app.use(uView)
+  app.component('donghua', donghua)
+  app.component('tanchuang', tanchuang)
+  app.component('errorshow', errorshow)
+
+  return { app }
 }
-// #endif
\ No newline at end of file
+// #endif
diff --git a/pages/NursingNew/component/api.js b/pages/NursingNew/component/api.js
index 09c5989..b53ad20 100644
--- a/pages/NursingNew/component/api.js
+++ b/pages/NursingNew/component/api.js
@@ -8,7 +8,13 @@ export const electricityMeterlist = () => {
 		method: 'get'
 	})
 }
-
+// 获得护理单元主页大图
+export const queryWorkCareList = (data) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryWorkCareList?workType=${data.workType}&employeeId=${data.employeeId}&nuId=${data.nuId}`,
+		method: 'get'
+	})
+}
 // 智能电表设备信息清零
 export const electricityMetereleReset = (cid,address) => {
 	return request({
diff --git a/pages/NursingNew/component/equipment.vue b/pages/NursingNew/component/equipment.vue
index b437124..007532b 100644
--- a/pages/NursingNew/component/equipment.vue
+++ b/pages/NursingNew/component/equipment.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
+	<view class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}" v-if="!closeit" >
 		<view class="zhezhao"
 			v-show="openqingling || openlahzha || openbaoxiu || openhehzha || openchaobiao ||openrizhi"
 			@click="closeall()">
@@ -560,7 +560,7 @@
 		waterwaterReset, waterwaterControl, waterbaoxiu, waterwaterRead, humidDevicebaoxiu, updateDeviceRealTime, cameraInfobaoxiu,
 		electricityMeterListArray, requestLogList, humidDevicejgList, humidDevicejgwarn
 	} from "./api.js"
-	import { movedirection, queryPadPageList } from '@/pages/watch/api/lunpan.js'
+	import { movedirection } from '@/pages/watch/api/lunpan.js'
 	import joysticknew from '@/component/public/newgame/joysticknew.vue';
 
 	const props = defineProps({
@@ -568,12 +568,6 @@
 			type: Boolean,
 			required: true,
 		},
-		// propsmove: {
-		// 	type: Number
-		// },
-		isMain: {
-			type: Boolean
-		}
 	});
 	const movetype = ref(-1);
 
@@ -672,32 +666,7 @@
 	const scrollLeft = ref(0)
 
 	// 监听 isMain 的变化，但只在 isShow 为 true 时响应
-	watch(
-		() => props.isMain,
-		(newVal, oldVal) => {
-			// 如果不是从一个明确的布尔值变到另一个（例如首次 undefined -> 布尔），可以按需忽略
-			if (typeof oldVal !== 'boolean') return
-			if (!props.isShow) return
-			if (lanjie.value) {
-				lanjie.value = false
-				return
-			}
 
-			if (oldVal === true && newVal === false) {
-				movetype.value = 0;
-				zeroIndex.value = 0;
-				typeNowtarget.value = zeroIndex.value;
-				changeallmessage()
-
-			} else if (oldVal === false && newVal === true) {
-				movetype.value = -1
-				zeroIndex.value = -1
-				typeNowtarget.value = 0;
-				changeallmessage()
-			}
-			// console.log("?????",typeNowtarget.value)
-		}
-	)
 	const zeroIndex = ref(-1)
 	const emit = defineEmits(['back', 'cleanmain', `canback`])
 	const savetopindex = ref(0)
@@ -1392,7 +1361,7 @@
 
 	const changeallmessage = () => {
 		uni.$emit('smallmonitor:isshow', false)
-		typeNow.value = allArray.value[typeNowtarget.value].typeNumber;
+		typeNow.value = allArray.value[typeNowtarget.value]?.typeNumber ;
 		if (typeNow.value === 1) {
 			indexmessage.value = allArray.value[typeNowtarget.value]
 			const firstTarget = indexmessage.value.eleValue;
@@ -1441,12 +1410,17 @@
 			changeallmessage()
 		}, 500)
 	}
+	const closeit = ref(false)
 	const init = () => {
 		allArray.value = [];
 		// console.log("????", uni.getStorageSync('serverUrl'), uni.getStorageSync('nuId'))
 		electricityMeterlist().then((res : any) => {
 			// console.log("!!!", res.result)
-			if (res.result.cameraInfoEntityList.length && res.result.cameraInfoEntityList != null) {
+			if(!res.result.cameraInfoEntityList.length){
+				closeit.value = true
+				return
+			}
+			if ( res.result.cameraInfoEntityList != null) {
 				res.result.cameraInfoEntityList.forEach((element : any, index : number) => {
 					element.typeNumber = 0
 					element.lookName = "摄像头" + (index+1) ;
@@ -1454,7 +1428,7 @@
 					allArray.value.push(element)
 				})
 			}
-			if (res.result.electricityMeterEntityList.length && res.result.electricityMeterEntityList != null) {
+			if ( res.result.electricityMeterEntityList != null) {
 				res.result.electricityMeterEntityList.forEach((element : any, index : number) => {
 					element.typeNumber = 1
 					element.lookName = "电表" + (index+1)
@@ -1462,7 +1436,7 @@
 					allArray.value.push(element)
 				})
 			}
-			if (res.result.waterMeterEntityList.length && res.result.waterMeterEntityList != null) {
+			if ( res.result.waterMeterEntityList != null) {
 				res.result.waterMeterEntityList.forEach((element : any, index : number) => {
 					element.typeNumber = 2
 					element.lookName = "水表" + (index+1)
@@ -1470,7 +1444,7 @@
 					allArray.value.push(element)
 				})
 			}
-			if (res.result.humidDeviceEntityList.length && res.result.humidDeviceEntityList != null) {
+			if ( res.result.humidDeviceEntityList != null) {
 				res.result.humidDeviceEntityList.forEach((element : any, index : number) => {
 					element.typeNumber = 3
 					element.lookName = "温度计" + (index+1)
@@ -1479,10 +1453,10 @@
 				})
 			}
 			// 重新刷新动画
-			let donghua = typeNowtarget.value;
+			// let donghua = typeNowtarget.value;
 			typeNowtarget.value = -1;
 			setTimeout(()=>{
-				typeNowtarget.value = donghua
+				typeNowtarget.value = 0
 			},500)
 			
 			// rightmessage.value = res.result.cameraInfoEntityList[0]
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 354b9af..e66748e 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -100,8 +100,17 @@
 					:interval="120" />
 			</view>
 			<view class="weight-time">
-				10:00 - 10:10
-				<view class="pao-father">
+				<view class="" v-if="indexmessage?.startTime">
+					{{ indexmessage?.startTime.slice(11, 16)  }}
+					-
+					{{ indexmessage?.endTime.slice(11, 16) }}
+				</view>
+				<view class="" v-show="!indexmessage?.startTime">
+					暂无数据
+				</view>
+				
+				
+				<view class="pao-father" v-show="indexmessage?.startTime">
 					<image class="pao-img" :src="`/static/index/newindex/states/pao.png`" />
 					<view style="z-index: 1;">
 						待执行
@@ -109,27 +118,27 @@
 
 				</view>
 			</view>
-			<image class="big-img" :src="`/static/index/newindex/wendu/2.png`" />
+			<image class="big-img" :src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" />
 			<view style="display: flex;align-items: center;">
-				<view class="server-name">
-					一级压疮防护
+				<view class="server-name" v-if="indexmessage?.startTime">
+					{{ indexmessage?.directiveName }}
 				</view>
 			</view>
 			<view style="display: flex;margin-top: 40rpx;">
 				<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
-					<view class="start-button">
+					<view class="start-button" v-show="indexmessage?.startTime">
 						开始服务
 					</view>
 				</view>
 				<view style="width: 240rpx;height: 90rpx;">
-					<view class="end-button">
+					<view class="end-button" v-show="indexmessage?.startTime">
 						结束服务
 					</view>
 				</view>
 
 			</view>
 		</view>
-		<view class="left-menu">
+		<view class="left-menu" v-show="indexmessage?.startTime">
 			<view v-for="(item,index) in leftArray" :key="index" style="margin: 30rpx 0;">
 				<view class="left-ball">
 					<image class="left-menu-img" :src="item" />
@@ -137,7 +146,7 @@
 
 			</view>
 		</view>
-		<view class="right-menu">
+		<view class="right-menu" v-show="indexmessage?.startTime">
 			<view class="zhezhao-top" @click="scrollTop -= 115"></view>
 			<view class="zhezhao-bottom" @click="scrollTop += 115"></view>
 			<image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`"
@@ -198,7 +207,8 @@
 				</view>
 
 			</view>
-			<image class="big-older" :src="`/static/index/newindex/leftmenu/${uni.getStorageSync('NUall').elderInfo?.name?`older`:`nopeople`}.png`" />
+			<image class="big-older"
+				:src="`/static/index/newindex/leftmenu/${uni.getStorageSync('NUall').elderInfo?.name?`older`:`nopeople`}.png`" />
 			<view class="name-weight">
 				{{ uni.getStorageSync('NUall').elderInfo?.name ? uni.getStorageSync('NUall').elderInfo?.name:`暂无长者`  }}
 			</view>
@@ -260,6 +270,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
+	import { queryWorkCareList } from './api.js'
 
 	const props = defineProps({
 		isShow: {
@@ -280,6 +291,7 @@
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
+		getgif()
 	}
 	const tagarray = ["市医保", "半失能", "正常计费"]
 
@@ -376,7 +388,7 @@
 				// console.log("????",transition.value)
 				setTimeout(() => {
 					transition.value = true;
-					console.log("看看", uni.getStorageSync('NUall'))
+					// console.log("看看", uni.getStorageSync('NUall'))
 				}, 50)
 			} else {
 				transition.value = false;
@@ -418,7 +430,8 @@
 		// 每秒更新一次时间
 		setInterval(updateTime, 1000);
 		photoplay.value = true;
-		getmenu()
+		getmenu();
+		getgif();
 	})
 	const filteredMenu = (index : number) => {
 		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
@@ -433,6 +446,19 @@
 			})
 		}))
 	}
+	const indexmessage = ref({});
+	const getgif = () => {
+		let data = {
+			nuId: uni.getStorageSync('NUall').nuId,
+			employeeId: uni.getStorageSync('userInfo').employessId,
+			workType: 5
+		}
+		queryWorkCareList(data).then((res : any) => {
+			// console.log("看看图",res.result.records[0])
+			indexmessage.value = res.result.records[0]
+			// console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
+		})
+	}
 	const lanjie = ref(false);
 	const gotolook = () => {
 		uni.navigateTo({
@@ -542,7 +568,7 @@
 				margin-top: 0.5vw;
 				width: 9vw;
 				height: 9vw;
-				
+
 				border: 1rpx solid #DCDCDC;
 				border-radius: 50%;
 			}
diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index 1af49d6..87da581 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -781,51 +781,6 @@
 		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-black-spe {
-	transition: all 1s;
-	position: absolute;
-	width: 360rpx;
-	height: 100rpx;
-	/* padding-left: 3rpx; */
-	padding: 0 20rpx;
-	border-radius: 20rpx;
-	border-top-right-radius: 0;
-	border: 2rpx solid #e8e9eb;
-	color: #545569;
-	/* background-color: rgb(77, 77, 77); */
-	bottom: -100rpx;
-	left: -220rpx;
-	/* color: #fff; */
-	background-color: #fff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	z-index: 999;
-	/* box-shadow: 0 2px 6px rgba(0, 131, 250, 0.2); */
-
-}
-
-.time-button-black {
-	transition: all 1s;
-	position: absolute;
-
-	width: 360rpx;
-	height: 100rpx;
-	padding: 0 20rpx;
-	border-radius: 20rpx;
-	border-bottom-right-radius: 0;
-	background-color: #fff;
-	top: -100rpx;
-	left: -220rpx;
-	border: 2rpx solid #e8e9eb;
-	color: #545569;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	z-index: 999;
-	box-shadow: 0 2px 6px rgba(0, 131, 250, 0.2);
-
-}
 
 .time-button-orange-spe {
 	transition: all 1s;
@@ -1954,12 +1909,13 @@
 		border-top: 17.32rpx solid #999;
 		/* 0.866 * s */
 		margin: 0rpx 0rpx 0 15rpx;
+		position: relative;
 	}
 
 	.mark-bgc {
 		position: absolute;
-		top: 50rpx;
-		left: 0;
+		top: 20rpx;
+		right: 0;
 		width: 450rpx;
 		background-color: #fff;
 		z-index: 999;
diff --git a/pages/NursingNew/component/nurse/index.ts b/pages/NursingNew/component/nurse/index.ts
deleted file mode 100644
index 39e7f73..0000000
--- a/pages/NursingNew/component/nurse/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// 定义 Link 类型
-export type roomBtttonType = {
-	url : string;
-	targetUrl : string;
-	name : string
-}
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index cf59e48..0624a70 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -14,9 +14,23 @@
 					: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>
@@ -35,19 +49,27 @@
 									</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 class="marknone" @click="openbody=!openbody;openface=false">
-						<view v-if="!bodyTagListLook.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>
-					<view class="tri-down" @click="openbody=!openbody;openface=false"></view>
 				</view>
-				<view style="display: flex;align-items: center;margin-right: 15rpx;padding: 0 15rpx;"
+				<!-- <view style="display: flex;align-items: center;margin-right: 15rpx;padding: 0 15rpx;"
 					:class="topindex===1&&!bodystatus&&!facestatus?'firsttarget':''">
 					<view class="mark">
 						情绪标签：
@@ -82,18 +104,18 @@
 					</view>
 
 					<view class="tri-down" @click="openface=!openface;openbody=false"></view>
-				</view>
-				<view class="white-button" :class="topindex===2?'firsttarget':''" @click="routerPush">
+				</view> -->
+				<view class="white-button"  @click="routerPush">
 					<image class="white-img" :src="`/static/index/newruler/yulan.png`" />
 					预览
 				</view>
-				<view class="white-button" :class="topindex===3?'firsttarget':''" @click="shareToWeixin">
+				<view class="white-button"  @click="shareToWeixin">
 					<image class="white-img" :src="`/static/index/newruler/fenxiang.png`" />
 					分享
 				</view>
-				<view class="white-button" :class="topindex===3?'firsttarget':''" @click="zhilingbao">
-					<image class="white-img" :src="`/static/index/newruler/fenxiang.png`" />
-					指令包
+				<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>
@@ -113,12 +135,6 @@
 								</view>
 							</view>
 						</view>
-						<!-- <view class="boom" :style="{ transform: transformStyle }" ref="leftLabels">
-							<view v-for="(item, index) in timearr[0].children" :key="index" class="boom-son"
-								v-show="item.tagName">
-								<text class="boom-text">{{ item.tagName }}</text>
-							</view>
-						</view> -->
 					</view>
 
 					<view class="super-card-container">
@@ -159,18 +175,6 @@
 															请选择服务指令迁移的目标单元格
 
 														</view>
-														<!-- <view class="time-button-black-spe"
-															:style="{left:saveEditIndex.index0?`-220rpx`:`0`}"
-															v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && index1==0 && isDelete">
-															是否确认删除该服务指令
-
-														</view>
-														<view class="time-button-black"
-															:style="{left:saveEditIndex.index0?`-220rpx`:`0`}"
-															v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && index1 && isDelete">
-															是否确认删除该服务指令
-
-														</view> -->
 														<view class="title-time-blue"
 															v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
 														</view>
@@ -407,13 +411,10 @@
 											监控
 										</view>
 									</view>
-
 								</view>
 							</view>
-
 						</view>
 					</view>
-
 				</view>
 			</view>
 		</view>
@@ -566,19 +567,15 @@
 					</view>
 
 				</view>
-				<!-- <view class="card-font">
-					确定要删除指令吗
-				</view> -->
 			</view>
 		</view>
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick,   watch } from 'vue';
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
 	import { onShow, onHide } from '@dcloudio/uni-app';
-	import type { roomBtttonType } from "./index";
-	import { getNclist, addBatch, addDirective, addInstant, addElderTag, deleteDirective, deleteInstant, deleteElderTag, editDirective } from "./api.js";
+	import { getNclist, addBatch, addDirective, addInstant, deleteDirective, deleteInstant, editDirective } from "./api.js";
 	import { myArray } from './yaoshandiao.js';
 
 	const props = defineProps({
@@ -586,19 +583,7 @@
 			type: Boolean,
 			required: true,
 		},
-		darkFans: {
-			type: Boolean,
-		},
-		canmove: {
-			type: Boolean,
-		},
-		
 	});
-	watch(
-		() => props.canmove,
-		() => {
-			bottomisShaking.value = false;
-		})
 	watch(
 		() => props.isshow,
 		(newVal, oldVal) => {
@@ -619,7 +604,6 @@
 					})
 				}
 				upmenuIndex.value = 0
-				getblue.value = !getblue.value
 			}
 		}
 	)
@@ -628,7 +612,6 @@
 	const facestatus = ref(false);
 	const facestatustarget = ref(-1);
 
-
 	/* ---- 用于 transform 的响应式字符串 ----
 	   注意：虽然这是响应式，但我们只在 rAF 里更新它（受控更新），避免频繁触发 Vue 渲染 */
 	const transformStyle = ref('translate3d(0, 0, 0)');
@@ -644,7 +627,6 @@
 		() => {
 			setTimeout(() => {
 				bodydonghua.value = openbody.value
-				emit('vip', bodydonghua.value)
 			}, 50)
 		}
 	)
@@ -654,7 +636,6 @@
 		() => {
 			setTimeout(() => {
 				facedonghua.value = openface.value
-				emit('vip', facedonghua.value)
 			}, 50)
 		}
 	)
@@ -663,9 +644,7 @@
 	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) => {
@@ -676,7 +655,7 @@
 
 			if (targetNumber > 1) {
 				uni.showToast({
-					title: "标签最多只能添加两个",
+					title: "每种标签最多只能添加两个",
 					icon: 'none',
 					duration: 3000
 				})
@@ -713,7 +692,6 @@
 	}
 
 	const open = ref(false);
-	const getblue = ref(false);
 
 	const bottomItems = ref([])
 	const nameArray = [
@@ -807,8 +785,6 @@
 		} else {
 			doChangeNew()
 		}
-
-
 	}
 	const doChangeNew = () => {
 		let object = JSON.parse(JSON.stringify(timearr.value[flyNumber.value.index0].children[flyNumber.value.index1]))
@@ -824,7 +800,6 @@
 		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());
@@ -871,15 +846,6 @@
 
 		timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime =
 			`${String(newEndHour)}:${pad2(newEndMin)}`;
-		// const rest = startTime.split(":")[1]; // ":20"
-		// const rest0 = endTime.split(":")[1];; // ":20"
-		// let many = Number(rest0) - Number(rest);
-		// let start = newtagName
-		// let end = Number(start) + many
-		// // 用 positioning 替换原来的小时部分
-		// timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, '0'); // "9:20"
-		// timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime = positioning + ":" + String(end % 60).padStart(2, '0'); // "9:20"
-		flyNumber.value.index0 = -1;
 		flyNumber.value.index1 = -1;
 		isMove.value = false;
 		let data = {
@@ -887,16 +853,13 @@
 			index1: saveEditIndex.value.index1
 		}
 		whereEvent(data);
-		// saveAll()
 		let infoValue = timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1]
 		infoValue.positioning = saveEditIndex.value.index0;
 		infoValue.positioningLong = saveEditIndex.value.index1;
-		// console.log("issuccess？",saveEditIndex.value.index0,saveEditIndex.value.index1)
 		editDirective(infoValue).then((res : any) => {
 			if (res.success) {
 				geteverything()
 			}
-
 		})
 	}
 	//变更左侧菜单
@@ -912,8 +875,8 @@
 		monthIndex.value = -1;
 		weekValue.value = "";
 		monthValue.value = "";
-		secondtop.value = 1
-		firsttop.value = 1
+		secondtop.value = 0.01
+		firsttop.value = 0.01
 		//这个东西完全是为了给动画用的，因为downmenuIndex这个吊东西其他地方在用，所以需要再整一个属性。
 		downdonghua.value = -1;
 
@@ -948,113 +911,9 @@
 		}
 	}
 
-	function dosomesave() {
-		cardsumit.value.op.name = secondopenValue.value[cardsumit.value.op.index[2]].relName
-		switch (secondopenValue.value[cardsumit.value.op.index[2]].cycleTypeId) {
-			case `1`:
-				openOp.value = 0
-				break;
-			case `2`:
-				openOp.value = 1
-				break;
-			case `3`:
-				openOp.value = 2
-				break;
-			default:
-				break;
-		}
-	}
-	const selectType = ref(true);
-	const deleteButton = ref(false);
 	const isRule = ref(false);
-	const savemoved = ref(-1);
-	const movecard = (where : number) => {
-		// isDelete.value = false;
-		// switch (where) {
-		// 	case 0:
-		// 		if (saveEditIndex.value.index1) {
-		// 			saveEditIndex.value.index1--
-		// 			centerCell();
-		// 			isopen.value = false;
-		// 			if (open.value) {
-		// 				setTimeout(() => {
-		// 					rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-		// 				}, 50)
-		// 			}
-		// 		} else {
-		// 			topindex.value = 0
-		// 			savemoved.value = saveEditIndex.value.index0
-		// 			isRule.value = false;
-		// 		}
-		// 		break
-		// 	case 1:
-		// 		if (saveEditIndex.value.index0 == 23) {
-		// 			return
-		// 		}
-		// 		saveEditIndex.value.index0++
-		// 		centerCell();
-		// 		isopen.value = false;
-		// 		if (open.value) {
-		// 			setTimeout(() => {
-		// 				rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-		// 			}, 50)
-		// 		}
-		// 		break
-		// 	case 2:
-		// 		if (saveEditIndex.value.index1 == 11) {
-		// 			return
-		// 		}
-		// 		saveEditIndex.value.index1++
-		// 		centerCell();
-		// 		isopen.value = false;
-		// 		if (open.value) {
-		// 			setTimeout(() => {
-		// 				rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-		// 			}, 50)
-		// 		}
-		// 		break
-		// 	case 3:
-		// 		if (saveEditIndex.value.index0 == 0) {
-		// 			return
-		// 		}
-		// 		saveEditIndex.value.index0--
-		// 		centerCell();
-		// 		isopen.value = false;
-		// 		if (open.value) {
-		// 			setTimeout(() => {
-		// 				rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-		// 			}, 50)
-		// 		}
-		// 		break
-		// }
-	}
 	const topindex = ref(-1)
-	const movetop = (where : number) => {
-		isDelete.value = false;
-		switch (where) {
-			case 0:
 
-				break
-			case 1:
-				if (topindex.value < 3) {
-					topindex.value++
-				}
-
-				break
-			case 2:
-				openbody.value = false
-				openface.value = false
-				topindex.value = -1
-				saveEditIndex.value.index0 = savemoved.value
-				isRule.value = true;
-				break
-			case 3:
-				if (topindex.value) {
-					topindex.value--
-				}
-				break
-		}
-	}
 	const weekValue = ref("");
 	const weekIndex = ref(-1);
 	const monthValue = ref("");
@@ -1114,14 +973,7 @@
 		}
 
 	}
-	const haveName = ref(false);
-	const isHave = () => {
-		if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].directiveName) {
-			haveName.value = true;
-		} else {
-			haveName.value = false;
-		}
-	}
+
 	// 给抖动用的
 	function pseudoRandom(index0, index1) {
 		const seed = index0 * 55.9898 + index1 * 78.233;
@@ -1135,17 +987,12 @@
 	// 在作用域中声明一个定时器变量
 	let throttleTimer = null;
 	//监听拖拽
-	// const dragOffset = ref(0);
-	// const moveDownNumber = ref(0)
 	/* 兼容：如果不支持 requestAnimationFrame，就用 setTimeout */
 	const requestAnimationFrame =
 		typeof window !== 'undefined' && window.requestAnimationFrame
 			? window.requestAnimationFrame
 			: (cb) => setTimeout(cb, 16);
 	function handleScrolltime(e) {
-		// let num = e.detail.scrollTop
-		// let formattedNum = parseFloat(num.toFixed(2));
-		// moveDownNumber.value = formattedNum
 		// uni-app 的 scroll 事件通常把位置放在 e.detail.scrollTop
 		// 为保险，先做容错判断
 		const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
@@ -1166,8 +1013,6 @@
 	function handleTop(e) {
 		leftIn.value = e.detail.scrollLeft
 	}
-
-	const changeBug = ref(true);
 	// 方法：根据条件返回不同的类名
 	const getClass = (item, index0, index1) => {
 		if (item.startTime) {
@@ -1271,18 +1116,11 @@
 			lastTap.value = now
 		}
 	}
-	// 暗黑模式
-	const underFans = ref<boolean>(false);
-	// 当前选中的菜单索引
-	const roomTar = ref<number[]>([]);
-	const emit = defineEmits(['vip', 'changeold']);
-	const isEdit = ref(false);
+
 	const saveEditIndex = ref({
 		index0: -1,
 		index1: -1
 	})
-	const clickstauts = ref(0)
-	const secondopenValue = ref([]);
 
 	const secondContant = (index : number) => {
 		iszhouqi.value = false;
@@ -1293,16 +1131,12 @@
 		downmenuIndex.value = index;
 		downdonghua.value = index;
 		thirdmenuIndex.value = 0;
-		firsttop.value = 1;
+		firsttop.value = 0.01;
 		nextTick(() => {
 			firsttop.value = 0;
 		})
 	}
 
-	const newchange = (type : number) => {
-		emit('changeold', type)
-	}
-
 	const timer = ref(null);//计时器
 	const elementsInfo = ref({})//所有表格的信息
 	const moveX = ref(0)
@@ -1314,26 +1148,13 @@
 		index1: 999,
 		tagName: ''
 	})
-	const deletebottomindex = ref(-1);
-	const deletedownisopen = ref(false);
+
 	const deletedownisopacity = ref(false);
-	const deletebottom = (index : number, name : string) => {
-		bottomisShaking.value = false;
-		deletebottomindex.value = index;
-		shakyTable.value = false;
-		deletedownisopacity.value = false;
-		deletedownisopen.value = true;
-		deletename.value = name;
-		setTimeout(() => {
-			deletedownisopacity.value = true
-		}, 100)
-	}
 
 	const touchindex1 = ref(-1);
 	// 分享矩阵到微信
 	const shareShow = ref(false);
 	const shareToWeixin = () => {
-
 		shareShow.value = true;
 		deletedownisopacity.value = false;
 		setTimeout(() => {
@@ -1414,42 +1235,15 @@
 	const shakyTable = ref(false);
 	const reldata = ref([]);
 	const deleteRuler = (index0 : number, index1 : number) => {
-		console.log("?????", timearr.value[index0].children[index1])
 		deleteDirective(timearr.value[index0].children[index1]).then((res : any) => {
-
 			if (res.success) {
 				geteverything()
 			}
 		})
 	}
-	const longPressTimer = ref(null);
-	const isScrolling = ref(false)
-	//长按计时器
-	let scrollTimeout = null
-	function handleScroll(e) {
-		isScrolling.value = true
-		// 清除之前的定时器
-		if (scrollTimeout) clearTimeout(scrollTimeout)
-		// 设置新的定时器
-		scrollTimeout = setTimeout(() => {
-			isScrolling.value = false;
-		}, 400)
-	}
-	const isBack = ref(false)
+
 	const saveX = ref(0);
 	const saveY = ref(0);
-	const isTuoing = ref(false);
-
-	// 存储菜单的id
-	const saveId = ref("");
-	const saveTagName = ref("");
-	function isblue() {
-		if (openOp.value !== -1) {
-			return true
-		} else {
-			return false
-		}
-	}
 
 	const bottomTimer = ref(null);
 	const bottomisShaking = ref(false);
@@ -1481,45 +1275,8 @@
 			bottomTimer.value = null
 		}
 	}
-	const openValue = ref({
-		time: "",
-		minute: "",
-		array: []
-	})
-	const cardsumit = ref({
-		op: {
-			name: "",
-			index: [-1, -1, -1],
-		},
-		startTime: "",
-		weekTimeNumber: -1,
-		monthTimeNumber: -1,
-		monthTime: "",
-		weekTime: ""
-	})
-	const openOp = ref(0);
-	const clickOp = (index : number, item : any) => {
-		saveId.value = item.id;
-		cardsumit.value.op.index[2] = index
-		cardsumit.value.op.name = item.relName
-		switch (item.cycleTypeId) {
-			case 0:
-				openOp.value = 0
-				break;
-			case 1:
-				openOp.value = 1
-				break;
-			case 2:
-				openOp.value = 2
-				break;
-			default:
-				break;
-		}
-
-	}
 
 	const indexsave = ref([-1, -1]);
-	const scrollContainer = ref(null)
 	const opensay = () => {
 		sayisopacity.value = false;
 		sayisopen.value = true;
@@ -1552,9 +1309,7 @@
 	}
 
 	const doaddDirective = (element : any) => {
-		// console.log("提交了啥", element)
 		addDirective(element).then((res) => {
-			console.log("添加后返回了啥1", res)
 			if (res.success) {
 				geteverything()
 			}
@@ -1563,7 +1318,6 @@
 
 	const killjishi = (id : string) => {
 		deleteInstant({ id: id }).then((res) => {
-			// console.log("添加后返回了啥1", res)
 			if (res.success) {
 				geteverything()
 			}
@@ -1571,7 +1325,6 @@
 	}
 
 	const addnew = () => {
-		// console.log("9999", timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1])
 
 		if (isDelete.value) {
 			isDelete.value = false;
@@ -1590,7 +1343,6 @@
 		if (iszhiling.value) {
 
 			let allobject = savePackagelist.value[forthmenuIndex.value];
-			// console.log("special",allobject)
 
 			if (saveEditIndex.value.index1 === -1 && saveEditIndex.value.index0 === -1) {
 				return
@@ -1659,14 +1411,11 @@
 				index1: saveEditIndex.value.index1
 			}
 			whereEvent(data);
-			console.log("zou", haveValue)
 			if (haveValue) {
-
 				editDirective(param).then((res : any) => {
 					if (res.success) {
 						geteverything()
 					}
-
 				})
 			} else {
 				doaddDirective(param);
@@ -1758,7 +1507,6 @@
 				cycleType = monthValue.value + "号";
 				cycleValue = monthValue.value
 			}
-			console.log("重要", cycleValue)
 			iszhouqi.value = false;
 			weekIndex.value = -1;
 			monthIndex.value = -1;
@@ -1771,7 +1519,6 @@
 		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')}`
-		console.log("allobject", allobject)
 		let param = {
 			id: haveValue ? timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id : "",
 			nuId: uni.getStorageSync('nuId'),
@@ -1815,17 +1562,14 @@
 			index1: saveEditIndex.value.index1
 		}
 		whereEvent(data);
-		console.log("日常指令看看进入了啥", param)
 		if (haveValue) {
 			editDirective(param).then((res : any) => {
 				if (res.success) {
 					geteverything()
 				}
-
 			})
 		} else {
 			doaddDirective(param);
-
 		}
 
 	}
@@ -1835,7 +1579,6 @@
 		if (!cansumit.value) {
 			return
 		}
-
 		let info = []
 
 		bodyTagList.value.forEach((element : any) => {
@@ -1849,21 +1592,14 @@
 			}
 		})
 
-		// bottomItems.value.forEach((element : any, index : number) => {
-		// 	element.sort = index
-		// })
-
 		let allvalue = {
 			nuId: uni.getStorageSync('nuId'),
 			nuName: uni.getStorageSync('nuName'),
 			elderId: uni.getStorageSync('elderId'),
 			elderName: uni.getStorageSync('NUall').elderInfo.name,
-			// serverList: postArray,
-			// instantList: bottomItems.value,
 			tagList: info
 		}
 
-		// console.log("入参", allvalue)
 		addBatch(allvalue).then(() => {
 			geteverything()
 		})
@@ -1934,13 +1670,10 @@
 						directiveName: '' // 默认的 directiveName
 					}))
 				}))
-				// console.log("wtf", res)
 				res.result.serviceList.forEach((res : any) => {
 					timearr.value[res.positioning].children[res.positioningLong] = res;
 				})
-				// console.log("返回了", res.result)
 				bottomItems.value = res.result.instantList
-				// console.log("看看获得了什么",bottomItems.value)
 				cansumit.value = true;
 				emotionTagList.value = res.result.emotionTagList;
 				emotionTagListLook.value = []
@@ -1951,13 +1684,11 @@
 					}
 				})
 				bodyTagList.value = res.result.bodyTagList
-				// console.log("zzzz",res.result.bodyTagList)
 				res.result.bodyTagList.forEach((res : any) => {
 					if (res.izSelected == 'Y') {
 						bodyTagListLook.value.push(res.netPic)
 					}
 				})
-				// console.log("res11111",res)
 			})
 		}
 	}
@@ -1975,7 +1706,6 @@
 			})
 		})
 		secondtemp.value = goodArray
-
 		if (res.result) {
 			res.result.forEach((element : any) => {
 				if (element.netFlag == '0') {
@@ -2001,7 +1731,6 @@
 				})
 			})
 			bigArray.value = res.result;
-			// console.log("右侧",bigArray.value)
 		}
 		downList.value = bigArray.value[0].children
 		upmenuIndex.value = -1;
@@ -2013,8 +1742,6 @@
 		uni.$on('where', findback);
 		downdonghua.value = 0;
 		geteverything()
-
-
 	})
 
 	const bodyTagListLook = ref([]);
@@ -2031,43 +1758,6 @@
 		solveWatch.value = 3;
 		whereEvent(data)
 	}
-
-	const moveNumber = ref({
-		index0: 999,
-		index1: 999
-	})
-
-	const moBan = ref({
-		directiveId: "",
-		directiveName: "",
-		typeId: "",
-		typeName: "",
-		categoryId: "",
-		categoryName: "",
-		cycleTypeId: "",
-		cycleType: "",
-		cycleValue: "",
-		startTime: "",
-		endTime: "",
-		positioning: "",
-		positioningLong: "",
-		izPackage: 'N',
-		previewFile: "",
-		previewFileSmall: "",
-		serviceDuration: "",
-		immediateFile: "",
-		immediateFileFocus: "",
-		netImmediateFileFocus:"",
-		netImmediateFile: "",
-		tagName: "",
-		netPreviewFile:"",
-		netPreviewFileSmall:"",
-		mp3File:"",
-		netMp3File:"",
-		mp4File:"",
-		netMp4File:"",
-		serviceContent:"",
-	})
 	// 切割bigArray
 	function splitString(str) {
 		// 使用正则表达式找到所有括号的内容
diff --git a/pages/NursingNew/component/nurse/index暂存.vue b/pages/NursingNew/component/nurse/index暂存.vue
new file mode 100644
index 0000000..ae1e7c6
--- /dev/null
+++ b/pages/NursingNew/component/nurse/index暂存.vue
@@ -0,0 +1,1800 @@
+<!-- 护嘱 -->
+<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 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>
+					</view>
+					<view class="marknone" @click="openbody=!openbody;openface=false">
+						<view v-if="!bodyTagListLook.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>
+					<view class="tri-down" @click="openbody=!openbody;openface=false"></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" :class="topindex===2?'firsttarget':''" @click="routerPush">
+					<image class="white-img" :src="`/static/index/newruler/yulan.png`" />
+					预览
+				</view>
+				<view class="white-button" :class="topindex===3?'firsttarget':''" @click="shareToWeixin">
+					<image class="white-img" :src="`/static/index/newruler/fenxiang.png`" />
+					分享
+				</view>
+				<view class="white-button" :class="topindex===3?'firsttarget':''" @click="zhilingbao">
+					<image class="white-img" :src="`/static/index/newruler/fenxiang.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.setStorage({
+			key: 'myArray',
+			data: timearr.value,
+			success: function () {
+				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('saveTree')
+		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/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index c71c2b1..0bd2d40 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -176,7 +176,7 @@
 				item.zk = false;
 				item.scrollleft = 0;
 			})
-			console.log("?????",form,res.result.records)
+			// console.log("?????",form,res.result.records)
 			listarr.value.push(...res.result.records)
 			status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
 		})
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 1b365a3..5cf14dc 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -1,18 +1,23 @@
 <template>
 	<view class="backgroundContainer">
-
+		<!-- 左侧菜单 -->
 		<leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent>
-	
 		<!-- 主页 -->
 		<index :isShow="menuIndexshow" v-if="!menuIndex" />
 		<!-- 设备页 -->
-		<equipment :isShow="menuIndexshowfifth" v-if="menuIndex==4"  />
+		<equipment :isShow="menuIndexshowfifth" v-if="menuIndex==4" />
+		<!-- 医嘱页 -->
 		<requestform :isShow="menuIndexshowfourth" v-if="menuIndex==3" />
 		<!-- 户嘱页 -->
 		<nurse :isshow="menuIndexshowsecond"
-			v-if="menuIndex==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')"  />
+			v-if="menuIndex==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
 		<!-- 医嘱 -->
-		<doctorask  v-if="menuIndex==2"/>
+		<doctorask v-if="menuIndex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
+		<!-- 没有数据 -->
+		<view class="nomessageclass" :style="messageopit?{opacity: `1`}:{opacity: `0`}"
+			v-if="(menuIndex == 1 || menuIndex == 2) && (!uni.getStorageSync('elderId') ||!uni.getStorageSync('nuId'))">
+			<defaultr cont="暂无老人入住"></defaultr>
+		</view>
 	</view>
 </template>
 
@@ -26,6 +31,8 @@
 	import { onShow } from '@dcloudio/uni-app';
 	import { getServiceTree, getNcPackagelist } from './component/nurse/api.js'
 	import leftcontent from "./component/leftcontent/leftcontent.vue"
+	import defaultr from '@/pages/procurement/components/default.vue';
+
 
 	onMounted(() => {
 		menuIndex.value = -1;
@@ -41,7 +48,6 @@
 		})
 	})
 
-
 	// 通用的生成函数
 	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
 		return Array.from({ length: count }, (_, i) => {
@@ -52,27 +58,30 @@
 		})
 	}
 	const tabbrarr = ref([
-		{name:'首页',url:'/static/shouye/sy/h0.png',urls:'/static/shouye/sy/h1.png'},
-		{name:'护嘱',url:'/static/shouye/sy/n0.png',urls:'/static/shouye/sy/n1.png'},
-		{name:'医嘱',url:'/static/shouye/sy/y0.png',urls:'/static/shouye/sy/y1.png'},
-		{name:'后勤',url:'/static/shouye/sy/l0.png',urls:'/static/shouye/sy/l1.png'},
-		{name:'物联',url:'/static/shouye/sy/g0.png',urls:'/static/shouye/sy/g1.png'},
-		{name:'返回',url:'/static/shouye/sy/f0.png',urls:'/static/shouye/sy/f1.png'},
+		{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' },
+		{ name: '护嘱', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' },
+		{ name: '医嘱', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' },
+		{ name: '后勤', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' },
+		{ name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png' },
+		{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' },
 	])
-	const navurl =(e)=>{
+	const navurl = (e) => {
 		changeMenu(e)
 	}
 
-
 	// 当前选中的菜单索引
 	const menuIndex = ref<number>(-1);
 	const menuIndexshow = ref<boolean>(false);
 	const menuIndexshowsecond = ref<boolean>(false);
 	const menuIndexshowfourth = ref<boolean>(false);
 	const menuIndexshowfifth = ref<boolean>(false);
+	const messageopit = ref<boolean>(false);
 
 	// 变更菜单
 	const changeMenu = (index : number) => {
+		if (index === menuIndex.value) {
+			return
+		}
 		menuIndex.value = index;
 		menuIndexshow.value = false
 		menuIndexshowsecond.value = false
@@ -89,7 +98,11 @@
 					break;
 				case 1:
 					menuIndexshowsecond.value = true
+					nomesssageshow()
+					break;
+				case 2:
 
+					nomesssageshow()
 					break;
 				case 3:
 					menuIndexshowfourth.value = true
@@ -121,12 +134,15 @@
 
 	});
 
-
-
+	const nomesssageshow = () => {
+		messageopit.value = false;
+		setTimeout(() => {
+			messageopit.value = true;
+		}, 200)
+	}
 </script>
 
 <style lang="less" scoped>
-
 	.backgroundContainer {
 		display: flex;
 		position: relative;
@@ -137,5 +153,8 @@
 		z-index: 12;
 	}
 
-	
+	.nomessageclass {
+		width: 100vw;
+		transition: opacity 1s ease;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 9f9da56..2759e79 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -36,7 +36,7 @@
 			</view>
 		</view>
 		<view class="photo-father">
-			<view class="juzhong" style="margin-left: -30rpx;">
+			<view class="juzhong" style="margin-left: -30rpx;z-index: 1;">
 				<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
 					:interval="120" />
 			</view>
@@ -568,6 +568,7 @@
 	.big-img {
 		width: 550rpx;
 		height: 550rpx;
+		z-index: 2;
 	}
 
 	.server-name {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4256b7a..f9d13d4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -150,6 +150,7 @@
 	import twoseven from '@/pages/login/twoseven.vue'
 	import { isRel, getLoginCode, loginApp } from './api.js'
 	import huakuai from '@/component/public/huakuai.vue'
+	import { initWs, connectWs } from '@/common/websocketManager.js';
 
 	const zyupgrade = ref(null);
 	const isTarget = ref(false);
@@ -202,18 +203,18 @@
 	const getImg = () => {
 		if (/^\d{11}$/.test(form.username)) {
 			isRel(form.username).then((res : any) => {
-				console.log("啥啊",res)
+				console.log("啥啊", res)
 				if (res.result.code == `0`) {
 					uni.setStorageSync('serverUrl', res.result.orgList[0].serverUrl);
 					uni.setStorageSync('orgList', res.result.orgList);
 					uni.setStorageSync('orgListName', res.result.orgList[0].departName);
 					uni.setStorageSync('orgListCode', res.result.orgList[0].orgCode);
-					
+
 					allserve.value = res.result.orgList
 					time.value = Date.now();
 
 					getLoginCode(time.value).then((res : any) => {
-						console.log("啥啊",res)
+						console.log("啥啊", res)
 						form.captcha = res.message
 						canclick.value = true
 					})
@@ -366,6 +367,14 @@
 		})
 	}
 	const gotoindex = () => {
+		if (uni.getStorageSync('userInfo')) {
+			initWs(`wss://www.focusnu.com/ws101/sdWebsocket/${uni.getStorageSync('userInfo').employessId}`, {
+				debug: true,
+				heartbeatInterval: 25000,
+				autoConnect: false,  // 不自动连接
+			});
+			connectWs();  // 主动连接 WebSocket
+		}
 		jumpTo(`/pages/login/animationpage`)
 	}
 </script>
diff --git a/request/index.js b/request/index.js
index faa1c47..cff7462 100644
--- a/request/index.js
+++ b/request/index.js
@@ -1,6 +1,6 @@
 // 全局请求封装
 const base_url = 'https://www.focusnu.com/opeapi'
-// const base_url = 'http://192.168.2.37:8081/opeapi'
+// const base_url = 'http://192.168.2.37:8081/opeapi' 
 // const base_url = 'http://localhost:8091/opeapi'
 // 请求超出时间
 const timeout = 5000
diff --git a/static/index/newruler/watch.png b/static/index/newruler/watch.png
new file mode 100644
index 0000000..3104114
Binary files /dev/null and b/static/index/newruler/watch.png differ