|
|
@@ -28,26 +28,26 @@
|
|
|
<view class="electricity-consumption">
|
|
|
|
|
|
|
|
|
- <!-- 统计 -->
|
|
|
- <view class="statistics-content">
|
|
|
- <view class="statistics-item"
|
|
|
- @click="gotoUrl('/pages/equipmentDataMonitoring/electricityConsumptionDetail?id='
|
|
|
- +FormData.meterId+'&name='+tabsFrom.title+'&type='+FormData.type)">
|
|
|
- <view class="item-title">
|
|
|
- <image class="img" src="@/assets/img/meterStatistics@3x.png"></image>电量统计(度)
|
|
|
- </view>
|
|
|
- <view class="item-value">
|
|
|
- <text>{{electricity}}</text> <u-icon name="arrow-right" color="#cccccc" size="24" ></u-icon>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="statistics-item" >
|
|
|
- <view class="item-title item-title2">
|
|
|
- <image class="img" src="@/assets/img/electricityStatistics@3x.png"></image>电费统计(元)
|
|
|
- </view>
|
|
|
- <view class="item-value">
|
|
|
- {{fee}}
|
|
|
- </view>
|
|
|
- </view>
|
|
|
+ <!-- 统计 -->
|
|
|
+ <view class="statistics-content">
|
|
|
+ <view class="statistics-item"
|
|
|
+ @click="gotoUrl('/pages/equipmentDataMonitoring/electricityConsumptionDetail?id='
|
|
|
+ +FormData.meterId+'&name='+tabsFrom.title+'&type='+FormData.type)">
|
|
|
+ <view class="item-title">
|
|
|
+ <image class="img" src="@/assets/img/meterStatistics@3x.png"></image>电量统计(度)
|
|
|
+ </view>
|
|
|
+ <view class="item-value">
|
|
|
+ <text>{{electricity}}</text> <u-icon name="arrow-right" color="#cccccc" size="24" ></u-icon>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="statistics-item" >
|
|
|
+ <view class="item-title item-title2">
|
|
|
+ <image class="img" src="@/assets/img/electricityStatistics@3x.png"></image>电费统计(元)
|
|
|
+ </view>
|
|
|
+ <view class="item-value">
|
|
|
+ {{fee}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="radio">
|
|
|
<u-radio-group v-model="value" @change="radioGroupChange">
|
|
|
@@ -57,21 +57,21 @@
|
|
|
</u-radio>
|
|
|
</u-radio-group>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <!-- 远程控制电源开关 -->
|
|
|
- <view class="control" v-if="codes&&codes.indexOf('switch')!=-1">
|
|
|
- <view class="text">
|
|
|
- 远程控制电源开关
|
|
|
- </view>
|
|
|
- <view class="icon">
|
|
|
+ </view>
|
|
|
+ <!-- 远程控制电源开关 -->
|
|
|
+ <view class="control" v-if="codes&&codes.indexOf('switch')!=-1">
|
|
|
+ <view class="text">
|
|
|
+ 远程控制电源开关
|
|
|
+ </view>
|
|
|
+ <view class="icon">
|
|
|
<img src="@/assets/img/control.png"
|
|
|
@click="switchBtnApi(meterDetail,0)"
|
|
|
v-if="meterDetail.switchStatus"
|
|
|
alt="" />
|
|
|
<img @click="switchBtnApi(meterDetail,1)"
|
|
|
v-else
|
|
|
- src="@/assets/img/switchClose.png" alt="" />
|
|
|
- </view>
|
|
|
+ src="@/assets/img/switchClose.png" alt="" />
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<!-- 各时段用电量 -->
|
|
|
<view class="electricity-chart">
|
|
|
@@ -92,13 +92,13 @@
|
|
|
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="total" >
|
|
|
- <view class="total-item">
|
|
|
- 电量合计：{{sumQuantity}}度
|
|
|
- </view>
|
|
|
- <view class="total-item">
|
|
|
- 电费合计：{{sumFee}}元
|
|
|
- </view>
|
|
|
+ <view class="total" >
|
|
|
+ <view class="total-item">
|
|
|
+ 电量合计：{{sumQuantity}}度
|
|
|
+ </view>
|
|
|
+ <view class="total-item">
|
|
|
+ 电费合计：{{sumFee}}元
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 异常告警 -->
|
|
|
@@ -125,12 +125,12 @@
|
|
|
{{item.configName}}
|
|
|
</view>
|
|
|
<view class="time">
|
|
|
- {{item.createTime}}
|
|
|
- <!-- 箭头 -->
|
|
|
- <view class="more">
|
|
|
- <u-icon name="arrow-right" color="#acacac" size="24"></u-icon>
|
|
|
+ {{item.createTime}}
|
|
|
+ <!-- 箭头 -->
|
|
|
+ <view class="more">
|
|
|
+ <u-icon name="arrow-right" color="#acacac" size="24"></u-icon>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -280,14 +280,14 @@
|
|
|
<view class="headline">
|
|
|
设备信息
|
|
|
</view>
|
|
|
- <view class="infos">
|
|
|
- <view class="item">
|
|
|
- <view class="item-title">
|
|
|
- 设备名称
|
|
|
- </view>
|
|
|
- <view class="item-value">
|
|
|
- {{meterDetail.name}}
|
|
|
- </view>
|
|
|
+ <view class="infos">
|
|
|
+ <view class="item">
|
|
|
+ <view class="item-title">
|
|
|
+ 设备名称
|
|
|
+ </view>
|
|
|
+ <view class="item-value">
|
|
|
+ {{meterDetail.name}}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="item-title">
|
|
|
@@ -318,25 +318,25 @@
|
|
|
设备地址
|
|
|
</view>
|
|
|
<view class="item-value">
|
|
|
- <span>{{meterDetail.installationAddress}}</span>
|
|
|
+ <span>{{meterDetail.installationAddress}}</span>
|
|
|
<image class="img" src="@/assets/img/riFill-navigation-fill 1.svg"></image>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <view class="item">
|
|
|
- <view class="item-title">
|
|
|
- 地址简称
|
|
|
- </view>
|
|
|
- <view class="item-value">
|
|
|
- {{meterDetail.installationAddressSimple}}
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="item">
|
|
|
- <view class="item-title">
|
|
|
- 使用单位
|
|
|
- </view>
|
|
|
- <view class="item-value">
|
|
|
- {{meterDetail.customer}}
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
+ <view class="item">
|
|
|
+ <view class="item-title">
|
|
|
+ 地址简称
|
|
|
+ </view>
|
|
|
+ <view class="item-value">
|
|
|
+ {{meterDetail.installationAddressSimple}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="item">
|
|
|
+ <view class="item-title">
|
|
|
+ 使用单位
|
|
|
+ </view>
|
|
|
+ <view class="item-value">
|
|
|
+ {{meterDetail.customer}}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="item-title">
|
|
|
@@ -374,22 +374,22 @@
|
|
|
import * as echarts from 'echarts';
|
|
|
import * as API from '@/apis/pagejs/index.js'
|
|
|
import * as API_energyManage from '@/apis/pagejs/energyManage.js'
|
|
|
-
|
|
|
- import * as API_electricityMeter from '@/apis/pagejs/electricityMeter.js'
|
|
|
+
|
|
|
+ import * as API_electricityMeter from '@/apis/pagejs/electricityMeter.js'
|
|
|
import * as WxJsApi from '@/apis/utils/wxJsApi.js'
|
|
|
|
|
|
export default {
|
|
|
data() {
|
|
|
- return {
|
|
|
- meterDetail: {}, //设备信息
|
|
|
- electricity: 0, //电量统计
|
|
|
+ return {
|
|
|
+ meterDetail: {}, //设备信息
|
|
|
+ electricity: 0, //电量统计
|
|
|
fee: 0, //电费统计
|
|
|
abnormalRecordsList: [], //异常list
|
|
|
companyId: '', //企业id
|
|
|
meterId: '', //设备id
|
|
|
titleName: '',
|
|
|
clickType: -1,
|
|
|
- sumQuantity: 0,
|
|
|
+ sumQuantity: 0,
|
|
|
sumFee: 0,
|
|
|
equipmentInfosShow: false,
|
|
|
kWhList: [],
|
|
|
@@ -489,15 +489,15 @@
|
|
|
this.getElectricityStatistics();
|
|
|
this.getTimeSlotStatistics();
|
|
|
this.getCompanyInfoList();
|
|
|
- this.getAbnormalAlarmRecord();
|
|
|
+ this.getAbnormalAlarmRecord();
|
|
|
this.getMeterDetails(this.meterId);
|
|
|
- },
|
|
|
- onReady() {
|
|
|
- WxJsApi.getWxConfig(['getLocation', 'openLocation', 'addEventListener', 'scanQRCode']).then((res) => {
|
|
|
- // //(res)
|
|
|
- }).catch(error => {
|
|
|
- //(res)
|
|
|
- })
|
|
|
+ },
|
|
|
+ onReady() {
|
|
|
+ WxJsApi.getWxConfig(['getLocation', 'openLocation', 'addEventListener', 'scanQRCode']).then((res) => {
|
|
|
+ // //(res)
|
|
|
+ }).catch(error => {
|
|
|
+ //(res)
|
|
|
+ })
|
|
|
},
|
|
|
beforeDestroy() {
|
|
|
this.clearTimer(); // 组件销毁前清除定时器
|
|
|
@@ -538,40 +538,40 @@
|
|
|
}
|
|
|
})
|
|
|
console.log(node,key)
|
|
|
- },
|
|
|
- toMeterLocation() {
|
|
|
- // WxJsApi.openLocation({
|
|
|
- // latitude: parseFloat(this.meterDetail.latitude), //目的地latitude
|
|
|
- // longitude: parseFloat(this.meterDetail.longitude), //目的地longitude
|
|
|
- // name: this.meterDetail.name,
|
|
|
- // address: this.meterDetail.installationAddress,
|
|
|
- // scale: 15, //地图缩放大小，可根据情况具体调整
|
|
|
- // success(res) {
|
|
|
- // uni.hideLoading()
|
|
|
- // },
|
|
|
- // complete() {
|
|
|
- // // uni.hideLoading()
|
|
|
- // }
|
|
|
- // });
|
|
|
- },
|
|
|
- getMeterDetails(meterId) {
|
|
|
- uni.showLoading({
|
|
|
- title: "加载中",
|
|
|
- mask: true,
|
|
|
- })
|
|
|
- API_electricityMeter.meterDetails({
|
|
|
- meterId: meterId
|
|
|
- }).then((res) => {
|
|
|
- uni.hideLoading();
|
|
|
+ },
|
|
|
+ toMeterLocation() {
|
|
|
+ // WxJsApi.openLocation({
|
|
|
+ // latitude: parseFloat(this.meterDetail.latitude), //目的地latitude
|
|
|
+ // longitude: parseFloat(this.meterDetail.longitude), //目的地longitude
|
|
|
+ // name: this.meterDetail.name,
|
|
|
+ // address: this.meterDetail.installationAddress,
|
|
|
+ // scale: 15, //地图缩放大小，可根据情况具体调整
|
|
|
+ // success(res) {
|
|
|
+ // uni.hideLoading()
|
|
|
+ // },
|
|
|
+ // complete() {
|
|
|
+ // // uni.hideLoading()
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ },
|
|
|
+ getMeterDetails(meterId) {
|
|
|
+ uni.showLoading({
|
|
|
+ title: "加载中",
|
|
|
+ mask: true,
|
|
|
+ })
|
|
|
+ API_electricityMeter.meterDetails({
|
|
|
+ meterId: meterId
|
|
|
+ }).then((res) => {
|
|
|
+ uni.hideLoading();
|
|
|
this.meterDetail = res.data.meter;
|
|
|
this.codes =this.carhelp.getPersonInfo().codes;
|
|
|
-
|
|
|
- }).catch(error => {
|
|
|
- uni.showToast({
|
|
|
- title: error,
|
|
|
- icon: "none"
|
|
|
- })
|
|
|
- })
|
|
|
+
|
|
|
+ }).catch(error => {
|
|
|
+ uni.showToast({
|
|
|
+ title: error,
|
|
|
+ icon: "none"
|
|
|
+ })
|
|
|
+ })
|
|
|
},
|
|
|
clearTimer() {
|
|
|
if (this.intervalId) {
|
|
|
@@ -617,7 +617,7 @@
|
|
|
configId: '',
|
|
|
pageIndex: 1,
|
|
|
pageSize: 2,
|
|
|
- companyId: this.companyId,
|
|
|
+ companyId: this.companyId,
|
|
|
meterId: this.meterId
|
|
|
}).then((res) => {
|
|
|
uni.hideLoading();
|
|
|
@@ -653,7 +653,7 @@
|
|
|
this.value = '2';
|
|
|
|
|
|
this.getTimeSlotStatistics();
|
|
|
- this.getElectricityStatistics();
|
|
|
+ this.getElectricityStatistics();
|
|
|
this.getMeterDetails(e[2].value);
|
|
|
}
|
|
|
},
|
|
|
@@ -670,7 +670,7 @@
|
|
|
this.value = '2';
|
|
|
|
|
|
this.getTimeSlotStatistics();
|
|
|
- this.getElectricityStatistics();
|
|
|
+ this.getElectricityStatistics();
|
|
|
this.getMeterDetails(this.meterId);
|
|
|
},
|
|
|
queryDate(queryTime, day) {
|
|
|
@@ -782,8 +782,8 @@
|
|
|
uni.hideLoading();
|
|
|
}
|
|
|
this.hourMap = response.data.hourMap;
|
|
|
- this.sumQuantity = response.data.kwhMap.kwh;
|
|
|
- this.sumFee = response.data.kwhMap.fee;
|
|
|
+ this.sumQuantity = response.data.kwhMap.kwh;
|
|
|
+ this.sumFee = response.data.kwhMap.fee;
|
|
|
|
|
|
this.getBarCharts(this.hourMap, interval);
|
|
|
|
|
|
@@ -815,8 +815,8 @@
|
|
|
uni.hideLoading();
|
|
|
}
|
|
|
this.showTop = [0, 0, 0, 0, 0, 0, 0, 0]
|
|
|
- var electricity = response.data.kwhMap.kwh + "";
|
|
|
- this.electricity = response.data.kwhMap.kwh;
|
|
|
+ var electricity = response.data.kwhMap.kwh + "";
|
|
|
+ this.electricity = response.data.kwhMap.kwh;
|
|
|
this.fee = response.data.kwhMap.fee;
|
|
|
|
|
|
if (electricity) {
|
|
|
@@ -895,10 +895,10 @@
|
|
|
type: 'shadow'
|
|
|
},
|
|
|
formatter: (value) => {
|
|
|
-
|
|
|
- var name = value[0].name;
|
|
|
- var obj=list[name]
|
|
|
- var text= `<p>${name}</p>`
|
|
|
+
|
|
|
+ var name = value[0].name;
|
|
|
+ var obj=list[name]
|
|
|
+ var text= `<p>${name}</p>`
|
|
|
|
|
|
|
|
|
if (obj.electricityPrice != undefined) {
|
|
|
@@ -958,9 +958,9 @@
|
|
|
this.queryDate(this.tabsFrom.show2Index, false)
|
|
|
}
|
|
|
},
|
|
|
- selector2cancel() {
|
|
|
- if(this.clickType != -1) {
|
|
|
- this.value = this.clickType;
|
|
|
+ selector2cancel() {
|
|
|
+ if(this.clickType != -1) {
|
|
|
+ this.value = this.clickType;
|
|
|
}
|
|
|
},
|
|
|
selector2reset(e) {
|
|
|
@@ -1051,9 +1051,9 @@
|
|
|
|
|
|
.background {
|
|
|
background-color: rgba(22, 119, 255, 1);
|
|
|
- padding-top: 88rpx;
|
|
|
+ padding-top: 88rpx;
|
|
|
height: 150px;
|
|
|
- padding-bottom: 100rpx;
|
|
|
+ //padding-bottom: 100rpx;
|
|
|
position: relative;
|
|
|
|
|
|
/deep/.u-border-bottom:after {
|
|
|
@@ -1075,15 +1075,15 @@
|
|
|
|
|
|
|
|
|
.background::after {
|
|
|
-
|
|
|
- content: '';
|
|
|
- position: absolute;
|
|
|
- bottom:-39rpx;
|
|
|
- width: 100%;
|
|
|
- height: 40rpx; /* 弧形的高度 */
|
|
|
- background-color: rgba(22, 119, 255, 1); /* 弧形的颜色 */
|
|
|
- border-radius: 50%; /* 创建圆形 */
|
|
|
- border-top-left-radius: 0;
|
|
|
+
|
|
|
+ content: '';
|
|
|
+ position: absolute;
|
|
|
+ bottom:-39rpx;
|
|
|
+ width: 100%;
|
|
|
+ height: 40rpx; /* 弧形的高度 */
|
|
|
+ background-color: rgba(22, 119, 255, 1); /* 弧形的颜色 */
|
|
|
+ border-radius: 50%; /* 创建圆形 */
|
|
|
+ border-top-left-radius: 0;
|
|
|
border-top-right-radius: 0;
|
|
|
|
|
|
}
|
|
|
@@ -1147,54 +1147,54 @@
|
|
|
padding: 32rpx 32rpx 0rpx;
|
|
|
border-radius: 8px;
|
|
|
margin: -188rpx 32rpx 0;
|
|
|
- position: relative;
|
|
|
- border: 1px solid rgba(255,255,255,1);
|
|
|
- background: linear-gradient(180deg, rgba(187,216,255,1) 0%,rgba(255,255,255,1) 63%);
|
|
|
- // 统计
|
|
|
- .statistics-content{
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
-
|
|
|
- .statistics-item{
|
|
|
- width: 300rpx;
|
|
|
- padding: 24rpx 0 24rpx 24rpx;
|
|
|
- border-radius: 8px;
|
|
|
- box-shadow: 0px 0px 8px 0px rgba(22,119,255,0.3);
|
|
|
- background-color: #fff;
|
|
|
- }
|
|
|
- .item-title{
|
|
|
- color: rgba(22,119,255,1);
|
|
|
- font-size: 32rpx;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- font-weight: bold;
|
|
|
- .img{
|
|
|
- width: 32rpx;
|
|
|
- height: 32rpx;
|
|
|
- vertical-align: middle;
|
|
|
- margin-right: 4rpx;
|
|
|
- }
|
|
|
- }
|
|
|
- .item-title2{
|
|
|
- color: rgba(129,97,255,1);
|
|
|
- }
|
|
|
- .item-value{
|
|
|
- color: rgba(16,16,16,1);
|
|
|
- font-size: 48rpx;
|
|
|
- font-weight: bold;
|
|
|
- margin-top: 8rpx;
|
|
|
- overflow: hidden;
|
|
|
- white-space: nowrap;
|
|
|
- text-overflow: ellipsis;
|
|
|
-
|
|
|
- text{
|
|
|
- display: inline-block;
|
|
|
- width: 80%;
|
|
|
- margin-right: 4rpx;
|
|
|
- }
|
|
|
- }
|
|
|
+ position: relative;
|
|
|
+ border: 1px solid rgba(255,255,255,1);
|
|
|
+ background: linear-gradient(180deg, rgba(187,216,255,1) 0%,rgba(255,255,255,1) 63%);
|
|
|
+ // 统计
|
|
|
+ .statistics-content{
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+
|
|
|
+
|
|
|
+ .statistics-item{
|
|
|
+ width: 300rpx;
|
|
|
+ padding: 24rpx 0 24rpx 24rpx;
|
|
|
+ border-radius: 8px;
|
|
|
+ box-shadow: 0px 0px 8px 0px rgba(22,119,255,0.3);
|
|
|
+ background-color: #fff;
|
|
|
+ }
|
|
|
+ .item-title{
|
|
|
+ color: rgba(22,119,255,1);
|
|
|
+ font-size: 32rpx;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ font-weight: bold;
|
|
|
+ .img{
|
|
|
+ width: 32rpx;
|
|
|
+ height: 32rpx;
|
|
|
+ vertical-align: middle;
|
|
|
+ margin-right: 4rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .item-title2{
|
|
|
+ color: rgba(129,97,255,1);
|
|
|
+ }
|
|
|
+ .item-value{
|
|
|
+ color: rgba(16,16,16,1);
|
|
|
+ font-size: 48rpx;
|
|
|
+ font-weight: bold;
|
|
|
+ margin-top: 8rpx;
|
|
|
+ overflow: hidden;
|
|
|
+ white-space: nowrap;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+
|
|
|
+ text{
|
|
|
+ display: inline-block;
|
|
|
+ width: 80%;
|
|
|
+ margin-right: 4rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.title {
|
|
|
@@ -1271,44 +1271,44 @@
|
|
|
.radio {
|
|
|
margin-top: 24rpx;
|
|
|
padding-left: 8rpx;
|
|
|
- /deep/.u-radio {
|
|
|
- margin-bottom: 8px;
|
|
|
- min-width: 25% !important;
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- }
|
|
|
- /deep/.u-radio__label{
|
|
|
- margin-left: 24rpx;
|
|
|
- font-size: 28rpx; ;
|
|
|
+ /deep/.u-radio {
|
|
|
+ margin-bottom: 8px;
|
|
|
+ min-width: 25% !important;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ /deep/.u-radio__label{
|
|
|
+ margin-left: 24rpx;
|
|
|
+ font-size: 28rpx; ;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- // 远程控制电源开关
|
|
|
- .control{
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
- margin: 24rpx 32rpx;
|
|
|
- padding: 40rpx 32rpx;
|
|
|
- background-color: #fff;
|
|
|
- border-radius: 8px;
|
|
|
- .text{
|
|
|
- color: rgba(51,51,51,1);
|
|
|
- font-size: 36rpx;
|
|
|
- font-weight: bold;
|
|
|
- }
|
|
|
- .icon{
|
|
|
- img{
|
|
|
- width: 64rpx;
|
|
|
- height: 64rpx;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
+ // 远程控制电源开关
|
|
|
+ .control{
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+ margin: 24rpx 32rpx;
|
|
|
+ padding: 40rpx 32rpx;
|
|
|
+ background-color: #fff;
|
|
|
+ border-radius: 8px;
|
|
|
+ .text{
|
|
|
+ color: rgba(51,51,51,1);
|
|
|
+ font-size: 36rpx;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+ .icon{
|
|
|
+ img{
|
|
|
+ width: 64rpx;
|
|
|
+ height: 64rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
//各时段用电量
|
|
|
.electricity-chart {
|
|
|
@@ -1335,22 +1335,22 @@
|
|
|
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
font-size: 36rpx;
|
|
|
- margin-left: 16rpx;
|
|
|
+ margin-left: 16rpx;
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
|
|
|
.more {
|
|
|
- margin-left: auto;
|
|
|
- border: 1px solid rgba(187,187,187,1);
|
|
|
- border-radius: 4px;
|
|
|
- padding: 8rpx;
|
|
|
+ margin-left: auto;
|
|
|
+ border: 1px solid rgba(187,187,187,1);
|
|
|
+ border-radius: 4px;
|
|
|
+ padding: 8rpx;
|
|
|
font-size: 24rpx;
|
|
|
}
|
|
|
- }
|
|
|
- .total{
|
|
|
- text-align: center;
|
|
|
- color: rgba(51,51,51,1);
|
|
|
- font-weight: bold;
|
|
|
+ }
|
|
|
+ .total{
|
|
|
+ text-align: center;
|
|
|
+ color: rgba(51,51,51,1);
|
|
|
+ font-weight: bold;
|
|
|
}
|
|
|
|
|
|
.chart {
|
|
|
@@ -1389,7 +1389,7 @@
|
|
|
align-items: center;
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
font-size: 36rpx;
|
|
|
- margin-left: 16rpx;
|
|
|
+ margin-left: 16rpx;
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
|
|
|
@@ -1495,11 +1495,11 @@
|
|
|
|
|
|
.time {
|
|
|
color: rgba(119, 119, 119, 1);
|
|
|
- font-size: 24rpx;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- .more{
|
|
|
- margin-left: 4rpx;
|
|
|
+ font-size: 24rpx;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ .more{
|
|
|
+ margin-left: 4rpx;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1602,12 +1602,12 @@
|
|
|
color: rgba(16, 16, 16, 1);
|
|
|
font-size: 36rpx;
|
|
|
text-align: center;
|
|
|
- font-weight: bold;
|
|
|
+ font-weight: bold;
|
|
|
margin-bottom: 24rpx;
|
|
|
}
|
|
|
|
|
|
.infos {
|
|
|
- padding-bottom: 100rpx;
|
|
|
+ //padding-bottom: 100rpx;
|
|
|
|
|
|
.item:last-of-type {
|
|
|
border: none;
|
|
|
@@ -1617,7 +1617,7 @@
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
|
|
|
- line-height: 48rpx;
|
|
|
+ line-height: 48rpx;
|
|
|
padding: 24rpx 0;
|
|
|
border-bottom: 1px solid #cccccc;
|
|
|
|
|
|
@@ -1629,16 +1629,16 @@
|
|
|
.item-value {
|
|
|
color: #666666;
|
|
|
flex: 1;
|
|
|
- margin-left: 16rpx;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
- .img{
|
|
|
- width: 32rpx;
|
|
|
- height: 32rpx;
|
|
|
- transform: rotate(90deg);
|
|
|
- margin-left: 96rpx;
|
|
|
+ margin-left: 16rpx;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+
|
|
|
+ .img{
|
|
|
+ width: 32rpx;
|
|
|
+ height: 32rpx;
|
|
|
+ transform: rotate(90deg);
|
|
|
+ margin-left: 96rpx;
|
|
|
}
|
|
|
}
|
|
|
}
|
zhengkaixin