This commit is contained in:
Teng 2026-01-19 14:18:45 +08:00
parent 7b4d7f0c98
commit e4585fdf25
41 changed files with 149 additions and 121 deletions

View File

@ -9,7 +9,7 @@
"backToExit" : "false",
"second" : {
"title" : "确认提示",
"message": "  进入应用前,你需先同意<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>,否则将退出应用。",
"message" : "  进入应用前,你需先同意<a href=\"https://www.focusnu.com/serviceAgreement\">《服务协议》</a>和<a href=\"https://www.focusnu.com/privacypolicy/\">《隐私政策》</a>,否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},

View File

@ -598,6 +598,7 @@
<script setup lang="ts">
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch ,reactive} from 'vue';
import { onBackPress, onShow, onHide } from "@dcloudio/uni-app"
import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
import { queryWorkOrderList,queryCountByType,queryAll } from './api.js'
// import {startOrder,endOrder} from './doctorask/api/api.js'
@ -726,7 +727,7 @@
const plsbuy = ref([])
const firstgetqueryCgdList = (nuId) => {
form.nuId = nuId;
console.log(form)
// console.log(form)
queryOrderList(form).then(res => {
if(res.result.records.length>0){
clickLeftMenu(0,res.result.records[0])
@ -737,7 +738,7 @@
}
const clickLeftMenu = (index : any, item : object) => {
queryOrderInfoList({ mainId: item.id }).then(res => {
console.log(res)
// console.log(res)
if(res.result.length>0){
indexmessage.value = res.result[0]
}else{
@ -994,7 +995,7 @@
if(e==2){
fwzlarr.value = zlarr.value.logistics
}
console.log(fwzlarr.value)
// console.log(fwzlarr.value)
}
const zldex = (e) =>{
if(e>-1&&e==fwzldex.value){
@ -1178,10 +1179,17 @@
timerId = updateTime();
//
setInterval(updateTime, 1000);
photoplay.value = true;
getmenu();
})
onShow(()=>{
setTimeout(()=>{
photoplay.value = true;
},200)
})
onHide(() => {
playall.value = false;
})
const filteredMenu = (index : number) => {
return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
}

View File

@ -53,7 +53,7 @@
}
.title-time-font-rel {
font-size: 34rpx;
font-size: 33rpx;
font-weight: 800;
/* margin-bottom: 5rpx; */
overflow: hidden;
@ -153,8 +153,8 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 96%;
height: 96%;
width: 98%;
height: 98%;
z-index: 10;
.blue-img {
@ -210,17 +210,18 @@
position: relative;
height: 100%;
padding: 25rpx;
padding-top: 18rpx;
.card-time {
position: absolute;
bottom: 25rpx;
bottom: 15rpx;
left: 20rpx;
font-size: 28rpx;
}
.card-time-red {
position: absolute;
bottom: 25rpx;
bottom: 15rpx;
left: 20rpx;
font-size: 28rpx;
color: #E33B3B;
@ -228,7 +229,7 @@
.card-time-blue {
position: absolute;
bottom: 25rpx;
bottom: 15rpx;
left: 20rpx;
font-size: 28rpx;
color: #4690FF;
@ -258,8 +259,8 @@
}
.title-time-border {
width: calc(100% - 20rpx);
height: calc(100% - 20rpx);
width: calc(100% - 15rpx);
height: calc(100% - 15rpx);
border-radius: 20rpx;
display: flex;
align-items: center;
@ -301,8 +302,8 @@
.title-time-border-future {
border: 2rpx solid #e5e6e6;
width: calc(100% - 20rpx);
height: calc(100% - 20rpx);
width: calc(100% - 15rpx);
height: calc(100% - 15rpx);
border-radius: 20rpx;
display: flex;
align-items: center;
@ -314,8 +315,8 @@
.title-time-border-hisOk {
border: 2rpx solid #D4E4FE;
width: calc(100% - 20rpx);
height: calc(100% - 20rpx);
width: calc(100% - 15rpx);
height: calc(100% - 15rpx);
border-radius: 20rpx;
display: flex;
align-items: center;
@ -326,8 +327,8 @@
.title-time-border-current {
border: 3rpx dashed #4690FF;
width: calc(100% - 20rpx);
height: calc(100% - 20rpx);
width: calc(100% - 15rpx);
height: calc(100% - 15rpx);
border-radius: 20rpx;
display: flex;
align-items: center;
@ -338,8 +339,8 @@
.title-time-border-hisFaild {
border: 2rpx dashed #FFE2E2;
width: calc(100% - 20rpx);
height: calc(100% - 20rpx);
width: calc(100% - 15rpx);
height: calc(100% - 15rpx);
border-radius: 20rpx;
display: flex;
align-items: center;
@ -396,7 +397,7 @@
align-items: center;
text-align: center;
z-index: 10;
.boom-text {
width: 45rpx;
height: 45rpx;
@ -456,7 +457,7 @@
right: 20rpx;
top: 30rpx;
height: 1278rpx;
width: 454rpx;
width: 600rpx;
background-color: #fff;
border-radius: 30rpx;
@ -465,39 +466,42 @@
height: 100rpx;
display: flex;
align-items: center;
/* background-color: red; */
.order-month {
margin-left: 30rpx;
font-size: 30rpx;
font-weight: 600;
width: 80rpx;
font-size: 37rpx;
font-weight: 800;
width: 100rpx;
}
.order-day {
width: 300rpx;
width: 440rpx;
height: 100rpx;
/* background-color: red; */
.days-father {
display: flex;
align-items: center;
font-size: 31rpx;
.days {
height: 100rpx;
min-width: 50rpx;
height: 75rpx;
min-width: 75rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 26rpx;
color: #BBBABA;
/* color: #BBBABA; */
}
.targetdays {
height: 50rpx;
min-width: 50rpx;
height: 75rpx;
min-width: 75rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 26rpx;
/* font-size: 30rpx; */
color: #fff;
border-radius: 50%;
background-color: #4690FF;
@ -521,8 +525,8 @@
padding-top: 10rpx;
padding-left: 20rpx;
/* position: relative; */
.history-left-jiao{
.history-left-jiao {
position: absolute;
right: 0;
top: 0;
@ -538,7 +542,8 @@
font-size: 19rpx;
font-weight: 600;
}
.history-left-jiao-error{
.history-left-jiao-error {
position: absolute;
right: 0;
top: 0;
@ -703,7 +708,7 @@
color: #555555;
position: relative;
border: 2rpx solid #4690FF;
}
@ -766,14 +771,16 @@
color: #555555;
display: flex;
}
.future-info-second {
position: absolute;
left:80rpx;
left: 80rpx;
bottom: 12rpx;
font-size: 25rpx;
color: #555555;
display: flex;
}
.info {
display: flex;
@ -832,11 +839,11 @@
.card-bao {
position: absolute;
right: 30rpx;
top: 40rpx;
width: 30rpx;
height: 30rpx;
font-size: 18rpx;
left: 30rpx;
top: 110rpx;
width: 32rpx;
height: 32rpx;
font-size: 24rpx;
display: flex;
justify-content: center;
align-items: center;
@ -932,7 +939,7 @@
bottom: 28rpx;
width: 22rpx;
height: 22rpx;
.open-img {
width: 100%;
@ -945,7 +952,9 @@
color: #999999;
margin-top: 20rpx;
}
.weight-time{
.weight-time {
font-weight: 600;
font-size: 32rpx;
margin-top: -5rpx;
}

View File

@ -49,7 +49,7 @@
<view class="title-time-blue"
v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
<image class="blue-img"
<image class="blue-img" lazy-load
src="/static/index/bluetarget.png" />
</view>
@ -78,7 +78,7 @@
</view>
<view v-if="item1.startTime"
:class="getFontClass(item1,index0,index1)">
<view style="margin-bottom: 3rpx;">
<view>
{{ item1.rightshow }}
</view>
<view class="weight-time">
@ -119,7 +119,7 @@
</scroll-view>
</view>
<view class="order-future">
<nomessgae :cont="`暂无数据`" v-show="!upmenuarray.length" ></nomessgae>
<nomessgae :cont="`暂无数据`" v-show="!upmenuarray.length"></nomessgae>
<scroll-view class="future-items" scroll-with-animation scroll-y :scroll-top="firsttopmove">
<view style="position: relative;" v-for="(item,index) in upmenuarray" :key="index"
@click="searchtable(item);">
@ -151,7 +151,7 @@
<view class="open-img-father" v-if="!item.tagtype"
@click.stop="clickfirstarray(item,index);"
:style="firstListTarget===index?{transform: `rotate(180deg)`}:{}">
<image class="open-img" src="/static/index/down.png" />
<image class="open-img" src="/static/index/down.png" lazy-load />
</view>
</view>
<view
@ -187,22 +187,22 @@
</view>
<view class="future-info" v-if="firstListTarget===index">
<view class="info" v-if="item.optType == 2">
<image class="info-img" src="/static/index/leftpeople.png" />
<image class="info-img" src="/static/index/leftpeople.png" lazy-load />
<view class="">
{{ item.optNames?.split(',')[0] }}
</view>
<image class="info-img" style="margin-left: 15rpx;"
<image class="info-img" style="margin-left: 15rpx;" lazy-load
src="/static/index/rightpeople.png" />
<view class="">
{{ item.optNames?.split(',')[1] }}
</view>
</view>
<view class="info" v-else>
<image class="info-img" src="/static/index/leftpeople.png" />
<image class="info-img" src="/static/index/leftpeople.png" lazy-load />
<view class="">
{{ item.optTypeName }}
</view>
<image class="info-img" style="margin-left: 15rpx;"
<image class="info-img" style="margin-left: 15rpx;" lazy-load
src="/static/index/rightpeople.png" />
<view class="">
{{ item.optNames }}
@ -211,7 +211,7 @@
</view>
<view class="open-img-father" @click.stop="clickfirstarray(item,index)"
:style="firstListTarget===index?{transform: `rotate(180deg)`}:{}">
<image class="open-img" src="/static/index/down.png" />
<image class="open-img" src="/static/index/down.png" lazy-load />
</view>
<view class="serviceContent" v-if="firstListTarget===index">
{{ item.serviceContent }}
@ -229,7 +229,7 @@
长者标签
</view>
</view>
<nomessgae :cont="`暂无数据`" v-show="!downmenuarray.length" ></nomessgae>
<nomessgae :cont="`暂无数据`" v-show="!downmenuarray.length"></nomessgae>
<scroll-view class="history-items" scroll-with-animation scroll-y
:scroll-top="secondtopmove">
<view v-for="(item,index) in downmenuarray" :key="index" @click="searchtable(item);">
@ -249,7 +249,7 @@
{{ extractHHMM(item.startTime) }}
</view>
<view style="display: flex;width: 1000rpx;">
<image class="history-img"
<image class="history-img" lazy-load
:src="`${serverUrl}${item.previewFileSmall}`" />
<view class="history-name">
{{ item.directiveName+" " }}|{{" " + item.serviceDuration + `分钟` }}
@ -277,7 +277,7 @@
{{ extractHHMM(item.startTime) }}
</view>
<view style="display: flex;width: 1000rpx;">
<image class="history-img"
<image class="history-img" lazy-load
:src="`${serverUrl}${item.previewFileSmall}`" />
<view class="history-name">
{{ item.directiveName+" " }}|{{" " + item.serviceDuration + `分钟` }}
@ -291,18 +291,20 @@
<view class="future-info-second" style="left: 20rpx;"
v-if="secondListTarget===index">
<view class="info" v-if="item.optType == 2">
<image class="info-img" src="/static/index/leftpeople.png" />
<image class="info-img" lazy-load
src="/static/index/leftpeople.png" />
<view class="">
{{ item.optNames?.split(',')[0] }}
</view>
<image class="info-img" style="margin-left: 15rpx;"
<image class="info-img" lazy-load style="margin-left: 15rpx;"
src="/static/index/rightpeople.png" />
<view class="">
{{ item.optNames?.split(',')[1] }}
</view>
</view>
<view class="info" v-else>
<image class="info-img" src="/static/index/leftpeople.png" />
<image class="info-img" lazy-load
src="/static/index/leftpeople.png" />
<view class="">
{{ item.optTypeName }}
</view>
@ -316,7 +318,7 @@
<view class="open-img-father" style="right: 15rpx;bottom: 11.5rpx;"
@click.stop="clicksecondarray(item,index)">
<image
<image lazy-load
:style="secondListTarget===index?{transform: `rotate(180deg)`}:{}"
class="open-img" src="/static/index/down.png" />
</view>
@ -325,22 +327,22 @@
<view class="future-info-second"
v-if="secondListTarget===index&& secondListTargetShow !== index">
<view class="info" v-if="item.optType == 2">
<image class="info-img" src="/static/index/leftpeople.png" />
<image class="info-img" lazy-load src="/static/index/leftpeople.png" />
<view class="">
{{ item.optNames?.split(',')[0] }}
</view>
<image class="info-img" style="margin-left: 15rpx;"
<image class="info-img" lazy-load style="margin-left: 15rpx;"
src="/static/index/rightpeople.png" />
<view class="">
{{ item.optNames?.split(',')[1] }}
</view>
</view>
<view class="info" v-else>
<image class="info-img" src="/static/index/leftpeople.png" />
<image class="info-img" lazy-load src="/static/index/leftpeople.png" />
<view class="">
{{ item.optTypeName }}
</view>
<image class="info-img" style="margin-left: 15rpx;"
<image class="info-img" lazy-load style="margin-left: 15rpx;"
src="/static/index/rightpeople.png" />
<view class="">
{{ item.optNames }}
@ -349,7 +351,7 @@
</view>
<view class="open-img-father" style="right: 16rpx;bottom: 12rpx;"
@click.stop="clicksecondarray(item,index)">
<image class="open-img" src="/static/index/down.png"
<image class="open-img" src="/static/index/down.png" lazy-load
:style="secondListTarget===index?{transform: `rotate(180deg)`}:{}" />
</view>
</view>
@ -820,7 +822,7 @@
getDirectiveOrders(time).then((data) => {
firstListTarget.value = -1;
secondListTarget.value = -1;
// console.log("", data.result.current)
// console.log("", data.result.all)
// console.log("", data.result.future)
data.result.current.forEach((element : any) => {
element.tagtype = 0
@ -856,7 +858,7 @@
element.rightshow = `未执行`
} else if (element.executeStatus === 'hisTimeOut') {
element.rightshow = `超时`
}else if (element.executeStatus === 'current') {
} else if (element.executeStatus === 'current') {
element.rightshow = ``
} else if (element.executeStatus === 'future') {
element.rightshow = ``
@ -989,7 +991,7 @@
const totalWidth = totalColumns * 259;
const totalHeight = totalRows * 245;
// scrollLeft scrollTop
cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2 ;
cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2;
// scrollTop.value = 0
scrollTop.value = Math.max(0, Math.min(scrollTop.value, totalHeight - visibleHeight)) / 2;
}

View File

@ -1690,7 +1690,7 @@
onMounted(() => {
savePackagelist.value = uni.getStorageSync('Packagelist') || []
let res = uni.getStorageSync('saveTree0')
console.log("00000",res)
// console.log("00000",res)
let goodArray = []
myArray.forEach((element : any) => {
element.children.forEach((element1 : any) => {

View File

@ -98,68 +98,68 @@
setTimeout(()=>{
menuIndex.value = 0;
},100)
console.log('护理单元')
// console.log('')
break;
case 'kzgn_hljz':
swipedex.value = 1;
setTimeout(()=>{
menuIndex.value =1;
},100)
console.log('护理矩阵')
// console.log('')
break;
case 'kzgn_yljz':
swipedex.value = 2;
setTimeout(()=>{
menuIndex.value = 2;
},100)
console.log('医疗矩阵')
// console.log('')
break;
case 'kzgn_hqjz':
swipedex.value = 3;
setTimeout(()=>{
menuIndex.value = 3;
},100)
console.log('后勤矩阵')
// console.log('')
break;
case 'kzgn_kfjz':
swipedex.value = 6;
setTimeout(()=>{
menuIndex.value = 6;
},100)
console.log('库房')
// console.log('')
break;
case 'kf_cg':
console.log('采购')
// console.log('')
break;
case 'kf_jh':
console.log('拣货')
// console.log('')
break;
case 'kf_wj':
console.log('完结')
// console.log('')
break;
case 'hldy_ql':
swipedex.value = 4;
setTimeout(()=>{
menuIndex.value = 4;
},100)
console.log('请领')
// console.log('')
break;
case 'kf_th':
console.log('退货')
// console.log('退')
break;
case 'kf_pd':
console.log('盘点')
// console.log('')
break;
case 'wl':
swipedex.value = 5;
setTimeout(()=>{
menuIndex.value = 5;
},100)
console.log('物联')
// console.log('')
break;
case 'back':
uni.navigateBack()
console.log('物联')
// console.log('')
break;
default:

View File

@ -1,7 +1,7 @@
<!-- 动画页 -->
<template>
<view>
<!-- <view class="ceshi">
<!-- <view class="ceshi">
<image class="all-home" src="/static/ceshi.png" mode="aspectFit"></image>
</view> -->
<view class="home">
@ -121,7 +121,7 @@
<script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick } from 'vue';
import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
import { onBackPress, onShow } from "@dcloudio/uni-app"
import { onBackPress, onShow, onHide } from "@dcloudio/uni-app"
import { queryPadPageList, queryDepartTreeSync } from '@/pages/watch/api/lunpan.js'
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
import exit from "@/component/public/exit.vue"
@ -129,6 +129,7 @@
onBackPress(() => {
return true; //
})
const playall = ref(false);
const zyupgrade = ref(null);
const leftMenuArray = ref([])
const exitshow = ref(false);
@ -142,16 +143,23 @@
if (len <= 15) return '1.1vw' // 11~15
return '0.9vw' // 15
})
onHide(() => {
playall.value = false;
})
//
onShow(() => {
setTimeout(()=>{
playall.value = true;
},200)
zyupgrade.value?.check_update();
queryPadPageList().then((res => {
leftMenuArray.value = res.result.records;
console.log("????", res)
// console.log("????", res)
}))
fontnumber.value = uni.getStorageSync('orgListName');
queryDepartTreeSync().then(res => {
console.log(res)
// console.log(res)
if (res.result[0].picUrl) {
fonturl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/' + res.result[0].picUrl
} else {
@ -252,10 +260,11 @@
false //
)
const playall = ref(false);
onMounted(() => {
playall.value = true;
// console.log("ceshi")
// playall.value = true;
//
getServiceTree0().then((res : any) => {
//

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB

View File

@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
export {
camera as default
};

View File

@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
export {
fullcamera as default
};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB