合并

pages/NursingNew/component/index.vue

@@ -81,56 +81,31 @@
 					<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" />
+					<image class="bottom-img" src="/static/index/card/alarm.png" />
 					<view class="bottom-font">
-						行政
+						即时
 					</view>
 				</view>
 			</view>
-			<!-- <view class="title-time">
-				<view class="time-title">
-					{{ currentTime }}
-				</view>
-				<view class="time-date">
-					{{ fullDate }}
-				</view>
-				<view class="right-container-tem">
-					<image class="right-container-tem-img" src="/static/index/newindex/wendu/0.png" />
-					<text
-						class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C</text>
-					<image class="right-container-tem-img" src="/static/index/newindex/wendu/1.png" />
-					<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 class="photo-father">
-			<view class="juzhong" style="margin-left: -30rpx;">
+			<view class="juzhong" style="margin-left: -30rpx;" :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}">
 				<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
 					:interval="120" />
 			</view>
-			<view class="juzhong" style="z-index: 2;margin-top: 80rpx;">
-				<donghua :width="`800rpx`" :height="`500rpx`" :links="bluesmallArray" :playing="photoplay" :loop="true"
-					:interval="120" />
-			</view>
+
 			<view class="weight-time">
 				<view class="" v-if="indexmessage?.startTime">
 					{{ indexmessage?.startTime.slice(11, 16)  }}
 					-
 					{{ indexmessage?.endTime.slice(11, 16) }}
 				</view>
-				<view class="" v-show="!indexmessage?.startTime">
-					暂无数据
+				<view style="height: 5vw;" v-show="!indexmessage?.startTime">
+					
 				</view>
 
 
@@ -199,6 +174,34 @@
 		</view>
 	</view>
 	<view class="index-content-right" :style="transition?{opacity: `1`}:{opacity: `0`}">
+		<view class="right-time">
+			<view class="time-top">
+				<view class="time-big">
+					{{ currentTime }}
+				</view>
+				<view class="">
+					<view class="time-week">
+						{{ weekDay }}
+					</view>
+					<view class="">
+						{{ fullDate }}
+					</view>
+				</view>
+			</view>
+			<view class="right-container-tem">
+				<view class="">
+					<image class="right-container-tem-img" src="/static/index/newindex/wendu/0.png" />
+					<text
+						class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C</text>
+				</view>
+				<view class="">
+					<image class="right-container-tem-img" src="/static/index/newindex/wendu/1.png" />
+					<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 class="right-top">
 			<view class="top-title">
 				护理单元
@@ -446,7 +449,7 @@
 		const year = now.getFullYear();
 		const month = (now.getMonth() + 1).toString().padStart(2, '0');
 		const day = now.getDate().toString().padStart(2, '0');
-		fullDate.value = `${year}.${month}.${day} ${weekDay.value}`;
+		fullDate.value = `${year}.${month}.${day}`;
 	};
 	onMounted(() => {
 		name.value = uni.getStorageSync('realname')
@@ -498,11 +501,35 @@
 		margin-left: 2vw;
 		height: 100%;
 		transition: opacity 1s ease;
-
-		.right-top {
+		.right-time{
 			margin-top: 80rpx;
 			width: 100%;
-			height: 50vh;
+			height: 15vh;
+			background-color: #fff;
+			border-radius: 4vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			padding-left: 30rpx;
+			.time-top{
+				display: flex;
+				align-items: center;
+				font-size: 1.1vw;
+				.time-big{
+					font-size: 3.5vw;
+					font-weight: 600;
+					margin-right: 10rpx;
+				}
+				.time-week{
+					font-weight: 600;
+				}
+			}
+		}
+
+		.right-top {
+			margin-top: 25rpx;
+			width: 100%;
+			height: 35vh;
 			background-color: #fff;
 			border-radius: 4vh;
 
@@ -518,7 +545,7 @@
 
 			.top-list {
 				width: 100%;
-				height: 41vh;
+				height: 26vh;
 
 				.list-view {
 					width: 86%;
@@ -638,17 +665,20 @@
 
 	.right-container-tem {
 		display: flex;
-		margin-top: 0.8vw;
+		justify-content: space-between;
+		align-items: center;
+		width: 80%;
 
 		.right-container-tem-text {
 			font-size: 30rpx;
-			margin-right: 20rpx;
 		}
 
 
 		.right-container-tem-img {
 			width: 38rpx;
 			height: 38rpx;
+			margin-right: 5rpx;
+			transform: translateY(6rpx)
 		}
 	}
 
@@ -680,8 +710,10 @@
 	}
 
 	.big-img {
-		width: 800rpx;
-		height: 550rpx;
+		margin-top: 40rpx;
+		width: 450rpx;
+		height: 450rpx;
+		z-index: 10;
 	}
 
 	.server-name {
@@ -903,11 +935,12 @@
 		right: 0;
 		top: 0;
 		width: 10vw;
-		height: 9.2vw;
+		height: 9.4vw;
 		border-radius: 2vw;
-		background-color: #FFFFFF;
+		background-color: #E4EBF4;
 		padding: 1.6vw;
 		margin-right: 1.5vw;
+		border: 2rpx solid #D2DFF0;
 	}
 
 	.title-card {

pages/Warehouse/index/component/index.vue

@@ -26,16 +26,26 @@
 				</view>
 			</view>
 
-			<view class="title-time">
-				<view class="time-title">
-					{{ currentTime }}
+			<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>
-				<view class="time-date">
-					{{ fullDate }}
+				<view class="card-bottom">
+					<image class="bottom-img" src="/static/index/card/alarm.png" />
+					<view class="bottom-font">
+						即时
+					</view>
 				</view>
 			</view>
 		</view>
 		<view class="photo-father">
+			<!--  :style="indexmessage?.startTime?{}:{filter: `grayscale(60%)`}" -->
 			<view class="juzhong" style="margin-left: -30rpx;z-index: 1;">
 				<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
 					:interval="120" />
@@ -54,7 +64,9 @@
 
 				</view>
 			</view>
-			<image class="big-img" :src="`/static/index/newindex/leftmenu/bigimg.png`" />
+			<image class="big-img" :src="`/static/index/newindex/leftmenu/bigimg.png`"  />
+<!-- 			<image class="big-img-nomessage"
+				:src="`/static/index/newindex/wendu/2.png`" /> -->
 			<view style="display: flex;align-items: center;">
 				<view class="server-name">
 					{{ filteredMenu(2)[menutarget]?.nuName }}
@@ -113,6 +125,34 @@
 		</view>
 	</view>
 	<view class="index-content-right" :style="transition?{opacity: `1`}:{opacity: `0`}">
+		<view class="right-time">
+			<view class="time-top">
+				<view class="time-big">
+					{{ currentTime }}
+				</view>
+				<view class="">
+					<view class="time-week">
+						{{ weekDay }}
+					</view>
+					<view class="">
+						{{ fullDate }}
+					</view>
+				</view>
+			</view>
+			<view class="right-container-tem">
+				<view class="">
+					<image class="right-container-tem-img" src="/static/index/newindex/wendu/0.png" />
+					<text
+						class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C</text>
+				</view>
+				<view class="">
+					<image class="right-container-tem-img" src="/static/index/newindex/wendu/1.png" />
+					<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 class="right-top">
 			<view class="top-title">
 				库房
@@ -362,7 +402,7 @@
 		const year = now.getFullYear();
 		const month = (now.getMonth() + 1).toString().padStart(2, '0');
 		const day = now.getDate().toString().padStart(2, '0');
-		fullDate.value = `${year}.${month}.${day} ${weekDay.value}`;
+		fullDate.value = `${year}.${month}.${day}`;
 	};
 	onMounted(() => {
 		name.value = uni.getStorageSync('realname')
@@ -400,12 +440,37 @@
 		margin-left: 2vw;
 		height: 100%;
 		transition: opacity 1s ease;
-
-		.right-top {
+		.right-time{
+			// margin-top: 10rpx;
 			width: 100%;
-			height: 50vh;
+			height: 15vh;
 			background-color: #fff;
 			border-radius: 4vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			padding-left: 30rpx;
+			.time-top{
+				display: flex;
+				align-items: center;
+				font-size: 1.1vw;
+				.time-big{
+					font-size: 3.5vw;
+					font-weight: 600;
+					margin-right: 10rpx;
+				}
+				.time-week{
+					font-weight: 600;
+				}
+			}
+		}
+		
+		.right-top {
+			width: 100%;
+			height: 35vh;
+			background-color: #fff;
+			border-radius: 4vh;
+			margin-top: 15rpx;
 
 			.top-title {
 				width: 100%;
@@ -419,7 +484,7 @@
 
 			.top-list {
 				width: 100%;
-				height: 41vh;
+				height: 26vh;
 
 				.list-view {
 					width: 86%;
@@ -566,9 +631,10 @@
 	}
 
 	.big-img {
-		width: 550rpx;
-		height: 550rpx;
-		z-index: 2;
+		margin-top: 40rpx;
+		width: 450rpx;
+		height: 450rpx;
+		z-index: 10;
 	}
 
 	.server-name {
@@ -635,7 +701,18 @@
 		border-radius: 40rpx;
 		font-size: 30rpx;
 	}
-
+	.title-card-right {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 10vw;
+		height: 9.4vw;
+		border-radius: 2vw;
+		background-color: #E4EBF4;
+		padding: 1.6vw;
+		margin-right: 1.5vw;
+		border: 2rpx solid #D2DFF0;
+	}
 	.pao-father {
 		position: absolute;
 		top: 20rpx;
@@ -800,7 +877,8 @@
 		padding: 1.6vw;
 		position: relative;
 		margin-right: 1.5vw;
-
+		margin-left: 1vw;
+	}
 		.card-bottom {
 			position: absolute;
 			left: 0;
@@ -874,8 +952,6 @@
 				}
 			}
 		}
-	}
-
 	.title-time {
 		position: absolute;
 		right: 0;
@@ -1056,4 +1132,27 @@
 			height: 3vw;
 		}
 	}
+	.right-container-tem {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 80%;
+	
+		.right-container-tem-text {
+			font-size: 30rpx;
+		}
+	
+	
+		.right-container-tem-img {
+			width: 38rpx;
+			height: 38rpx;
+			margin-right: 5rpx;
+			transform: translateY(6rpx)
+		}
+	}
+	.big-img-nomessage {
+		width: 500rpx;
+		height: 500rpx;
+		z-index: 10;
+	}
 </style>

pages/login/newanimationpage.vue

@@ -48,11 +48,12 @@
 			</view>
 		</view>
 		<view class="storeman tp">
-			<donghua width="4vw" height="7vw" :interval="1000" :links="storemanarray" :playing="playall" :loop="true" />
+			<donghua width="4vw" height="7vw" :interval="250"
+				:links="[...storemanarray, ...storemanarray.slice().reverse()]" :playing="playall" :loop="true" />
 		</view>
 		<view class="worker tp">
-			<donghua width="4.5vw" height="5.5vw" :interval="1000" :links="workerarray" :playing="playall"
-				:loop="true" />
+			<donghua width="4.5vw" height="6vw" :interval="250"
+				:links="[...workerarray, ...workerarray.slice().reverse()]" :playing="playall" :loop="true" />
 		</view>
 		<view class="line tp">
 			<donghua width="100vw" height="100vh" :interval="500" :links="lamparray" :playing="playall" :loop="true" />
@@ -64,7 +65,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="12vw" height="10vw" :interval="150" :links="[...officerarray, ...officerarray.slice().reverse()]" :playing="playall" :loop="true" />
+			<donghua width="14vw" height="13vw" :interval="250" :links="officerarray" :playing="playall" :loop="true" />
 		</view>
 		<view class="Print tp">
 			<donghua width="6vw" height="6vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
@@ -72,6 +73,23 @@
 		<view class="fontend tp">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/reception.png" mode="aspectFit"></image>
 		</view>
+		<view class="fontendtable tp">
+			<image class="all-home" src="/static/index/warehouse/newindexhome/reception2.png" mode="aspectFit"></image>
+		</view>
+		<view class="peopleleft tp">
+			<donghua width="7vw" height="8vw" :interval="500" :links="peopleleftarray" :playing="playall"
+				:loop="true" />
+		</view>
+		<view class="peopleright tp">
+			<donghua width="7vw" height="8vw" :interval="500" :links="peoplerightarray" :playing="playall"
+				:loop="true" />
+		</view>
+		<view class="door tp">
+			<donghua width="17vw" height="16vw" :interval="200" :links="[...doorarray, ...doorarray.slice().reverse()]" :playing="playall" :loop="true" />
+		</view>
+		<view class="ondoor tp">
+			<donghua width="5vw" height="6vw" :interval="300" :links="ondoorarray" :playing="playall" :loop="true" />
+		</view>
 		<view class="fontroom tp">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/receive.png" mode="aspectFit"></image>
 		</view>
@@ -250,11 +268,47 @@
 	const filteredMenu = (index : number) => {
 		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
 	}
+	const ondoorarray = 
+	genPaths(
+		'/static/index/warehouse/newindexhome/',
+		'gate',
+		5,    // 张数
+		'png',
+		0,     // 起始索引为 1
+		false  // 不补零
+	)
+	const doorarray =
+		genPaths(
+			'/static/index/warehouse/newindexhome/',
+			'door',
+			11,    // 张数
+			'png',
+			0,     // 起始索引为 1
+			false  // 不补零
+		)
+	const peopleleftarray =
+		genPaths(
+			'/static/index/warehouse/newindexhome/',
+			'Front',
+			2,    // 张数
+			'png',
+			1,     // 起始索引为 1
+			false  // 不补零
+		)
+	const peoplerightarray =
+		genPaths(
+			'/static/index/warehouse/newindexhome/',
+			'Front',
+			2,    // 张数
+			'png',
+			3,     // 起始索引为 1
+			false  // 不补零
+		)
 	const storemanarray =
 		genPaths(
 			'/static/index/warehouse/newindexhome/',
 			'Operator',
-			2,    // 张数
+			8,    // 张数
 			'png',
 			1,     // 起始索引为 1
 			false  // 不补零
@@ -272,7 +326,7 @@
 		genPaths(
 			'/static/index/warehouse/newindexhome/',
 			'service',
-			2,    // 张数
+			8,    // 张数
 			'png',
 			0,     // 起始索引为 1
 			false  // 不补零
@@ -281,8 +335,8 @@
 	const officerarray =
 		genPaths(
 			'/static/index/warehouse/newindexhome/cler',
-			'cler',
-			13,    // 张数
+			'cler1-',
+			24,    // 张数
 			'png',
 			1,     // 起始索引为 1
 			false  // 不补零
@@ -682,6 +736,31 @@
 		left: -1.5vw;
 	}
 
+	.fontendtable {
+		width: 30vw;
+		height: 30vw;
+		position: fixed;
+		bottom: 1.5vw;
+		left: 0vw;
+		z-index: 10;
+	}
+
+	.peopleleft {
+		width: 7vw;
+		height: 8vw;
+		position: fixed;
+		bottom: 11vw;
+		left: 16vw;
+	}
+
+	.peopleright {
+		width: 7vw;
+		height: 8vw;
+		position: fixed;
+		bottom: 14vw;
+		left: 10.5vw;
+	}
+
 	.fontroom {
 		width: 40vw;
 		height: 28vw;
@@ -701,7 +780,7 @@
 
 	.worker {
 		width: 4.5vw;
-		height: 5.5vw;
+		height: 6vw;
 		position: fixed;
 		top: 13.5vw;
 		right: 5vw;
@@ -727,10 +806,10 @@
 	}
 
 	.officer {
-		width: 12vw;
-		height: 10vw;
+		width: 14vw;
+		height: 13vw;
 		position: fixed;
-		bottom: 19.5vw;
+		bottom: 16vw;
 		right: 2vw;
 		z-index: 2;
 	}
@@ -778,7 +857,20 @@
 		width: 50%;
 		height: 50%;
 	}
-
+	.door{
+		width: 17vw;
+		height: 16vw;
+		position: fixed;
+		bottom: 0vw;
+		left: 0vw;
+	}
+	.ondoor{
+		width: 5vw;
+		height: 6vw;
+		position: fixed;
+		bottom: 1vw;
+		left: 4vw;
+	}
 	// .tp {
 	// 	image {
 	// 		width: 100%;