From 5844ed5f3e7e9394c75a436eb9fcb77ace268292 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 8 Jan 2026 15:17:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/api.js         |  16 +++-
 pages/NursingNew/component/index.vue      | 100 ++++++++++++++++------
 pages/Warehouse/index/component/index.vue |  50 +++++++++--
 pages/watch/settings/api.js               |   4 +-
 pages/watch/settings/settings.vue         |   4 +-
 5 files changed, 137 insertions(+), 37 deletions(-)

diff --git a/pages/NursingNew/component/api.js b/pages/NursingNew/component/api.js
index 5df1a04..e53a393 100644
--- a/pages/NursingNew/component/api.js
+++ b/pages/NursingNew/component/api.js
@@ -144,4 +144,18 @@ export const humidDevicejgwarn = (data) => {
 		url: `${uni.getStorageSync('serverUrl')}/api/iot/humidDevice/jglist?column=createTime&order=desc&pageNo=${data.pageNo}&pageSize=${data.pageSize}&optType=read&sn=${data.sn}`,
 		method: 'get'
 	})
-}
\ No newline at end of file
+}
+// 护理医疗后勤数量
+export const queryCountByType = (data) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/services/directivePlan/queryCountByType?nuId=${data.nuId}&elderId=${data.elderId}`,
+		method: 'get'
+	})
+}
+// 即时指令内容
+export const queryAll = (data) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/services/directivePlanInstant/queryAll?nuId=${data.nuId}&elderId=${data.elderId}`,
+		method: 'get'
+	})
+} 
\ No newline at end of file
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index a9ed0ae..4c2c03f 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -4,7 +4,7 @@
 			<view class="title-card" @click="nusing">
 				<view class="card-top">
 					<view class="card-top-left">
-						50
+						{{hldyobj?.hllFinishedTotal}}
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -13,7 +13,7 @@
 						<view class="line">
 						</view>
 						<view class="line-gray">
-							80
+							{{hldyobj?.hllTotal}}
 						</view>
 					</view>
 
@@ -28,7 +28,7 @@
 			<view class="title-card"  @click="nusing">
 				<view class="card-top">
 					<view class="card-top-left">
-						32
+						0
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -37,7 +37,7 @@
 						<view class="line">
 						</view>
 						<view class="line-gray">
-							60
+							0
 						</view>
 					</view>
 
@@ -52,7 +52,7 @@
 			<view class="title-card"  @click="nusing">
 				<view class="card-top" >
 					<view class="card-top-left">
-						65
+						{{hldyobj.hqlFinishedTotal}}
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -61,7 +61,7 @@
 						<view class="line">
 						</view>
 						<view class="line-gray">
-							70
+							{{hldyobj.hqlTotal}}
 						</view>
 					</view>
 
@@ -76,7 +76,7 @@
 			<view class="title-card-right" @click="jszlshow = true">
 				<view class="card-top">
 					<view class="card-top-left">
-						65
+						
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -98,14 +98,14 @@
 						即时服务指令
 					</view>
 					<view class="spiw">
-						<view v-for="(v,i) in ['护理','医疗','后勤']" :key="i" :class="i==0?'act':''">{{v}}</view> 
+						<view v-for="(v,i) in ['护理','医疗','后勤']" :key="i" :class="i==fwzlindex?'act':''" @click="shtab(i)">{{v}}</view> 
 					</view>
 					<scroll-view class="scrol" scroll-y="true">
-						<view v-for="(v,i) in 0" :key='i' :class="i==2?'act':''" class="cdk">
-							<image src="/static/qr.png" mode="aspectFill"></image>
-							<text>{{v}}</text>
+						<view v-for="(v,i) in fwzlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
+							<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
+							<text>{{v.directiveName}}</text>
 						</view>
-						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;">
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="fwzlarr.length==0">
 							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
 							<view style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
 								暂无服务指令
@@ -277,7 +277,7 @@
 				<image class="bottom-carmera" src="/static/index/newindex/leftmenu/carmera.png" @click="gotolook" />
 				<view class="blue-button" @click="geteverything()">
 					长者标签
-					<view class="jb" >
+					<view class="jb" v-if="zzbqshow">
 						<image src="/static/index/card/bj.png" mode="aspectFill"></image>
 					</view>
 					<view class="zzbq guodu" @click.stop :class="zzbqshow?'':'zzh0'">
@@ -481,7 +481,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch ,reactive} from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
-	import { queryWorkOrderList } from './api.js'
+	import { queryWorkOrderList,queryCountByType,queryAll } from './api.js'
 	// import {startOrder,endOrder} from './doctorask/api/api.js'
 	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
 	import { getNclist } from "./nurse/api.js";
@@ -723,11 +723,61 @@
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
-		console.log(data.nuId)
 		firstgetqueryCgdList(data.nuId);
+		hlylhq(data.nuId,data.elderInfo?.id)
+		zlfunc(data.nuId,data.elderInfo?.id)
 		emit('swip')
 	}
-
+	const hldyobj = ref({})
+	const hlylhq = (nuId,elderId)=>{
+		let data = {
+			nuId:nuId,
+			elderId:elderId
+		}
+		queryCountByType(data).then(res=>{
+			console.log(res)
+			hldyobj.value = res.result
+		})
+	}
+	const fwzlindex = ref(0);
+	const fwzldex = ref(-1);
+	
+	const fwzlarr = ref(0);
+	const zlarr = ref({});
+	const zlfunc = (nuId,elderId)=>{
+		let data = {
+			nuId:nuId,
+			elderId:elderId
+		}
+		queryAll(data).then(res=>{
+			console.log(res)
+			zlarr.value = res.result;
+			shtab(fwzlindex.value)
+		})
+	}
+	const shtab = (e)=>{
+		fwzlindex.value = e;
+		if(e==0){
+			fwzlarr.value = zlarr.value.care
+		}
+		if(e==1){
+			fwzlarr.value = [];
+		}
+		if(e==2){
+			fwzlarr.value = zlarr.value.logistics
+		}
+	}
+	const zldex = (e) =>{
+		if(e>-1&&e==fwzldex.value){
+			fwzldex.value = -1
+		}else{
+			fwzldex.value = e
+		}
+	}
+	const subitshowing = () =>{
+		jszlshow.value = false
+	}
+	
 	function calcAge(dateOfBirth : string) {
 		const birthYear = parseInt(dateOfBirth?.slice(0, 4), 10);
 		const currentYear = new Date().getFullYear();
@@ -897,12 +947,12 @@
 	}
 	const indexmessage = ref({});
 	const getgif = () => {
-		let data = {
-			nuId: uni.getStorageSync('NUall').nuId,
-			employeeId: uni.getStorageSync('userInfo').employessId,
-			workType: 5
-		}
-		console.log("看看图",data)
+		 
+		// let data = {
+		// 	nuId: uni.getStorageSync('NUall').nuId,
+		// 	employeeId: uni.getStorageSync('userInfo').employessId,
+		// 	workType: 5
+		// }
 		// queryWorkOrderList(data).then((res : any) => {
 		// 	console.log("看看图",res)
 		// 	indexmessage.value = res.result.records[0]; 
@@ -946,6 +996,7 @@
 		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
 			emotionTagList.value = [];
 			bodyTagList.value = [];
+			zzbqshow.value = true;
 			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
 				 res.result.emotionTagList.forEach(item=>{
 					 if(item.izSelected == 'Y'){
@@ -957,7 +1008,6 @@
 						 bodyTagList.value.push(item)
 					 }
 				 })
-				 zzbqshow.value = true;
 				// emotionTagList.value = res.result.emotionTagList;
 				// bodyTagList.value = res.result.bodyTagList;
 				console.log(res.result)
@@ -1923,7 +1973,7 @@
 		height: 1.1vw;
 		top: 2.7vw;
 		right: 1.5vw;
-		z-index: 220;
+		z-index: 201;
 		image{
 			width: 100%;
 			height: 100%;
@@ -1932,7 +1982,7 @@
 	.zzh0{
 		height: 0vw !important;
 		padding: 0 1.6vw !important;
-		top: 2.7vw !important;
+		// top: 2.7vw !important;
 	}
 	.zzbq{
 		width: 18vw;
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index ec6bffe..226b2d6 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -4,7 +4,7 @@
 			<view class="title-card">
 				<view class="card-top">
 					<view class="card-top-left">
-						15
+						{{hldyobj.cklFinishedTotal}}
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -13,7 +13,7 @@
 						<view class="line">
 						</view>
 						<view class="line-gray">
-							70
+							{{hldyobj.cklTotal}}
 						</view>
 					</view>
 
@@ -29,7 +29,7 @@
 			<view class="title-card-right"  @click="jszlshow = true">
 				<view class="card-top">
 					<view class="card-top-left">
-						65
+						 
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -54,11 +54,11 @@
 						<view v-for="(v,i) in ['库房']" :key="i" :class="i==0?'act':''">{{v}}</view> 
 					</view>
 					<scroll-view class="scrol" scroll-y="true">
-						<view v-for="(v,i) in 1" :key='i' :class="i==2?'act':''" class="cdk">
-							<image src="/static/qr.png" mode="aspectFill"></image>
-							<text>{{v}}</text>
+						<view v-for="(v,i) in zlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
+							<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
+							<text>{{v.directiveName}}</text>
 						</view>
-						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;">
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="zlarr.length==0">
 							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
 							<view style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
 								暂无服务指令
@@ -277,6 +277,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
+	import { queryWorkOrderList,queryCountByType,queryAll } from '@/pages/NursingNew/component/api.js'
 	const jszlshow = ref(false)
 	const props = defineProps({
 		isShow: {
@@ -299,6 +300,41 @@
 		console.log(uni.getStorageSync('elderId'),uni.getStorageSync('nuId'),data.elderInfo)
 		uni.setStorageSync('NUall', data);
 		emit('swip')
+		hlylhq(data.nuId )
+		zlfunc(data.nuId )
+	}
+	const hldyobj = ref({})
+	const hlylhq = (nuId)=>{
+		let data = {
+			nuId:nuId 
+		}
+		queryCountByType(data).then(res=>{
+			console.log(res)
+			hldyobj.value = res.result
+		})
+	}
+	const fwzlindex = ref(0);
+	const fwzldex = ref(-1);
+	const zlarr = ref({});
+	const zlfunc = (nuId)=>{
+		let data = {
+			nuId:nuId,
+			elderId:elderId
+		}
+		queryAll(data).then(res=>{
+			console.log(res)
+			zlarr.value = res.result.invoicing;
+		})
+	}
+	const zldex = (e) =>{
+		if(e>-1&&e==fwzldex.value){
+			fwzldex.value = -1
+		}else{
+			fwzldex.value = e
+		}
+	}
+	const subitshowing = () =>{
+		jszlshow.value = false
 	}
 	const tagarray = ["市医保", "半失能", "正常计费"]
 
diff --git a/pages/watch/settings/api.js b/pages/watch/settings/api.js
index 7c82f37..d2d75c9 100644
--- a/pages/watch/settings/api.js
+++ b/pages/watch/settings/api.js
@@ -25,9 +25,9 @@ export const updateBaseInfo = (params) => {
 	})
 }
 // 改头像
-export const userEdit = (params) => {
+export const editAvatar = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/sys/user/login/setting/userEdit`,
+		url: `${uni.getStorageSync('serverUrl')}/sys/user/login/setting/editAvatar`,
 		method: 'post',
 		data: params,
 	})
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index 1dc3395..b99c54e 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -120,7 +120,7 @@
 	import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
 	import { getLoginCode, loginApp } from '@/pages/login/api.js'
 
-	import {userEdit} from './api.js'
+	import {editAvatar} from './api.js'
 	const zyupgrade = ref(null);
 	const issay = ref(false)
 	const openany = ref(false);
@@ -190,7 +190,7 @@
 		userInfo.value = uni.getStorageSync('userInfo');
 	}
 	const avaxg = () =>{
-		userEdit({avatar:userInfo.value.avatar,id:userInfo.value.id}).then(res=>{
+		editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id}).then(res=>{
 			console.log(res)
 			if(res.success){
 				uni.setStorageSync('userInfo', userInfo.value);

From b9722250b6373e22f5810122b364a6be44f6c165 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 8 Jan 2026 16:51:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/leftcontent/leftcontent.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index 3cf2470..846308a 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -85,10 +85,14 @@
 	const scoltop =(e)=>{
 		if(e==0){
 			scrolltop.value = topsc.value;
-			scrolltop.value = 0;
+			nextTick(()=>{
+				scrolltop.value = 0;
+			})
 		}else{
 			scrolltop.value = topsc.value;
-			scrolltop.value = 999;
+			nextTick(()=>{
+				scrolltop.value = 999;
+			})
 		}
 	}
 	const codesc = ref(0)