From 2462b1b124e171db8a065b230e26d87d78dc54c3 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Fri, 13 Mar 2026 16:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/public/donghua.vue                  | 257 +++++++++++-------
 .../component/leftcontent/serveswipe.vue      |   2 +-
 pages/NursingNew/component/nurse/index.css    |  72 ++---
 pages/NursingNew/component/nurse/newindex.vue |  90 +++---
 .../component/pleasetake/common/htditem.vue   |   2 +-
 pages/NursingNew/index.vue                    |   2 +-
 pages/login/newanimationpage.vue              |   6 +-
 static/index/changemode.png                   | Bin 0 -> 3302 bytes
 8 files changed, 261 insertions(+), 170 deletions(-)
 create mode 100644 static/index/changemode.png

diff --git a/component/public/donghua.vue b/component/public/donghua.vue
index aa5648f..5c76030 100644
--- a/component/public/donghua.vue
+++ b/component/public/donghua.vue
@@ -21,130 +21,205 @@
 	)) -->
 <template>
 	<view>
-		<image :src="isError ? defaultImage : links[currentIndex]" :style="{ width: width, height: height }"
-			:mode="objectFit" @error="isError = true" @load="isError = false" />
-		<button v-if="showButton" @click="$emit('update:playing', !playing)">
+		<image :src="displaySrc" :style="{ width: width, height: height }" :mode="objectFit" @error="handleError"
+			@load="handleLoad" />
+		<button v-if="showButton" @click="togglePlaying">
 			{{ playing ? '停止播放' : '开始播放' }}
 		</button>
 	</view>
 </template>
 
-<script setup>
-	import {
-		ref,
-		watch,
-		onUnmounted
-	} from 'vue'
+<script setup lang="ts">
+	import { ref, computed, watch, onUnmounted } from 'vue'
 
-	// 定义组件的 props
+	/* ---------------- props ---------------- */
 	const props = defineProps({
-		// links是图片地址所组成的数组
 		links: {
-			type: Array,
+			type: Array as () => string[],
 			default: () => []
 		},
-		// 长宽的值可以传任何类型
-		width: {
-			type: String,
-			default: '65rpx'
-		},
-		height: {
-			type: String,
-			default: '65rpx'
-		},
-		// 展示的动画中每一帧的图片类型
-		objectFit: {
-			type: String,
-			default: 'aspectFill'
-		},
-		// 动画如果加载失败，展示的图片
-		defaultImage: {
-			type: String,
-			default: ''
-		},
-		// 注意这是每一帧图片的间隔，这个值越小加载的越快
-		interval: {
-			type: Number,
-			default: 80
-		},
-		// 注意，因为这是监听的机制，所以默认转态必须是false，然后在mounted这类钩子或按钮变成true来播放
-		playing: {
-			type: Boolean,
-			default: false
-		},
-		// 展示是否停止、开启动画的按钮
-		showButton: {
-			type: Boolean,
-			default: false
-		},
-		// 重要：动画时候会不停的循环
-		loop: {
-			type: Boolean,
-			default: false
-		}
+		width: { type: String, default: '65rpx' },
+		height: { type: String, default: '65rpx' },
+		objectFit: { type: String, default: 'aspectFill' },
+		defaultImage: { type: String, default: '' },
+		interval: { type: Number, default: 80 }, // ms
+		playing: { type: Boolean, default: false },
+		showButton: { type: Boolean, default: false },
+		loop: { type: Boolean, default: false },
+		// 可选：每帧最大重试次数（失败后跳过）
+		maxRetryPerFrame: { type: Number, default: 1 }
 	})
 
-	// 定义组件发出的事件
 	const emit = defineEmits(['update:playing'])
 
-	// 组件内部状态
-	const currentIndex = ref(0) // 当前播放的图片索引
-	const isPlaying = ref(false) // 是否正在播放
-	const isError = ref(false) // 当前图片是否加载失败
-	let timer = null // 定时器
+	/* ---------------- local state ---------------- */
+	const currentIndex = ref(0)
+	const internalPlaying = ref(false) // 与 props.playing 同步（主要用于内部判断）
+	const timer : { id : number | null } = { id: null } // 使用对象包装，方便类型
+	// 记录每帧失败次数
+	const frameRetries = new Map<number, number>()
+	// 记录已经判定为“失败很严重、需要显示默认图”的帧
+	const failedFrames = new Set<number>()
 
-	// 开始播放
-	const startPlay = () => {
-		if (isPlaying.value) return
-		isPlaying.value = true
-		timer = setInterval(() => {
-			if (props.loop) {
-				// 循环播放：使用模运算循环索引
-				currentIndex.value = (currentIndex.value + 1) % props.links.length
-				isError.value = false
-			} else {
-				// 非循环播放：到末尾时停止
-				if (currentIndex.value < props.links.length - 1) {
-					currentIndex.value++
-					isError.value = false
-				} else {
-					stopPlay()
+	/* ---------------- helpers / computed ---------------- */
+	const hasLinks = computed(() => Array.isArray(props.links) && props.links.length > 0)
+	const displaySrc = computed(() => {
+		if (!hasLinks.value) {
+			return props.defaultImage || ''
+		}
+		// 如果该帧被标为失败则显示 defaultImage（兜底）
+		if (failedFrames.has(currentIndex.value) && props.defaultImage) {
+			return props.defaultImage
+		}
+		// 正常显示链接（或 defaultImage 如果索引越界）
+		const idx = currentIndex.value
+		return props.links[idx] || props.defaultImage || ''
+	})
+
+	/* ---------------- play control (使用递归 setTimeout) ---------------- */
+	function clearTimer() {
+		if (timer.id !== null) {
+			clearTimeout(timer.id)
+			timer.id = null
+		}
+	}
+
+	function scheduleNextTick() {
+		// 防止重复 schedule
+		if (timer.id !== null) return
+		timer.id = setTimeout(() => {
+			timer.id = null
+			tickFrame()
+			// 继续循环（如果仍在播放）
+			if (props.playing) {
+				// 若没有 links 则不再 schedule
+				if (hasLinks.value) {
+					scheduleNextTick()
 				}
 			}
-		}, props.interval)
+		}, Math.max(16, props.interval)) as unknown as number
 	}
 
-	// 停止播放
-	const stopPlay = () => {
-		isPlaying.value = false
-		clearInterval(timer)
+	function startPlay() {
+		if (!hasLinks.value) return
+		if (timer.id !== null) return
+		internalPlaying.value = true
+		scheduleNextTick()
 	}
 
-	// 监听 playing 属性变化
+	function stopPlay() {
+		internalPlaying.value = false
+		clearTimer()
+	}
+
+	function tickFrame() {
+		// 当没有帧时什么也不做
+		if (!hasLinks.value) return
+
+		const len = props.links.length
+		if (len === 0) return
+
+		if (props.loop) {
+			// 循环播放
+			currentIndex.value = (currentIndex.value + 1) % len
+		} else {
+			// 非循环播放：到末尾停止并通知父组件
+			if (currentIndex.value < len - 1) {
+				currentIndex.value++
+			} else {
+				// 到尾了，停止播放
+				stopPlay()
+				// 告知父组件（保持 playing 为单一真相）
+				emit('update:playing', false)
+			}
+		}
+	}
+
+	/* ---------------- image event handlers ---------------- */
+	function handleError() {
+		// 记录重试次数并决定是否跳过该帧
+		const idx = currentIndex.value
+		const prev = frameRetries.get(idx) || 0
+		const nextCount = prev + 1
+		frameRetries.set(idx, nextCount)
+
+		if (nextCount > (props.maxRetryPerFrame || 0)) {
+			// 标记为失败帧，用 defaultImage 兜底并尝试跳到下一帧（避免卡住）
+			failedFrames.add(idx)
+			// 立即跳到下一帧（但不用强制立即 schedule — 因为 scheduleNextTick 会继续）
+			// 若你想立即切换也可以直接调用 tickFrame()
+			if (hasLinks.value) {
+				// 如果是 loop 模式或尚未到尾（非 loop），直接 advance，否则 stop
+				if (props.loop || currentIndex.value < props.links.length - 1) {
+					// 立即 advance 一帧，但不要重复 schedule（tickFrame 内部不依赖 timer）
+					tickFrame()
+				} else {
+					stopPlay()
+					emit('update:playing', false)
+				}
+			}
+		} else {
+			// 尝试跳过到下一帧（减少卡顿风险）
+			if (hasLinks.value) {
+				if (props.loop || currentIndex.value < props.links.length - 1) {
+					tickFrame()
+				} else {
+					stopPlay()
+					emit('update:playing', false)
+				}
+			}
+		}
+	}
+
+	function handleLoad() {
+		// 成功加载清理重试记录（该帧已正常）
+		const idx = currentIndex.value
+		frameRetries.delete(idx)
+		failedFrames.delete(idx)
+	}
+
+	/* ---------------- watch props ---------------- */
+	// 以 props.playing 为单一真相源；当 props.playing 改变时启动/停止
 	watch(() => props.playing, (val) => {
-		currentIndex.value = 0
 		if (val) {
+			// reset index 到 0（可选，如果你希望保留进度可以去掉）
+			// currentIndex.value = 0
 			startPlay()
 		} else {
 			stopPlay()
-			setTimeout(() => currentIndex.value = 0, 50)
-
+			// 保证视觉上复位到首帧（可选）
+			setTimeout(() => {
+				currentIndex.value = 0
+			}, 50)
 		}
 	})
 
-	// 监听 links 数组变化
-	watch(() => props.links, () => {
+	// 监听 links 的引用变化（但不要 deep watch）
+	// 当父组件传入新的数组对象时触发：重置状态，清理 retry/failed 信息
+	watch(() => props.links, (newLinks, oldLinks) => {
+		// 如果引用相同且长度相同，尽量不重置（减少不必要抖动）
+		if (newLinks === oldLinks) return
+		// 重置索引和错误记录
 		currentIndex.value = 0
-		isError.value = false
-		if (isPlaying.value) {
+		frameRetries.clear()
+		failedFrames.clear()
+		// 如果当前 props.playing 为 true，重启播放（先清理 timer 再开始）
+		if (props.playing) {
 			stopPlay()
+			// 延迟一点点再启动，避免连续多次触发时重复 schedule
+			setTimeout(() => {
+				if (props.playing) startPlay()
+			}, 30)
 		}
-	}, {
-		deep: true
-	})
+	}, { immediate: false })
 
-	// 组件销毁时清理定时器
+	/* ---------------- toggle via internal button ---------------- */
+	function togglePlaying() {
+		emit('update:playing', !props.playing)
+	}
+
+	/* ---------------- cleanup ---------------- */
 	onUnmounted(() => {
-		stopPlay()
+		clearTimer()
 	})
 </script>
\ No newline at end of file
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
index bb55164..6cfc409 100644
--- a/pages/NursingNew/component/leftcontent/serveswipe.vue
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -1577,7 +1577,7 @@
 
 	.message-view {
 		display: flex;
-
+		font-size: 25rpx;
 		.message-shu {
 			width: 3rpx;
 			height: 1.5vw;
diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index 17fbe88..80b100f 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -1453,20 +1453,6 @@
 		margin-left: -5rpx;
 		display: flex;
 		align-items: center;
-
-		.target-gray {
-			background-color: #F8F8FA;
-			border: 1rpx solid #D5D5D5;
-			display: flex;
-			height: 100%;
-			align-items: center;
-			padding: 0 18rpx;
-			border-radius: 10rpx;
-			font-size: 28rpx;
-			color: #222222;
-		}
-
-
 	}
 
 	.target-contain {
@@ -1550,7 +1536,7 @@
 	top: 310rpx;
 	left: 0;
 	width: 100%;
-	height: 472rpx;
+	height: 490rpx;
 	background-color: #fff;
 	border: 2rpx solid rgba(0, 137, 254, 0.29);
 	border-radius: 35rpx;
@@ -1800,7 +1786,7 @@
 		right: 20rpx;
 		top: 50%;
 		transform: translateY(-50%);
-		width: 200rpx;
+		width: 220rpx;
 		height: 70%;
 		background-color: #0089FE;
 		border-radius: 20rpx;
@@ -1809,6 +1795,13 @@
 		align-items: center;
 		color: #fff;
 		font-size: 35rpx;
+
+		.white-imge {
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 5rpx;
+		}
+
 	}
 }
 
@@ -2128,16 +2121,17 @@
 
 .packtarget-end {
 	width: 100%;
-	height: 200rpx;
+	height: 240rpx;
 	display: flex;
 	padding-top: 15rpx;
 	position: relative;
+	/* background-color: red; */
 
 
 	.target-edit {
 		position: absolute;
 		right: 5rpx;
-		bottom: -20rpx;
+		bottom: 0rpx;
 		width: 130rpx;
 		height: 60rpx;
 		display: flex;
@@ -2151,8 +2145,8 @@
 	}
 
 	.end-icon {
-		width: 100rpx;
-		height: 100rpx;
+		width: 80rpx;
+		height: 80rpx;
 		margin-left: 20rpx;
 		margin-top: 5rpx;
 		margin-right: 20rpx;
@@ -2165,15 +2159,12 @@
 	border: 1rpx solid #D5D5D5;
 	display: flex;
 	height: 35rpx;
-	width: 100%;
-	/* align-items: center; */
-	/* padding: 0 10rpx; */
+	padding: 0 10rpx;
 	border-radius: 10rpx;
-	font-size: 23rpx;
-	color: #222222;
+	font-size: 25rpx;
+	color: #7a7a7a;
 	justify-content: center;
 	align-items: center;
-	margin-top: 10rpx;
 }
 
 .packtarget-title {
@@ -2186,7 +2177,7 @@
 		position: absolute;
 		top: 2.5rpx;
 		left: 0;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		/* margin-top: 3rpx; */
 	}
 
@@ -2199,7 +2190,10 @@
 }
 
 .packtarget-serviceContent {
-	width: 350rpx;
+	position: absolute;
+	left: 0;
+	top: 100rpx;
+	width: 530rpx;
 	height: 70rpx;
 	margin-top: 10rpx;
 	font-size: 25rpx;
@@ -2406,11 +2400,13 @@
 	width: 100%;
 	height: 100%;
 }
-.includestwo-father{
+
+.includestwo-father {
 	display: flex;
 	align-items: center;
-		margin-top: 5rpx;
+	margin-top: 5rpx;
 }
+
 .includestwo {
 
 	width: 110rpx;
@@ -2423,26 +2419,32 @@
 	align-items: center;
 	color: #fff;
 }
-.includestwo-detail{
+
+.includestwo-detail {
 	font-size: 25rpx;
 	margin-left: 10rpx;
 }
-.includestwo-image{
+
+.includestwo-image {
 	width: 12rpx;
 	height: 11rpx;
 	margin-left: 6rpx;
 }
-.target-gray-spec{
+
+.target-gray-spec {
 	background-color: #F8F8FA;
 	border: 1rpx solid #D5D5D5;
 	display: flex;
 	height: 35rpx;
-	/* align-items: center; */
 	padding: 0 10rpx;
 	border-radius: 10rpx;
 	font-size: 25rpx;
 	color: #222222;
 	justify-content: center;
 	align-items: center;
-	/* margin-top: 10rpx; */
+}
+.gray-view{
+	display: flex;
+	align-items: center;
+	margin-top: 7rpx;
 }
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue
index 6642d89..3b89148 100644
--- a/pages/NursingNew/component/nurse/newindex.vue
+++ b/pages/NursingNew/component/nurse/newindex.vue
@@ -64,7 +64,7 @@
 														<!-- 	<view class="card-bao" v-if="item1.izPackage==`Y`">
 															包
 														</view> -->
-													<!-- 	<image class="more-card"
+														<!-- 	<image class="more-card"
 															v-if="item1.includesarray && item1.includesarray.length>1"
 															src="/static/index/manycards.png" /> -->
 														<view :class="getClass(item1,index0,index1)"
@@ -82,16 +82,18 @@
 																	class="title-time-font-tags">
 																	({{ item1.directiveName?splitString(item1.directiveName)[1]:""}})
 																</view>
-																<view class="includestwo-father" v-if="item1.includesarray && item1.includesarray.length>1">
+																<view class="includestwo-father"
+																	v-if="item1.includesarray && item1.includesarray.length>1">
 																	<view class="includestwo">
 																		指令集合
 																	</view>
 																	<view class="includestwo-detail">
 																		详情
 																	</view>
-																	<image class="includestwo-image" src="/static/index/rightmore.png" />
+																	<image class="includestwo-image"
+																		src="/static/index/rightmore.png" />
 																</view>
-																
+
 																<view v-if="item1.startTime" class="card-time">
 
 																	<view class="weight-time">
@@ -307,7 +309,7 @@
 														{{ bottomItems[moreindex]?.directiveName }}
 													</view>
 													<view class="detail-contain">
-														{{ bottomItems[moreindex]?.serviceContent }}
+														{{ bottomItems[moreindex]?.serviceContent || `暂无指令详细信息` }}
 													</view>
 												</view>
 											</view>
@@ -349,16 +351,18 @@
 								<!-- 	<view class="servers-heng" :style="ruleritem.izPackage==`Y`?{left:`114rpx`}:{}"
 									v-show="ruleritem.directiveName"></view> -->
 
-								<image class="explain-icon" @click.stop="clickexplainopen" style="top: 25rpx;" v-if="ruleritem.includesarray?.length !== 1 "
+								<image class="explain-icon" @click.stop="clickexplainopen" style="top: 25rpx;"
+									v-if="ruleritem.includesarray?.length !== 1 "
 									src="/static/index/procurement/explain.png" mode="aspectFill"></image>
 
-								<view class="explain-text" v-show="explainopen" style="top: 78rpx;" :style="ruleritem.includesarray?.length >1?{height:`80rpx`}:{height:`160rpx`}">
+								<view class="explain-text" v-show="explainopen" style="top: 78rpx;"
+									:style="ruleritem.includesarray?.length >1?{height:`80rpx`}:{height:`160rpx`}">
 									<view class="triangle">
 										<view class="triangle-small"></view>
 									</view>
 									<view class="">
-										{{  ruleritem.includesarray?.length >1?`长按可进行删除操作。`:`双击服务指令可添加矩阵, 长按服务指令可拖动到即时指令区进行添加。` }}
-										
+										{{ ruleritem.includesarray?.length >1?`长按可进行删除操作。`:`双击服务指令可添加矩阵, 长按服务指令可拖动到即时指令区进行添加。` }}
+
 									</view>
 								</view>
 							</view>
@@ -473,7 +477,7 @@
 												{{ savePackagelist[packnumber]?.directives[packdetail]?.directiveName }}
 											</view>
 											<view class="detail-contain">
-												{{ savePackagelist[packnumber]?.directives[packdetail]?.serviceContent }}
+												{{ savePackagelist[packnumber]?.directives[packdetail]?.serviceContent || `暂无指令详细信息` }}
 											</view>
 										</view>
 									</view>
@@ -529,7 +533,7 @@
 									</view>
 								</view>
 								<view class="target-smalltext">
-									{{ ruleritem.serviceContent }}
+									{{ ruleritem.serviceContent || `暂无指令详细信息` }}
 								</view>
 								<view class="target-edit" style="right: 150rpx;" @click.stop="editcardname(0)"
 									v-show="editingmode">
@@ -561,10 +565,10 @@
 										<text v-if="!editingmode">
 											{{ ruleritem?.includesarray[packtargetindex]?.newtypename }}
 										</text>
-										<text class="packtarget-blue" v-else @click.stop="edititems(ruleritem,true)">
+										<text class="packtarget-blue" v-else @click.stop="edititems(ruleritem?.includesarray[packtargetindex],true)">
 											{{ ruleritem?.includesarray[packtargetindex]?.newtypename }}
 										</text>
-	
+
 										<view class="packtarget-shu">
 											|
 										</view>
@@ -579,7 +583,8 @@
 										<view class="details" :style="packtargetindex==index?{color:`#0089FE`}:{}"
 											v-for="(item,index) in ruleritem?.includesarray"
 											@touchstart="startdeletedetail" @touchend="enddeletedetail"
-											@click.stop="cleanallopen();packtargetindex=index;killbaddata = true" :key="index">
+											@click.stop="cleanallopen();packtargetindex=index;killbaddata = true"
+											:key="index">
 											<image class="detail-icon" :class="detailshake?`wiggle`:``" :src="
 												    index === packtargetindex
 												      ? (item.immediateFileFocus ? serverUrl + item.immediateFileFocus : noimageshowtarget)
@@ -610,17 +615,19 @@
 											      : noimageshow
 											  " mode="aspectFill">
 										</image>
-										<view class="target-gray">
-											{{ ruleritem?.includesarray[packtargetindex]?.categoryName }}
-										</view>
-										<view class="target-gray">
-											{{ ruleritem?.includesarray[packtargetindex]?.typeName }}
-										</view>
 									</view>
 
 									<view class="">
 										<view class="packtarget-title">
-											<!-- <view class="target-gray">
+											<view class="target-black">
+												{{ splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[0] + (splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1]?`(${splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1]})`:"")  }}
+											</view>
+											<view class="target-black"
+												v-if="splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1] ">
+											</view>
+										</view>
+										<view class="gray-view">
+											<view class="target-gray">
 												{{ ruleritem?.includesarray[packtargetindex]?.categoryName }}
 											</view>
 											<view class="target-shu">
@@ -628,23 +635,18 @@
 											</view>
 											<view class="target-gray">
 												{{ ruleritem?.includesarray[packtargetindex]?.typeName }}
-											</view> -->
-											<view class="target-black">
-												{{ splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[0] + (splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1]?`(${splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1]})`:"")  }}
 											</view>
-											<view class="target-black"
-												v-if="splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1] ">
+										</view>
+
 
-											</view>
-										</view>
-										<view class="packtarget-serviceContent">
-											{{ ruleritem?.includesarray[packtargetindex]?.serviceContent }}
-										</view>
 									</view>
 									<!-- <view class="target-edit" style="right: 150rpx;" @click.stop="editcardname(1)"
 										v-show="editingmode">
 										修改
 									</view> -->
+									<view class="packtarget-serviceContent">
+										{{ ruleritem?.includesarray[packtargetindex]?.serviceContent || `暂无指令详细信息` }}
+									</view>
 									<view class="target-edit" @click.stop="editcardname(0)" v-show="editingmode">
 										添加
 									</view>
@@ -656,9 +658,9 @@
 								</view>
 
 							</view>
-							<view class="edit-open" v-show="editopen" @click.stop>
+							<view class="edit-open" :style="whitetou?{top:`160rpx`}:{}" v-show="editopen" @click.stop>
 								<view class="edit-menu">
-									<view class="triangle" v-show="!whitetou">
+									<view class="triangle" :style="whitetou?{right:`390rpx`}:{}">
 										<view class="triangle-small"></view>
 									</view>
 									<view class="edit-tags" :style="edittype===index?{fontWeight:`800`}:{}"
@@ -742,7 +744,8 @@
 								</view>
 							</view>
 							<view class="blue-right" @click="cleanallopen();editingmode = !editingmode">
-								{{ editingmode?"确定":"+编辑" }}
+								<image class="white-imge" src="/static/index/changemode.png" />
+								{{ editingmode?"只读模式":"编辑模式" }}
 							</view>
 
 						</view>
@@ -1017,7 +1020,13 @@
 			nosave.value.cycleValue = Number(inputnum.value).toString()
 		}
 		isclickright.value = true
-		let allobject = ruleritem.value
+		let allobject = {}
+		if(whitetou.value){
+			allobject = smallcard.value
+		}else{
+			allobject = ruleritem.value
+		}
+		
 		const now = new Date();
 		const ts = `${now.getFullYear()}-${(now.getMonth() + 1).toString().padStart(2, '0')}-${now.getDate().toString().padStart(2, '0')} ${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}:${now.getSeconds().toString().padStart(2, '0')}`;
 		let data = {
@@ -1034,10 +1043,10 @@
 			optCount: nosave.value.optCount,
 			optTime: ts,
 		}
-		console.log("啥情况", data)
-		// return
+		// console.log("啥情况", data)
+		
 		editDirective(data).then((res) => {
-			console.log("啥情况", res)
+			// console.log("啥情况1111", res)
 			if (res.success) {
 				geteverything()
 				setTimeout(() => {
@@ -1084,8 +1093,13 @@
 		optCount: "",
 	})
 	const whitetou = ref(false);
+	const smallcard = ref({});
 	const edititems = (item : any, whitetoushow : boolean) => {
+		if(whitetoushow){
+			smallcard.value = item;
+		}
 		whitetou.value = whitetoushow
+		
 		nosave.value.cycleTypeId = item.cycleTypeId;
 		nosave.value.cycleValue = item.cycleValue
 		nosave.value.optCount = item.optCount
diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index 197af1b..865aaeb 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -484,7 +484,7 @@
 			margin-top: 2vw;
 			margin-bottom: 0.8vw;
 			margin-left: 1.2vw;
-			background: red;
+			// background: red;
 			// padding: 0.2vw;
 			// padding: 0.5vw;
 			// margin: 0.7vw auto 0.3vw;
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 4737956..7450a6c 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -249,7 +249,7 @@
 			// console.log("???????????????",res.result.records[0].permissionList)
 			arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }];
 			let tbr = [];
-			console.log("xxxx",res)
+			// console.log("xxxx",res)
 			if (arr) {
 				arr.forEach((v, i) => {
 					let obj = arrs.find(item =>
diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue
index 932ee38..7e78df0 100644
--- a/pages/login/newanimationpage.vue
+++ b/pages/login/newanimationpage.vue
@@ -158,7 +158,7 @@
 	onShow(() => {
 		setTimeout(() => {
 			playall.value = true;
-		}, 2000)
+		}, 300)
 
 		zyupgrade.value?.check_update();
 		queryPadPageList().then((res => {
@@ -370,11 +370,11 @@
 	}
 
 	const ceshijump = () => {
-		ceshiopen.value = true
+		// ceshiopen.value = true
 		// uni.navigateTo({
 		// 	url:"/pages/login/ceshi"
 		// })
-		console.log("wtf")
+		// console.log("wtf")
 		// try {
 		// 	const Intent = plus.android.importClass('android.content.Intent')
 		// 	const Uri = plus.android.importClass('android.net.Uri')
diff --git a/static/index/changemode.png b/static/index/changemode.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7bdaf97182459bd12de3a64c6fe562c9f1429de
GIT binary patch
literal 3302
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
avIjM2-njs$<z7NsP&6Y;!`f5cjQ;>;WWXl?

literal 0
HcmV?d00001