更新

salesRanking/page/enterpriseDetails/enterpriseDetails.vue

@@ -52,14 +52,10 @@
 					:class=" chartSeleIndex==index?'selechartSeleBar_item':'chartSeleBar_item' ">{{item.lable}}</view>
 			</view>
 			<view class="chart_scoll">
-				<swiper @change="swiperChange" :current='chartSeleIndex' class="swiper" :interval="1000"
+				<view class="swiper-item" v-if="chartSeleIndex == 0">
-					:duration="1000">
-					<!-- <swiper-item @tap.stop=''>
-						<view class="swiper-item">
 					<view style="height:75%;">
-								<qiunDataCharts :canvas2d='true' canvasId='canvasIdw' inScrollView="true" type="area"
+						<qiunDataCharts :canvas2d='true' canvasId='canvasIdw' type="area"
-									:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}"
+							:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}" :chartData="Line" />
-									:chartData="Line" />
 					</view>
 					<view v-if="detailsData"
 						style="height: 25%; display: flex; justify-content: space-around; align-items: center;">
@@ -68,13 +64,10 @@
 						<view> <text class="numberoli">{{detailsData.siteDayBalance|price}}</text> ￥</view>
 					</view>
 				</view>
-					</swiper-item>
+				<view class="swiper-item" v-if="chartSeleIndex == 1">
-					<swiper-item>
-						<view class="swiper-item">
 					<view style="height:75%;">
-								<qiunDataCharts :canvas2d='true' canvasId='canvasIdt' inScrollView="true" type="area"
+						<qiunDataCharts :canvas2d='true' canvasId='canvasIdt' type="area"
-									:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}"
+							:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}" :chartData="LineTwo" />
-									:chartData="LineTwo" />
 					</view>
 					<view v-if="chartsData"
 						style="height: 25%; display: flex; justify-content: space-around; align-items: center;">
@@ -83,30 +76,19 @@
 						</view>
 					</view>
 				</view>
-					</swiper-item> -->																														
+				<view class="swiper-item" v-if="chartSeleIndex == 2">
-					<swiper-item>
-						
-					</swiper-item>					
-				</swiper>
-				
-				
-				
-				<!-- <view style="height: 70%;width: 100%; padding: 20rpx 0;">
-					<qiun-data-charts type="area" :opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}" :chartData="Line" />
-				</view> -->
-			</view>
-			
-			<view class="swiper-item">
 					<view style="height:75%;">
-					<qiunDataCharts :canvas2d='true' canvasId='canvasIdt' inScrollView="true" type="area"
+						<qiunDataCharts :canvas2d='true' canvasId='canvasIdx' type="area"
-						:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}"
+							:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}},enableScroll:true,xAxis:{itemCount:7}}"
-						:chartData="oneMonthLine" />
+							:chartData="oneMonthLine" :ontouch="true" />
 					</view>
-				<view
+					<view v-if="oneMonthData"
 						style="height: 25%; display: flex; justify-content: space-around; align-items: center;">
 						<view class="swiper-item_table">今日</view>
-					<view> <text class="numberoli">{{}}</text> L</view>
+						<view> <text class="numberoli">{{oneMonthData.todaySalesRose.toFixed(2)}}</text> L
-					<view> <text class="numberoli">{{}}</text> ￥</view>
+						</view>
+						<view> <text class="numberoli">{{oneMonthData.siteDayBalance|price}}</text> ￥</view>
+					</view>
 				</view>
 			</view>
 
@@ -163,23 +145,24 @@
 				},
 				dedata: null,
 				chartsData: null,
+				detailsData: null,
+				oneMonthData: null,
 				income: 0,
 				quantity: 0,
-				detailsData: null,
 				chartSeleBarData: [{
 					lable: '近五日动销',
 					value: 0
 				}, {
 					lable: '近五次充值',
 					value: 1
-				},{
+				}, {
 					lable: '近一月动销',
 					value: 2
 				}],
 				chartSeleIndex: 0,
 				Line: {},
 				LineTwo: {},
-				oneMonthLine:{}
+				oneMonthLine: {}
 			}
 		},
 		onLoad(e) {
@@ -209,6 +192,9 @@
 			}
 		},
 		methods: {
+			getTouchMove(e) {
+				// console.log('e',e)
+			},
 			datePopupChange(e) {
 				sy[(this.routerIndex ? 'queryBusinessIncome' : 'queryEnterpriseIncome')]({
 					[((this.routerIndex ? 'siteId' : 'companyId'))]: this.dedata.id,
@@ -277,7 +263,7 @@
 					this.quantity = res.data.orderNumber
 					console.log(res, '收入')
 				})
-				if(this.routerIndex) {
+				if (this.routerIndex) {
 					// 近一个月动销 仅油站动销展示
 					sy.findMonthlySiteMovingPinVo(e.id).then(res => {
 						let dateArr = []
@@ -285,8 +271,11 @@
 						res.data.siteMovingPins.forEach(item => {
 							let date = item.createTime.split('-')
 							dateArr.push(`${date[1]}-${date[2]}`)
-							moneyArr.push(item.money.toFixed(2))
+							let money = (item.money + '').includes('.') ? item.money.toFixed(2) : item
+								.money
+							moneyArr.push(money)
 						})
+						this.oneMonthData = res.data
 						this.oneMonthLine = {
 							categories: dateArr,
 							series: [{
@@ -333,7 +322,7 @@
 
 			},
 			swiperChange(e) {
-				this.chartSeleIndex = e.detail.current
+				// this.chartSeleIndex = e.detail.current
 			},
 			chartSeleBarFn(item, index) {
 				this.chartSeleIndex = index
@@ -345,6 +334,10 @@
 <style scoped>
 	@import url("./enterpriseDetails.css");
 
+	.swiper-item {
+		width: 100%;
+	}
+
 	.list_item_tip {
 		padding: 11rpx 14rpx;
 		background-color: #9F43CC;