常志远 1 year ago
parent
commit
47c53085ab

+ 1 - 0
App.vue

@@ -34,6 +34,7 @@
 	// 导航
 	.navbar-c{
 		background-color: #fff;
+		height: 88rpx;
 		line-height: 88rpx;
 		padding: 0 24rpx;
 		display: flex;

+ 6 - 0
assets/img/iconPark-all-application.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="24" height="24" style="border-color: rgba(187,187,187,1);border-width: 0;border-style: solid" filter="drop-shadow(0px 2px 4px rgba(0,126,132,1))">
+    
+    <g>
+    <path d="M18 6H8C6.89543 6 6 6.89543 6 8V18C6 19.1046 6.89543 20 8 20H18C19.1046 20 20 19.1046 20 18V8C20 6.89543 19.1046 6 18 6Z" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linejoin="round"></path><path d="M18 28H8C6.89543 28 6 28.8954 6 30V40C6 41.1046 6.89543 42 8 42H18C19.1046 42 20 41.1046 20 40V30C20 28.8954 19.1046 28 18 28Z" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linejoin="round"></path><path d="M40 6H30C28.8954 6 28 6.89543 28 8V18C28 19.1046 28.8954 20 30 20H40C41.1046 20 42 19.1046 42 18V8C42 6.89543 41.1046 6 40 6Z" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linejoin="round"></path><path d="M40 28H30C28.8954 28 28 28.8954 28 30V40C28 41.1046 28.8954 42 30 42H40C41.1046 42 42 41.1046 42 40V30C42 28.8954 41.1046 28 40 28Z" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linejoin="round"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/iconPark-caution.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="24" height="24" style="border-color: rgba(187,187,187,1);border-width: 0;border-style: solid" filter="drop-shadow(0px 2px 4px rgba(190,0,7,1))">
+    
+    <g>
+    <rect width="48" height="48" fill="rgba(255,255,255,1)" fill-opacity="0.01" stroke="none"></rect><path fill-rule="evenodd" clip-rule="evenodd" d="M24 5.00018L2 43.0002H46L24 5.00018Z" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linejoin="round"></path><path d="M24 35.0002V36.0002" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" fill="none"></path><path d="M24 19.0007L24.0083 29.0002" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" fill="none"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/iconPark-edit-one.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="24" height="24" style="border-color: rgba(187,187,187,1);border-width: 0;border-style: solid" filter="drop-shadow(0px 2px 4px rgba(0,100,53,1))">
+    
+    <g>
+    <rect width="48" height="48" fill="rgba(255,255,255,1)" fill-opacity="0.01" stroke="none"></rect><path d="M29 4H9C7.89543 4 7 4.89543 7 6V42C7 43.1046 7.89543 44 9 44H37C38.1046 44 39 43.1046 39 42V20.0046" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"></path><path d="M13 18H21" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" fill="none"></path><path d="M13 28H25" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" fill="none"></path><path d="M40.9991 6.00079L29.0044 17.9956" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/iconPark-network-tree.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="24" height="24" style="border-color: rgba(187,187,187,1);border-width: 0;border-style: solid" filter="drop-shadow(0px 2px 4px rgba(0,6,121,0.78))">
+    
+    <g>
+    <rect width="48" height="48" fill="rgba(255,255,255,1)" fill-opacity="0.01" stroke="none"></rect><rect x="4" y="34" width="8" height="8" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"></rect><rect x="8" y="6" width="32" height="12" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"></rect><path d="M24 34V18" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"></path><path d="M8 34V26H40V34" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"></path><rect x="36" y="34" width="8" height="8" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"></rect><rect x="20" y="34" width="8" height="8" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"></rect><path d="M14 12H16" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/iconPark-ranking-list.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="24" height="24" style="border-color: rgba(187,187,187,1);border-width: 0;border-style: solid" filter="drop-shadow(0px 2px 4px rgba(0,59,128,1))">
+    
+    <g>
+    <rect width="48" height="48" fill="rgba(255,255,255,1)" fill-opacity="0.01" stroke="none"></rect><path d="M42 8H6C4.89543 8 4 8.89543 4 10V38C4 39.1046 4.89543 40 6 40H42C43.1046 40 44 39.1046 44 38V10C44 8.89543 43.1046 8 42 8Z" fill="none" stroke="rgba(255,255,255,1)" stroke-width="4"></path><path d="M24 17V31" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" fill="none"></path><path d="M32 24V31" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" fill="none"></path><path d="M16 22V31" stroke="rgba(255,255,255,1)" stroke-width="4" stroke-linecap="round" fill="none"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/riLine-file-chart-2-line.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="24" height="24" style="" filter="drop-shadow(0px 2px 4px rgba(0,7,142,0.78))">
+    
+    <g>
+    <path d="M20 5.333h-13.333v21.333h18.667v-16h-5.333v-5.333zM4 3.989c0-0.731 0.596-1.323 1.332-1.323h16.001l6.667 6.667v18.657c0 0.003 0 0.006 0 0.009 0 0.733-0.592 1.328-1.324 1.333h-21.352c-0.729-0.005-1.318-0.594-1.324-1.322v-24.022zM16 10.667v5.333h5.333c0 2.946-2.388 5.333-5.333 5.333s-5.333-2.388-5.333-5.333c0-2.946 2.388-5.333 5.333-5.333v0z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/riLine-file-list-3-line.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="24" height="24" style="border-color: rgba(187,187,187,1);border-width: 0;border-style: solid" filter="drop-shadow(0px 2px 4px rgba(0,7,142,0.78))">
+    
+    <g>
+    <path d="M25.333 29.333h-18.667c-2.209 0-4-1.791-4-4v0-21.333c0-0.736 0.597-1.333 1.333-1.333v0h18.667c0.736 0 1.333 0.597 1.333 1.333v0 16h5.333v5.333c0 2.209-1.791 4-4 4v0zM24 22.667v2.667c0 0.736 0.597 1.333 1.333 1.333s1.333-0.597 1.333-1.333v0-2.667h-2.667zM21.333 26.667v-21.333h-16v20c0 0.736 0.597 1.333 1.333 1.333v0h14.667zM8 9.333h10.667v2.667h-10.667v-2.667zM8 14.667h10.667v2.667h-10.667v-2.667zM8 20h6.667v2.667h-6.667v-2.667z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

+ 42 - 24
pages/mine/myApps.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="我的应用" title-color="#101010"></u-navbar>
+		<u-navbar title="我的应用" title-color="#101010" :is-back="false" ></u-navbar>
 		<!-- 用电管理 -->
 		<view class="apps-content">
 			<view class="title">
@@ -8,67 +8,82 @@
 			</view>
 			<view class="apps-groups">
 				<view class="item" @click="gotoUrl('/pages/equipmentDataMonitoring/dataMonitoring-list')"
-					v-if="codes.indexOf('detector')!=-1">
+					>
 					<view class="item-icon">
-						<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>
+						<image class="img" src="@/assets/img/riLine-file-chart-2-line.svg" mode=""></image>
 					</view>
 					<view class="item-name">
-						设备数据监
+						设备数据监
 					</view>
 				</view>
-				<view class="item" @click="gotoUrl('/pages/equipmentDataMonitoring/equipmentElectricity')"
-					v-if="codes.indexOf('reading')!=-1">
+				
+				<view class="item"
+					>
 					<view class="item-icon item-icon2">
-						<image class="img" src="@/assets/img/iconPark-order.svg" mode=""></image>
+						<image class="img" src="@/assets/img/iconPark-network-tree.svg" mode=""></image>
 					</view>
 					<view class="item-name">
-						设备用电量
+						设备状态监测
 					</view>
 				</view>
-				<view class="item" @click="gotoUrl('/pages/equipmentInformation/equipmentInformation')">
+				
+				<view class="item" >
 					<view class="item-icon item-icon3">
-						<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>
+						<image class="img" src="@/assets/img/iconPark-ranking-list.svg" mode=""></image>
 					</view>
 					<view class="item-name">
-						设备信息
+						异常设备排名
 					</view>
 				</view>
 				<view class="item" @click="gotoUrl('/pages/abnormal/abnormalAlarmRecord')"
-					v-if="abnormalRecordsList.length != 0">
+					>
 					<view class="item-icon item-icon4">
-						<image class="img" src="@/assets/img/iconPark-order.svg" mode=""></image>
+						<image class="img" src="@/assets/img/iconPark-caution.svg" mode=""></image>
 					</view>
 					<view class="item-name">
 						异常告警记录
 					</view>
 				</view>
-				<view class="item" v-if="false">
+				<view class="item"
+					>
 					<view class="item-icon item-icon5">
-						<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>
+						<image class="img" src="@/assets/img/iconPark-all-application.svg" mode=""></image>
 					</view>
 					<view class="item-name">
-						异常设备排名
+						设备管理
 					</view>
 				</view>
+				<view class="item" @click="gotoUrl('/pages/equipmentDataMonitoring/equipmentElectricity')"
+					>
+					<view class="item-icon item-icon6">
+						<image class="img" src="@/assets/img/iconPark-order.svg" mode=""></image>
+					</view>
+					<view class="item-name">
+						设备用电量
+					</view>
+				</view>
+				
+				
+				
 			</view>
 		</view>
 		<!-- 工单管理 -->
-		<view class="apps-content" v-if="false">
+		<view class="apps-content" >
 			<view class="title">
 				工单管理
 			</view>
 			<view class="apps-groups">
 				<view class="item">
 					<view class="item-icon">
-						<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>
+						<image class="img" src="@/assets/img/riLine-file-list-3-line.svg" mode=""></image>
 					</view>
 					<view class="item-name">
 						工单统计
 					</view>
 				</view>
 				<view class="item">
-					<view class="item-icon item-icon6">
-						<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>
+					<view class="item-icon item-icon7">
+						<image class="img" src="@/assets/img/iconPark-edit-one.svg" mode=""></image>
 					</view>
 					<view class="item-name">
 						故障上报
@@ -188,18 +203,21 @@
 					}
 				}
 				.item-icon2{
-					background: linear-gradient(178.44deg, rgba(122,232,227,1) 3.96%,rgba(57,182,182,1) 100.6%)
+                  background: linear-gradient(179.2deg, rgba(168,178,238,1) 6.28%,rgba(123,123,240,1) 96.94%);
 				}
 				.item-icon3{
-					background: linear-gradient(179.2deg, rgba(168,178,238,1) 6.28%,rgba(123,123,240,1) 96.94%);
+					background: linear-gradient(181.79deg, rgba(117,213,224,1) -1.13%,rgba(53,153,203,1) 94.2%);
 				}
 				.item-icon4{
-					background: linear-gradient(180.29deg, rgba(255,124,112,1) 0.9%,rgba(255,79,63,1) 100.4%);
+background: linear-gradient(180.29deg, rgba(255,124,112,1) 0.9%,rgba(255,79,63,1) 100.4%);
 				}
 				.item-icon5{
-					background: linear-gradient(181.79deg, rgba(117,213,224,1) -1.13%,rgba(53,153,203,1) 94.2%);
+background: linear-gradient(180deg, rgba(93,155,255,1) 0%,rgba(0,97,255,1) 100%);
 				}
 				.item-icon6{
+background: linear-gradient(178.44deg, rgba(122,232,227,1) 3.96%,rgba(57,182,182,1) 100.6%);
+				}
+				.item-icon7{
 					background: linear-gradient(180.4deg, rgba(127,213,151,1) 2.1%,rgba(67,176,116,1) 101.21%);
 				}
 				.item-name{