优化

machineAndCell/BMS/BMS.vue

@@ -25,7 +25,7 @@
 					</view>
 				</view>
 				<view style="position: relative;">
-					<view style="height: 130rpx;"></view>
+					<view style="height: 140rpx;"></view>
 					<view style="margin-top: 40rpx;justify-content: center;position: absolute;left: 50%;transform: translateX(-50%);top: -50%;" class="ddflex">
 						<cell :width="99" :height="197" :soc="info.State.SOC" :showsoc="true" :rotate="90"></cell>
 					</view>
@@ -140,14 +140,14 @@
 						<view>充电开关：</view>
 						<view style="color: #A8A5A5;">{{info.Seting.CHON==1?'开启':'关闭'}}</view>
 					</view>
-					<switch style="transform: scale(0.6);" :checked="info.Seting.CHON" color="#FF753A"></switch>
+					<switch style="transform: scale(0.7);" :checked="info.Seting.CHON" color="#FF753A"></switch>
 				</view> -->
 				<view class="ddflex state">
 					<view class="ddflex">
 						<view>放电开关：</view>
 						<view style="color: #A8A5A5;">{{info.Seting.DHON==1?'开启':'关闭'}}</view>
 					</view>
-					<switch style="transform: scale(0.6);" :checked="info.Seting.DHON==1?true:false" color="#FF753A" @change="switchChange"></switch>
+					<switch style="transform: scale(0.7);" :checked="info.Seting.DHON==1?true:false" color="#FF753A" @change="switchChange"></switch>
 				</view>
 			</view>
 		</block>

machineAndCell/machineItemManage/machineItemManage.vue

@@ -13,7 +13,7 @@
 					<view>仓位状态：</view>
 					<view style="color: #A8A5A5;">{{doorInfo.boxEnable==1?'启用':'禁用'}}</view>
 				</view>
-				<switch style="transform: scale(0.6);" :checked="doorInfo.boxEnable" color="#FF753A" @change="boxEnableChange"></switch>
+				<switch style="transform: scale(0.7);" :checked="doorInfo.boxEnable" color="#FF753A" @change="boxEnableChange"></switch>
 			</view>
 		</view>
 		<view class="note">关闭后，仓门将禁用，用户无法打开</view>

pages/cell/cell.vue

@@ -6,6 +6,7 @@
 					<view>{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
+				<view v-else>电池</view>
 			</view>
 			<view class="tab-box ddflex">
 				<view class="fflex ddflex">

pages/index/index.vue

@@ -99,7 +99,7 @@
 		</view>
 
 		<!-- 图表统计 -->
-		<view class="echart-box" v-if="storeRanking&&storeRanking.length>0">
+		<view class="echart-box">
 			<view class="echart-box-header ddflex">
 				<view class="echart-box-title">商家营业额排名</view>
 				<view class="echart-box-timeType ddflex">
@@ -601,17 +601,25 @@
 					this.option.xAxis[0].axisLabel.fontSize = 13 * this.rpxTopxScale
 					this.option.legend.itemHeight = 10 * this.rpxTopxScale
 					this.option.legend.itemWidth = 40 * this.rpxTopxScale
-					this.option.xAxis[0].data = this.echartData.orderList.map(item=>{return item.showTime})
-					this.option.series[0].data = this.echartData.orderList.map(item=>{return item.orderCount})
-					this.option.series[1].data = this.echartData.profitList.map(item=>{return item.profit})
-					this.option.series[2].data = this.echartData.turnoverList.map(item=>{return item.turnover})
+					if(this.echartData.orderList.length>0){
+						this.option.xAxis[0].data = this.echartData.orderList.map(item=>{return item.showTime})
+						this.option.series[0].data = this.echartData.orderList.map(item=>{return item.orderCount})
+					}
+					if(this.echartData.profitList.length>0){
+						this.option.series[1].data = this.echartData.profitList.map(item=>{return item.profit})
+					}
+					if(this.echartData.turnoverList.length>0){
+						this.option.series[2].data = this.echartData.turnoverList.map(item=>{return item.turnover})
+					}
 					chart.setOption(this.option);
 				});
 				if (this.$refs.chart2) {
 					this.$refs.chart2.init(echarts, async chart => {
 						// let echartData = await this.getEchartData()
-						this.option2.yAxis[0].data = this.storeRanking.map(item=>{return item.name})
-						this.option2.series[0].data = this.storeRanking.map(item=>{return item.turnover})
+						if(this.storeRanking.length>0){
+							this.option2.yAxis[0].data = this.storeRanking.map(item=>{return item.name})
+							this.option2.series[0].data = this.storeRanking.map(item=>{return item.turnover})
+						}
 						chart.setOption(this.option2);
 					});
 				}

pages/machine/machine.vue

@@ -6,6 +6,7 @@
 					<view>{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
+				<view v-else>机柜</view>
 			</view>
 			<view class="search-box ddflex">
 				<image class="search-saoma" src="../../static/pages/images/saoma.png" @click="saomaFn()"></image>

pages/machineLook/machineLook.vue

@@ -9,6 +9,7 @@
 					<view>{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
+				<view v-else :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">设备</view>
 			</view>
 			<view class="search-box ddflex">
 				<image class="search-saoma" src="../../static/pages/images/saoma.png" @click="saomaFn()"></image>

pages/operationData/operationData.vue

@@ -520,19 +520,28 @@
 					this.option.xAxis[0].axisLabel.fontSize = 13 * this.rpxTopxScale
 					this.option.legend.itemHeight = 10 * this.rpxTopxScale
 					this.option.legend.itemWidth = 40 * this.rpxTopxScale
-					this.option.xAxis[0].data = this.echartData.orderList.map(item=>{return item.showTime})
-					this.option.series[0].data = this.echartData.orderList.map(item=>{return item.orderCount})
-					this.option.series[1].data = this.echartData.profitList.map(item=>{return item.profit})
-					this.option.series[2].data = this.echartData.turnoverList.map(item=>{return item.turnover})
+					if(this.echartData.orderList&&this.echartData.orderList.length>0){
+						this.option.xAxis[0].data = this.echartData.orderList.map(item=>{return item.showTime})
+						this.option.series[0].data = this.echartData.orderList.map(item=>{return item.orderCount})
+					}
+					if(this.echartData.profitList&&this.echartData.profitList.length>0){
+						this.option.series[1].data = this.echartData.profitList.map(item=>{return item.profit})
+					}
+					if(this.echartData.turnoverList&&this.echartData.turnoverList.length>0){
+						this.option.series[2].data = this.echartData.turnoverList.map(item=>{return item.turnover})
+					}
 					chart.setOption(this.option);
 				});
 				if (this.$refs.chart2) {
 					this.$refs.chart2.init(echarts, async chart => {
 						// let echartData = await this.getEchartData()
-						this.option2.xAxis[0].data = this.barEchartData.turnoverList.map(item=>{return item.showTime})
 						this.option2.yAxis[0].axisLabel.fontSize = 13 * this.rpxTopxScale
 						this.option2.xAxis[0].axisLabel.fontSize = 13 * this.rpxTopxScale
-						this.option2.series[0].data = this.barEchartData.turnoverList.map(item=>{return item.orderCount?item.orderCount:0})
+						
+						if(this.barEchartData.turnoverList&&this.barEchartData.turnoverList.length>0){
+							this.option2.xAxis[0].data = this.barEchartData.turnoverList.map(item=>{return item.showTime})
+							this.option2.series[0].data = this.barEchartData.turnoverList.map(item=>{return item.orderCount?item.orderCount:0})
+						}
 						this.option2.series[0].label.normal.fontSize = 13 * this.rpxTopxScale
 						chart.setOption(this.option2);
 					});
@@ -540,10 +549,13 @@
 				if (this.$refs.chart3) {
 					this.$refs.chart3.init(echarts, async chart => {
 						// let echartData = await this.getEchartData()
-						this.option3.xAxis[0].data = this.barEchartData.profitList.map(item=>{return item.showTime})
 						this.option3.yAxis[0].axisLabel.fontSize = 13 * this.rpxTopxScale
 						this.option3.xAxis[0].axisLabel.fontSize = 13 * this.rpxTopxScale
-						this.option3.series[0].data = this.barEchartData.profitList.map(item=>{return item.profit})
+						
+						if(this.barEchartData.profitList&&this.barEchartData.profitList.length>0){
+							this.option3.xAxis[0].data = this.barEchartData.profitList.map(item=>{return item.showTime})
+							this.option3.series[0].data = this.barEchartData.profitList.map(item=>{return item.profit})
+						}
 						this.option3.series[0].label.normal.fontSize = 13 * this.rpxTopxScale
 						chart.setOption(this.option3);
 					});

pages/orderLook/orderLook.vue

@@ -9,6 +9,7 @@
 					<view>{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
+				<view v-else :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">订单</view>
 			</view>
 			<view class="tab-box">
 				<view class="fflex ddflex">