yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

This commit is contained in:
wangweidong 2025-12-22 08:51:14 +08:00
parent 1cb9b99b2b 83753aed1d
commit 2085d90da2
5 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/NursingNew/component/nurse/api.js
View File

@ -11,9 +11,9 @@ export const getServiceTree = () => {
})
}
// 查询表格
export const getNclist = (nuId,customerId) => {
export const getNclist = (nuId,elderId) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNclist?nuId=${nuId}&customerId=${customerId}`,
url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNclist?nuId=${nuId}&elderId=${elderId}`,
method: 'get',
})
}
@ -26,7 +26,7 @@ export const addBatch = (params) => {
})
}
// 查询指令包
export const getNcPackagelist = (nuId,customerId) => {
export const getNcPackagelist = (nuId,elderId) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNcPackagelist`,
method: 'get',

69
pages/NursingNew/component/nurse/index.vue
View File

@ -190,11 +190,11 @@
</view>
<image class="title-time-button"
style="width: 80rpx;height: 50rpx;"
v-if="item1.cycleType!='日常'"
v-if="item1.cycleTypeId!=1"
src="/static/index/newruler/jiao.png" />
<view class="title-time-font"
style="right: 10rpx;top: 5rpx;"
v-if="item1.cycleType!='日常'">
v-if="item1.cycleTypeId!=1">
{{item1.cycleType}}
</view>
</view>
@ -288,15 +288,15 @@
<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.cycleType ==='周期护理'">
<view class="title-time-button-font" v-show="item.cycleTypeId ==2">
周期
</view>
<view class="title-time-button-font" v-show="item.cycleType ==='即时护理'">
<view class="title-time-button-font" v-show="item.cycleTypeId ==3">
即时
</view>
<image class="title-time-button" v-show="item.cycleType ==='周期护理'"
<image class="title-time-button" v-show="item.cycleTypeId ==2"
src="/static/index/newruler/jiao.png" />
<image class="title-time-button" v-show="item.cycleType ==='即时护理'"
<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 " />
@ -460,7 +460,7 @@
<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?item1.cycleType:"日常" }}
{{ item1.cycleType }}
</view>
</view>
<view class="title-time-font-rel">
@ -554,10 +554,10 @@
{{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].cycleType"
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].cycleType">
v-if="timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleTypeId!=1">
{{ timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleType }}
</view>
</view>
@ -1113,14 +1113,14 @@
function dosomesave() {
cardsumit.value.op.name = secondopenValue.value[cardsumit.value.op.index[2]].relName
switch (secondopenValue.value[cardsumit.value.op.index[2]].cycleType) {
case `日常护理`:
switch (secondopenValue.value[cardsumit.value.op.index[2]].cycleTypeId) {
case `1`:
openOp.value = 0
break;
case `周期护理`:
case `2`:
openOp.value = 1
break;
case `即时护理`:
case `3`:
openOp.value = 2
break;
default:
@ -1333,7 +1333,7 @@
const changeBug = ref(true);
// 方法：根据条件返回不同的类名
const getClass = (item, index0, index1) => {
if (item.cycleType) {
if (item.startTime) {
if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
return 'title-time-border-yellow-active-transparent';
} else if (shakyTable.value) {
@ -1665,14 +1665,14 @@
saveId.value = item.id;
cardsumit.value.op.index[2] = index
cardsumit.value.op.name = item.relName
switch (item.cycleType) {
case `日常护理`:
switch (item.cycleTypeId) {
case 0:
openOp.value = 0
break;
case `周期护理`:
case 1:
openOp.value = 1
break;
case `即时护理`:
case 2:
openOp.value = 2
break;
default:
@ -1783,8 +1783,8 @@
id: haveValue ? timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id : "",
nuId: uni.getStorageSync('nuId'),
nuName: uni.getStorageSync('nuName'),
customerId: uni.getStorageSync('customerId'),
customerName: uni.getStorageSync('NUall').elderInfo.name,
elderId: uni.getStorageSync('elderId'),
elderName: uni.getStorageSync('NUall').elderInfo.name,
directiveId: allobject.id,
directiveName: allobject.packageName,
typeId: "",
@ -1841,7 +1841,7 @@
let stopIt = false;
let allobject = bigArray.value[upmenuIndex.value].children[downmenuIndex.value].children[thirdmenuIndex.value]
if (allobject.cycleType === "即时护理") {
if (allobject.cycleTypeId == 3) {
scrollLeft.value = 1;
bottomItems.value.forEach((element : any, index : number) => {
if (element.directiveName == allobject.title) {
@ -1864,8 +1864,8 @@
pushValue.id = ""
pushValue.nuId = uni.getStorageSync('nuId');
pushValue.nuName = uni.getStorageSync('nuName');
pushValue.customerId = uni.getStorageSync('customerId');
pushValue.customerName = uni.getStorageSync('NUall').elderInfo.name;
pushValue.elderId = uni.getStorageSync('elderId');
pushValue.elderName = uni.getStorageSync('NUall').elderInfo.name;
bottomItems.value.unshift(pushValue)
// 实现即时指令动画
cleansettimeout.value = setTimeout(() => {
@ -1895,19 +1895,19 @@
flyNumber.value.index1 = -1;
isMove.value = false;
if (allobject.cycleType === "周期护理" && iszhouqi.value && weekIndex.value == -1 && monthIndex.value == -1) {
if (allobject.cycleTypeId == 2 && iszhouqi.value && weekIndex.value == -1 && monthIndex.value == -1) {
return
}
else if (allobject.cycleType === "周期护理" && !iszhouqi.value) {
else if (allobject.cycleTypeId == 2 && !iszhouqi.value) {
iszhouqi.value = true
return
}
let cycleType = "";
let cycleValue = "";
if (allobject.cycleType === "日常护理") {
if (allobject.cycleTypeId == 1) {
cycleType = "日常"
} else {
if (weekIndex.value !== -1) {
if (weekIndex.value != -1) {
cycleType = weekValue.value
let cycleTypeIndex = 0;
weekDays.forEach((element : any, index : any) => {
@ -1939,8 +1939,8 @@
id: haveValue ? timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id : "",
nuId: uni.getStorageSync('nuId'),
nuName: uni.getStorageSync('nuName'),
customerId: uni.getStorageSync('customerId'),
customerName: uni.getStorageSync('NUall').elderInfo.name,
elderId: uni.getStorageSync('elderId'),
elderName: uni.getStorageSync('NUall').elderInfo.name,
directiveId: allobject.id,
directiveName: allobject.title,
typeId: allobject.typeId,
@ -2019,8 +2019,8 @@
let allvalue = {
nuId: uni.getStorageSync('nuId'),
nuName: uni.getStorageSync('nuName'),
customerId: uni.getStorageSync('customerId'),
customerName: uni.getStorageSync('NUall').elderInfo.name,
elderId: uni.getStorageSync('elderId'),
elderName: uni.getStorageSync('NUall').elderInfo.name,
// serverList: postArray,
// instantList: bottomItems.value,
tagList: info
@ -2088,8 +2088,8 @@
const emotionTagList = ref([]);
const bodyTagList = ref([]);
const geteverything = () => {
if (uni.getStorageSync('nuId') && uni.getStorageSync('customerId')) {
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('customerId')).then((res : any) => {
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 => ({
@ -2120,7 +2120,7 @@
bodyTagListLook.value.push(res.netPic)
}
})
console.log("res11111",res)
})
}
}
@ -2164,6 +2164,7 @@
})
})
bigArray.value = res.result;
console.log("右侧",bigArray.value)
}
downList.value = bigArray.value[0].children
upmenuIndex.value = -1;

2
pages/NursingNew/index.vue
View File

@ -60,7 +60,7 @@
<requestform :isShow="menuIndexshowfourth" v-if="menuIndex==3" />
<!-- 户嘱页 -->
<nurse :isold="isOld===2" :liang="indexNumber" :isshow="menuIndexshowsecond"
v-if="menuIndex==1&&isOld===2&&uni.getStorageSync('customerId')&&uni.getStorageSync('nuId')"
v-if="menuIndex==1&&isOld===2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')"
:propsmove="propsmove" :isMain="isMain" @vip="canmoveit" />
<!-- 医嘱 -->
<doctorask v-if="menuIndex==2"/>

2
pages/login/index.vue
View File

@ -131,7 +131,7 @@
uni.setStorageSync('nuId', cardarray.value[index].nuId);
uni.setStorageSync('nuName', cardarray.value[index].nuName);
uni.setStorageSync('customerId', cardarray.value[index].elderInfo ? cardarray.value[index].elderInfo?.id : null);
uni.setStorageSync('elderId', cardarray.value[index].elderInfo ? cardarray.value[index].elderInfo?.id : null);
uni.setStorageSync('NUall', cardarray.value[index]);
if (leftarraytarget.value===1) {

4
pages/watch/index.vue
View File

@ -706,7 +706,7 @@
savetypeNow.value = leftTargetIndex.value
uni.setStorageSync('nuId', filteredMenu.value[savetypeNow.value].nuId);
uni.setStorageSync('nuName', filteredMenu.value[savetypeNow.value].nuName);
uni.setStorageSync('customerId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
uni.setStorageSync('elderId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
uni.setStorageSync('NUall', filteredMenu.value[savetypeNow.value]);
if (!typeNow.value) {
@ -1205,7 +1205,7 @@
display: flex;
.menu {
flex: 0 0 auto; // 👈 关键点
flex: 0 0 auto; // 关键点
height: 90rpx;
width: 240rpx;
border-radius: 50rpx;