This commit is contained in:
wangweidong 2026-04-02 16:03:10 +08:00
parent a8e59bcc13
commit c5fe2ea1d5
5 changed files with 92 additions and 30 deletions

View File

@ -2,8 +2,8 @@
"name" : "护理单元",
"appid" : "__UNI__FB2D473",
"description" : "护理单元",
"versionName" : "1.0.038",
"versionCode" : 10038,
"versionName" : "1.0.040",
"versionCode" : 10040,
"transformPx" : false,
/* 5+App */
"app-plus" : {

View File

@ -177,13 +177,13 @@
</view>
</view>
<view class="right-top">
<view class="right-top" v-if="kf=='0'">
<view class="top-title">
护理单元
</view>
<scroll-view class="top-list" scroll-y>
<view class="list-view" :style="menutarget===index?{borderColor:`#8DD6FF`,backgroundColor:`#F7F7F9`}:{}"
v-for="(item,index) in filteredMenu(0)" :key="index" @click="clickmenu(index)">
v-for="(item,index) in filteredMenu('izHldy')" :key="index" @click="clickmenu(index)">
<view class="list-img">
<image :src="`/static/index/newindex/leftmenu/NU${item.elderInfo?.name?`blue`:`white`}.png`" />
<view v-if="item.readList!=null&&item.readList.length>0"></view>
@ -204,6 +204,34 @@
</view>
</scroll-view>
</view>
<view class="right-top" v-if="kf=='1'">
<view class="top-title">
库房
</view>
<scroll-view class="top-list" scroll-y>
<view class="list-view" :style="menutarget===index?{borderColor:`#8DD6FF`,backgroundColor:`#F7F7F9`}:{}"
v-for="(item,index) in filteredMenu('izKf')" :key="index" @click="clickmenu(index)">
<!-- <image class="list-img"
:src="`/static/index/newindex/leftmenu/ware${item.elderInfo?.name?`blue`:`white`}.png`" /> -->
<image class="list-img" :src="`/static/index/newindex/leftmenu/wareblue.png`" />
<view class="">
<view class="first-line">
<view style="font-size: 1.3vw;">
{{ item.nuName }}
</view>
<view class="first-line-second" :style="item.flag?'background:#47ADF5;color:#fff':''">
{{ item.flag?`盘点`:`正常` }}
</view>
</view>
<view class="second-line">
NUID{{ item.nuId }}
</view>
</view>
</view>
</scroll-view>
</view>
<view class="mengban" style="background-color: transparent;" v-if="zzbqshow"
@click="zzbqshow = false;tagtarget=-1"></view>
<view class="right-bottom">
@ -353,15 +381,23 @@
type: Boolean,
required: true,
},
kf: {
type: String
},
});
const leftMenuArray = ref([]);
const menutarget = ref(0)
const emit = defineEmits(['swip', "gospecial"])
const clickmenu = (index : number) => {
let data = null;
menutarget.value = index
let data = filteredMenu(0)[index]
if(props.kf=='0'){
data = filteredMenu('izHldy')[index]
}else{
data = filteredMenu('izKf')[index];
}
uni.setStorageSync('nuId', data.nuId);
uni.setStorageSync('nuName', data.nuName);
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
@ -369,6 +405,7 @@
inits(data.nuId)
hlylhq(data.nuId, data.elderInfo?.id)
emit('swip')
}
const hldyobj = ref({})
const hlylhq = (nuId, elderId) => {
@ -575,19 +612,40 @@
onHide(() => {
photoplay.value = false;
})
const filteredMenu = (index : number) => {
return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
const filteredMenu = ( code) => {
return leftMenuArray.value.filter(item => item[code] == 'Y');
}
const getmenu = () => {
queryPadPageList().then((res => {
leftMenuArray.value = res.result.records;
// console.log("", filteredMenu(0))
filteredMenu(0).forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) {
menutarget.value = index;
clickmenu(menutarget.value)
}
})
if(props.kf=='0'){
leftMenuArray.value = res.result.records;
console.log(res.result.records)
filteredMenu('izHldy').forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) {
menutarget.value = index;
clickmenu(menutarget.value)
}
})
}else{
leftMenuArray.value = res.result.records;
let arr = filteredMenu('izKf');
arr.forEach((element : any, index : number) => {
if (element.nuId == uni.getStorageSync('NUall').nuId) {
menutarget.value = index;
clickmenu(index)
}
if (element.readList == null) {
element.flag = false
} else if (element.readList.length > 0) {
element.readList.forEach(k => {
if (k.type == 'pdd') {
element.flag = true
}
})
}
})
}
}))
}
const indexmessage = ref({});

View File

@ -18,7 +18,7 @@
<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
</view>
<scroll-view @touchmove.stop class="scrolbox" scroll-x="true" scroll-with-animation :scroll-left="botleft" :enable-flex="true">
<view class="bots" v-if="plsbuy.length>1" @touchmove.stop>
<view class="bots" v-if="plsbuy.length>1" @touchmove.stop :style="plsbuy.length<12?'display: flex':'display: block;'">
<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"
@click="change({'detail':{'current':i,'key':1}})">
<view class="bots-red" v-if="v?.chaoshitime "></view>
@ -457,20 +457,20 @@
}
botleft.value = (a-4)*20;
if (plsbuy.value[a]?.izStart == 'Y' && plsbuy.value[a]?.izFinish == 'N') {
timeacde(1)
}
if
( plsbuy.value[a]?.izMulti=='Y'
&&plsbuy.value[a]?.directiveList[swipdcurrent.value].izStart == 'Y'
&& plsbuy.value[a]?.directiveList[swipdcurrent.value].izFinish == 'N')
{
timeacde()
timeacde(2)
}
}
const djstinme = ref(0)
const timeacde = () => {
const timeacde = (e) => {
let obj = plsbuy.value[current.value];
console.log(obj.izMulti,11111111111111)
if(obj.izMulti == "Y"){
if(e==2){
let timestampMs = new Date(obj.directiveList[swipdcurrent.value].servEndTime).getTime();
let times = new Date().getTime();
let djs = timestampMs - times;
@ -479,7 +479,6 @@
djstinme.value = 0;
plsbuy.value[current.value].directiveList[swipdcurrent.value].chaoshitime = true
}
console.log(plsbuy.value)
}else{
let timestampMs = new Date(obj.servEndTime).getTime();
let times = new Date().getTime();
@ -490,8 +489,6 @@
plsbuy.value[current.value].chaoshitime = true
}
}
console.log(plsbuy.value)
}
// const timeend = () => {
// //
@ -1161,7 +1158,6 @@
.bots {
height: 100%;
white-space: nowrap;
display: flex;
justify-content: center;
view {
width: 1.3vw;

View File

@ -48,7 +48,7 @@
<leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent>
<!-- 主页 -->
<!-- <index :isShow="menuIndex==0" v-if="swipedex==0&&!specialPage" @swip="swip" @gospecial="gospecial" /> -->
<index :isShow="menuIndex=='jcgn_sy'" v-if="swipedex=='jcgn_sy'&&!specialPage" @swip="swip" @gospecial="gospecial" />
<index :isShow="menuIndex=='jcgn_sy'" v-if="swipedex=='jcgn_sy'&&!specialPage" @swip="swip" @gospecial="gospecial" :kf="kf"/>
<!-- 新主页 -->
<!-- <bignurse :isshow="menuIndex==0"
@ -97,6 +97,7 @@
<script setup lang="ts">
import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
import { onLoad } from "@dcloudio/uni-app"
import { queryPadPageList, getPermissionList } from '@/pages/watch/api/lunpan.js'
import index from "./component/index.vue"
import newnurse from "./component/nurse/newindex.vue"
@ -132,7 +133,11 @@
}
})
const kf = ref('0')
onLoad((e)=>{
console.log(e)
kf.value = e.kf;
})
const listarr = ref([]);
onMounted(() => {
menuIndex.value = '';

View File

@ -271,7 +271,6 @@
onMounted(() => {
//
getServiceTree0('1,2,3,4,5').then((res : any) => {
console.log(res.result)
uni.setStorageSync("saveTree1", res.result.fwzl[1])
uni.setStorageSync("saveTree2", res.result.fwzl[2])
uni.setStorageSync("saveTree3", res.result.fwzl[3])
@ -303,7 +302,7 @@
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
uni.setStorageSync('NUall', data);
uni.navigateTo({
url: '/pages/NursingNew/index'
url: '/pages/NursingNew/index?kf=0'
})
}
if (index == 1) {
@ -338,9 +337,13 @@
uni.setStorageSync('nuName', data.nuName);
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
uni.setStorageSync('NUall', data);
// uni.navigateTo({
// url: '/pages/Warehouse/index/index',
// })
uni.navigateTo({
url: '/pages/Warehouse/index/index',
url: '/pages/NursingNew/index?kf=1',
})
}
if (index == 6) {
uni.navigateTo({