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 @@ - - - - - \ 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 @@