소스 검색

页面跳转

wkyy 1 년 전
부모
커밋
900e6a00e9

+ 21 - 6
pages/equipmentDataMonitoring/dataMonitoring-list.vue

@@ -8,13 +8,13 @@
 			</view>
 		</u-navbar> -->
 		<view class="navbar-c">
-			<view class="back">
+			<view class="back" @click="toStatistics">
 				<u-icon name="arrow-left" color="#101010" size="36"></u-icon>
 			</view>
 			<view class="title">
 				设备数据监测<image class="img" src="@/assets/img/refresh-line.svg"></image>
 			</view>
-			<view class="right">
+			<view class="right" @click="toDataMonitoringMap">
 				<image class="img" src="@/assets/img/riLine-road-map-line.svg" mode=""></image>地图
 			</view>
 		</view>
@@ -26,7 +26,7 @@
 			</view>
 			
 			<view class="main">
-				<view class="item">
+				<view class="item" @click="toElectronicMonitoring">
 					<view class="title">
 					<view class="icon-box">
 						<image class="img" src="@/assets/img/transformer1.svg" mode=""></image>
@@ -369,12 +369,28 @@
 			}
 		},
 		methods: {
-			
+			toStatistics() {
+				uni.navigateBack()
+			},
+			toDataMonitoringMap() {
+				uni.navigateTo({
+					url: '/pages/equipmentDataMonitoring/dataMonitoring-map'
+				})
+			},
+			toElectronicMonitoring() {
+				uni.navigateTo({
+					url: '/pages/equipmentDataMonitoring/electronicMonitoring'
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.back {
+		z-index: 999;
+		width: 200rpx;
+	}
 	
 	.slot{
 		display: flex;
@@ -391,12 +407,11 @@
 		background-color: #fff;
 		position: sticky;
 		 top: 0;	
-		z-index: 999;
+		// z-index: 999;
 	}
 	
 	.main{
 		background-color: #fff;
-		
 		.item{
 			border-bottom: 1px solid rgba(245,245,245,1);
 			padding: 32rpx 32rpx  16rpx 32rpx;

+ 4 - 2
pages/equipmentDataMonitoring/dataMonitoring-map.vue

@@ -8,7 +8,7 @@
 			<view class="title">
 				设备数据监测<image class="img" src="@/assets/img/refresh-line.svg"></image>
 			</view>
-			<view class="right">
+			<view class="right" @click="toDataMonitoringList">
 				<image class="img" src="@/assets/img/riLine-road-map-line.svg" mode=""></image>列表
 			</view>
 		</view>
@@ -194,7 +194,9 @@
 			}
 		},
 		methods: {
-			
+			toDataMonitoringList() {
+				uni.navigateBack()
+			}
 		}
 	}
 </script>

+ 9 - 2
pages/mine/mine.vue

@@ -4,6 +4,9 @@
 			<!-- 个人信息 -->
 			<view class="person-infos">
 				<view class="photo">
+					<!-- <u-avatar class="avatar"
+						src="@/assets/img/photo@x1.png" size="112">
+					</u-avatar> -->
 					<image class="img" src="@/assets/img/photo@x1.png" mode=""></image>
 				</view>
 				<view class="else">
@@ -78,7 +81,7 @@
 
 
 		<view class="function-group">
-			<view class="function-item">
+			<view class="function-item" @click="toSetting">
 				<view class="icon">
 					<image class="img" src="@/assets/img/riLine-settings-2-line.svg" mode=""></image>
 				</view>
@@ -113,7 +116,11 @@
 			
 		},
 		methods: {
-			
+			toSetting() {
+				uni.navigateTo({
+					url: '/pages/businessHall-test/mine/setting'
+				})
+			}
 		}
 	}
 </script>

+ 13 - 8
pages/statistics/statistics.vue

@@ -5,7 +5,7 @@
 			<view class="title">
 				能源中心 (电力110)
 			</view>
-			<view class="icon">
+			<view class="icon" @click="toDataMonitoringList">
 				<image class="img" src="@/assets/img/riLine-equalizer-line.svg" mode=""></image>
 			</view>
 		</view>
@@ -23,7 +23,7 @@
 		<view class="main">
 			<!-- 统计1 -->
 			<view class="statistics-1">
-				<view class="item">
+				<view class="item" @click="toDataMonitoringList">
 					<view class="item-top">
 						<view class="img-box">
 							<u-circle-progress active-color="#2979ff" :percent="8/15*100" width="88">
@@ -38,17 +38,15 @@
 							</view>
 						</view>
 					</view>
-
 					<!-- 累计 -->
 					<view class="total">
 						本月累计报警 <text class="total-number">12</text> 次
 					</view>
 				</view>
 
-				<view class="item">
+				<view class="item" @click="toWorkorderManagement()">
 					<view class="item-top">
 						<view class="img-box">
-							<!-- <image class="img" src="@/assets/img/annular.png" mode=""></image> -->
 							<u-circle-progress active-color="#2979ff" :percent="12/20*100" width="88">
 							</u-circle-progress>
 						</view>
@@ -204,7 +202,6 @@
 
 				</view>
 				<view class="chat">
-					<!-- <image class="chat-img" src="@/assets/img/qmJEzOi@1x.png" mode=""></image> -->
 					<view id="pieEcharts" style="min-height:620rpx;">
 
 					</view>
@@ -223,7 +220,6 @@
 
 				</view>
 				<view class="chat">
-					<!-- <image class="chat-img" src="@/assets/img/AUgyKM0@1x.png" mode=""></image> -->
 					<view id="barEcharts" style="min-height:410rpx;">
 
 					</view>
@@ -242,7 +238,6 @@
 
 				</view>
 				<view class="chat">
-					<!-- <image class="chat-img" src="@/assets/img/AUgyKM1@1x.png" mode=""></image> -->
 					<view id="lineEcharts" style="min-height:410rpx;">
 
 					</view>
@@ -481,6 +476,16 @@
 			},
 			change(index) {
 				this.current = index;
+			},
+			toDataMonitoringList() {
+				uni.navigateTo({
+					url: '/pages/equipmentDataMonitoring/dataMonitoring-list'
+				})
+			},
+			toWorkorderManagement() {
+				uni.navigateTo({
+					url: '/pages/workorderManagement/workorderManagement'
+				})
 			}
 		}
 	}