Commit 15848b0dce9cb0573aead9744dd88b3b197121fd

Authored by 周铨
1 parent 763179aa

解决加载时,weixin-echart在最高层的问题

1 <view class="pieWxEchart_main"> 1 <view class="pieWxEchart_main">
2 - <ec-canvas id="mychart-dom-bar" style="width: 100%; height: 500rpx;" canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas> 2 + <ec-canvas id="mychart-dom-bar" style="width: 100%; height: 500rpx;" force-use-old-canvas="true" canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>
3 3
4 - </view>  
  4 +</view>
@@ -39,79 +39,7 @@ Page({ @@ -39,79 +39,7 @@ Page({
39 } 39 }
40 ], 40 ],
41 deviceDataList: [], 41 deviceDataList: [],
42 - overallDataList: [  
43 - {  
44 - type: '光伏',  
45 - oneLabelName: "母线电压",  
46 - oneLabelNum: "20.21",  
47 - unitOne: "V",  
48 - unitTwo: "Hz",  
49 - unitThree: "kW",  
50 - twoLabelNum: "320.00",  
51 - twoLabelName: "PV电网频率",  
52 - threeLabelName: "PV负载功率",  
53 - threeLabelNum: '320.00'  
54 - },  
55 - {  
56 - type: '风电',  
57 - oneLabelName: "总有功功率",  
58 - oneLabelNum: "",  
59 - // unitOne: "kW",  
60 - // unitTwo: "kW",  
61 - // unitThree: "A",  
62 - // unitFour: "A",  
63 - // unitFive: "A",  
64 - twoLabelNum: "",  
65 - twoLabelName: "总无功功率",  
66 - threeLabelName: "A相电流",  
67 - threeLabelNum: '',  
68 - fourLabelName: "B相电流",  
69 - fourLabelNum: '',  
70 - fiveLabelName: "C相电流",  
71 - fiveLabelNum: '',  
72 - },  
73 - {  
74 - type: '充电桩',  
75 - oneLabelName: "A枪电压",  
76 - oneLabelNum: "20.21",  
77 - unitOne: "V",  
78 - unitTwo: "%",  
79 - unitthree: "V",  
80 - unitFour: "%",  
81 - twoLabelNum: "320.00",  
82 - twoLabelName: "A枪SOC",  
83 - threeLabelName: "B枪电压",  
84 - threeLabelNum: '320.00',  
85 - fourLabelName: "B枪SOC",  
86 - fourLabelNum: '65%',  
87 - },  
88 -  
89 - {  
90 - type: '电网',  
91 - oneLabelName: "A相有功功率",  
92 - oneLabelNum: "20.21",  
93 - unitOne: "kW",  
94 - unitTwo: "kW",  
95 - unitthree: "kW",  
96 - twoLabelNum: "320.00",  
97 - twoLabelName: "B相有功功率",  
98 - threeLabelName: "C相有功功率",  
99 - threeLabelNum: '65%',  
100 - },  
101 - {  
102 - type: '储能',  
103 - oneLabelName: "SOC",  
104 - oneLabelNum: "20.21",  
105 - unitOne: "%",  
106 - unitTwo: "A",  
107 - unitThree: "V",  
108 - twoLabelNum: "320.00",  
109 - twoLabelName: "总电流",  
110 - threeLabelName: "总电压",  
111 - threeLabelNum: '320.00'  
112 - },  
113 -  
114 - ], 42 + overallDataList: [],
115 storeCountList: [ 43 storeCountList: [
116 { 44 {
117 type: "设备", 45 type: "设备",
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <circularDiagram deviceInfo="{{allData.deviceInfo}}"></circularDiagram> 35 <circularDiagram deviceInfo="{{allData.deviceInfo}}"></circularDiagram>
36 <deviceData deviceDataList="{{deviceDataList}}"></deviceData> 36 <deviceData deviceDataList="{{deviceDataList}}"></deviceData>
37 </view> 37 </view>
38 - <view class="overallOperationStatus"> 38 + <view class="overallOperationStatus" wx:if="{{overallDataList.length>0}}">
39 <topTitle topTitleName="整体运行情况"></topTitle> 39 <topTitle topTitleName="整体运行情况"></topTitle>
40 <overallOperation overallDataList="{{overallDataList}}"></overallOperation> 40 <overallOperation overallDataList="{{overallDataList}}"></overallOperation>
41 </view> 41 </view>