diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index b9c4f88..ea18215 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -740,7 +740,7 @@
const openleft = ref(false)
const menutarget = ref(0)
- const emit = defineEmits(['swip'])
+ const emit = defineEmits(['swip',"gospecial"])
const clickmenu = (index : number) => {
menutarget.value = index
let data = filteredMenu(0)[index]
@@ -1005,15 +1005,7 @@
}))
)
const nusing = ()=>{
- uni.setStorage({
- key: 'myArray',
- data: timearr.value,
- success: function () {
- uni.navigateTo({
- url: `/pages/timeMatrix/indexnew`
- })
- },
- });
+ emit('gospecial',1)
}
const jszlshow = ref(false)
diff --git a/pages/NursingNew/component/nurse/api.js b/pages/NursingNew/component/nurse/api.js
index dc469a4..0583c95 100644
--- a/pages/NursingNew/component/nurse/api.js
+++ b/pages/NursingNew/component/nurse/api.js
@@ -105,4 +105,12 @@ export const editDirective = (params) => {
method: 'post',
data: params,
})
+}
+
+// 根据日期查询日程表
+export const getDirectiveOrders = (date) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getDirectiveOrders?nuId=${uni.getStorageSync('nuId')}&elderId=${uni.getStorageSync('elderId')}&queryDate=${date}`,
+ method: 'get',
+ })
}
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/bigindex.css b/pages/NursingNew/component/nurse/bigindex.css
new file mode 100644
index 0000000..d340eb3
--- /dev/null
+++ b/pages/NursingNew/component/nurse/bigindex.css
@@ -0,0 +1,549 @@
+.super-card {
+ display: flex;
+ width: 100%;
+
+ .super-card-container {
+ background-blend-mode: screen;
+ isolation: isolate;
+ overflow: hidden;
+ margin-left: 10rpx;
+ width: 1455rpx;
+ border-left: 0;
+ position: relative;
+ border-radius: 30rpx;
+ overflow: hidden;
+ border: 3rpx dashed #dde1e6;
+ }
+
+ .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: 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: 290rpx;
+ flex-direction: column;
+
+ border-right: 1rpx solid transparent;
+ border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+
+ .title-time-img {
+ width: 65rpx;
+ height: 65rpx;
+ margin-top: -5rpx;
+ }
+
+ .title-time-font-rel {
+ font-size: 32rpx;
+ font-weight: 600;
+ /* margin-bottom: 5rpx; */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: black;
+ }
+ .title-time-font-tags{
+ font-size: 24rpx;
+ font-weight: 600;
+ /* margin-bottom: 5rpx; */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #999;
+ }
+ .title-time-items {
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+
+ .right-box-items-button {
+ width: 35rpx;
+ height: 35rpx;
+ margin: 0 5rpx;
+ }
+ }
+ }
+
+ .super-card-time-card {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 234rpx;
+ 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;
+
+ }
+}
+
+.right-container {
+ width: calc(100% - 260rpx);
+ height: 100vh;
+ transition: opacity 1s ease;
+ position: relative;
+ margin-left: -50rpx;
+
+ .joystick {
+ position: absolute;
+ bottom: 200rpx;
+ left: 20rpx;
+ width: 300rpx;
+ height: 300rpx;
+ z-index: 9999;
+ }
+
+ .outer-circle {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ background-color: rgba(127, 127, 127, 0.1);
+ position: relative;
+ }
+
+ .inner-circle {
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 50%;
+ background-color: rgba(127, 127, 127, 0.3);
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+
+ .doctorsay-container-view {
+ width: 100%;
+ height: 1350rpx;
+ display: flex;
+ margin-top: 62rpx;
+
+ .doctorsay-container-container {
+ width: 100%;
+ overflow: hidden;
+ }
+ }
+}
+
+.title-time-blue {
+ /* 你的定位与尺寸保持不变 */
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 90%;
+ height: 88%;
+ z-index: 10;
+
+ --color: #99C9FD;
+ --thick: 2px;
+ --radius: 16px;
+
+ border: var(--thick) dashed var(--color);
+ border-radius: var(--radius);
+
+ background:
+ /* 上边 */
+ repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / 100% var(--thick) no-repeat,
+ /* 下边 */
+ repeating-linear-gradient(90deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) bottom left / 100% var(--thick) no-repeat,
+ /* 左边 */
+ repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top left / var(--thick) 100% no-repeat,
+ /* 右边 */
+ repeating-linear-gradient(0deg, var(--color) 0 var(--dash), transparent 0 calc(var(--dash) + var(--gap))) top right / var(--thick) 100% no-repeat;
+}
+
+
+.time-button-orange-spe {
+ transition: all 1s;
+ position: absolute;
+ width: 280rpx;
+ height: 100rpx;
+ padding: 0 20rpx;
+ border-radius: 20rpx;
+ border-top-right-radius: 0rpx;
+ border: 2rpx solid #e8e9eb;
+ background-color: #fff;
+ color: #545569;
+ bottom: -100rpx;
+ left: -130rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 999;
+
+}
+
+.time-button-orange {
+ transition: all 1s;
+ position: absolute;
+ width: 280rpx;
+ height: 100rpx;
+ border-radius: 20rpx;
+ padding: 0 20rpx;
+ border: 2rpx solid #e8e9eb;
+ border-bottom-right-radius: 0rpx;
+ background-color: #fff;
+ top: -90rpx;
+ left: -130rpx;
+ color: #545569;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 999;
+
+}
+
+.title-time {
+ display: flex;
+ width: 100%;
+ position: relative;
+ height: 100%;
+ padding: 20rpx;
+
+ .card-time{
+ position: absolute;
+ bottom: 20rpx;
+ left: 20rpx;
+ font-size: 27rpx;
+ }
+ .card-time-red{
+ position: absolute;
+ bottom: 20rpx;
+ left: 20rpx;
+ font-size: 27rpx;
+ color: #E33B3B;
+ }
+ .card-time-blue{
+ position: absolute;
+ bottom: 20rpx;
+ left: 20rpx;
+ font-size: 27rpx;
+ color: #4690FF;
+ }
+
+ .title-time-time {
+ font-size: 32rpx;
+ margin: 0 auto;
+ font-weight: 600;
+ }
+
+ .title-time-button {
+ position: absolute;
+ top: -6rpx;
+ right: -4rpx;
+ width: 55rpx;
+ height: 40rpx;
+ }
+
+ .title-time-font {
+ position: absolute;
+ top: 0rpx;
+ right: 4rpx;
+ font-size: 20rpx;
+ color: #1083f8;
+ }
+}
+
+.title-time-border {
+ margin-top: 4rpx;
+ margin-left: 4rpx;
+ width: calc(100% - 8rpx);
+ height: calc(100% - 8rpx);
+ border-radius: 20rpx;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+}
+
+.title-time-border-big {
+ transform: scale(1.3);
+ transform-origin: top;
+ border-top: 0rpx solid #fff;
+ transition: transform 0.5s ease-out, opacity 0.5s ease-out;
+ z-index: 999;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 226rpx;
+ width: 100%;
+ border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
+ flex-direction: column;
+ position: relative;
+}
+
+.title-time-border-big-top {
+ transform: scale(1.3);
+ transform-origin: top;
+ border-top: 0rpx solid #fff;
+ transition: transform 0.5s ease-out, opacity 0.5s ease-out;
+ z-index: 999;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 226rpx;
+ width: 100%;
+ border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
+ flex-direction: column;
+ position: relative;
+}
+
+.title-time-border-yellow {
+ margin: 10rpx;
+ border: 2rpx solid #e5e6e6;
+ width: calc(100% - 40rpx);
+ height: calc(100% - 40rpx);
+ border-radius: 20rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F8F9;
+ flex-direction: column;
+
+}
+.title-time-border-hisOk{
+ margin: 10rpx;
+ border: 2rpx solid #D4E4FE;
+ width: calc(100% - 40rpx);
+ height: calc(100% - 40rpx);
+ border-radius: 20rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F6F9FF;
+ flex-direction: column;
+}
+.title-time-border-current{
+ margin: 10rpx;
+ border: 3rpx dashed #4690FF;
+ width: calc(100% - 40rpx);
+ height: calc(100% - 40rpx);
+ border-radius: 20rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F6F9FF;
+ flex-direction: column;
+}
+.title-time-border-hisFaild{
+ margin: 10rpx;
+ border: 2rpx dashed #FFE2E2;
+ width: calc(100% - 40rpx);
+ height: calc(100% - 40rpx);
+ border-radius: 20rpx;
+ display: flex;
+ align-items: center;
+ background-color: #FFF8F8;
+ flex-direction: column;
+}
+
+.title-time-border-yellow-active-transparent {
+ margin: 10rpx;
+ width: calc(100% - 40rpx);
+ height: calc(100% - 40rpx);
+ border-radius: 20rpx;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ opacity: 0.3;
+ background-color: rgba(255, 255, 255, 0.5);
+}
+
+.title-time-border-yellow-active {
+ margin: 10rpx;
+ border: 1rpx solid #dae8fa;
+ width: calc(100% - 40rpx);
+ height: calc(100% - 40rpx);
+ border-radius: 20rpx;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ animation: shakesmall 0.8s infinite;
+ background-color: rgba(255, 255, 255, 0.5);
+}
+
+@keyframes shakesmall {
+ 0% {
+ transform: rotate(-2deg);
+ }
+
+ 25% {
+ transform: rotate(2deg);
+ }
+
+ 50% {
+ transform: rotate(-2deg);
+ }
+
+ 75% {
+ transform: rotate(2deg);
+ }
+
+ 100% {
+ transform: rotate(-2deg);
+ }
+}
+
+.boom-father {
+ position: absolute;
+ top: 110rpx;
+ left: -17rpx;
+ width: 60rpx;
+ height: 1170rpx;
+ margin-top: 0rpx;
+ overflow: hidden;
+ z-index: 999;
+}
+
+.boom {
+ height: 3000rpx;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ z-index: 0;
+
+ .boom-son {
+ height: 234rpx;
+ width: 60rpx;
+ font-size: 30rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ z-index: 10;
+ font-size: 22rpx;
+ color: #A9ACB1;
+
+ .boom-text {
+ width: 30rpx;
+ height: 50rpx;
+ border: 2rpx dashed #A9ACB1;
+ border-radius: 20rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 1;
+ background-color: #eff0f4;
+ }
+ }
+
+ .boom-son-target {
+ height: 250rpx;
+ width: 60rpx;
+ font-size: 30rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ z-index: 10;
+ font-weight: 700;
+ font-size: 25rpx;
+ color: #A9ACB1;
+ background: linear-gradient(to bottom, #ff8a00, #eceaff);
+ }
+}
+
+
+.left-top {
+ border-top-left-radius: 0 !important;
+}
+
+.right-top {
+ border-top-right-radius: 0 !important;
+}
+
+.left-bottom {
+ border-bottom-left-radius: 0 !important
+}
+
+.right-bottom {
+ border-bottom-right-radius: 0 !important;
+}
+
+.xian-bian {
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 999;
+ border-right: 1rpx solid transparent;
+ border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+}
+
+.pulic-time {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #99C9FD;
+ font-size: 35rpx;
+ font-weight: 600;
+}
+
+.right-order{
+ position: fixed;
+ right: 20rpx;
+ top: 62rpx;
+ height: 1220rpx;
+ width: 430rpx;
+ background-color: #fff;
+ border-radius: 30rpx;
+ .order-title{
+ width: 100%;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ .order-month{
+ margin-left: 30rpx;
+ font-size: 30rpx;
+ font-weight: 600;
+ width: 80rpx;
+ }
+ .order-day{
+ width: 300rpx;
+ height: 100rpx;
+ .days-father{
+ display: flex;
+ align-items: center;
+ .days{
+ height: 100rpx;
+ min-width: 50rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 26rpx;
+ color: #BBBABA;
+ }
+ .targetdays{
+ height: 50rpx;
+ min-width: 50rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 26rpx;
+ color: #fff;
+ border-radius: 50%;
+ background-color: #4690FF;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/bigindex.vue b/pages/NursingNew/component/nurse/bigindex.vue
new file mode 100644
index 0000000..a0b313b
--- /dev/null
+++ b/pages/NursingNew/component/nurse/bigindex.vue
@@ -0,0 +1,619 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item1.directiveName?splitString(item1.directiveName)[0]:""}}
+
+
+ ({{ item1.directiveName?splitString(item1.directiveName)[1]:""}})
+
+
+ {{ `${parseHourMinutestring(item1.startTime).hour}:${parseHourMinutestring(item1.startTime).minute}-${parseHourMinutestring(item1.endTime).hour}:${parseHourMinutestring(item1.endTime).minute}` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ selectdata.month }}月
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index - 副本.vue b/pages/NursingNew/component/nurse/index - 副本.vue
deleted file mode 100644
index abdd326..0000000
--- a/pages/NursingNew/component/nurse/index - 副本.vue
+++ /dev/null
@@ -1,1816 +0,0 @@
-
-
-
-
-
- NUID:{{ uni.getStorageSync('nuId')}}
-
-
- {{ uni.getStorageSync('nuName')}}
-
-
-
-
-
- 老人标签:
-
-
-
-
-
- 未选择
-
-
-
-
-
-
-
-
-
-
-
-
-
- 体型标签
-
-
-
-
-
-
-
- {{item.tagName}}
-
-
-
-
-
-
- 情绪标签
-
-
-
-
-
-
-
- {{item.tagName}}
-
-
-
-
-
-
-
-
-
-
- 预览
-
-
-
- 分享
-
-
-
- 监控
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.tagName}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择服务指令迁移的目标单元格
-
-
-
- 请选择服务指令迁移的目标单元格
-
-
-
-
-
-
-
-
-
-
- {{item1.startTime + `-` + item1.endTime}}
-
-
-
- {{item1.cycleType}}
-
-
-
- {{splitString(item1.directiveName)[0]}}
-
-
- {{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 即时指令
-
-
-
-
-
-
-
-
-
-
-
- {{item.directiveName}}
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- 周
- 月
-
-
- 周
- 月
-
-
-
-
- {{item}}
-
-
-
-
-
- {{item}}
-
-
-
-
-
-
-
-
-
-
-
- 周期
-
-
- 即时
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
- 指令包
-
-
- 包名:{{ item.packageName }}
-
-
-
- 包含:
-
-
- 、
- {{ item1.directiveName }}
-
-
-
-
-
-
-
- 不能重复添加相同的即时服务指令
-
-
- 请选择服务指令来进行操作
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确定
-
-
-
-
-
-
- 监控
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确定
-
-
- 确定要删除指令吗
-
-
-
-
-
- {{timearr[saveEditIndex.index0].children[saveEditIndex.index1].startTime + `-` + timearr[saveEditIndex.index0].children[saveEditIndex.index1].endTime}}
-
-
-
- {{ timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleType }}
-
-
-
- {{splitString(timearr[saveEditIndex.index0].children[saveEditIndex.index1].directiveName)[0]}}
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index 8b6d9c4..87da581 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -551,44 +551,33 @@
isolation: isolate;
overflow: hidden;
margin-left: 10rpx;
- width: 1455rpx;
- /* height: 1460rpx; */
+ width: 1300rpx;
+ height: 1350rpx;
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: 50rpx;
- width: 289.3rpx;
+ height: 80rpx;
+ width: 259rpx;
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: 290rpx;
+ width: 259rpx;
flex-direction: column;
-
border-right: 1rpx solid transparent;
border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
@@ -624,13 +613,12 @@
display: flex;
justify-content: center;
align-items: center;
- height: 227rpx;
- width: 100%;
+ height: 200rpx;
+ width: calc(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; */
}
}
@@ -639,7 +627,6 @@
height: 100vh;
transition: opacity 1s ease;
position: relative;
- margin-left: -30rpx;
.joystick {
position: absolute;
@@ -673,7 +660,8 @@
width: 100%;
height: 1350rpx;
display: flex;
- margin-top: 80rpx;
+ /* background-color: red; */
+ /* margin-top: 10rpx; */
.doctorsay-container-container {
width: 100%;
@@ -1314,7 +1302,6 @@
// justify-content: center;
align-items: center;
flex-direction: column;
-
}
@@ -1328,8 +1315,8 @@
display: flex;
justify-content: center;
align-items: center;
- height: 226rpx;
- width: 100%;
+ height: 200rpx;
+ width: calc(100%);
border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
flex-direction: column;
position: relative;
@@ -1345,8 +1332,8 @@
display: flex;
justify-content: center;
align-items: center;
- height: 226rpx;
- width: 100%;
+ height: 200rpx;
+ width: calc(100%);
border-image: repeating-linear-gradient(90deg, #0184db 0px, #0184db 6rpx, transparent 6rpx, transparent 12rpx) 1;
flex-direction: column;
position: relative;
@@ -1499,13 +1486,18 @@
.boom-father {
position: absolute;
- top: 130rpx;
+ top: 220rpx;
left: -17rpx;
width: 60rpx;
- height: 1130rpx;
- margin-top: 0rpx;
+ height: 1000rpx;
+ margin-top: 10rpx;
+ /* background-color: red; */
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 {
@@ -1516,7 +1508,7 @@
}
.boom {
- height: 3000rpx;
+ height: 2500rpx;
display: flex;
flex-direction: column;
/* // justify-content: center; */
@@ -1526,7 +1518,7 @@
.boom-son {
- height: 226rpx;
+ height: 200rpx;
width: 60rpx;
font-size: 30rpx;
display: flex;
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index c97e3b0..abdd326 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -2,6 +2,123 @@
+
+
+ NUID:{{ uni.getStorageSync('nuId')}}
+
+
+ {{ uni.getStorageSync('nuName')}}
+
+
+
+
+
+ 老人标签:
+
+
+
+
+
+ 未选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 体型标签
+
+
+
+
+
+
+
+ {{item.tagName}}
+
+
+
+
+
+
+ 情绪标签
+
+
+
+
+
+
+
+ {{item.tagName}}
+
+
+
+
+
+
+
+
+
+
+ 预览
+
+
+
+ 分享
+
+
+
+ 监控
+
+
+
@@ -21,19 +138,18 @@
-
-
+
{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
-
-
+
-
@@ -104,7 +220,7 @@
-
+
@@ -478,11 +594,13 @@
if (solveWatch.value) {
solveWatch.value--
} else {
- scrollTop.value = 0.001
+ centerCell();
+ cardLeft.value = 1
+ scrollTop.value = 1
nextTick(() => {
scrollTop.value = 0
- timeNowMove()
+ cardLeft.value = 775
})
}
upmenuIndex.value = 0
@@ -504,9 +622,6 @@
const bodydonghua = ref(false)
const openbody = ref(false)
const openface = ref(false)
-
- const hournow = ref(new Date().getHours());
-
watch(
() => openbody.value,
() => {
@@ -1668,32 +1783,25 @@
const totalColumns = 24; // 总列数
const totalRows = 11; // 总行数
- const visibleWidth = 1455; // 可视区域宽度 (rpx),基于 scalcType * widthType ≈ 2220
- const visibleHeight = 1130; // 可视区域高度 (rpx),假设显示约5行时 heightType = 102.5
+ const visibleWidth = 1300; // 可视区域宽度 (rpx),基于 scalcType * widthType ≈ 2220
+ const visibleHeight = 400; // 可视区域高度 (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) * 290;
- const cellCenterY = (saveEditIndex.value.index1 + 0.5 ) * 227;
+ const cellCenterX = (saveEditIndex.value.index0 + 0.5) * 259;
+ const cellCenterY = (saveEditIndex.value.index1 - 1) * 200;
// 计算 scrollLeft 和 scrollTop,使格子中心位于可视区域中心
cardLeft.value = cellCenterX - visibleWidth / 2;
scrollTop.value = cellCenterY - visibleHeight / 2;
// 计算网格总宽高
- const totalWidth = totalColumns * 290;
- const totalHeight = totalRows * 227;
+ const totalWidth = totalColumns * 259;
+ const totalHeight = totalRows * 200;
// 限制 scrollLeft 和 scrollTop 在有效范围内
- cardLeft.value = Math.max(0, Math.min(cardLeft.value, totalWidth - visibleWidth)) / 2 + 0.7;
+ 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;
}
}
- // 表格进来就给我居中
- 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
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index a85cba2..e3f3892 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -3,7 +3,8 @@
-
+
+
@@ -36,11 +37,22 @@
import requestform from "./component/pleasetake/takehome.vue"
import doctorask from "./component/doctorask/doctorask.vue"
import nurse from "./component/nurse/index.vue"
- import { onShow } from '@dcloudio/uni-app';
+ import bignurse from "./component/nurse/bigindex.vue"
+ import { onBackPress,onShow } from '@dcloudio/uni-app';
import { getNcPackagelist } from './component/nurse/api.js'
import leftcontent from "./component/leftcontent/leftcontent.vue"
import defaultr from '@/pages/procurement/components/default.vue';
+ onBackPress(() => {
+ if(specialPage.value){
+ specialPage.value --
+ return true; // 禁止返回手势返回
+ }else{
+ return false; // 禁止返回手势返回
+ }
+
+ })
+
const listarr = ref([]);
onMounted(() => {
menuIndex.value = 0;
@@ -55,7 +67,9 @@
listarr.value = res.result ;
})
})
-
+ const gospecial = (index:number) => {
+ specialPage.value = index
+ }
// 通用的生成函数
function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
return Array.from({ length: count }, (_, i) => {
@@ -71,8 +85,10 @@
{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_hqjz'},
{ name: '库房矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_kfjz'},
])
+ const specialPage = ref(0)
const navurl = (e,v) => {
swipedex.value = -1;
+ specialPage.value = 0
switch (v.type){
case 'hldy':
swipedex.value = 0;
@@ -282,7 +298,7 @@
position: relative;
width: 100%;
height: 100vh;
- background-color: #eff0f4;
+ background-color: #f2f3f8;
overflow: hidden;
z-index: 12;
}