diff --git a/component/public/severcard.vue b/component/public/severcard.vue
index 3913509..845e60f 100644
--- a/component/public/severcard.vue
+++ b/component/public/severcard.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 8c1d045..2f6fdc9 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -3,20 +3,9 @@
-
- {{hldyobj?.hllFinishedTotal}}
-
-
-
-
-
- {{hldyobj?.hllTotal}}
-
-
-
@@ -24,25 +13,29 @@
护理
+
+
+ 33
+ 已执行
+
+
+ 44
+ 待执行
+
+
+ 1
+ 异常
+
+
-
- 0
-
-
-
-
-
- 0
-
-
@@ -51,26 +44,29 @@
医疗
+
+
+ 33
+ 已执行
+
+
+ 44
+ 待执行
+
+
+ 1
+ 异常
+
+
-
- {{hldyobj?.hqlFinishedTotal}}
-
-
-
-
-
- {{hldyobj?.hqlTotal}}
-
-
-
@@ -78,21 +74,35 @@
后勤
+
+
+ 33
+ 已执行
+
+
+ 44
+ 待执行
+
+
+ 1
+ 异常
+
+
-
+
-
+ 11
-
+
- 即时
+ 即时指令
@@ -128,180 +138,6 @@
-
-
@@ -440,161 +276,7 @@
-
-
-
-
-
-
- {{ topbuttontarget==1?`照片`:`录像` }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 点击上传{{topbuttontarget==1?'图片':'录像'}}
-
-
-
-
-
-
-
- 确定
-
-
-
-
+
@@ -947,8 +629,6 @@
}
}
const leftMenuArray = ref([]);
- const openleft = ref(false)
-
const menutarget = ref(0)
const emit = defineEmits(['swip',"gospecial"])
const clickmenu = (index : number) => {
@@ -1378,20 +1058,22 @@
font-size: 1vw;
}
.index-content-right {
- width: 19.5vw;
- margin-left: 2vw;
+ width: 22vw;
height: 100%;
transition: opacity 1s ease;
+ position: relative;
+ left: -0.5vw;
.right-time{
- margin-top: 50rpx;
+ margin-top:1.2vw;
width: 100%;
- height: 15vh;
+ height: 12vw;
background-color: #fff;
- border-radius: 4vh;
+ border-radius: 1.6vw;
display: flex;
flex-direction: column;
justify-content: center;
padding-left: 30rpx;
+ padding: 0 2.2vw;
.time-top{
display: flex;
align-items: center;
@@ -1408,12 +1090,12 @@
}
.right-top {
- margin-top: 25rpx;
+ margin-top: 1vw;
width: 100%;
- height: 36.5vh;
+ height:22vw;
background-color: #fff;
- border-radius: 4vh;
-
+ border-radius: 1.6vw;
+
.top-title {
width: 80%;
height: 6vh;
@@ -1492,7 +1174,7 @@
.right-bottom {
margin-top: 2vh;
width: 100%;
- height: 38vh;
+ height: 23.4vw;
background-color: #fff;
border-radius: 3vh;
padding-top: 1vh;
@@ -1523,29 +1205,15 @@
}
}
.index-content-other {
- width: 65vw;
+ width: 67vw;
height: 100%;
transition: opacity 0.4s ease;
position: relative;
-
- .abs-time {
- position: absolute;
- right: 20rpx;
- top: 150rpx;
- // width: 300rpx;
-
- .big-time {
- font-size: 90rpx;
- font-weight: 600;
- width: 100%;
- justify-content: center;
- // padding: 0 40rpx;
- }
- }
+ margin-left: -1.5vw;
}
.right-container-title-nav {
- margin-top: 50rpx;
+ margin-top: 1.2vw;
display: flex;
height: 20vh;
position: relative;
@@ -1563,6 +1231,7 @@
justify-content: space-between;
align-items: center;
width: 90%;
+ margin-top: 1vw;
.right-container-tem-text {
font-size: 30rpx;
@@ -1577,267 +1246,65 @@
}
}
- .photo-father {
- width: 100%;
- height: 1100rpx;
- display: flex;
- flex-direction: column;
- align-items: center;
- position: relative;
- margin-top: 0rpx;
- }
-
- .juzhong {
- position: absolute;
- top: 0%;
- left: 50%;
- transform: translate(-50%, -20%);
- // 禁止动画阻挡逻辑
- z-index: -1;
- }
-
- .weight-time {
- font-weight: 800;
- font-size: 70rpx;
- margin-top: 2vw;
- position: relative;
- margin-left: -50rpx;
- }
-
- .big-img {
- margin-top: 40rpx;
- height: 450rpx;
- z-index: 10;
- }
-
- .server-name {
- font-size: 35rpx;
- margin-right: 10rpx;
- font-weight: 600;
- margin-top: 2vw;
- }
-
- .server-bgc {
- width: 160rpx;
- height: 50rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- position: relative;
-
- }
-
- .bgc-img {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- }
-
- .bgc-font {
- color: #fff;
- z-index: 1;
- }
-
- .states-father {
- display: flex;
- margin: 0 20rpx;
- }
-
- .start-button {
- width: 100%;
- height: 100%;
- background: linear-gradient(to bottom, #009DEF, #0076FF);
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 40rpx;
- color: #fff;
- font-size: 1.5vw;
-
- }
-
- .end-button {
- width: 100%;
- height: 100%;
- background: linear-gradient(to bottom, #FFFFFF, #C8D0D9);
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 40rpx;
- font-size: 1.5vw;
- }
-
- .pao-father {
- position: absolute;
- top: 20rpx;
- right: -110rpx;
- font-size: 22rpx;
- width: 100rpx;
- height: 50rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- color: #FFFFFF;
-
- .pao-img {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
-
- }
- }
-
- .left-menu {
- position: absolute;
- top: 55%;
- left: 100rpx;
- transform: translateY(-50%);
- }
-
- .zoom {
- transform: scale(1.2);
- transform-origin: bottom left;
- transition: transform 1s ease;
- }
-
- .left-ball {
- width: 80rpx;
- height: 80rpx;
- border-radius: 50%;
- display: flex;
- justify-content: center;
- align-items: center;
-
-
- .left-menu-img {
- width: 40rpx;
- height: 40rpx;
- }
- }
-
- .right-menu {
- position: absolute;
- top: 60%;
- right: 80rpx;
- transform: translateY(-50%);
- display: flex;
- flex-direction: column;
- align-items: center;
- width: 140rpx;
-
- .top-img {
- width: 140rpx;
- height: 110rpx;
- padding: 0 50rpx;
- }
-
- .right-scroll {
- width: 100%;
- height: 450rpx;
- }
-
- .white-circle {
- height: 170rpx;
- border-radius: 60rpx;
- background-color: #fff;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-direction: column;
- text-align: center;
- font-size: 25rpx;
- width: 100rpx;
-
- .right-menu-img {
- width: 50rpx;
- height: 50rpx;
- }
-
- .right-menu-name {
- width: 50rpx;
- }
- }
- }
-
- .zhezhao-top {
- position: absolute;
- top: 105rpx;
- left: 0%;
- width: 120%;
- height: 120rpx;
- z-index: 4;
- }
-
- .zhezhao-bottom {
- position: absolute;
- bottom: 105rpx;
- left: 0%;
- width: 120%;
- height: 120rpx;
- z-index: 4;
- }
-
- .zhezhao-left {
- position: absolute;
- top: 0rpx;
- left: 0%;
- height: 100%;
- width: 120rpx;
- background: linear-gradient(to right,
- rgba(239, 240, 244, 1) 0%,
- /* #eff0f4 全不透明 */
- rgba(239, 240, 244, 0) 100%
- /* #eff0f4 完全透明 */
- );
- z-index: 4;
- }
-
- .zhezhao-right {
- position: absolute;
- top: 0rpx;
- right: 0%;
- height: 100%;
- width: 120rpx;
- background: linear-gradient(to left,
- rgba(239, 240, 244, 1) 0%,
- /* #eff0f4 全不透明 */
- rgba(239, 240, 244, 0) 100%
- /* #eff0f4 完全透明 */
- );
- z-index: 4;
- }
-
.title-card-right {
- position: absolute;
- right: 0;
- top: 0;
- width: 10vw;
- height: 9.4vw;
- border-radius: 2vw;
- background-color: #E4EBF4;
+ width: 12.6vw;
+ height: 12vw;
+ border-radius: 1.6vw;
+ background-color: #FFFFFF;
+ margin-right: 1.6vw;
+ border: 2rpx solid #FFFFFF;
padding: 1.6vw;
- margin-right: 1.5vw;
- border: 2rpx solid #D2DFF0;
+ position: relative;
}
.title-card {
- width: 10vw;
- height: 9vw;
- border-radius: 2vw;
+ width: 17.2vw;
+ height: 12vw;
+ border-radius: 1.6vw;
background-color: #FFFFFF;
padding: 1.6vw;
position: relative;
- margin-right: 1.5vw;
+ margin-right: 1vw;
+ .mesu{
+ width: 100%;
+ height: 2.5vw;
+ position: absolute;
+ bottom: 2vw;
+ left: 0;
+ padding: 0 1.5vw;
+ display: flex;
+ justify-content: space-between;
+ >view{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-around;
+ width: 33%;
+ height: 100%;
+ &:nth-child(1),&:nth-child(2){
+ border-right: 1px solid #DCDCDC;
+ }
+ >text{
+ &:nth-child(1){
+ font-weight: bold;
+ font-size: 1.8vw;
+ color: #333333;
+ margin-top: -1vw;
+ }
+ &:nth-child(2){
+ font-weight: 400;
+ font-size: 1vw;
+ color: #333333;
+ }
+ }
+ }
+ }
}
.card-bottom {
position: absolute;
left: 0;
- bottom: 0;
+ top: 1.9vw;
width: 100%;
height: 3vw;
display: flex;
@@ -1850,7 +1317,7 @@
.bottom-font {
color: #555555;
- font-size: 1.4vw;
+ font-size: 1.5vw;
margin-left: 0.5vw;
}
}
@@ -1858,17 +1325,17 @@
.card-top {
width: 100%;
display: flex;
- justify-content: space-between;
- position: relative;
-
+ justify-content: flex-end;
+
+
.card-top-left {
font-size: 1.8vw;
font-weight: 600;
}
.card-top-right {
- width: 2vw;
- height: 2vw;
+ width: 2.3vw;
+ height: 2.3vw;
border-radius: 50%;
background-color: #F1F2F3;
display: flex;
@@ -1876,8 +1343,8 @@
align-items: center;
.right-img {
- width: 0.8vw;
- height: 0.8vw;
+ width:1vw;
+ height:1vw;
}
}
@@ -1908,31 +1375,6 @@
}
}
- .title-time {
- position: absolute;
- right: 0;
- top: 0;
- width: 15vw;
- height: 9.5vw;
- border-radius: 2vw;
- background-color: #fff;
- display: flex;
- flex-direction: column;
- align-items: center;
-
- .time-title {
- font-weight: 600;
- font-size: 3vw;
- margin-top: 0.4vw;
- }
-
- .time-date {
- margin-top: 0.2vw;
- font-size: 1.3vw;
- color: #222222;
- }
- }
-
.blue-button {
margin-top: 0.5vw;
width: 7vw;
@@ -1972,7 +1414,7 @@
}
.message-bottom {
- margin-top: 0.5vh;
+ margin-top: 1.7vh;
width: 100%;
height: 4vh;
display: flex;
@@ -1992,107 +1434,6 @@
}
}
- .fixed-card {
- position: fixed;
- right: 2.4vw;
- top: 5.8vh;
- width: 35vw;
- height: 28vh;
- background-color: rgba(239, 246, 255, 0.95);
- border-radius: 1.5vw;
- border: 1rpx solid #638DFF;
- box-shadow: 0 2rpx 6rpx #A0B9FF;
- display: flex;
- align-items: center;
- transition: all 0.5s ease;
- padding:0 0 0 1.5vw;
- .fixed-card-left {
- display: flex;
- flex-direction: column;
- align-items: center;
- margin-right:1.2vw;
- .card-left-img {
- width: 12vw;
- height: 8vw;
- }
- }
-
- .big-time {
- font-weight: 600;
- font-size: 2.8vw;
- }
-
- .icon-people {
- display: flex;
- margin: 0.3vw 0;
- color: #555555;
-
- .people-img {
- width: 1.5vw;
- height: 1.5vw;
- margin-right: 0.3vw;
- margin-top: 0.1vw;
- }
- }
-
- .icon-button {
- display: flex;
- margin-top: 1vw;
- font-size: 1.5vw;
- width: 18.5vw;
- justify-content: space-around;
- .button-left {
- width: 8.5vw;
- height: 3.3vw;
- background-color: #fff;
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 1.2vw;
- border: 1rpx solid #C7D2E4;
- color: #333333;
- }
-
- .button-right {
- width: 8.5vw;
- height: 3.3vw;
- background-color: #fff;
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 1.2vw;
- border: 1rpx solid #5AAEFF;
- color: #249BFA;
- background: linear-gradient(to bottom, #fff, #D1EAFF);
- }
- }
- }
-
- .left-open {
- position: absolute;
- left: -1.5vw;
- top: 50%;
- transform: translateY(-50%);
- width: 3vw;
- height: 5vw;
- border: 1rpx solid #B8C4DA;
- background-color: #F2F7FD;
- z-index: 999;
- border-radius: 3vw;
- display: flex;
- justify-content: center;
- align-items: center;
- transition: all 0.5s ease;
-
- .open-img {
- width: 3vw;
- height: 3vw;
- }
- }
-
-
-
-
.noarray {
width: 90%;
@@ -2125,62 +1466,6 @@
z-index: 100;
background: RGBA(239, 240, 244, 0.55);
}
- .photowall {
- position: fixed;
- top: 54%;
- left: 50%;
- transform: translate(-50%, -50%);
- width: 80vw;
- height: 83%;
- border-radius: 30rpx;
- background-color: #fff;
- transition: all 0.3s;
- z-index: 9990;
- box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
- padding: 0 90rpx;
- .photowall-title {
- margin-top: 50rpx;
- display: flex;
- justify-content: space-between;
- width: 100%;
- margin-bottom: 50rpx;
-
- .photowall-name {
- font-size: 38rpx;
- // font-weight: 600;
- }
-
- .photowall-left {
- color: #888888;
- }
-
- .photowall-right {
- font-size: 30rpx;
- font-weight: 600;
- }
- }
-
- .photowall-other {
- width: 76vw;
- height: 62vh;
- display: flex;
- margin-top: 20rpx;
- flex-wrap: wrap;
- .photowall-other-one {
- width: 22vw;
- height: 430rpx;
- margin-right: 3vw;
- margin-bottom: 0%;
- border-radius: 30rpx;
- display:flex;
- position: relative;
- video{
- width: 100%;
- height: 100%;
- }
- }
- }
- }
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index 42977c6..18cdf15 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -160,10 +160,10 @@
width: 6vw;
display: flex;
flex-direction: column;
- height: 60vh;
- padding: 4vh 0 ;
+ height: 66vh;
+ padding: 4vh 0 3vh;
position: relative;
- margin-top: -5vh;
+ margin-top: -2vh;
.iconst{
width: 6vw;
@@ -197,7 +197,7 @@
width: 6vw;
display: flex;
flex-direction: column;
- height: 52vh;
+ height: 57vh;
// background-color: red;
.act{
background: RGBA(228, 229, 231, 1);
@@ -218,6 +218,7 @@
position: relative;
justify-content: space-between;
padding: 0.3vw 0.2vw;
+ margin-top: 0.4vw;
.tm{
width: 100%;
height: 100%;
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
index 3f9bb40..b2601e8 100644
--- a/pages/NursingNew/component/leftcontent/serveswipe.vue
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -1,136 +1,148 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
服务倒计时
-
+
-
+
- {{ indexmessage?.startTime.slice(11, 16) }}
- | 30分钟
+ {{ indexmessage?.startTime.slice(11, 16) }}
+ | 30分钟
-
-
-
-
-
- {{indexmessage?.izStart=='N'?'待执行':'执行中'}}
-
-
-
-
-
+
+
+
+
+ {{indexmessage?.izStart=='N'?'待执行':'执行中'}}
+
+
+
+
+
-
-
-
- 强直屈曲洗手
- (大体重)
-
-
+
-
-
+
-
-
-
-
+
+
+
-
- {{ indexmessage?.directiveName }}
-
-
-
-
+
+ {{ indexmessage?.directiveName }}
+
+
+
+
+
{{indexmessage?.categoryName }}
-
-
-
-
-
-
- 开始服务
-
-
-
-
- 结束服务
-
-
-
-
-
@@ -159,138 +169,294 @@
-
-
-
-
- {{v.name }}
-
-
- {{v.sex}}
-
-
- {{ v.height}}cm
-
-
-
- {{ v.weight}}Kg
-
-
-
+
+
+
+
+ {{v.name }}
+
+
+ {{v.sex}}
+
+
+ {{ v.height}}cm
+
+
+
+ {{ v.weight}}Kg
+
+
-
-
+
+
+
+
+
+
+
+
+ {{ topbuttontarget==1?`照片`:`录像` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传{{topbuttontarget==1?'图片':'录像'}}
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/index/newindex/rightmenu/bottom.png b/static/index/newindex/rightmenu/bottom.png
index c202229..cdb6d0b 100644
Binary files a/static/index/newindex/rightmenu/bottom.png and b/static/index/newindex/rightmenu/bottom.png differ
diff --git a/static/index/newindex/rightmenu/top.png b/static/index/newindex/rightmenu/top.png
index 29c02ea..77dbca4 100644
Binary files a/static/index/newindex/rightmenu/top.png and b/static/index/newindex/rightmenu/top.png differ