Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/index.vue

@@ -73,7 +73,31 @@
 					</view>
 				</view>
 			</view>
-			<view class="title-time">
+			<view class="title-card-right">
+				<view class="card-top">
+					<view class="card-top-left">
+						65
+					</view>
+					<view class="card-top-right">
+						<image class="right-img" src="/static/index/card/arrow.png" />
+					</view>
+					<view class="card-spec">
+						<view class="line">
+						</view>
+						<view class="line-gray">
+							70
+						</view>
+					</view>
+
+				</view>
+				<view class="card-bottom">
+					<image class="bottom-img" src="/static/index/card/work.png" />
+					<view class="bottom-font">
+						行政
+					</view>
+				</view>
+			</view>
+			<!-- <view class="title-time">
 				<view class="time-title">
 					{{ currentTime }}
 				</view>
@@ -88,7 +112,7 @@
 					<text
 						class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="photo-father">
 			<view class="juzhong" style="margin-left: -30rpx;">
@@ -118,7 +142,8 @@
 
 				</view>
 			</view>
-			<image class="big-img" :src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" />
+			<image class="big-img"
+				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" />
 			<view style="display: flex;align-items: center;">
 				<view class="server-name" v-if="indexmessage?.startTime">
 					{{ indexmessage?.directiveName }}
@@ -883,6 +908,18 @@
 		z-index: 4;
 	}
 
+	.title-card-right {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 10vw;
+		height: 9.2vw;
+		border-radius: 2vw;
+		background-color: #FFFFFF;
+		padding: 1.6vw;
+		margin-right: 1.5vw;
+	}
+
 	.title-card {
 		width: 10vw;
 		height: 9vw;
@@ -891,78 +928,78 @@
 		padding: 1.6vw;
 		position: relative;
 		margin-right: 1.5vw;
+	}
 
-		.card-bottom {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			height: 3vw;
+	.card-bottom {
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 3vw;
+		display: flex;
+
+		.bottom-img {
+			width: 1.6vw;
+			height: 1.6vw;
+			margin-left: 1.8vw;
+		}
+
+		.bottom-font {
+			color: #555555;
+			font-size: 1.4vw;
+			margin-left: 0.5vw;
+		}
+	}
+
+	.card-top {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+
+		.card-top-left {
+			font-size: 1.8vw;
+			font-weight: 600;
+		}
+
+		.card-top-right {
+			width: 2vw;
+			height: 2vw;
+			border-radius: 50%;
+			background-color: #F1F2F3;
 			display: flex;
+			justify-content: center;
+			align-items: center;
 
-			.bottom-img {
-				width: 1.6vw;
-				height: 1.6vw;
-				margin-left: 1.8vw;
-			}
-
-			.bottom-font {
-				color: #555555;
-				font-size: 1.4vw;
-				margin-left: 0.5vw;
+			.right-img {
+				width: 0.8vw;
+				height: 0.8vw;
 			}
 		}
 
-		.card-top {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			position: relative;
+		.card-spec {
+			position: absolute;
+			top: 1.1vw;
+			left: 1.6vw;
+			width: 1.5vw;
+			height: 2vw;
+			// background-color: #0076FF;
 
-			.card-top-left {
-				font-size: 1.8vw;
-				font-weight: 600;
-			}
-
-			.card-top-right {
-				width: 2vw;
-				height: 2vw;
-				border-radius: 50%;
-				background-color: #F1F2F3;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.right-img {
-					width: 0.8vw;
-					height: 0.8vw;
-				}
-			}
-
-			.card-spec {
+			.line {
 				position: absolute;
-				top: 1.1vw;
-				left: 1.6vw;
-				width: 1.5vw;
-				height: 2vw;
-				// background-color: #0076FF;
+				inset: 0;
+				background: linear-gradient(to bottom right,
+						transparent calc(50% - 1px),
+						#d5d5d5 50%,
+						transparent calc(50% + 1px))
+			}
 
-				.line {
-					position: absolute;
-					inset: 0;
-					background: linear-gradient(to bottom right,
-							transparent calc(50% - 1px),
-							#d5d5d5 50%,
-							transparent calc(50% + 1px))
-				}
-
-				.line-gray {
-					position: absolute;
-					right: -1.1vw;
-					bottom: -0.6vw;
-					color: #888888;
-					font-size: 1.3vw;
-				}
+			.line-gray {
+				position: absolute;
+				right: -1.1vw;
+				bottom: -0.6vw;
+				color: #888888;
+				font-size: 1.3vw;
 			}
 		}
 	}

pages/NursingNew/component/leftcontent/leftcontent.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="letbox" :style="style">
-			<view class="logo tp">
+			<view class="logomain tp">
 				<image src="/static/shouye/logo2.png" mode="aspectFill"></image>
 			</view>
 			<view class="cont">
@@ -50,6 +50,10 @@
 			width: 3.8vw;
 			height: 3.8vw;
 		}
+		.logomain{
+			width: 6.5vw;
+			height: 6.5vw;
+		}
 		.cont{
 			width: 4vw;
 			display: flex;

pages/login/newanimationpage.vue

@@ -64,7 +64,7 @@
 			<image class="all-home" src="/static/index/warehouse/newindexhome/office.png" mode="aspectFit"></image>
 		</view>
 		<view class="officer tp" @click="housactive(1)">
-			<donghua width="5vw" height="10vw" :interval="1000" :links="officerarray" :playing="playall" :loop="true" />
+			<donghua width="12vw" height="10vw" :interval="150" :links="[...officerarray, ...officerarray.slice().reverse()]" :playing="playall" :loop="true" />
 		</view>
 		<view class="Print tp">
 			<donghua width="6vw" height="6vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
@@ -280,9 +280,9 @@
 
 	const officerarray =
 		genPaths(
-			'/static/index/warehouse/newindexhome/',
+			'/static/index/warehouse/newindexhome/cler',
 			'cler',
-			2,    // 张数
+			13,    // 张数
 			'png',
 			1,     // 起始索引为 1
 			false  // 不补零
@@ -727,11 +727,11 @@
 	}
 
 	.officer {
-		width: 5vw;
+		width: 12vw;
 		height: 10vw;
 		position: fixed;
-		bottom: 16vw;
-		right: 9vw;
+		bottom: 19.5vw;
+		right: 2vw;
 		z-index: 2;
 	}