修复设备列表样式重叠

pages/details/index.js

@@ -411,7 +411,7 @@ ymdlistdatas:[]
         itemWidth:8,
         icon:"circle",
         formatter: function (name) {
-          return name + _this.data.Electricitylevel.total.sumdischargeTotal+' kwh';  // 在名称和单位之间添加空格间距
+          return name + _this.data.Electricitylevel.total.sumdischargeTotal+' kWh';  // 在名称和单位之间添加空格间距
       },
         data:[
           {name: '累计充电'},
@@ -423,7 +423,7 @@ ymdlistdatas:[]
         itemWidth:8,
         icon:"circle",
         formatter: function (name) {
-          return name + _this.data.Electricitylevel.total.sumchargeTotal + ' kwh';  // 在名称和单位之间添加空格间距
+          return name + _this.data.Electricitylevel.total.sumchargeTotal + ' kWh';  // 在名称和单位之间添加空格间距
       },
         data:[
           {name: '累计放电'},

pages/details/index.wxml

@@ -30,14 +30,14 @@
  <view class="cumulative_2"></view>
  <view class="cumulative_3">
  <view>累计充电量</view>
- <view>{{ Electricitylevel.total.sumchargeTotal }} kwh</view>
+ <view>{{ Electricitylevel.total.sumchargeTotal }} kWh</view>
  </view>
  </view>
  <view class="cumulative_1">
  <view class="cumulative_22"></view>
  <view class="cumulative_3">
  <view>累计放电量</view>
- <view>{{ Electricitylevel.total.sumdischargeTotal }} kwh</view>
+ <view>{{ Electricitylevel.total.sumdischargeTotal }} kWh</view>
  </view>
  </view>
 </view> -->

pages/index/index copy.js

@@ -306,7 +306,7 @@ startDataUpdates() {
         itemWidth: 8,
         icon: "circle",
         formatter: function (name) {
-          return name + `   ${data.accumulatedchargetime} kwh`;
+          return name + `   ${data.accumulatedchargetime} kWh`;
         },
         data: [{ name: '今日充电' }]
       }, {
@@ -316,7 +316,7 @@ startDataUpdates() {
         itemWidth: 8,
         icon: "circle",
         formatter: function (name) {
-          return name + `   ${data.accumulateddischargetime} kwh`;
+          return name + `   ${data.accumulateddischargetime} kWh`;
         },
         data: [{ name: '今日放电' }]
       }],

pages/index/index.js

@@ -297,7 +297,7 @@ unloadCharts: function () {
           fontSize: 10 // 设置字号为20px
       },
         formatter: function (name) {
-          return name + `   ${data.accumulatedchargetime} kwh`;
+          return name + `   ${data.accumulatedchargetime} kWh`;
         },
         rich:{
           a: {
@@ -318,7 +318,7 @@ unloadCharts: function () {
           fontSize: 10 // 设置字号为20px
       },
         formatter: function (name) {
-          return name + `   ${data.accumulateddischargetime} kwh`;
+          return name + `   ${data.accumulateddischargetime} kWh`;
         },
         data: [{ name: '今日放电' }]
       }],

pages/index/index.wxml

@@ -11,7 +11,7 @@
   </view>
 </view>
 <view style="{{'height: ' + navStatusBarHeight +'px'}}"></view>
-<!-- <view class="title_2">电站额定容量：{{characteristic.ratedCap}}kwh</view> -->
+<!-- <view class="title_2">电站额定容量：{{characteristic.ratedCap}}kWh</view> -->
 
 	<view class="canvasArea">
 		<ec-canvas type="2d" id="dispace_charts" canvas-id="dispace_charts" ec="{{ ec_dispace_charts }}"></ec-canvas>
@@ -87,8 +87,8 @@
     </view> -->
  <!-- <view class="battery_bottom"></view> -->
  <view ></view>
-    <view class="batteryccc">累计充电 <text class="battery">{{converter.formattoFixed(characteristic.chargeEnergy,2)}} </text> <text>kwh</text> </view>
-    <view class="batteryccc">累计放电 <text class="battery">{{converter.formattoFixed(characteristic.disChargeEnergy,2)}} </text> <text>kwh</text> </view>
+    <view class="batteryccc">累计充电 <text class="battery">{{converter.formattoFixed(characteristic.chargeEnergy,2)}} </text> <text>kWh</text> </view>
+    <view class="batteryccc">累计放电 <text class="battery">{{converter.formattoFixed(characteristic.disChargeEnergy,2)}} </text> <text>kWh</text> </view>
     </view>
     </view>
     </view>

pages/login/index.js

@@ -103,7 +103,10 @@ wx.showToast({
     // 在这里处理返回的数据
   })
   .catch((err) => {
-    console.error('请求失败：', err);
+    wx.showToast({
+      title: "账户或密码输入不正确",
+      icon: 'none',
+    });
     // 在这里处理请求失败的情况
   });
        

pages/monitor/index.wxml

@@ -122,7 +122,7 @@
 </view>
 </view>
 </view>
-<view class="charge">日正向总电能(0.00kwh)</view>
+<view class="charge">日正向总电能(0.00kWh)</view>
 <view class="discharge">
  <view class="dischargebox">
   <view>1</view>
@@ -140,7 +140,7 @@
   <view>谷</view>
  </view>
 </view> 
-<view class="charge">日反向总电能(0.00kwh)</view>
+<view class="charge">日反向总电能(0.00kWh)</view>
 <view class="discharge">
  <view class="dischargebox">
   <view>1</view>
@@ -158,7 +158,7 @@
   <view>谷</view>
  </view>
 </view> 
-<view class="charge">累计正向总电能(17，432.00kwh)</view>
+<view class="charge">累计正向总电能(17，432.00kWh)</view>
 <view class="discharge">
  <view class="dischargebox">
   <view>1</view>
@@ -176,7 +176,7 @@
   <view>谷</view>
  </view>
 </view> 
-<view class="charge">累计反向总电能(17，432.00kwh)</view>
+<view class="charge">累计反向总电能(17，432.00kWh)</view>
 <view class="discharge">
  <view class="dischargebox">
   <view>1</view>
@@ -283,7 +283,7 @@
   <image class="power_imgaes" src="https://esos-iot.bjdexn.cn/wx_images/8.png" mode=""/>
 
 <view>
-<view>85.7kwh</view>
+<view>85.7kWh</view>
 <view>可放电量</view>
 </view>
 </view>

pages/station/index.wxml

@@ -11,19 +11,19 @@
  </view>
  <view class="custom_div">
  <view class="batteryccc">在线状态</view>
- <view class="tag_type2red" class="{{item.comState=='离线'?'tag_type2red':'tag_type2'}}">{{item.comState}}</view>
+ <view class="{{item.comState== '离线' ? 'tag_type2red':'tag_type2'}}">{{item.comState}}</view>
  <!-- <view class="tag_type2">{{item.comState}}</view> -->
  </view>
  <view class="custom_div">
  <view class="batteryccc">故障状态</view>
  <!-- <view class="tag_type1">{{item.faultState}}</view> -->
- <view class="tag_type2red" class="{{item.faultState=='正常'?'tag_type2':'tag_type2red'}}">{{item.faultState}}</view>
+ <view class="{{item.faultState== '正常' ? 'tag_type2':'tag_type2red'}}">{{item.faultState}}</view>
 
  </view>
  <view class="custom_div">
  <view class="batteryccc">运行状态</view>
  <!-- <view class="tag_type3">{{item.runState}}</view> -->
- <view class="tag_type2red" class="{{item.runState=='运行'?'tag_type2':'tag_type3'}}">{{item.runState}}</view>
+ <view class="{{item.runState== '运行' ? 'tag_type2':'tag_type3'}}">{{item.runState}}</view>
 
  </view>
  <view class="custom_div">