常志远 1 年之前
父節點
當前提交
398ea966f4

二進制
assets/img/chat@13x.png


+ 6 - 0
assets/img/riLine-search-line 1.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="16" height="16" style="" filter="none">
+    
+    <g>
+    <path d="M24.041 22.156l5.711 5.709-1.887 1.887-5.709-5.711c-2.027 1.636-4.634 2.625-7.472 2.625-0.006 0-0.012 0-0.018 0h0.001c-6.624 0-12-5.376-12-12s5.376-12 12-12 12 5.376 12 12c0 0.005 0 0.011 0 0.017 0 2.838-0.99 5.446-2.643 7.495l0.018-0.023zM21.367 21.167c1.629-1.674 2.633-3.962 2.633-6.485 0-0.005 0-0.010 0-0.015v0.001c0-5.157-4.177-9.333-9.333-9.333-5.157 0-9.333 4.176-9.333 9.333 0 5.156 4.176 9.333 9.333 9.333 0.004 0 0.009 0 0.015 0 2.523 0 4.812-1.005 6.487-2.635l-0.002 0.002 0.2-0.2z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

二進制
assets/img/switchIcon.png


+ 1 - 0
assets/img/tabbarImg2/message-2-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="rgba(173,184,194,1)"><path d="M6.45455 19L2 22.5V4C2 3.44772 2.44772 3 3 3H21C21.5523 3 22 3.44772 22 4V18C22 18.5523 21.5523 19 21 19H6.45455ZM7 10V12H9V10H7ZM11 10V12H13V10H11ZM15 10V12H17V10H15Z"></path></svg>

+ 1 - 0
assets/img/tabbarImg2/message-2-fill2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="rgba(80,152,255,1)"><path d="M6.45455 19L2 22.5V4C2 3.44772 2.44772 3 3 3H21C21.5523 3 22 3.44772 22 4V18C22 18.5523 21.5523 19 21 19H6.45455ZM7 10V12H9V10H7ZM11 10V12H13V10H11ZM15 10V12H17V10H15Z"></path></svg>

+ 8 - 8
components/energyCenterTabbar.vue

@@ -9,8 +9,8 @@
 <script>
 	var img1=require('@/assets/img/tabbarImg2/bar-chart-2-fill 2.svg')
 	var img2=require('@/assets/img/tabbarImg2/bar-chart-2-fill.svg')
-	var img3=require('@/assets/img/tabbarImg2/file-2-fill 2.svg') 
-	var img4=require('@/assets/img/tabbarImg2/file-2-fill.svg')
+	var img3=require('@/assets/img/tabbarImg2/message-2-fill.svg') 
+	var img4=require('@/assets/img/tabbarImg2/message-2-fill2.svg')
 	var img5=require('@/assets/img/tabbarImg/chat-smile-2-fill.svg')
 	var img6=require('@/assets/img/tabbarImg/chat-smile-2-fill2.svg')
 	var img7=require('@/assets/img/tabbarImg/function-line .svg')
@@ -40,13 +40,13 @@
 							pagePath2: "/pages/mine/myApps",
 						},
 					 
-					// {
-					// 	iconPath: img3,
-					// 	selectedIconPath: img4,
-					// 	text: '工单',
-					// 	pagePath2: "/pages/workOrderManagement/workOrderManagement",
+					{
+						iconPath: img3,
+						selectedIconPath: img4,
+						text: '消息',
+						pagePath2: "/pages/mine/message",
 						
-					// },
+					},
 					
 					{
 						iconPath: img5,

+ 585 - 216
pages/statistics/statistics.vue

@@ -3,17 +3,17 @@
 		<!-- 导航栏 -->
 		<view class="navbar">
 			<view class="title">
-				能源中心
+				能源管理
 			</view>
-			<view class="icon" @click="toDataMonitoringList" v-if="codes.indexOf('detector') != -1">
+			<!-- <view class="icon" @click="toDataMonitoringList" v-if="codes.indexOf('detector') != -1">
 				<image class="img" src="@/assets/img/riLine-equalizer-line.svg" mode=""></image>
-			</view>
+			</view> -->
 		</view>
 		<!-- 标签 -->
 		<view class="tabs-box">
 			<view class="tabs" :style="{width: companyList.length>4 ? '' : '100%'}">
-				<u-tabs :list="merchantList1" :is-scroll="false" active-color="#fff" inactive-color="#CCE2FF" bg-color="#1677FF"
-					:current="current" @change="change"></u-tabs>
+				<u-tabs :list="merchantList1" :is-scroll="false" active-color="#fff" inactive-color="#CCE2FF"
+					bg-color="#1677FF" :current="current" @change="change"></u-tabs>
 			</view>
 			<view class="more" @click="popShow=true" v-if="companyList.length >= 4">
 				<u-icon name="arrow-down" color="#fff" size="40"></u-icon>
@@ -31,58 +31,59 @@
 				</view>
 			</view>
 			<view class="tabs-options">
-				<view class="item" v-for="(item, index) in merchantList2" :key="index" @click="merchantChange(item,index)">
+				<view class="item" v-for="(item, index) in merchantList2" :key="index"
+					@click="merchantChange(item,index)">
 					{{item.name}}
 				</view>
 			</view>
 		</u-popup>
 
-		<view class="main">
-			<!-- 统计1 -->
-			<view class="statistics-1">
-				<view class="item" @click="toEquipmentConditionMonitoring()">
-					<view class="item-top">
-						<view class="img-box">
-							<u-circle-progress active-color="#2979ff" :percent="alarmsPercent" width="88">
-							</u-circle-progress>
-						</view>
-						<view class="number">
-							<view class="normal">
-								正常:{{alarmsForm.okNum}}台
-							</view>
-							<view class="abnormal">
-								异常:{{alarmsForm.errorNum}}台
-							</view>
-						</view>
+		<view class="main" v-if="current==0">
+			<!-- 电表运行情况 -->
+			<view class="statistics-1 statistics">
+				<view class="title">
+					<view class="icon">
+						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
 					</view>
-					<!-- 累计 -->
-					<view class="total">
-						本月累计报警 <text class="total-number">{{alarmsForm.errorMonthNum}}</text> 次
+					<view class="text">
+						电表运行情况
+					</view>
+					<view class="check-all" @click="toEquipmentElectricity">
+						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 					</view>
 				</view>
 
-				<view class="item" @click="toWorkOrderManagement()">
-					<view class="item-top">
+				<view class="item">
+					<view class="item-progess">
 						<view class="img-box">
-							<u-circle-progress active-color="#2979ff" :percent="0" width="88">
+							<u-circle-progress active-color="#2979ff" :percent="alarmsPercent" width="88">
 							</u-circle-progress>
 						</view>
-						<view class="number">
+
+					</view>
+					<!-- 累计 -->
+					<view class="total">
+						<view class="total1">
 							<view class="normal">
-								未处理:0
+								正常:1台
 							</view>
 							<view class="abnormal">
-								已处理:0
+								异常:2台
 							</view>
 						</view>
-					</view>
-					<!-- 累计 -->
-					<view class="total">
-						本月累计工单 <text class="total-number">0</text> 条
+						<view class="total2">
+							本月累计触发告警 <text class="total-number">12</text> 次
+
+
+						</view>
 					</view>
 				</view>
 
+
+
 			</view>
+
+
 			<!-- 用电量 -->
 			<view class="statistics-e statistics" v-if="codes.indexOf('reading') != -1 && kWhList.length != 0">
 				<view class="title">
@@ -92,10 +93,6 @@
 					<view class="text">
 						用电量 (度)
 					</view>
-					<view class="change" @click="getPowerConsumption(1)">
-						<image class="change-img" src="@/assets/img/refresh-line.svg" mode=""></image>
-						<text>换一批</text>
-					</view>
 					<view class="check-all" @click="toEquipmentElectricity">
 						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 					</view>
@@ -103,7 +100,8 @@
 				<view class="content">
 					<view class="electricity">
 
-						<view class="item" v-for="(item, index) in kWhList" :key="index" @click="toElectronicMonitoring(item)">
+						<view class="item" v-for="(item, index) in kWhList" :key="index"
+							@click="toElectronicMonitoring(item)">
 							<view class="item-content">
 								<view class="equipment">
 									<view class="equipment1 ">
@@ -117,12 +115,12 @@
 
 
 									<view class="state" v-if="!item.online">
-										<view class="dot off-line"></view>
+										<!-- <view class="dot off-line"></view> -->
 										<view class="text">离线</view>
 									</view>
 
 									<view class="state state2" v-else>
-										<view class="dot on-line"></view>
+										<!-- <view class="dot on-line"></view> -->
 										<view class="text">在线</view>
 									</view>
 
@@ -174,7 +172,7 @@
 			</view>
 
 			<!-- 统计2 异常告警记录 -->
-			<view class="statistics-2 statistics" v-if="abnormalRecordsList.length != 0">
+			<view class="statistics-2 statistics">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -187,24 +185,23 @@
 					</view>
 				</view>
 				<!-- 异常  -->
-				<view class="abnormal-item" v-for="(item, index) in abnormalRecordsList" :key="index"
-					@click="gotoUrl('/pages/abnormal/abnormalAlarmDetails?id='+item.id)">
+				<view class="abnormal-item">
 					<view class="item-title">
-						<!-- <image class="img" src="@/assets/img/riFill-error-warning-fill 1.svg"></image> -->
+
 						<view class="name">
-							{{item.configName}}
+							设备离线
 						</view>
 						<view class="date">
-							{{item.createTime}}
+							2024-02-14 09:00:01
 						</view>
 					</view>
 					<view class="item-value">
 						<view class="value-content">
 							<view class="value1">
-								{{item.meterName}}
+								七楼电表1
 							</view>
 							<view class="value2">
-								{{item.installationAddressSimple}}
+								荆鹏软件园
 							</view>
 						</view>
 						<!-- 箭头 -->
@@ -217,174 +214,315 @@
 
 
 			</view>
-			<!-- 统计3 设备数据监测-->
-			<view class="statistics-3 statistics" v-if="codes.indexOf('detector')!=-1 && deviceList.length!=0">
+
+
+
+			<!-- 异常设备排名 -->
+			<view class="statistics statistics-ranking">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
 					</view>
 					<view class="text">
-						设备数据监测
-					</view>
-					<view class="change" @click="getEquipmentDataMonitoring(1)">
-						<image class="change-img" src="@/assets/img/refresh-line.svg" mode=""></image>
-						<text>换一批</text>
+						异常设备排名
 					</view>
-					<view class="check-all" @click="toDataMonitoringList">
+					<view class="check-all">
 						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 					</view>
 				</view>
-				<view class="monitoring-item" v-for="(item, index) in deviceList" :key="index"
-					@click="toElectronicMonitoring(item)">
-					<view class="item-title">
-						<view class="text1">
-							{{item.name}}
+				<!-- 合计 -->
+				<view class="total">
+					本年度共有<text> 42</text>次设备异常告警
+				</view>
+				<view class="ranking-main">
+					<view class="item" v-for="item in 3"
+						@click="gotoUrl('/pages/equipmentDataMonitoring/electronicMonitoring?id='+'&name=')">
+						<view class="ranking">
+							1
 						</view>
 
-						<view class="state">
-							<view class="state1">
-								<view class="icon">
-									<image class="img" src="@/assets/img/antFill-alert.svg" mode=""></image>
-								</view>
-								{{item.temperatureStatus=='1' ? '正常' : '异常'}}
+						<view class="name">
+							<view class="name1">
+								荆鹏软件园01
 							</view>
-							<view class="state2">
-								<view class="icon">
-									<image class="img" src="@/assets/img/smoke.svg" mode=""></image>
-								</view>
-								{{item.smokeStatus=='1' ? '正常' : '异常'}}
+							<view class="name2">
+								荆鹏集团
 							</view>
-							<!-- 箭头 -->
-							<view class="more">
-								<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
+						<view class="time">
+							5次
+						</view>
+					</view>
+				</view>
+				<!-- 查看全部排名 -->
+				<!-- <view class="check-all" @click="gotoUrl('/pages/abnormal/abnormalDeviceRanking')">
+					查看全部排名 <u-icon name="arrow-down" size="24" color="rgba(119,119,119,1)"></u-icon>
+				</view> -->
+			</view>
+
+		</view>
+
+		<view class="main" v-if="current==1">
+			<!-- 设备运行情况 -->
+
+			<view class="statistics-1 statistics">
+				<view class="title">
+					<view class="icon">
+						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
+					</view>
+					<view class="text">
+						设备运行情况
+					</view>
+					<view class="check-all" @click="toEquipmentElectricity">
+						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
+					</view>
+				</view>
+
+				<view class="item">
+					<view class="item-progess">
+						<view class="img-box">
+							<u-circle-progress active-color="#2979ff" :percent="alarmsPercent" width="88">
+							</u-circle-progress>
+						</view>
+
+					</view>
+					<!-- 累计 -->
+					<view class="total">
+						<view class="total1">
+							<view class="normal">
+								正常:1台
+							</view>
+							<view class="abnormal">
+								异常:2台
 							</view>
+						</view>
+						<view class="total2">
+							本月累计触发告警 <text class="total-number">12</text> 次
+
 
 						</view>
 					</view>
-					<view class="company-name">
-						{{item.installationAddressSimple}}
-						<!-- 离线 -->
-						<view class="state" v-if="!item.online">
-							<text class="off-line"></text>离线
+				</view>
+
+
+
+			</view>
+			<!-- 能源管理 -->
+			<view class="statistics statistics-manage">
+				<view class="title">
+					<view class="icon">
+						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
+					</view>
+					<view class="text">
+						能源管理
+					</view>
+					<view class="check-all" @click="toEquipmentElectricity">
+						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
+					</view>
+				</view>
+
+           <!-- 图表 -->
+				<view class="chart">
+					<view class="u-subsection">
+						<u-subsection :list="list" :current="0" font-size="24"></u-subsection>
+					</view>
+					<view class="chat-box">
+						<img src="@/assets/img/chat@13x.png" alt="" />
+					</view>
+				</view>
+            
+				<view class="search">
+					<view class="switch">
+						<u-switch v-model="checked" size="40"></u-switch><text>只看离线表</text>
+					</view>
+					<view class="search-box">
+						<input type="text" placeholder="请输入电表查询" />
+						<view class="icon">
+							<img src="@/assets/img/riLine-search-line 1.svg" alt="" />
+						</view>
+					</view>
+
+				</view>
+              <!-- 电表统计 -->
+				<view class="meter-statistic">
+					<!-- 总计 -->
+					<view class="sum">
+						<view class="icon">
+							<u-icon name="arrow-up" color="#d4d4d4" size="24"></u-icon>
+						</view>
+						<view class="meter-name">
+							荆鹏软件园总表
 						</view>
-						<!-- 在线 -->
-						<view class="state state2" v-else>
-							<text class="on-line"></text>在线
+						<view class="meter-state">
+							在线
+						</view>
+						<view class="meter-number">
+							5610.39度<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
 						</view>
 					</view>
-					<!-- 监控信息 -->
-					<view class="infos" v-if="item.remoteMonitorRecord != null">
-						<view class="infos-item">
-							<view class="icon">
-								当前电流:
-								<!-- <img src="../../assets/img/iconPark-electric-wave 1.svg" alt="" /> -->
-							</view>
-							<view class="text">
-								{{item.remoteMonitorRecord.dcaTotal.toFixed(2)}}A
-							</view>
+					<view class="sum2">
+						<view class="title">
+							一级表合计用电(未扣除)
 						</view>
-						<view class="infos-item">
-							<view class="icon">
-								当前电压:
-								<!-- <img src="../../assets/img/voltage.svg" alt="" /> -->
-							</view>
-							<view class="text">
-								{{item.remoteMonitorRecord.dcvTop.toFixed(2)}}V
-							</view>
+						<view class="value">
+							5608.39度
+
+						</view>
+					</view>
+					<!-- 一级表 -->
+					<view class="sum first-level">
+						<view class="icon">
+							<u-icon name="arrow-up" color="#d4d4d4" size="24"></u-icon>
+						</view>
+						<view class="icon">
+							<img src="@/assets/img/switchIcon.png" alt="" />
+						</view>
+						<view class="meter-name">
+							一级表a
+						</view>
+						<view class="meter-state">
+							在线
+						</view>
+						<view class="meter-number">
+							2805.39度<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
+					</view>
+					<!-- 二级表 -->
+					<view class="sum second-level">
+						<view class="icon">
+							<u-icon name="arrow-up" color="#d4d4d4" size="24"></u-icon>
+						</view>
+						<view class="icon">
+							<img src="@/assets/img/switchIcon.png" alt="" />
 						</view>
-						<view class="infos-item">
+						<view class="meter-name">
+							二级表a
+						</view>
+						<view class="meter-state">
+							在线
+						</view>
+						<view class="meter-number">
+							2805.39度<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
+					</view>
+					<!-- 开关 -->
+					<view class="else-switch">
+						<view class="sum item">
+
 							<view class="icon">
-								当前温度:
-								<!-- <img src="../../assets/img/iconPark-thermometer.svg" alt="" /> -->
+								<img src="@/assets/img/switchIcon.png" alt="" />
 							</view>
-							<view class="text">
-								{{item.remoteMonitorRecord.temperatureTop}}℃
+							<view class="meter-name">
+								空调开关
 							</view>
-						</view>
-						<view class="infos-item">
-							<view class="icon">
-								当前功率:
-								<!-- <img src="../../assets/img/power.svg" alt="" /> -->
+							<view class="meter-state">
+								在线
 							</view>
-							<view class="text">
-								{{(item.remoteMonitorRecord.totalPower).toFixed(2)}}kW
+							<view class="meter-number">
+								2805.39度<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
 							</view>
 						</view>
-						<view class="infos-item">
+
+						<view class="sum item">
+
 							<view class="icon">
-								当前功率因数:
-								<!-- <img src="../../assets/img/powerFactor.svg" alt="" /> -->
+								<img src="@/assets/img/switchIcon.png" alt="" />
 							</view>
-							<view class="text">
-								{{item.remoteMonitorRecord.dcfTop.toFixed(2)}}
+							<view class="meter-name">
+								灯控开关
 							</view>
-						</view>
-						<view class="infos-item">
-							<view class="icon">
-								平均功率因数:
-
+							<view class="meter-state">
+								在线
 							</view>
-							<view class="text">
-								{{item.remoteMonitorRecord.averPowerFactor.toFixed(2)}}
+							<view class="meter-number">
+								2805.39度<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
 							</view>
 						</view>
 					</view>
-				</view>
-			</view>
-
-			<!--设备状态-->
-			<view class="statistics-4 statistics">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
+					
+					<view class="sum second-level">
+						<view class="icon">
+							<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
+						<view class="icon">
+							<img src="@/assets/img/switchIcon.png" alt="" />
+						</view>
+						<view class="meter-name">
+							二级表a
+						</view>
+						<view class="meter-state meter-state2">
+							离线
+						</view>
+						<view class="meter-number">
+							2805.39度<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
 					</view>
-					<view class="text">
-						设备状态
+					
+					<view class="sum first-level">
+						<view class="icon">
+							<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
+						<view class="icon">
+							<img src="@/assets/img/switchIcon.png" alt="" />
+						</view>
+						<view class="meter-name">
+							一级表a
+						</view>
+						<view class="meter-state">
+							在线
+						</view>
+						<view class="meter-number">
+							2805.39度<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
 					</view>
 				</view>
-				<view class="chat">
-					<view id="pieEcharts" style="min-height:620rpx;">
 
-					</view>
-				</view>
 			</view>
 
-			<!-- 故障类型 -->
-			<view class="statistics-5 statistics" v-if="false">
+<view class="statistics-2 statistics">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
 					</view>
 					<view class="text">
-						故障类型
+						异常告警记录
 					</view>
-				</view>
-				<view class="chat">
-					<view id="barEcharts" style="min-height:410rpx;">
-
+					<view class="check-all" @click="gotoUrl('/pages/abnormal/abnormalAlarmRecord?id='+companyId)">
+						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 					</view>
 				</view>
-			</view>
+				<!-- 异常  -->
+				<view class="abnormal-item">
+					<view class="item-title">
 
-			<!-- 工单处理 -->
-			<view class="statistics-6 statistics" v-if="false">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						工单处理
+						<view class="name">
+							设备离线
+						</view>
+						<view class="date">
+							2024-02-14 09:00:01
+						</view>
 					</view>
-				</view>
-				<view class="chat">
-					<view id="lineEcharts" style="min-height:410rpx;">
+					<view class="item-value">
+						<view class="value-content">
+							<view class="value1">
+								七楼电表1
+							</view>
+							<view class="value2">
+								荆鹏软件园
+							</view>
+						</view>
+						<!-- 箭头 -->
+						<view class="more">
+							<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+						</view>
 
 					</view>
 				</view>
-			</view>
 
-			<!-- 异常设备排名 -->
-			<view class="statistics statistics-ranking" v-if="false">
+
+			</view>
+			
+			<view class="statistics statistics-ranking">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -392,19 +530,21 @@
 					<view class="text">
 						异常设备排名
 					</view>
+					<view class="check-all">
+						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
+					</view>
 				</view>
 				<!-- 合计 -->
 				<view class="total">
 					本年度共有<text> 42</text>次设备异常告警
 				</view>
 				<view class="ranking-main">
-					<view class="item" @click="gotoUrl('/pages/equipmentDataMonitoring/electronicMonitoring?id='+'&name=')">
+					<view class="item" v-for="item in 3"
+						@click="gotoUrl('/pages/equipmentDataMonitoring/electronicMonitoring?id='+'&name=')">
 						<view class="ranking">
 							1
 						</view>
-						<view class="icon">
-							<image class="img" src="@/assets/img/transformer1.svg" mode=""></image>
-						</view>
+			
 						<view class="name">
 							<view class="name1">
 								荆鹏软件园01
@@ -419,13 +559,13 @@
 					</view>
 				</view>
 				<!-- 查看全部排名 -->
-				<view class="check-all" @click="gotoUrl('/pages/abnormal/abnormalDeviceRanking')">
+				<!-- <view class="check-all" @click="gotoUrl('/pages/abnormal/abnormalDeviceRanking')">
 					查看全部排名 <u-icon name="arrow-down" size="24" color="rgba(119,119,119,1)"></u-icon>
-				</view>
+				</view> -->
 			</view>
-
 		</view>
 
+
 		<energyCenterTabbar :current="0"></energyCenterTabbar>
 	</view>
 </template>
@@ -467,6 +607,25 @@
 				myPieChart: null,
 				intervalId: null, // 用于存储间隔ID
 				intervalReady: true, // 用于存储间隔ID 
+				list: [{
+						name: '上月'
+					},
+					{
+						name: '当月'
+					},
+					{
+						name: '当日'
+					}, {
+						name: '当年'
+					}, {
+						name: '合计'
+					},
+					{
+						name: '指定月份'
+					}
+				],
+				current: 0,
+				checked: false,
 			}
 		},
 		onLoad() {
@@ -533,7 +692,7 @@
 					var list = response.data.companyInfoList;
 					var mList1 = [];
 					var mList2 = [];
-					
+
 					mList1.push({
 						id: '',
 						name: '全部'
@@ -545,7 +704,7 @@
 							mList1.push(list[i]);
 						}
 					}
-					
+
 					this.companyList = list;
 					this.merchantList1 = mList1;
 					this.merchantList2 = mList2;
@@ -672,7 +831,8 @@
 					uni.hideLoading();
 					this.alarmsForm = response.data;
 					if (this.alarmsForm.okNum != 0) {
-						this.alarmsPercent = this.alarmsForm.okNum / (this.alarmsForm.okNum + this.alarmsForm.errorNum) * 100;
+						this.alarmsPercent = this.alarmsForm.okNum / (this.alarmsForm.okNum + this.alarmsForm
+							.errorNum) * 100;
 					}
 				}).catch(error => {
 					uni.showToast({
@@ -948,7 +1108,8 @@
 			},
 			toElectronicMonitoring(item) {
 				uni.navigateTo({
-					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item.name +
+					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item
+						.name +
 						'&companyId=' + item.companyId
 				})
 			}
@@ -1048,7 +1209,7 @@
 			border-radius: 8px;
 			background-color: rgba(255, 255, 255, 1);
 			box-shadow: 0px 1px 6px 0px rgba(0, 59, 142, 0.05);
-			margin-top: 24rpx;
+			margin-bottom: 24rpx;
 			padding: 40rpx;
 
 			.title {
@@ -1113,6 +1274,7 @@
 
 				.item:last-of-type {
 					border: none;
+					padding-bottom: 0;
 				}
 
 				.item {
@@ -1161,36 +1323,32 @@
 
 					// 状态
 					.state {
-
-
-						display: flex;
-						align-items: center;
+						width: 64rpx;
+						height: 36rpx;
+						line-height: 36rpx;
+						border-radius: 8rpx;
+						font-size: 22rpx;
+						text-align: center;
+						border: 1px solid rgba(255, 123, 0, 1);
 						color: rgba(255, 123, 0, 1);
 						margin-left: auto;
 
-						.dot {
-							margin-right: 8rpx;
-
-							width: 16rpx;
-							height: 16rpx;
-							background-color: rgba(255, 123, 0, 1);
-							border-radius: 999px;
-							margin-left: auto;
-
-						}
+						// .dot {
+						// 	margin-right: 8rpx;
 
-						.off-line {
+						// 	width: 16rpx;
+						// 	height: 16rpx;
+						// 	background-color: rgba(255, 123, 0, 1);
+						// 	border-radius: 999px;
+						// 	margin-left: auto;
 
-							background-color: rgba(255, 123, 0, 1);
+						// }
 
-						}
 
-						.on-line {
-							background-color: rgba(0, 185, 98, 1);
-						}
 					}
 
 					.state2 {
+						border: 1px solid rgba(0, 185, 98, 1);
 						color: rgba(0, 185, 98, 1);
 					}
 
@@ -1232,18 +1390,21 @@
 
 		// 统计1
 		.statistics-1 {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
+			background-color: rgba(255, 255, 255, 1);
+			width: 100%;
+			padding: 24rpx;
+			box-shadow: 0px 1px 6px 0px rgba(0, 59, 142, 0.05);
+			border-radius: 8px;
+			margin-bottom: 24rpx;
+
 
 			.item {
-				width: 330rpx;
-				padding: 24rpx;
-				box-shadow: 0px 1px 6px 0px rgba(0, 59, 142, 0.05);
-				border-radius: 8px;
-				background-color: rgba(255, 255, 255, 1);
 
-				.item-top {
+				margin-top: 32rpx;
+				display: flex;
+				align-items: center;
+
+				.item-progess {
 					display: flex;
 					align-items: center;
 
@@ -1254,39 +1415,58 @@
 						vertical-align: middle;
 					}
 
-					.number {
+
+				}
+
+
+				.total {
+					margin-left: 24rpx;
+
+					color: rgba(119, 119, 119, 1);
+
+					.total1 {
+						display: flex;
 						color: rgba(51, 51, 51, 1);
 						font-size: 32rpx;
+						font-weight: bold;
 
 						.normal {
 							margin-bottom: 12rpx;
 						}
 					}
-				}
 
-				.total {
-					margin-top: 28rpx;
-					text-align: center;
-					color: rgba(119, 119, 119, 1);
+					.total2 {
+						color: rgba(119, 119, 119, 1);
+						
+					}
+
+					.abnormal {
+						margin-left: 24rpx;
+					}
 				}
 
 				.total-number {
-					color: #EE3138;
+					color: rgba(255, 123, 0, 1);
 					margin: 0 8rpx;
+					font-weight: bold;
 				}
 			}
 		}
 
 		// 统计2异常报警记录
 		.statistics-2 {
-
+.abnormal-item:last-of-type{
+				   border-bottom: none !important;
+				   padding-bottom: 0;
+			   }
 			.abnormal-item {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				padding: 16rpx;
 				border-bottom: 1px solid rgba(245, 245, 245, 1);
-
+               
+			   
 				.item-title {
 
 
@@ -1439,7 +1619,7 @@
 
 		// 设备状态
 		.statistics-4 {
-			
+
 			.chat-img {
 				width: 100%;
 				height: 620rpx;
@@ -1459,6 +1639,7 @@
 		.statistics-ranking {
 			.total {
 				color: rgba(16, 16, 16, 1);
+				padding-left: 52rpx;
 
 				text {
 					color: #1677FF;
@@ -1467,10 +1648,14 @@
 			}
 
 			.ranking-main {
-				margin-top: 48rpx;
+				margin-top: 40rpx;
 				border-radius: 16px;
 				background-color: #fff;
 
+				.item:last-of-type {
+					margin-bottom: 0;
+				}
+
 				.item {
 					display: flex;
 					align-items: center;
@@ -1529,6 +1714,190 @@
 				font-size: 12px;
 			}
 		}
+
+// 能源管理
+		.statistics-manage {
+			padding: 40rpx 0;
+			.title,.chart,.search,.meter-statistic{
+				padding: 0 32rpx;
+			}
+			// 图表
+			.chart {
+				padding-top: 32rpx;
+				border-top: 1px solid rgba(242,242,242,1);
+				/deep/.u-subsection {
+					padding: 2px;
+				}
+
+				/deep/.u-item {
+					padding: 0;
+					font-size: 24rpx
+				}
+
+				.chat-box {
+					margin-top: 24rpx;
+					width: 100%;
+					height: 480rpx;
+
+					img {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+			.search {
+				border-top: 1px solid rgba(242, 242, 242, 1);
+				border-bottom: 1px solid rgba(242, 242, 242, 1);
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 40rpx 32rpx;
+
+				.switch {
+					display: flex;
+					align-items: center;
+
+					text {
+						margin-left: 8rpx;
+						color: rgba(51, 51, 51, 1);
+					}
+				}
+
+				.search-box {
+					border-radius: 50px;
+					background-color: rgba(242, 244, 246, 1);
+					color: rgba(136, 136, 136, 1);
+					height: 56rpx;
+					line-height: 56rpx;
+					padding-left: 16rpx;
+					padding-right: 8rpx;
+					flex: 1;
+					margin-left: 28rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					uni-input {
+						height: 56rpx;
+						line-height: 56rpx !important;
+						width: 75%;
+					}
+
+					.icon {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 64rpx;
+						height: 40rpx;
+						border-radius: 50px;
+						background-color: rgba(22, 119, 255, 1);
+					}
+				}
+			}
+
+		}
+// 电表统计
+		.meter-statistic {
+			margin-top: 32rpx;
+
+			.sum {
+				display: flex;
+				align-items: center;
+
+				.meter-name {
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+					margin-left: 8rpx;
+					font-weight: bold;
+				}
+
+				.icon {
+					margin-right: 8rpx;
+
+					img {
+						width: 40rpx;
+						height: 40rpx;
+						vertical-align: middle;
+					}
+				}
+
+				.meter-state {
+					margin-left: 8rpx;
+					width: 64rpx;
+					height: 36rpx;
+					line-height: 36rpx;
+					border-radius: 4px;
+					background-color: rgba(255, 255, 255, 1);
+					color: rgba(0, 185, 98, 1);
+					font-size: 22rpx;
+					text-align: center;
+					border: 1px solid rgba(0, 185, 98, 1);
+				}
+				.meter-state2{
+					border: 1px solid rgba(255,123,0,1);
+					color: rgba(255,123,0,1);
+				}
+
+				.meter-number {
+					margin-left: auto;
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+
+					/deep/.u-icon--right {
+						margin-left: 8rpx;
+					}
+				}
+			}
+
+			.sum2 {
+				padding: 0 32rpx;
+				margin-top: 8rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.title {
+					color: rgba(119, 119, 119, 1);
+				}
+
+				.value {
+					color: rgba(119, 119, 119, 1);
+				}
+			}
+   // 一级表
+			.first-level {
+				padding-left: 32rpx;
+				margin-top: 20rpx;
+
+				.meter-name {
+					font-size: 28rpx
+				}
+			}
+// 二级表
+			.second-level {
+				padding-left: 64rpx;
+				margin-top: 20rpx;
+
+				.meter-name {
+					font-size: 24rpx
+				}
+			}
+
+			.else-switch {
+				padding-left: 144rpx;
+
+				.meter-name {
+					font-size: 24rpx
+				}
+
+				.item {
+					margin-top: 24rpx;
+				}
+			}
+		}
+
+
 	}
 
 	/deep/.u-drawer {