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

合并代码

This commit is contained in:
Teng 2026-01-08 17:05:36 +08:00
parent 50abca6a67
commit 8f15fe3686
4 changed files with 60 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pages/NursingNew/component/nurse/index.css
View File

@ -551,33 +551,44 @@
isolation: isolate;
overflow: hidden;
margin-left: 10rpx;
width: 1300rpx;
height: 1350rpx;
width: 1455rpx;
/* height: 1460rpx; */
border-left: 0;
position: relative;
border-radius: 30rpx;
overflow: hidden;
border: 3rpx dashed #dde1e6;
/* border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1; */
/* background-color: red; */
}
.super-card-right{
border-right: 1rpx solid transparent;
border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
}
.super-card-time {
display: flex;
justify-content: center;
align-items: center;
height: 80rpx;
width: 259rpx;
height: 50rpx;
width: 289.3rpx;
border-bottom: 1rpx solid transparent;
border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
/* font-weight: 700; */
z-index: -1;
font-size: 25rpx;
color: #A9ACB1;
background-color: #EDF3FD;
}
.super-card-time-und {
display: flex;
justify-content: center;
align-items: center;
width: 259rpx;
width: 290rpx;
flex-direction: column;
border-right: 1rpx solid transparent;
border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
@ -613,12 +624,13 @@
display: flex;
justify-content: center;
align-items: center;
height: 200rpx;
width: calc(100%);
height: 227rpx;
width: 100%;
transition: all 0.8s;
border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
flex-direction: column;
position: relative;
/* background-color: #fff; */
}
}
@ -627,6 +639,7 @@
height: 100vh;
transition: opacity 1s ease;
position: relative;
margin-left: -30rpx;
.joystick {
position: absolute;
@ -660,8 +673,7 @@
width: 100%;
height: 1350rpx;
display: flex;
/* background-color: red; */
/* margin-top: 10rpx; */
margin-top: 80rpx;
.doctorsay-container-container {
width: 100%;
@ -1302,6 +1314,7 @@
// justify-content: center;
align-items: center;
flex-direction: column;
}
@ -1315,8 +1328,8 @@
display: flex;
justify-content: center;
align-items: center;
height: 200rpx;
width: calc(100%);
height: 226rpx;
width: 100%;
border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
flex-direction: column;
position: relative;
@ -1332,8 +1345,8 @@
display: flex;
justify-content: center;
align-items: center;
height: 200rpx;
width: calc(100%);
height: 226rpx;
width: 100%;
border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
flex-direction: column;
position: relative;
@ -1486,18 +1499,13 @@
.boom-father {
position: absolute;
top: 220rpx;
top: 130rpx;
left: -17rpx;
width: 60rpx;
height: 1000rpx;
margin-top: 10rpx;
/* background-color: red; */
height: 1130rpx;
margin-top: 0rpx;
overflow: hidden;
z-index: 999;
/* background: linear-gradient(to bottom, #c4dbf4, #c9c2ef, #c6dcf3); */
/* border-bottom: 2rpx solid #fff; */
/* border-left: 2rpx solid #fff; */
/* border-bottom-left-radius: 20rpx; */
}
.doctorsay-container-card-font-dark {
@ -1508,7 +1516,7 @@
}
.boom {
height: 2500rpx;
height: 3000rpx;
display: flex;
flex-direction: column;
/* // justify-content: center; */
@ -1518,7 +1526,7 @@
.boom-son {
height: 200rpx;
height: 226rpx;
width: 60rpx;
font-size: 30rpx;
display: flex;

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

@ -2,123 +2,6 @@
<template>
<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}"
@click="bottomisShaking=false;shakyTable = false">
<view class="right-container-title-nav">
<text style="margin-left: 30rpx;">
NUID：{{ uni.getStorageSync('nuId')}}
</text>
<text class="new-weight">
{{ uni.getStorageSync('nuName')}}
</text>
<view class="right-icons">
<view style="display: flex;align-items: center;margin-right: 25rpx;padding: 0 15rpx;"
:class="!topindex&&!bodystatus&&!facestatus?'firsttarget':''">
<view class="mark">
<view style="margin-right: 15rpx;">
老人标签:
</view>
<view class="overlay" v-show="openbody" @click="openbody=false"></view>
</view>
<view class="marknone" @click="openbody=!openbody;openface=false">
<view v-if="!bodyTagListLook.length&&!emotionTagListLook.length" style="margin-top: -3rpx;">
未选择
</view>
<view v-for="(item,index) in bodyTagListLook" :key="index">
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
</view>
<view v-for="(item,index) in emotionTagListLook" :key="index">
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
</view>
</view>
<view class="tri-down" @click="openbody=!openbody;openface=false">
<view class="mark-bgc" v-show="openbody" :style="{opacity:bodydonghua?1:0}" @click.stop>
<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
<view>
体型标签
</view>
</view>
<view style="display: flex;flex-wrap: wrap;">
<view v-for="(item,index) in bodyTagList" :key="index" @click="addbody(index)">
<view class="tags-father" :class="bodystatustarget===index?'secondtarget':''">
<image class="tags-img"
:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
<view class="tags-font"
:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
{{item.tagName}}
</view>
</view>
</view>
</view>
<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
<view>
情绪标签
</view>
</view>
<view style="display: flex;flex-wrap: wrap;">
<view v-for="(item,index) in emotionTagList" :key="index" @click="addface(index)">
<view class="tags-father" :class="facestatustarget===index?'secondtarget':''">
<image class="tags-img"
:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
<view class="tags-font"
:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
{{item.tagName}}
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<!-- <view style="display: flex;align-items: center;margin-right: 15rpx;padding: 0 15rpx;"
:class="topindex===1&&!bodystatus&&!facestatus?'firsttarget':''">
<view class="mark">
情绪标签：
<view class="overlay" v-show="openface" @click="openface=false"></view>
<view class="mark-bgc" v-show="openface" :style="{opacity:facedonghua?1:0}" @click.stop>
<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
<view>
情绪标签
</view>
</view>
<view style="display: flex;flex-wrap: wrap;">
<view v-for="(item,index) in emotionTagList" :key="index" @click="addface(index)">
<view class="tags-father" :class="facestatustarget===index?'secondtarget':''">
<image class="tags-img"
:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
<view class="tags-font"
:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
{{item.tagName}}
</view>
</view>
</view>
</view>
</view>
</view>
<view class="marknone" @click="openface=!openface;openbody=false">
<view v-if="!emotionTagListLook.length" style="margin-top: -3rpx;">
未选择
</view>
<view v-for="(item,index) in emotionTagListLook" :key="index">
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
</view>
</view>
<view class="tri-down" @click="openface=!openface;openbody=false"></view>
</view> -->
<view class="white-button" @click="routerPush">
<image class="white-img" :src="`/static/index/newruler/yulan.png`" />
预览
</view>
<view class="white-button" @click="shareToWeixin">
<image class="white-img" :src="`/static/index/newruler/fenxiang.png`" />
分享
</view>
<view class="white-button" @click="changLeft(5)">
<image class="white-img" style="width: 45rpx;height: 45rpx;" :src="`/static/index/newruler/watch.png`" />
监控
</view>
</view>
</view>
<view class="doctorsay-container-view">
<view class="doctorsay-container-container">
<view class="super-card">
@ -138,18 +21,19 @@
</view>
<view class="super-card-container">
<scroll-view style="height: 1330rpx;width: 100%;border: 2rpx solid balck;" scroll-with-animation
<scroll-view style="width: 100%;" scroll-with-animation
:scroll-left="cardLeft" scroll-x @scroll="handleTop" :show-scrollbar="false">
<view style="display: flex;width:4824rpx;">
<view v-for="(item0,index0) in timearr" :key="index0">
<view v-for="(item0,index0) in timearr" :key="index0" class="super-card-right">
<view class="super-card-time">
{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
</view>
</view>
</view>
<view style="display: flex;height: calc(100% - 330rpx);position: relative;">
<view style="display: flex;height: 1130rpx;position: relative;">
<view class="xian-bian"></view>
<scroll-view style="height: 100%;width:6744rpx;" :scroll-top="scrollTop"
<scroll-view style="height: 100%;width:6960rpx;background-color: #fff;" :scroll-top="scrollTop"
scroll-with-animation :scroll-y="true" @scroll="handleScrolltime"
:show-scrollbar="false">
<view style="display: flex;height: 100%;">
@ -220,7 +104,7 @@
</view>
</scroll-view>
</view>
<view class="right-cards">
<!-- <view class="right-cards">
<view style="margin-top: 20rpx;margin-left: 30rpx;">
<view class="">
即时指令
@ -414,7 +298,7 @@
</view>
</view>
</view>
</view>
</view> -->
</view>
</view>
</view>
@ -594,13 +478,11 @@
if (solveWatch.value) {
solveWatch.value--
} else {
// centerCell();
cardLeft.value = 1294
scrollTop.value = 1
scrollTop.value = 0.001
nextTick(() => {
scrollTop.value = 0
cardLeft.value =1295
timeNowMove()
})
}
upmenuIndex.value = 0
@ -622,6 +504,9 @@
const bodydonghua = ref(false)
const openbody = ref(false)
const openface = ref(false)
const hournow = ref(new Date().getHours());
watch(
() => openbody.value,
() => {
@ -1783,25 +1668,32 @@
const totalColumns = 24; // 总列数
const totalRows = 11; // 总行数
const visibleWidth = 1300; // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220
const visibleHeight = 400; // 可视区域高度 (rpx)，假设显示约5行时 heightType = 102.5
const visibleWidth = 1455; // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220
const visibleHeight = 1130; // 可视区域高度 (rpx)，假设显示约5行时 heightType = 102.5
function centerCell() {
if (saveEditIndex.value.index0 >= 0 && saveEditIndex.value.index0 <= totalColumns && saveEditIndex.value.index1 >= 0 && saveEditIndex.value.index1 <= totalRows) {
// 计算点击格子的中心位置 (rpx)
const cellCenterX = (saveEditIndex.value.index0 + 0.5) * 259;
const cellCenterY = (saveEditIndex.value.index1 - 1) * 200;
const cellCenterX = (saveEditIndex.value.index0 + 0.5) * 290;
const cellCenterY = (saveEditIndex.value.index1 + 0.5 ) * 227;
// 计算 scrollLeft 和 scrollTop，使格子中心位于可视区域中心
cardLeft.value = cellCenterX - visibleWidth / 2;
scrollTop.value = cellCenterY - visibleHeight / 2;
// 计算网格总宽高
const totalWidth = totalColumns * 259;
const totalHeight = totalRows * 200;
const totalWidth = totalColumns * 290;
const totalHeight = totalRows * 227;
// 限制 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 + 0.7;
// scrollTop.value = 0
scrollTop.value = Math.max(0, Math.min(scrollTop.value, totalHeight - visibleHeight)) / 2;
}
}
// 表格进来就给我居中
function timeNowMove() {
const cellCenterX = (hournow.value + 0.5) * 290;
cardLeft.value = cellCenterX - visibleWidth / 2;
const totalWidth = totalColumns * 290;
cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2 + 0.7;
}
const iszhiling = ref(false)
const zhilingbao = () => {
iszhiling.value = !iszhiling.value

2
unpackage/dist/dev/.nvue/pages/camera.js vendored
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
};

2
unpackage/dist/dev/.nvue/pages/fullcamera.js vendored
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
};