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 cd99008..ef907ec 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -1,2152 +1,2148 @@
-
-
-
-
-
-
- 50
-
-
-
-
-
-
-
-
- 80
-
-
-
-
-
-
-
- 护理
-
-
-
-
-
-
- 32
-
-
-
-
-
-
-
-
- 60
-
-
-
-
-
-
-
- 医疗
-
-
-
-
-
-
- 65
-
-
-
-
-
-
-
-
- 70
-
-
-
-
-
-
-
- 后勤
-
-
-
-
-
-
- 65
-
-
-
-
-
-
-
-
-
- 即时
-
-
-
-
-
-
-
-
- 即时服务指令
-
-
- {{v}}
-
-
-
-
- {{v}}
-
-
-
-
-
- 暂无服务指令
-
-
-
-
- 取消
- 确定
-
-
-
-
-
-
-
-
-
-
-
-
- {{ indexmessage?.startTime.slice(11, 16) }}
- -
- {{ indexmessage?.endTime.slice(11, 16) }}
-
-
-
-
-
-
-
-
-
- 待执行
-
-
-
-
-
-
-
- {{ indexmessage?.directiveName }}
-
-
-
-
-
- 开始服务
-
-
-
-
- 结束服务
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ currentTime }}
-
-
-
- {{ weekDay }}
-
-
- {{ fullDate }}
-
-
-
-
-
-
- {{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C
-
-
-
- {{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%
-
-
-
-
-
-
-
- 护理单元
-
-
-
-
-
-
-
- {{ item.nuName }}
-
-
- {{ item.elderInfo?.name?`入住`:`空闲` }}
-
-
-
- NUID:{{ item.nuId }}
-
-
-
-
-
-
-
-
-
-
- 长者标签
-
-
-
-
-
-
-
- 体重标签
-
-
-
-
- {{v.tagName}}
-
-
-
-
-
-
-
- 情绪标签
-
-
-
-
- {{v.tagName}}
-
-
-
-
-
-
-
-
-
- {{ tagtarget==-1?'':detail }}
-
-
-
-
-
-
- {{ uni.getStorageSync('NUall').elderInfo?.name ? uni.getStorageSync('NUall').elderInfo?.name:`暂无长者` }}
-
-
- {{ uni.getStorageSync('NUall').elderInfo?.sex }}
-
-
- {{ calcAge(uni.getStorageSync('NUall').elderInfo?.dateOfBirth) }}
-
- 岁
-
-
- {{ uni.getStorageSync('NUall').elderInfo?.checkinTime.replace(/-/g, '.') }}
-
-
-
- {{ uni.getStorageSync('NUall').elderInfo?.yblxName }}
-
-
- {{ uni.getStorageSync('NUall').elderInfo?.sndjName }}
-
-
- {{ uni.getStorageSync('NUall').elderInfo?.jfztName }}
-
-
-
-
-
-
-
-
- 库存盘点
-
-
-
-
- 10:00 - 10:10
-
-
-
- 单人执行
-
- 王金福
-
-
- 业务单号:P10120251010001
-
-
-
- 开始服务
-
-
- 结束服务
-
-
-
-
-
-
-
-
-
-
-
-
- {{ topbuttontarget==1?`照片`:`录像` }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 点击上传{{topbuttontarget==1?'图片':'录像'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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)
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 @@
- 15
+ {{hldyobj.cklFinishedTotal}}
@@ -13,7 +13,7 @@
- 70
+ {{hldyobj.cklTotal}}
@@ -29,7 +29,7 @@
- 65
+
@@ -54,11 +54,11 @@
{{v}}
-
-
- {{v}}
+
+
+ {{v.directiveName}}
-
+
暂无服务指令
@@ -277,6 +277,7 @@