diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css index 19fee56..fe7c2ff 100644 --- a/pages/NursingNew/component/nurse/index.css +++ b/pages/NursingNew/component/nurse/index.css @@ -791,8 +791,8 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - width: 98%; - height: 98%; + width: 100%; + height: 103%; z-index: 10; .blue-img { @@ -1332,15 +1332,32 @@ .title-time-border-yellow { margin: 10rpx; border: 2rpx solid transparent; - /* background: linear-gradient(to bottom, #fff1db, #ffe2b2); */ - width: calc(100% - 40rpx); - height: calc(100% - 40rpx); border-radius: 20rpx; display: flex; + justify-content: center; align-items: center; background-color: rgba(255, 255, 255, 0.5); flex-direction: column; - /* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */ + font-size: 30rpx; + overflow: hidden; + width: 240rpx; + height: 170rpx; + /* background-color: red; */ + + .kill-icon { + margin-top: 10rpx; + width: 70rpx; + height: 70rpx; + /* 性能关键 */ + will-change: transform; + transform-origin: 50% 52%; + } + + .kill-text { + white-space: nowrap; + color: #818181; + font-size: 30rpx; + } } .title-time-border-yellow-active-transparent { @@ -1739,7 +1756,7 @@ .neuro-box { position: relative; width: 600rpx; - height: 450rpx; + height: 550rpx; border-radius: 30rpx; background-color: #fff; display: flex; @@ -1749,17 +1766,7 @@ padding: 0 5%; } -.button { - width: 47%; - background-color: #ddf0ff; - display: flex; - justify-content: center; - align-items: center; - color: #007CFF; - border: 1rpx solid #007CFF; - font-size: 25rpx; - border-radius: 30rpx; -} + .title { margin-top: 70rpx; @@ -1775,13 +1782,26 @@ } .button-white { - width: 47%; + width: 30%; border: 2rpx solid #c3cacd; background: linear-gradient(to bottom, #f3f3f5, #dee4e9); display: flex; justify-content: center; align-items: center; - font-size: 25rpx; + font-size: 30rpx; + border-radius: 30rpx; + margin-right: 20rpx; +} + +.button { + width: 30%; + background-color: #ddf0ff; + display: flex; + justify-content: center; + align-items: center; + color: #007CFF; + border: 1rpx solid #007CFF; + font-size: 30rpx; border-radius: 30rpx; } @@ -1793,8 +1813,9 @@ width: 100%; height: 70rpx; display: flex; - justify-content: space-between; - padding: 0 50rpx; + /* justify-content: space-between; */ + justify-content: center; + /* padding: 0 100rpx; */ } .right-container-title-nav { @@ -2162,7 +2183,6 @@ .setting-warn { width: 89%; margin-left: 5.5%; - height: 47rpx; border: 2rpx dashed #EE2C35; display: flex; align-items: center; @@ -2171,9 +2191,14 @@ border-radius: 10rpx; background-color: #FFF6F6; font-size: 25rpx; - /* margin-top: 0 10rpx; */ margin-top: -10rpx; margin-bottom: 10rpx; + overflow: hidden; + transition: max-height 500ms ease, opacity 500ms ease; + height: 47rpx; + /* 写死 */ + line-height: 47rpx; + /* 文字垂直居中 */ } .triangle { @@ -2298,7 +2323,27 @@ background-color: #F6F9FF; flex-direction: column; } - +.title-time-border-error{ + border: 2rpx solid red; + width: calc(100% - 15rpx); + height: calc(100% - 15rpx); + border-radius: 20rpx; + display: flex; + align-items: center; + background-color: rgba(238, 44, 53, 0.05); + flex-direction: column; +} +.title-time-border-own{ + border: 2rpx dashed #5E8EF6; + width: calc(100% - 15rpx); + height: calc(100% - 15rpx); + border-radius: 20rpx; + display: flex; + align-items: center; + background-color: #F6F9FF; + flex-direction: column; + opacity: 0.3; +} .title-time { display: flex; width: 100%; @@ -3293,10 +3338,10 @@ width: 100%; height: 200rpx; display: flex; - padding-top:15rpx; + padding-top: 15rpx; position: relative; - - + + .target-edit { position: absolute; right: 5rpx; @@ -3339,7 +3384,8 @@ font-size: 23rpx; color: #222222; } - .target-black{ + + .target-black { position: absolute; top: 2.5rpx; right: 0; @@ -3354,13 +3400,127 @@ color: #919191; } } -.packtarget-serviceContent{ + +.packtarget-serviceContent { width: 430rpx; height: 100rpx; margin-top: 10rpx; font-size: 25rpx; color: #666666; - - - +} + +/* 隐藏状态 */ +.collapsed { + max-height: 0; + opacity: 0; + padding-top: 0; + /* 如需彻底压缩可把内边距也为0 */ + padding-bottom: 0; +} + +/* 展开状态 */ +.expanded { + max-height: 47rpx; + opacity: 1; +} + +.card-box { + margin-top: 20rpx; + width: 259rpx; + height: 245rpx; + border-radius: 20rpx; + background: #fff; + will-change: transform; + pointer-events: none; + z-index: 200; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + .title-time-blue-card { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 98%; + height: 98%; + z-index: 10; + + .blue-img { + width: 100%; + height: 100%; + } + } + + .card-bao { + position: absolute; + left: 35rpx; + top: 110rpx; + width: 32rpx; + height: 32rpx; + font-size: 24rpx; + display: flex; + justify-content: center; + align-items: center; + background-color: #4690FF; + color: #fff; + border-radius: 5rpx; + } + + .title-time-border-hisOk { + border: 2rpx solid #D4E4FE; + width: calc(100% - 15rpx); + height: calc(100% - 15rpx); + border-radius: 20rpx; + display: flex; + align-items: center; + background-color: #F6F9FF; + flex-direction: column; + font-size: 30rpx; + overflow: hidden; + border: 2rpx solid #46B2F6; + + .title-time { + display: flex; + width: 100%; + position: relative; + height: 100%; + padding: 25rpx; + padding-top: 18rpx; + flex-direction: column; + + .title-time-font-rel { + margin-top: 9rpx; + font-size: 33rpx; + font-weight: 800; + 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; + } + + .card-time { + position: absolute; + bottom: 30rpx; + left: 30rpx; + font-size: 30rpx; + + .weight-time { + display: flex; + } + } + } + + } } \ No newline at end of file diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue index 9537538..f9828b5 100644 --- a/pages/NursingNew/component/nurse/newindex.vue +++ b/pages/NursingNew/component/nurse/newindex.vue @@ -23,7 +23,7 @@ + :scroll-x="canmovechange" @scroll="handleTop" :show-scrollbar="false"> @@ -34,7 +34,7 @@ @@ -49,16 +49,20 @@ @click="rulerTouchClick(item1,index0,index1)" :data-index0="index0" :data-index1="index1"> + v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !isTuoing"> + + + + :src="`/static/index/newtarget${timearr[index0]?.children[index1]?.id?`red`:``}.png`" /> 包 + :style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s`,border:saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !isTuoing? `2rpx solid #46B2F6`:'' }"> @@ -114,8 +118,9 @@ - - + + {{ item.tagName }} @@ -130,7 +135,8 @@ - + {{ item.tagName }} @@ -153,8 +159,8 @@ - - {{ menutype?`情绪`:`体型`}}标签可复选两项 + + {{ (menutype ? '情绪' : '体型') + '标签可复选两项' }} @@ -163,9 +169,11 @@ ✓ - - + + {{ item.tagName }} @@ -186,7 +194,7 @@ + :style="isblue==`1`&&isTuoing?{border:`4rpx dashed #0089FE`}:{border:`4rpx dashed #fff`}"> @@ -201,20 +209,19 @@ - {{ item.directiveName }} - + - - @@ -222,7 +229,7 @@ + :style="isblue==`1`&&isTuoing?{border:`4rpx dashed #0089FE`}:{border:`4rpx dashed #fff`}"> @@ -236,16 +243,18 @@ - + {{ item.directiveName }} - + @@ -309,15 +318,17 @@ - - + {{ item.title }} @@ -327,7 +338,7 @@ + :scroll-y="canmovechange"> + :scroll-y="canmovechange"> - + - + - @@ -405,7 +417,8 @@ - + @@ -436,6 +449,10 @@ {{ ruleritem.serviceContent }} + + 修改 + 编辑 @@ -468,14 +485,16 @@ - + - + {{ splitString(item.directiveName)[0] }} @@ -489,9 +508,11 @@ - + @@ -512,59 +533,15 @@ {{ ruleritem?.directivesList[packtargetindex]?.serviceContent }} + + 修改 + 编辑 - - @@ -660,62 +637,7 @@ - - - - - - - - - {{ timearr[showDetail[0]]?.children[showDetail[1]]?.startTime }} - - {{ timearr[showDetail[0]]?.children[showDetail[1]]?.endTime }} - - - {{ timearr[showDetail[0]]?.children[showDetail[1]]?.directiveName }} - - - - - - - {{ timearr[showDetail[0]]?.children[showDetail[1]]?.startTime }} - - {{ timearr[showDetail[0]]?.children[showDetail[1]]?.endTime }} - - - - - - - {{item1.serviceDuration + "分钟"}} - - - - {{ item1.cycleType }} - - - - {{splitString(item1.directiveName)[0]}} - - - - - - - - @@ -751,29 +673,59 @@ 取消 - 确定 + 确定 确定要删除指令吗 - + + + + + + 包 + + + + + {{ splitString(postitem.directiveName)[0]}} + + + ({{ splitString(postitem.directiveName)[1]}}) + + - - - - {{timearr[saveEditIndex.index0].children[saveEditIndex.index1].startTime + `-` + timearr[saveEditIndex.index0].children[saveEditIndex.index1].endTime}} - - - - {{ timearr[saveEditIndex.index0]?.children[saveEditIndex.index1].cycleType }} + + {{ postitem.startTime }} + + - + + {{ postitem.endTime }} + + - - {{splitString(timearr[saveEditIndex.index0]?.children[saveEditIndex.index1].directiveName)[0]}} + + + + + + + + + + + 取消 + 确定 + + + 确定要删除指令吗 + + + + + {{ killthisid.directiveName }} @@ -784,7 +736,7 @@