合并代码

This commit is contained in:
Teng 2026-02-03 15:13:24 +08:00
parent 163fd78ac1
commit 068018786e
44 changed files with 662 additions and 545 deletions

View File

@ -92,7 +92,7 @@
const form = reactive({ const form = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
employeeId: uni.getStorageSync('userInfo').employessId, employeeId: uni.getStorageSync('userInfo').employeesId,
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
workType: 2 workType: 2
}) })

View File

@ -2,8 +2,8 @@
"name" : "护理单元", "name" : "护理单元",
"appid" : "__UNI__FB2D473", "appid" : "__UNI__FB2D473",
"description" : "护理单元", "description" : "护理单元",
"versionName" : "1.0.030", "versionName" : "1.0.031",
"versionCode" : 10030, "versionCode" : 10031,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

View File

@ -198,7 +198,7 @@
const form = reactive({ const form = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
employeeId:uni.getStorageSync('userInfo').employessId, employeeId:uni.getStorageSync('userInfo').employeesId,
nuId:uni.getStorageSync('nuId') nuId:uni.getStorageSync('nuId')
}) })
const open = ref(0) const open = ref(0)

View File

@ -297,7 +297,7 @@
const form = reactive({ const form = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
employeeId:uni.getStorageSync('userInfo').employessId, employeeId:uni.getStorageSync('userInfo').employeesId,
nuId:uni.getStorageSync('nuId'), nuId:uni.getStorageSync('nuId'),
workType:5 workType:5
}) })
@ -444,6 +444,7 @@
ilanarr.value = v.manuallyPicPath.split(","); ilanarr.value = v.manuallyPicPath.split(",");
ilanarr.value = ilanarr.value.filter(item => item !== ''); ilanarr.value = ilanarr.value.filter(item => item !== '');
}else if(r == 2&&v.manuallyMp4Path){ }else if(r == 2&&v.manuallyMp4Path){
ilanarr.value = v.manuallyMp4Path.split(","); ilanarr.value = v.manuallyMp4Path.split(",");
ilanarr.value = ilanarr.value.filter(item => item !== ''); ilanarr.value = ilanarr.value.filter(item => item !== '');
}else if(r == 3&&v.tplinkPath){ }else if(r == 3&&v.tplinkPath){
@ -663,10 +664,10 @@
nuId:nuId, nuId:nuId,
elderId:elderId elderId:elderId
} }
queryAll(data).then(res=>{ // queryAll(data).then(res=>{
zlarr.value = res.result; // zlarr.value = res.result;
shtab(fwzlindex.value) // shtab(fwzlindex.value)
}) // })
} }
const shtab = (e)=>{ const shtab = (e)=>{
fwzlindex.value = e; fwzlindex.value = e;
@ -892,7 +893,7 @@
// let data = { // let data = {
// nuId: uni.getStorageSync('NUall').nuId, // nuId: uni.getStorageSync('NUall').nuId,
// employeeId: uni.getStorageSync('userInfo').employessId, // employeeId: uni.getStorageSync('userInfo').employeesId,
// workType: 5 // workType: 5
// } // }
// queryWorkOrderList(data).then((res : any) => { // queryWorkOrderList(data).then((res : any) => {

View File

@ -3,7 +3,8 @@
<view class="swipeservwe"> <view class="swipeservwe">
<view class="swper" v-if="plsbuy.length==0"> <view class="swper" v-if="plsbuy.length==0">
<view class="photo-father"> <view class="photo-father">
<image class="big-img" style="width: 550rpx;top:30%;" :src="`/static/index/newindex/wendu/2.png`" mode="aspectFill"/> <image class="big-img" style="width: 550rpx;top:30%;" :src="`/static/index/newindex/wendu/2.png`"
mode="aspectFill" />
<view class="juzhong" style=" filter:grayscale(60%)"> <view class="juzhong" style=" filter:grayscale(60%)">
<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="true" :loop="true" <donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="true" :loop="true"
:interval="120" /> :interval="120" />
@ -18,10 +19,11 @@
<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" /> <image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
</view> </view>
<view class="bots" v-if="plsbuy.length>1"> <view class="bots" v-if="plsbuy.length>1">
<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''" :style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view> <view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"
:style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view>
</view> </view>
<swiper class="swiper" :circular="true" :indicator-dots="false" <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="autoplay" :interval="3000"
:autoplay="autoplay" :interval="3000" :duration="500" :current="current2" @change="change"> :duration="500" :current="current2" @change="change">
<swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper"> <swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper">
<view class="photo-father"> <view class="photo-father">
<!-- {filter: `grayscale(60%)`} --> <!-- {filter: `grayscale(60%)`} -->
@ -31,13 +33,30 @@
</view> </view>
<view class="timedjs" v-if="current==i&&indexmessage?.izStart=='Y'"> <view class="timedjs" v-if="current==i&&indexmessage?.izStart=='Y'">
<text>服务倒计时</text> <text>服务倒计时</text>
<timeing :initTime="djstinme" :timeoutDuration="Number(indexmessage.timeoutDuration)*60" @timeend="timeend"></timeing> <timeing v-if="indexmessage?.serviceDuration" :initTime="djstinme"
:timeoutDuration="Number(indexmessage.timeoutDuration)*60" @timeend="timeend"></timeing>
<view class="no-time-all" v-else>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
MIN
</view>
</view>
<text style="color: #959595;font-size: 1.9vw;padding: 0 5rpx;">:</text>
<view class="no-time-view">
<image class="no-time" src="/static/index/newindex/states/always.png" />
<view class="no-text">
SEC
</view>
</view>
</view>
</view> </view>
<view class="weight-time"> <view class="weight-time">
<view> <view>
{{ indexmessage?.startTime.slice(11, 16) }} {{ indexmessage?.startTime.slice(11, 16) }}
<text style="font-size: 1.8vw;font-weight: 500;" v-if="indexmessage?.serviceDuration"> <text style="font-size: 1.8vw;font-weight: 500;" v-if="indexmessage?.serviceDuration">
|&nbsp; {{indexmessage?.serviceDuration}}分钟 |&nbsp; {{indexmessage?.serviceDuration ?indexmessage?.serviceDuration: ``}}分钟
</text> </text>
</view> </view>
<view style="height: 4vw;"> </view> <view style="height: 4vw;"> </view>
@ -48,21 +67,28 @@
</view> </view>
</view> </view>
</view> </view>
<view class="big-img" v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='N'&&!indexmessage.flag" @click="indexmessage.flag = true"> <view class="big-img"
v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='N'&&!indexmessage.flag"
@click="indexmessage.flag = true">
<image :src="`/static/zlb.png`" :style=" 'width: 450rpx' " mode="aspectFill" /> <image :src="`/static/zlb.png`" :style=" 'width: 450rpx' " mode="aspectFill" />
</view> </view>
<view class="cardbox" v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'||indexmessage.flag"> <view class="cardbox"
v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'||indexmessage.flag">
<scroll-view scroll-y="true" class="scrollcard" @touchmove.stop> <scroll-view scroll-y="true" class="scrollcard" @touchmove.stop>
<view class="itemcard" v-for="(v,s) in indexmessage.servebao" :class="{'act':v.flag,'last':v.last}" :key='s' @click="zldex(v,indexmessage.servebao,s)"> <view class="itemcard" v-for="(v,s) in indexmessage.servebao"
:class="{'act':v.flag,'last':v.last}" :key='s'
@click="zldex(v,indexmessage.servebao,s)">
<view class="brcard"> <view class="brcard">
<view class="bgs" v-if="v.last"> <view class="bgs" v-if="v.last">
<image src="/static/index/newtarget.png" mode=""></image> <image src="/static/index/newtarget.png" mode=""></image>
</view> </view>
</view> </view>
<image :src="!v.flag? (v.immediateFile?serverUrl + v.immediateFile:'/static/logo.png'): ( v.immediateFileFocus?serverUrl + v.immediateFileFocus:'/static/logotarget.png')" /> <image
:src="!v.flag? (v.immediateFile?serverUrl + v.immediateFile:'/static/logo.png'): ( v.immediateFileFocus?serverUrl + v.immediateFileFocus:'/static/logotarget.png')" />
<text>{{v.match[0]}}</text> <text>{{v.match[0]}}</text>
<view v-if="v.match[1]" style="position: relative;z-index: 2;">({{v.match[1]}})</view> <view v-if="v.match[1]" style="position: relative;z-index: 2;">({{v.match[1]}})
</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -107,8 +133,7 @@
<view class="left-menu"> <view class="left-menu">
<view @click="errmsgclk(0,1,indexmessage)"> <view @click="errmsgclk(0,1,indexmessage)">
<view class="left-ball" <view class="left-ball" :style="indexmessage?.serviceContent!=''?' ':'opacity: 0.4'">
:style="indexmessage?.serviceContent!=''?' ':'opacity: 0.4'">
<image class="left-menu-img" <image class="left-menu-img"
:src="'/static/index/newindex/leftmenu/left'+0+'.png'" /> :src="'/static/index/newindex/leftmenu/left'+0+'.png'" />
</view> </view>
@ -128,8 +153,7 @@
</view> </view>
</view> </view>
<view v-for="(item,index) in [3,4]" :key="index" @click="errmsgclk(item,2,indexmessage)"> <view v-for="(item,index) in [3,4]" :key="index" @click="errmsgclk(item,2,indexmessage)">
<view class="left-ball" <view class="left-ball" :style="indexmessage?.izStart=='Y'?' ':'opacity: 0.4'">
:style="indexmessage?.izStart=='Y'?' ':'opacity: 0.4'">
<image class="left-menu-img" <image class="left-menu-img"
:src="'/static/index/newindex/leftmenu/left'+item+'.png'" /> :src="'/static/index/newindex/leftmenu/left'+item+'.png'" />
</view> </view>
@ -138,7 +162,8 @@
<view class="right-menu"> <view class="right-menu">
<!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`" /> --> <!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`" /> -->
<view class="right-scroll"> <view class="right-scroll">
<view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;" @click="zhixing(1,indexmessage)"> <view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;"
@click="zhixing(1,indexmessage)">
<view class="white-circle" :style="indexmessage?.izStart=='Y'?'opacity: 0.4' : ''"> <view class="white-circle" :style="indexmessage?.izStart=='Y'?'opacity: 0.4' : ''">
<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" /> <image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" />
<view class="right-menu-name"> <view class="right-menu-name">
@ -146,7 +171,8 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin:1.5vw 0;width:4vw;margin-left: 20rpx;" @click="zhixing(2,indexmessage)"> <view style="margin:1.5vw 0;width:4vw;margin-left: 20rpx;"
@click="zhixing(2,indexmessage)">
<view class="white-circle" :style="indexmessage?.izStart=='Y'?'opacity: 0.4' : ''"> <view class="white-circle" :style="indexmessage?.izStart=='Y'?'opacity: 0.4' : ''">
<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" /> <image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" />
<view class="right-menu-name"> <view class="right-menu-name">
@ -219,7 +245,8 @@
<image style="width: 100%;height: 100%;border-radius: 30rpx;" <image style="width: 100%;height: 100%;border-radius: 30rpx;"
:src="item?serverpicUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill" :src="item?serverpicUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
:lazy-load="true" /> :lazy-load="true" />
<view @click.stop="open=1;del(item,index)" class="del" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')"> <view @click.stop="open=1;del(item,index)" class="del"
v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw; <image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
height: 1.4vw;"></image> height: 1.4vw;"></image>
</view> </view>
@ -229,7 +256,8 @@
<video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index" <video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index"
:src="servervideoUrl+item" direction="180" mode="aspectFill"></video> :src="servervideoUrl+item" direction="180" mode="aspectFill"></video>
<view @click.stop="ilanarr.splice(index,1)" <view @click.stop="ilanarr.splice(index,1)"
v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')" class="shanchu"> v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')"
class="shanchu">
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw; <image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
height: 1.4vw;"></image> height: 1.4vw;"></image>
</view> </view>
@ -262,7 +290,8 @@
</view> </view>
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang> <tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;" /> <errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;" />
<tanchuang :show="open==3" :font="font" @back="open = 0" @right="del1()" fontsize="font-size:2.2vw" :close="false"> </tanchuang> <tanchuang :show="open==3" :font="font" @back="open = 0" @right="del1()" fontsize="font-size:2.2vw"
:close="false"> </tanchuang>
<severcard ref="severcards"></severcard> <severcard ref="severcards"></severcard>
</view> </view>
@ -346,7 +375,7 @@
const form = reactive({ const form = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
employeeId: uni.getStorageSync('userInfo').employessId, employeeId: uni.getStorageSync('userInfo').employeesId,
nuId: uni.getStorageSync('nuId'), nuId: uni.getStorageSync('nuId'),
workType: 5 workType: 5
}) })
@ -367,15 +396,16 @@
open.value = 3 open.value = 3
return return
} }
queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => { //
console.log(res) // queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => {
zdxzarr.value = res.result; // console.log(res)
zdxzarr.value.forEach(item => { // zdxzarr.value = res.result;
item.flag = false // zdxzarr.value.forEach(item => {
console.log(item.headPath) // item.flag = false
}) // console.log(item.headPath)
zdxzdex.value = e; // })
}) // zdxzdex.value = e;
// })
} }
const plsbuy = ref([]) const plsbuy = ref([])
const flag = ref(false) const flag = ref(false)
@ -721,64 +751,65 @@
font.value = '敬请期待~' font.value = '敬请期待~'
open.value = 3 open.value = 3
return return
console.log(e, k, indexmessage) //
if (k == 1) { // console.log(e, k, indexmessage)
if(indexmessage.izPackage=='Y'&&e==0){ // if (k == 1) {
// if(indexmessage.izPackage=='Y'&&e==0){
if(indexmessage.flag||indexmessage.izStart == 'Y'){ // if(indexmessage.flag||indexmessage.izStart == 'Y'){
let last = indexmessage.servebao.find(item => item.last === true); // let last = indexmessage.servebao.find(item => item.last === true);
console.log(last) // console.log(last)
if(!!last){ // if(!!last){
errmsg.value = last?.serviceContent==''?'暂无数据':last?.serviceContent // errmsg.value = last?.serviceContent==''?'':last?.serviceContent
openerror.value = true; // openerror.value = true;
}else{ // }else{
errmsg.value = indexmessage?.serviceContent // errmsg.value = indexmessage?.serviceContent
openerror.value = true; // openerror.value = true;
} // }
}else{ // }else{
errmsg.value = indexmessage?.serviceContent // errmsg.value = indexmessage?.serviceContent
openerror.value = true; // openerror.value = true;
} // }
} // }
if (indexmessage?.izStart == 'Y'&&indexmessage.izPackage!='Y') { // if (indexmessage?.izStart == 'Y'&&indexmessage.izPackage!='Y') {
switch (e) { // switch (e) {
case 0: // case 0:
if (indexmessage?.serviceContent == '') { return } // if (indexmessage?.serviceContent == '') { return }
errmsg.value = indexmessage?.serviceContent // errmsg.value = indexmessage?.serviceContent
break; // break;
case 1: // case 1:
if (indexmessage?.mp3File == '') { return } // if (indexmessage?.mp3File == '') { return }
errmsg.value = indexmessage?.mp3File // errmsg.value = indexmessage?.mp3File
break; // break;
case 2: // case 2:
if (indexmessage?.mp4File == '') { return } // if (indexmessage?.mp4File == '') { return }
errmsg.value = indexmessage?.mp4File // errmsg.value = indexmessage?.mp4File
break; // break;
default: // default:
break; // break;
} // }
openerror.value = true; // openerror.value = true;
} // }
} else { // } else {
if (indexmessage?.izStart == 'Y') { // if (indexmessage?.izStart == 'Y') {
switch (e) { // switch (e) {
case 3: // case 3:
ysptp(indexmessage, 0, 1) // ysptp(indexmessage, 0, 1)
break; // break;
case 4: // case 4:
ysptp(indexmessage, 0, 2) // ysptp(indexmessage, 0, 2)
break; // break;
default: // default:
break; // break;
} // }
} // }
} // }
} }
const ysptp = (v, i, r) => { const ysptp = (v, i, r) => {
// v.manuallyPicPath // v.manuallyPicPath
@ -881,6 +912,7 @@
border-radius: 50%; border-radius: 50%;
align-items: center; align-items: center;
} }
.del { .del {
width: 1.6vw; width: 1.6vw;
height: 1.6vw; height: 1.6vw;
@ -894,6 +926,7 @@
border-radius: 50%; border-radius: 50%;
align-items: center; align-items: center;
} }
.uplods { .uplods {
width: 100%; width: 100%;
height: 71%; height: 71%;
@ -934,6 +967,7 @@
border-radius: 1.6vw; border-radius: 1.6vw;
margin-top: 0.5vw; margin-top: 0.5vw;
padding: 3vw 0 0; padding: 3vw 0 0;
.bots { .bots {
width: 60%; width: 60%;
position: absolute; position: absolute;
@ -985,10 +1019,12 @@
} }
.swiper { .swiper {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.swper { .swper {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -1129,6 +1165,7 @@
} }
} }
.brcard { .brcard {
width: 11.2vw; width: 11.2vw;
height: 8vw; height: 8vw;
@ -1140,22 +1177,26 @@
background: rgba(255, 255, 255, 0.5); background: rgba(255, 255, 255, 0.5);
z-index: 0; z-index: 0;
} }
.bgs { .bgs {
width: 11.2vw; width: 11.2vw;
height: 8vw; height: 8vw;
position: absolute; position: absolute;
top: -1.05vw; top: -1.05vw;
left: -0.15vw; left: -0.15vw;
image { image {
width: 103%; width: 103%;
height: 105%; height: 105%;
} }
} }
.act { .act {
.brcard { .brcard {
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
border: 2rpx dashed #0089FE; border: 2rpx dashed #0089FE;
} }
text, text,
view { view {
color: #017DE9; color: #017DE9;
@ -1263,11 +1304,13 @@
} }
} }
.left-menu { .left-menu {
position: absolute; position: absolute;
top: 37%; top: 37%;
left: 5.3vw; left: 5.3vw;
transform: translateY(-50%); transform: translateY(-50%);
>view { >view {
margin: 0.8vw 0; margin: 0.8vw 0;
} }
@ -1929,4 +1972,36 @@
} }
} }
} }
.no-time-all {
display: flex;
align-items: center;
.no-time-view {
display: flex;
justify-content: center;
align-items: center;
width: 110rpx;
height: 100rpx;
background-color: #eaeaea;
position: relative;
border-radius: 10rpx;
.no-text {
position: absolute;
bottom: 2rpx;
left: 50%;
transform: translateX(-50%);
// font-size: 23rpx;
font-size: 0.7vw;
font-weight: 600;
// color: #666;
}
.no-time {
width: 70%;
height: 70%;
}
}
}
</style> </style>

View File

@ -6,7 +6,9 @@
<view class="flip_face child text" :style="{ zIndex: faceZindexmin || 0 }" id="flip_face"> <view class="flip_face child text" :style="{ zIndex: faceZindexmin || 0 }" id="flip_face">
{{ Math.floor(bottomTime / 60) }} {{ Math.floor(bottomTime / 60) }}
</view> </view>
<view class="flip_back child text" :style="backZindex&&transformInfomin ? { zIndex: backZindex } : {}" id="flip_back" >
<view class="flip_back child text" :style="backZindex&&transformInfomin ? { zIndex: backZindex } : {}"
id="flip_back">
{{ Math.floor(topTime / 60) }} {{ Math.floor(topTime / 60) }}
<text>MIN</text> <text>MIN</text>
</view> </view>
@ -23,6 +25,7 @@
<view class="flip_face child text" :style="{ zIndex: faceZindex || 0 }" id="flip_face"> <view class="flip_face child text" :style="{ zIndex: faceZindex || 0 }" id="flip_face">
{{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60)}} {{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60)}}
</view> </view>
<view class="flip_back child text" :style="backZindex ? { zIndex: backZindex } : {}" id="flip_back"> <view class="flip_back child text" :style="backZindex ? { zIndex: backZindex } : {}" id="flip_back">
{{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }} {{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}
<text>SEC</text> <text>SEC</text>
@ -154,10 +157,12 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
.red { .red {
color: red !important; color: red !important;
view { view {
color: red !important; color: red !important;
} }
} }
.box { .box {
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
@ -173,7 +178,7 @@ export default {
background-color: #eaeaea; background-color: #eaeaea;
line-height: 5vw; line-height: 5vw;
border-bottom: 2rpx solid #fff; border-bottom: 2rpx solid #fff;
border-radius: 4px 4px 0 0; border-radius: 8px 8px 0 0;
} }
.box .flip { .box .flip {
@ -181,7 +186,7 @@ export default {
top: 0rpx; top: 0rpx;
z-index: 1; z-index: 1;
transform-origin: bottom; transform-origin: bottom;
border-radius: 4rpx 4rpx 0 0; border-radius: 8rpx 8rpx 0 0;
} }
.box .flip .flip_face { .box .flip .flip_face {
@ -204,7 +209,7 @@ export default {
background-color: #f4f4f4; background-color: #f4f4f4;
line-height: 0rpx; line-height: 0rpx;
border-top: 1rpx solid #fff; border-top: 1rpx solid #fff;
border-radius: 0 0 4px 4px; border-radius: 0 0 8px 8px;
} }
.text { .text {
@ -213,6 +218,7 @@ export default {
font-weight: 900; font-weight: 900;
color: #666; color: #666;
position: relative; position: relative;
>text { >text {
position: absolute; position: absolute;
width: 100%; width: 100%;
@ -223,4 +229,5 @@ export default {
font-size: 0.7vw; font-size: 0.7vw;
} }
} }
</style> </style>

View File

@ -1,7 +1,6 @@
<!-- 护嘱 --> <!-- 护嘱 -->
<template> <template>
<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}" <view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}" @click="bottomisShaking=false;">
@click="bottomisShaking=false;">
<severcard></severcard> <severcard></severcard>
<view class="doctorsay-container-view"> <view class="doctorsay-container-view">
<view class="doctorsay-container-container"> <view class="doctorsay-container-container">
@ -14,7 +13,6 @@
<text class="boom-text"> <text class="boom-text">
{{item.tagName}} {{item.tagName}}
</text> </text>
</view> </view>
</view> </view>
</view> </view>
@ -64,7 +62,7 @@
</view> </view>
<view :class="getClass(item1,index0,index1)" <view :class="getClass(item1,index0,index1)"
style="font-size: 30rpx;overflow: hidden;" style="font-size: 30rpx;overflow: hidden;"
:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s`,border:saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !isTuoing? `2rpx solid #46B2F6`:'' }"> :style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s`,border:saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !isTuoing && item1.startTime? `2rpx solid #46B2F6`:'' }">
<view class="title-time" v-if="item1.startTime" <view class="title-time" v-if="item1.startTime"
style="flex-direction: column;"> style="flex-direction: column;">
@ -135,7 +133,6 @@
</view> </view>
</view> </view>
<image class="haven-img" v-if="!bodyTagListLook.length" <image class="haven-img" v-if="!bodyTagListLook.length"
src="/static/index/procurement/haven.png" mode="aspectFill"></image> src="/static/index/procurement/haven.png" mode="aspectFill"></image>
@ -329,7 +326,6 @@
<view class="servers-heng" :style="ruleritem.izPackage==`Y`?{left:`114rpx`}:{}" <view class="servers-heng" :style="ruleritem.izPackage==`Y`?{left:`114rpx`}:{}"
v-show="ruleritem.directiveName"></view> v-show="ruleritem.directiveName"></view>
<image class="explain-icon" @click="explainopen=!explainopen" style="top: 0;" <image class="explain-icon" @click="explainopen=!explainopen" style="top: 0;"
src="/static/index/procurement/explain.png" mode="aspectFill"></image> src="/static/index/procurement/explain.png" mode="aspectFill"></image>
@ -409,9 +405,7 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="pack-heng"> <view class="pack-heng"></view>
</view>
<scroll-view class="pack-detail" scroll-with-animation :scroll-y="canmovechange"> <scroll-view class="pack-detail" scroll-with-animation :scroll-y="canmovechange">
<view class="detail-father"> <view class="detail-father">
<view class="details" <view class="details"
@ -798,10 +792,33 @@
} }
}); });
const canmovechange = ref(true) const canmovechange = ref(true);
const nextpageing = ref(false)
let nextPageTimer = null
//
onBeforeUnmount(() => {
if (nextPageTimer) {
clearTimeout(nextPageTimer)
nextPageTimer = null
}
})
watch(() => props.howtomove, (newVal : [number, number], oldVal : [number, number]) => { watch(() => props.howtomove, (newVal : [number, number], oldVal : [number, number]) => {
if (oldVal[0] === 2) { if (oldVal[0] === 2) {
// true
nextpageing.value = true
//
if (nextPageTimer) {
clearTimeout(nextPageTimer)
}
// 1 false
nextPageTimer = setTimeout(() => {
nextpageing.value = false
nextPageTimer = null
}, 1000)
const nextX = notrelxy.value[0] + newVal[0] const nextX = notrelxy.value[0] + newVal[0]
if (nextX >= 0 && nextX <= 23) { if (nextX >= 0 && nextX <= 23) {
notrelxy.value[0] = nextX notrelxy.value[0] = nextX
@ -1005,7 +1022,7 @@
const openerror = ref(false) const openerror = ref(false)
const errshow = ref("") const errshow = ref("")
const emit = defineEmits(['handsend', `rulepush`]) const emit = defineEmits(['handsend', `rulepush`, `cleanall`])
const serverUrl = ref(uni.getStorageSync('imagebase')) const serverUrl = ref(uni.getStorageSync('imagebase'))
const bodystatus = ref(false); const bodystatus = ref(false);
@ -1208,6 +1225,11 @@
: (cb) => setTimeout(cb, 16); : (cb) => setTimeout(cb, 16);
function handleScrolltime(e) { function handleScrolltime(e) {
//
if (killbaddata.value && !canmovechange.value && !nextpageing.value) {
emit('cleanall')
// console.log("")
}
killbaddata.value = true killbaddata.value = true
// //
const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0; const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
@ -1229,6 +1251,12 @@
const killbaddata = ref(true) const killbaddata = ref(true)
function handleTop(e) { function handleTop(e) {
//
if (killbaddata.value && !canmovechange.value && !nextpageing.value) {
emit('cleanall')
// console.log("")
}
killbaddata.value = true killbaddata.value = true
leftIn.value = e.detail.scrollLeft leftIn.value = e.detail.scrollLeft
} }
@ -1938,6 +1966,7 @@
}) })
.exec() .exec()
canmovechange.value = false; canmovechange.value = false;
// nextpageing.value = false
}, 300) }, 300)
} }
@ -1996,7 +2025,7 @@
}) })
.exec() .exec()
} }
}, 800) }, 500)
} }
const handleTouchStart = (item : any, e : any) => { const handleTouchStart = (item : any, e : any) => {
@ -2012,7 +2041,7 @@
isTuoing.value = true; isTuoing.value = true;
emit('handsend', item) emit('handsend', item)
postitem.value = item postitem.value = item
}, 800) }, 500)
} }
const isScrolling = ref(false) const isScrolling = ref(false)
// //

View File

@ -197,7 +197,7 @@
const form = reactive({ const form = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
employeeId:uni.getStorageSync('userInfo').employessId, employeeId:uni.getStorageSync('userInfo').employeesId,
nuId:uni.getStorageSync('nuId') nuId:uni.getStorageSync('nuId')
}) })
const open = ref(0) const open = ref(0)

View File

@ -40,7 +40,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="delete-view" :style="isblue==`3`?{backgroundColor: `rgba(255, 239, 239, 0.8)`}:{}" v-if="!startmoveit&&whoisit"> <view class="delete-view" :style="isblue==`3`?{backgroundColor: `rgba(255, 239, 239, 0.8)`}:{}"
v-if="!startmoveit&&whoisit">
<image class="delete-img" :src="`/static/index/trash${isblue==`3`?`target`:``}.png`" /> <image class="delete-img" :src="`/static/index/trash${isblue==`3`?`target`:``}.png`" />
</view> </view>
<!-- 左侧菜单 --> <!-- 左侧菜单 -->
@ -53,8 +54,8 @@
<bignurse :isshow="menuIndex==0" <bignurse :isshow="menuIndex==0"
v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
<!-- 户嘱页 --> <!-- 户嘱页 -->
<newnurse :isshow="menuIndex==1" v-if="swipedex==1" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue' :howtomove="howtomove" <newnurse :isshow="menuIndex==1" v-if="swipedex==1" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue'
:targetrule="targetrule" @handsend="handsend" @rulepush="rulepush" /> :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush" @cleanall="cleanall" />
<!-- 医嘱 --> <!-- 医嘱 -->
<doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> <doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
<logistics :isshow="menuIndex==3" <logistics :isshow="menuIndex==3"
@ -114,9 +115,9 @@
// console.log("", res) // console.log("", res)
uni.setStorageSync("Packagelist", res.result) uni.setStorageSync("Packagelist", res.result)
}) })
getPermissionList({ employessId: uni.getStorageSync('userInfo').employessId }).then(res => { getPermissionList({ employeesId: uni.getStorageSync('userInfo').employeesId }).then(res => {
listarr.value = res.result; listarr.value = res.result;
// console.log("", listarr.value) console.log("这个是啥", listarr.value)
}) })
}) })
const gospecial = (index : number) => { const gospecial = (index : number) => {
@ -233,6 +234,7 @@
queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => { queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => {
let arr = res.result.records[0].permissionList; let arr = res.result.records[0].permissionList;
arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }]; arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }];
let tbr = []; let tbr = [];
// console.log("xxxx",arr) // console.log("xxxx",arr)
@ -245,6 +247,7 @@
tbr.push(v); tbr.push(v);
} }
}) })
// console.log("",tbr)
tbr.forEach(item => { tbr.forEach(item => {
let obj = tabbrarr.value.find(r => let obj = tabbrarr.value.find(r =>
r.type == item.menuCode r.type == item.menuCode
@ -495,13 +498,13 @@
} }
const getxy = throttle(getxyrel, 40); const getxy = throttle(getxyrel, 40);
const cleanall = (event) => { const cleanall = (event) => {
setTimeout(()=>{ // setTimeout(()=>{
if (whoisit.value) { if (whoisit.value) {
detectorEnd(); // handmove([a,b]) detectorEnd(); // handmove([a,b])
} }
handmove([-200, -200]) handmove([-200, -200])
startmoveit.value = true; startmoveit.value = true;
},100) // },100)
} }
// bigArray // bigArray
function splitString(str) { function splitString(str) {

View File

@ -222,7 +222,7 @@
const form = reactive({ const form = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
employeeId:uni.getStorageSync('userInfo').employessId, employeeId:uni.getStorageSync('userInfo').employeesId,
nuId:uni.getStorageSync('nuId'), nuId:uni.getStorageSync('nuId'),
workType:5 workType:5
}) })
@ -273,10 +273,10 @@
nuId:nuId, nuId:nuId,
// elderId:elderId // elderId:elderId
} }
queryAll(data).then(res=>{ // queryAll(data).then(res=>{
console.log(res) // console.log(res)
zlarr.value = res.result.invoicing; // zlarr.value = res.result.invoicing;
}) // })
} }
const zldex = (e) =>{ const zldex = (e) =>{
if(e>-1&&e==fwzldex.value){ if(e>-1&&e==fwzldex.value){

View File

@ -145,7 +145,7 @@
const listarr = ref([]) const listarr = ref([])
const swip = ()=>{ const swip = ()=>{
let nuId = uni.getStorageSync('nuId'); let nuId = uni.getStorageSync('nuId');
getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{ getPermissionList({employeesId:uni.getStorageSync('userInfo').employeesId}).then(res=>{
res.result.forEach(item=>{ res.result.forEach(item=>{
if(item.nuId == nuId){ if(item.nuId == nuId){
listarr.value = item.dataList listarr.value = item.dataList

View File

@ -399,7 +399,7 @@
} }
const gotoindex = () => { const gotoindex = () => {
if (uni.getStorageSync('userInfo')) { if (uni.getStorageSync('userInfo')) {
initWs(`wss://www.focusnu.com/ws101/sdWebsocket/${uni.getStorageSync('userInfo').employessId}`, { initWs(`wss://www.focusnu.com/ws101/sdWebsocket/${uni.getStorageSync('userInfo').employeesId}`, {
debug: true, debug: true,
heartbeatInterval: 25000, heartbeatInterval: 25000,
autoConnect: false, // autoConnect: false, //

View File

@ -121,11 +121,12 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick } from 'vue'; import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick } from 'vue';
import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js' import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
import { onBackPress, onShow, onHide } from "@dcloudio/uni-app" import { onBackPress, onShow, onHide,onUnload } from "@dcloudio/uni-app"
import { queryPadPageList, queryDepartTreeSync } from '@/pages/watch/api/lunpan.js' import { queryPadPageList, queryDepartTreeSync } from '@/pages/watch/api/lunpan.js'
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue' import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
import exit from "@/component/public/exit.vue" import exit from "@/component/public/exit.vue"
onBackPress(() => { onBackPress(() => {
return true; // return true; //
}) })
@ -159,7 +160,7 @@
// console.log("zzzzzzzzzzzzzzzzzzzzzzzzzzzz") // console.log("zzzzzzzzzzzzzzzzzzzzzzzzzzzz")
queryPadPageList().then((res => { queryPadPageList().then((res => {
leftMenuArray.value = res.result.records; leftMenuArray.value = res.result.records;
console.log("????111111111111", leftMenuArray.value) // console.log("????111111111111", leftMenuArray.value)
})) }))
fontnumber.value = uni.getStorageSync('orgListName'); fontnumber.value = uni.getStorageSync('orgListName');
queryDepartTreeSync().then(res => { queryDepartTreeSync().then(res => {
@ -379,6 +380,7 @@
} }
const ceshijump = () => { const ceshijump = () => {
// try { // try {
// const Intent = plus.android.importClass('android.content.Intent') // const Intent = plus.android.importClass('android.content.Intent')
// const Uri = plus.android.importClass('android.net.Uri') // const Uri = plus.android.importClass('android.net.Uri')

View File

@ -30,7 +30,7 @@
库存预警 库存预警
</view> </view>
<scroll-view scroll-x="true" class="kcscrol guodu" <scroll-view scroll-x="true" class="kcscrol guodu"
:style="tx?(qb?'width:38.2vw':'width:47.2vw') : (qb?'width:71.2vw':'width:80.2vw') " :style="tx?(qb?'width:39.2vw':'width:48.2vw') : (qb?'width:72.2vw':'width:81.2vw') "
scroll-with-animation :scroll-left="scrollleft" @scroll="onScroll" @scrolltolower="scrolltolower(1)"> scroll-with-animation :scroll-left="scrollleft" @scroll="onScroll" @scrolltolower="scrolltolower(1)">
<view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)"> <view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" <image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"

View File

@ -21,7 +21,7 @@ export const queryPadPageList = (params) => {
export const getPermissionList = (params) => { export const getPermissionList = (params) => {
return request({ return request({
url: `${uni.getStorageSync('serverUrl')}/api/employessInfo/getPermissionList`, url: `${uni.getStorageSync('serverUrl')}/api/employeesInfo/getPermissionList`,
method: 'get', method: 'get',
data: params, data: params,
}) })

View File

@ -188,7 +188,7 @@
userInfo.value = uni.getStorageSync('userInfo'); userInfo.value = uni.getStorageSync('userInfo');
} }
const avaxg = () =>{ const avaxg = () =>{
editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id,employessId:userInfo.value.employessId}).then(res=>{ editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id,employeesId:userInfo.value.employeesId}).then(res=>{
if(res.success){ if(res.success){
uni.setStorageSync('userInfo', userInfo.value); uni.setStorageSync('userInfo', userInfo.value);
uni.showToast({ uni.showToast({

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,8 +7,8 @@
"id": "__UNI__FB2D473", "id": "__UNI__FB2D473",
"name": "护理单元", "name": "护理单元",
"version": { "version": {
"name": "1.0.030", "name": "1.0.031",
"code": 10030 "code": 10031
}, },
"description": "护理单元", "description": "护理单元",
"developer": { "developer": {

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: 858 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.030","code":10030},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.031","code":10031},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}

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: 858 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB