Browse Source

修复设备列表样式重叠

master
dong 1 year ago
parent
commit
11d8e8c70b

+ 2
- 2
pages/details/index.js View File

411
         itemWidth:8,
411
         itemWidth:8,
412
         icon:"circle",
412
         icon:"circle",
413
         formatter: function (name) {
413
         formatter: function (name) {
414
-          return name + _this.data.Electricitylevel.total.sumdischargeTotal+' kwh';  // 在名称和单位之间添加空格间距
414
+          return name + _this.data.Electricitylevel.total.sumdischargeTotal+' kWh';  // 在名称和单位之间添加空格间距
415
       },
415
       },
416
         data:[
416
         data:[
417
           {name: '累计充电'},
417
           {name: '累计充电'},
423
         itemWidth:8,
423
         itemWidth:8,
424
         icon:"circle",
424
         icon:"circle",
425
         formatter: function (name) {
425
         formatter: function (name) {
426
-          return name + _this.data.Electricitylevel.total.sumchargeTotal + ' kwh';  // 在名称和单位之间添加空格间距
426
+          return name + _this.data.Electricitylevel.total.sumchargeTotal + ' kWh';  // 在名称和单位之间添加空格间距
427
       },
427
       },
428
         data:[
428
         data:[
429
           {name: '累计放电'},
429
           {name: '累计放电'},

+ 2
- 2
pages/details/index.wxml View File

30
  <view class="cumulative_2"></view>
30
  <view class="cumulative_2"></view>
31
  <view class="cumulative_3">
31
  <view class="cumulative_3">
32
  <view>累计充电量</view>
32
  <view>累计充电量</view>
33
- <view>{{ Electricitylevel.total.sumchargeTotal }} kwh</view>
33
+ <view>{{ Electricitylevel.total.sumchargeTotal }} kWh</view>
34
  </view>
34
  </view>
35
  </view>
35
  </view>
36
  <view class="cumulative_1">
36
  <view class="cumulative_1">
37
  <view class="cumulative_22"></view>
37
  <view class="cumulative_22"></view>
38
  <view class="cumulative_3">
38
  <view class="cumulative_3">
39
  <view>累计放电量</view>
39
  <view>累计放电量</view>
40
- <view>{{ Electricitylevel.total.sumdischargeTotal }} kwh</view>
40
+ <view>{{ Electricitylevel.total.sumdischargeTotal }} kWh</view>
41
  </view>
41
  </view>
42
  </view>
42
  </view>
43
 </view> -->
43
 </view> -->

+ 2
- 2
pages/index/index copy.js View File

306
         itemWidth: 8,
306
         itemWidth: 8,
307
         icon: "circle",
307
         icon: "circle",
308
         formatter: function (name) {
308
         formatter: function (name) {
309
-          return name + `   ${data.accumulatedchargetime} kwh`;
309
+          return name + `   ${data.accumulatedchargetime} kWh`;
310
         },
310
         },
311
         data: [{ name: '今日充电' }]
311
         data: [{ name: '今日充电' }]
312
       }, {
312
       }, {
316
         itemWidth: 8,
316
         itemWidth: 8,
317
         icon: "circle",
317
         icon: "circle",
318
         formatter: function (name) {
318
         formatter: function (name) {
319
-          return name + `   ${data.accumulateddischargetime} kwh`;
319
+          return name + `   ${data.accumulateddischargetime} kWh`;
320
         },
320
         },
321
         data: [{ name: '今日放电' }]
321
         data: [{ name: '今日放电' }]
322
       }],
322
       }],

+ 2
- 2
pages/index/index.js View File

297
           fontSize: 10 // 设置字号为20px
297
           fontSize: 10 // 设置字号为20px
298
       },
298
       },
299
         formatter: function (name) {
299
         formatter: function (name) {
300
-          return name + `   ${data.accumulatedchargetime} kwh`;
300
+          return name + `   ${data.accumulatedchargetime} kWh`;
301
         },
301
         },
302
         rich:{
302
         rich:{
303
           a: {
303
           a: {
318
           fontSize: 10 // 设置字号为20px
318
           fontSize: 10 // 设置字号为20px
319
       },
319
       },
320
         formatter: function (name) {
320
         formatter: function (name) {
321
-          return name + `   ${data.accumulateddischargetime} kwh`;
321
+          return name + `   ${data.accumulateddischargetime} kWh`;
322
         },
322
         },
323
         data: [{ name: '今日放电' }]
323
         data: [{ name: '今日放电' }]
324
       }],
324
       }],

+ 3
- 3
pages/index/index.wxml View File

11
   </view>
11
   </view>
12
 </view>
12
 </view>
13
 <view style="{{'height: ' + navStatusBarHeight +'px'}}"></view>
13
 <view style="{{'height: ' + navStatusBarHeight +'px'}}"></view>
14
-<!-- <view class="title_2">电站额定容量:{{characteristic.ratedCap}}kwh</view> -->
14
+<!-- <view class="title_2">电站额定容量:{{characteristic.ratedCap}}kWh</view> -->
15
 
15
 
16
 	<view class="canvasArea">
16
 	<view class="canvasArea">
17
 		<ec-canvas type="2d" id="dispace_charts" canvas-id="dispace_charts" ec="{{ ec_dispace_charts }}"></ec-canvas>
17
 		<ec-canvas type="2d" id="dispace_charts" canvas-id="dispace_charts" ec="{{ ec_dispace_charts }}"></ec-canvas>
87
     </view> -->
87
     </view> -->
88
  <!-- <view class="battery_bottom"></view> -->
88
  <!-- <view class="battery_bottom"></view> -->
89
  <view ></view>
89
  <view ></view>
90
-    <view class="batteryccc">累计充电 <text class="battery">{{converter.formattoFixed(characteristic.chargeEnergy,2)}} </text> <text>kwh</text> </view>
91
-    <view class="batteryccc">累计放电 <text class="battery">{{converter.formattoFixed(characteristic.disChargeEnergy,2)}} </text> <text>kwh</text> </view>
90
+    <view class="batteryccc">累计充电 <text class="battery">{{converter.formattoFixed(characteristic.chargeEnergy,2)}} </text> <text>kWh</text> </view>
91
+    <view class="batteryccc">累计放电 <text class="battery">{{converter.formattoFixed(characteristic.disChargeEnergy,2)}} </text> <text>kWh</text> </view>
92
     </view>
92
     </view>
93
     </view>
93
     </view>
94
     </view>
94
     </view>

+ 4
- 1
pages/login/index.js View File

103
     // 在这里处理返回的数据
103
     // 在这里处理返回的数据
104
   })
104
   })
105
   .catch((err) => {
105
   .catch((err) => {
106
-    console.error('请求失败:', err);
106
+    wx.showToast({
107
+      title: "账户或密码输入不正确",
108
+      icon: 'none',
109
+    });
107
     // 在这里处理请求失败的情况
110
     // 在这里处理请求失败的情况
108
   });
111
   });
109
        
112
        

+ 5
- 5
pages/monitor/index.wxml View File

122
 </view>
122
 </view>
123
 </view>
123
 </view>
124
 </view>
124
 </view>
125
-<view class="charge">日正向总电能(0.00kwh)</view>
125
+<view class="charge">日正向总电能(0.00kWh)</view>
126
 <view class="discharge">
126
 <view class="discharge">
127
  <view class="dischargebox">
127
  <view class="dischargebox">
128
   <view>1</view>
128
   <view>1</view>
140
   <view>谷</view>
140
   <view>谷</view>
141
  </view>
141
  </view>
142
 </view> 
142
 </view> 
143
-<view class="charge">日反向总电能(0.00kwh)</view>
143
+<view class="charge">日反向总电能(0.00kWh)</view>
144
 <view class="discharge">
144
 <view class="discharge">
145
  <view class="dischargebox">
145
  <view class="dischargebox">
146
   <view>1</view>
146
   <view>1</view>
158
   <view>谷</view>
158
   <view>谷</view>
159
  </view>
159
  </view>
160
 </view> 
160
 </view> 
161
-<view class="charge">累计正向总电能(17,432.00kwh)</view>
161
+<view class="charge">累计正向总电能(17,432.00kWh)</view>
162
 <view class="discharge">
162
 <view class="discharge">
163
  <view class="dischargebox">
163
  <view class="dischargebox">
164
   <view>1</view>
164
   <view>1</view>
176
   <view>谷</view>
176
   <view>谷</view>
177
  </view>
177
  </view>
178
 </view> 
178
 </view> 
179
-<view class="charge">累计反向总电能(17,432.00kwh)</view>
179
+<view class="charge">累计反向总电能(17,432.00kWh)</view>
180
 <view class="discharge">
180
 <view class="discharge">
181
  <view class="dischargebox">
181
  <view class="dischargebox">
182
   <view>1</view>
182
   <view>1</view>
283
   <image class="power_imgaes" src="https://esos-iot.bjdexn.cn/wx_images/8.png" mode=""/>
283
   <image class="power_imgaes" src="https://esos-iot.bjdexn.cn/wx_images/8.png" mode=""/>
284
 
284
 
285
 <view>
285
 <view>
286
-<view>85.7kwh</view>
286
+<view>85.7kWh</view>
287
 <view>可放电量</view>
287
 <view>可放电量</view>
288
 </view>
288
 </view>
289
 </view>
289
 </view>

+ 3
- 3
pages/station/index.wxml View File

11
  </view>
11
  </view>
12
  <view class="custom_div">
12
  <view class="custom_div">
13
  <view class="batteryccc">在线状态</view>
13
  <view class="batteryccc">在线状态</view>
14
- <view class="tag_type2red" class="{{item.comState=='离线'?'tag_type2red':'tag_type2'}}">{{item.comState}}</view>
14
+ <view class="{{item.comState== '离线' ? 'tag_type2red':'tag_type2'}}">{{item.comState}}</view>
15
  <!-- <view class="tag_type2">{{item.comState}}</view> -->
15
  <!-- <view class="tag_type2">{{item.comState}}</view> -->
16
  </view>
16
  </view>
17
  <view class="custom_div">
17
  <view class="custom_div">
18
  <view class="batteryccc">故障状态</view>
18
  <view class="batteryccc">故障状态</view>
19
  <!-- <view class="tag_type1">{{item.faultState}}</view> -->
19
  <!-- <view class="tag_type1">{{item.faultState}}</view> -->
20
- <view class="tag_type2red" class="{{item.faultState=='正常'?'tag_type2':'tag_type2red'}}">{{item.faultState}}</view>
20
+ <view class="{{item.faultState== '正常' ? 'tag_type2':'tag_type2red'}}">{{item.faultState}}</view>
21
 
21
 
22
  </view>
22
  </view>
23
  <view class="custom_div">
23
  <view class="custom_div">
24
  <view class="batteryccc">运行状态</view>
24
  <view class="batteryccc">运行状态</view>
25
  <!-- <view class="tag_type3">{{item.runState}}</view> -->
25
  <!-- <view class="tag_type3">{{item.runState}}</view> -->
26
- <view class="tag_type2red" class="{{item.runState=='运行'?'tag_type2':'tag_type3'}}">{{item.runState}}</view>
26
+ <view class="{{item.runState== '运行' ? 'tag_type2':'tag_type3'}}">{{item.runState}}</view>
27
 
27
 
28
  </view>
28
  </view>
29
  <view class="custom_div">
29
  <view class="custom_div">

Loading…
Cancel
Save