diff --git a/pages/NursingNew/component/nurse/bigindex.css b/pages/NursingNew/component/nurse/bigindex.css index 07d6e30..593e5b8 100644 --- a/pages/NursingNew/component/nurse/bigindex.css +++ b/pages/NursingNew/component/nurse/bigindex.css @@ -7,7 +7,7 @@ isolation: isolate; overflow: hidden; margin-left: 10rpx; - width: 1450rpx; + width: 1300rpx; border-left: 0; position: relative; border-radius: 30rpx; @@ -26,13 +26,13 @@ align-items: center; height: 50rpx; - width: 289.3rpx; + width: 258.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: 20rpx; - color: #A9ACB1; + font-size: 27rpx; + color: #9b9ea2; background-color: #EDF3FD; } @@ -40,7 +40,7 @@ display: flex; justify-content: center; align-items: center; - width: 290rpx; + width: 259rpx; flex-direction: column; border-right: 1rpx solid transparent; @@ -89,7 +89,7 @@ display: flex; justify-content: center; align-items: center; - height: 234rpx; + height: 245rpx; width: 100%; transition: all 0.8s; border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1; @@ -371,10 +371,10 @@ .boom-father { position: absolute; - top: 110rpx; + top: 87rpx; left: -17rpx; width: 60rpx; - height: 1170rpx; + height: 1225rpx; margin-top: 0rpx; overflow: hidden; z-index: 999; @@ -388,22 +388,22 @@ z-index: 0; .boom-son { - height: 234rpx; + height: 245rpx; width: 60rpx; - font-size: 30rpx; + font-size: 25rpx; display: flex; justify-content: center; align-items: center; text-align: center; z-index: 10; - font-size: 1rpx; - color: #A9ACB1; - + .boom-text { - width: 30rpx; - height: 50rpx; - /* border: 2rpx dashed #A9ACB1; */ - border-radius: 20rpx; + width: 45rpx; + height: 45rpx; + font-size: 22rpx; + color: #0091ff; + border: 2rpx solid #DFDFE0; + border-radius: 50%; display: flex; justify-content: center; align-items: center; @@ -411,21 +411,6 @@ 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); - } } @@ -960,3 +945,7 @@ color: #999999; margin-top: 20rpx; } +.weight-time{ + font-weight: 600; + font-size: 32rpx; +} \ No newline at end of file diff --git a/pages/NursingNew/component/nurse/bigindex.vue b/pages/NursingNew/component/nurse/bigindex.vue index 02eda0b..0518cda 100644 --- a/pages/NursingNew/component/nurse/bigindex.vue +++ b/pages/NursingNew/component/nurse/bigindex.vue @@ -56,10 +56,10 @@ 包 - 超时 - + --> {{ item1.rightshow }} - - {{ `${parseHourMinutestring(item1.startTime).hour}:${parseHourMinutestring(item1.startTime).minute} - ${parseHourMinutestring(item1.endTime).hour}:${parseHourMinutestring(item1.endTime).minute}` }} + + {{ `${parseHourMinutestring(item1.startTime).hour}:${parseHourMinutestring(item1.startTime).minute}-${parseHourMinutestring(item1.endTime).hour}:${parseHourMinutestring(item1.endTime).minute}` }} @@ -718,7 +718,7 @@ const showDetail = ref([-1, -1]) const moveById = ref(0); const rulerTouchClickfather = (index0 : number, index1 : number) => { - console.log("sssss", timearr.value[index0].children[index1]) + // console.log("sssss", timearr.value[index0].children[index1]) firstListTarget.value = -1; secondListTarget.value = -1; moveById.value = timearr.value[index0].children[index1].id @@ -854,7 +854,9 @@ element.positioningLong = parseHourMinute(element.startTime).minute / 5; if (element.executeStatus === 'hisUnExe') { element.rightshow = `未执行` - } else if (element.executeStatus === 'current') { + } else if (element.executeStatus === 'hisTimeOut') { + element.rightshow = `超时` + }else if (element.executeStatus === 'current') { element.rightshow = `` } else if (element.executeStatus === 'future') { element.rightshow = `` @@ -973,31 +975,31 @@ const totalColumns = 24; // 总列数 const totalRows = 11; // 总行数 - const visibleWidth = 1450; // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220 - const visibleHeight = 1170; // 可视区域高度 (rpx)，假设显示约5行时 heightType = 102.5 + const visibleWidth = 1295; // 可视区域宽度 (rpx)，基于 scalcType * widthType ≈ 2220 + const visibleHeight = 1225; // 可视区域高度 (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) * 234; + const cellCenterX = (saveEditIndex.value.index0 + 0.5) * 259; + const cellCenterY = (saveEditIndex.value.index1 + 0.5) * 245; // 计算 scrollLeft 和 scrollTop，使格子中心位于可视区域中心 cardLeft.value = cellCenterX - visibleWidth / 2; scrollTop.value = cellCenterY - visibleHeight / 2; // 计算网格总宽高 - const totalWidth = totalColumns * 290; - const totalHeight = totalRows * 234; + const totalWidth = totalColumns * 259; + const totalHeight = totalRows * 245; // 限制 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; + const cellCenterX = (hournow.value + 0.5) * 259; let width = cellCenterX - visibleWidth / 2; - const totalWidth = totalColumns * 290; - cardLeft.value = Math.max(0, Math.min(width, totalWidth - visibleWidth)) / 2 + 0.7; + const totalWidth = totalColumns * 259; + cardLeft.value = Math.max(0, Math.min(width, totalWidth - visibleWidth)) / 2; } const iszhiling = ref(false) const zhilingbao = () => { diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue index 132a918..3c53513 100644 --- a/pages/login/newanimationpage.vue +++ b/pages/login/newanimationpage.vue @@ -1,8 +1,8 @@