From dff404a76987de5b632ae635a6dea6c95dc37a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 16:58:59 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b4-daily-business-statistics.vue | 114 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 74 insertions(+), 40 deletions(-)
diff --git a/src/components/view/b4-daily-business-statistics.vue b/src/components/view/b4-daily-business-statistics.vue
index b6ca2d7..743edf6 100644
--- a/src/components/view/b4-daily-business-statistics.vue
+++ b/src/components/view/b4-daily-business-statistics.vue
@@ -1,94 +1,94 @@
<template>
-<div class="daily-main">
+<div class="daily-main" v-loading="loading">
<div class="daily-content" style="height:100%">
<p style="font-size: 16px;padding:19.5px 0px">姣忔棩涓氬姟缁熻</p>
- <el-row :gutter="35">
- <el-col :xs="12" :sm="10" :md="8" :lg="6" :xl="4" style="margin-bottom: 30px;">
+ <el-row :gutter="20">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩浠诲姟鎺ユ敹</h4>
- <span >2453</span>
+ <span>{{ pageData.RECEIVE }}</span>
<div class="daily-head-left-info">
- <img src="../../../static/img/daliy-up.svg" alt="">
- <span :class="{active:false}" class="num"> 8.5% </span>
- <span>杈冩槰澶�</span>
+ <img :src="`../../../static/img/daliy-${pageData.RECEIVE_RATIO<0?'down':'up'}.svg`" alt="">
+ <span :class="{active:pageData.RECEIVE_RATIO<0}" class="num" v-html="` ${handleData(pageData.RECEIVE_RATIO)}% `"></span>
+ <span style="font-size: 12px;">杈冩槰澶�</span>
</div>
</div>
<img src="../../../static/img/daliy-0.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="10" :md="8" :lg="6" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩浠诲姟瀹屾垚</h4>
- <span >1687</span>
+ <span >{{ pageData.FINISHE }}</span>
<div class="daily-head-left-info">
- <img src="../../../static/img/daliy-up.svg" alt="">
- <span :class="{active:false}" class="num"> 8.5% </span>
- <span>杈冩槰澶�</span>
+ <img :src="`../../../static/img/daliy-${pageData.FINISHE_RATIO<0?'down':'up'}.svg`" alt="">
+ <span :class="{active:pageData.FINISHE_RATIO<0}" class="num" v-html="` ${handleData(pageData.FINISHE_RATIO)}% `"></span>
+ <span style="font-size: 12px;">杈冩槰澶�</span>
</div>
</div>
<img src="../../../static/img/daliy-1.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="10" :md="8" :lg="6" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩浠诲姟鍓╀綑</h4>
- <span >766</span>
+ <span >{{ pageData.SURPLUS }}</span>
<div class="daily-head-left-info">
- <img src="../../../static/img/daliy-up.svg" alt="">
- <span :class="{active:false}" class="num"> 8.5% </span>
- <span>杈冩槰澶�</span>
+ <img :src="`../../../static/img/daliy-${pageData.SURPLUS_RATIO<0?'down':'up'}.svg`" alt="">
+ <span :class="{active:pageData.SURPLUS_RATIO<0}" class="num" v-html="` ${handleData(pageData.SURPLUS_RATIO)}% `"></span>
+ <span style="font-size: 12px;">杈冩槰澶�</span>
</div>
</div>
<img src="../../../static/img/daliy-2.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="10" :md="8" :lg="6" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩妫�娴嬭垂鐢�</h4>
- <span >锟�7359</span>
+ <span>锟{ pageData.PRICE }}</span>
<div class="daily-head-left-info">
- <img src="../../../static/img/daliy-up.svg" alt="">
- <span :class="{active:false}" class="num"> 8.5% </span>
- <span>杈冩槰澶�</span>
+ <img :src="`../../../static/img/daliy-${pageData.PRICE_RATIO<0?'down':'up'}.svg`" alt="">
+ <span :class="{active:pageData.PRICE_RATIO}" class="num" v-html="` ${handleData(pageData.PRICE_RATIO)}% `"></span>
+ <span style="font-size: 12px;">杈冩槰澶�</span>
</div>
</div>
<img src="../../../static/img/daliy-3.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="10" :md="8" :lg="6" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩妫�娴嬪伐鏃�</h4>
- <span >306</span>
+ <span>{{pageData.COST}}</span>
<div class="daily-head-left-info">
- <img src="../../../static/img/daliy-down.svg" alt="">
- <span :class="{active:true}" class="num"> 8.5% </span>
- <span>杈冩槰澶�</span>
+ <img :src="`../../../static/img/daliy-${pageData.COST_RATIO<0?'down':'up'}.svg`" alt="">
+ <span :class="{active:pageData.COST_RATIO<0}" class="num" v-html="` ${handleData(pageData.COST_RATIO)}% `"></span>
+ <span style="font-size: 12px;">杈冩槰澶�</span>
</div>
</div>
<img src="../../../static/img/daliy-4.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="10" :md="8" :lg="6" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩妫�娴嬩汉鍛�</h4>
- <span >109</span>
+ <span >{{ pageData.PERSON }}</span>
<div class="daily-head-left-info">
- <img src="../../../static/img/daliy-up.svg" alt="">
- <span :class="{active:false}" class="num"> 8.5% </span>
- <span>杈冩槰澶�</span>
+ <img :src="`../../../static/img/daliy-${pageData.PERSON_RATIO<0?'down':'up'}.svg`" alt="">
+ <span :class="{active:pageData.PERSON_RATIO<0}" class="num" v-html="` ${handleData(pageData.PERSON_RATIO)}% `"></span>
+ <span style="font-size: 12px;">杈冩槰澶�</span>
</div>
</div>
<img src="../../../static/img/daliy-5.svg" alt="" srcset="">
</div>
</el-col>
</el-row>
- <el-row :gutter="35">
+ <el-row :gutter="20">
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 30px;">
<div class="daily-card chart-box">
<h4>杩�10鏃ヤ换鍔℃帴鏀堕噺</h4>
@@ -115,35 +115,69 @@
return{
chartConfig0:{
height: '435px',
- isLoading:true,
+ isLoading:false,
type:'line'
},
chartData0:{
- xData:['4-11','4-12','4-13','4-14','4-15','4-16','4-17','4-18','4-19','4-20'],
+ xData:[],
yData:[
{
title:'浠诲姟鎺ユ敹閲�',
- data:[10,20,10,40,50,20,70,40,90,50]
+ data:[]
}
]
},
chartConfig1:{
height: '435px',
- isLoading:true,
+ isLoading:false,
type:'bar'
},
chartData1:{
- xData:['4-11','4-12','4-13','4-14','4-15','4-16','4-17','4-18','4-19','4-20'],
+ xData:[],
yData:[
{
title:'浠婃棩鎺ユ敹',
- data:[10,20,10,40,50,20,70,40,90,50]
+ data:[]
},
{
title:'浠婃棩瀹屾垚',
- data:[15,10,6,33,66,44,56,77,44,55]
+ data:[]
},
]
+ },
+ pageData:{},
+ loading:false,
+ }
+ },
+ mounted(){
+ this.init()
+ },
+ methods:{
+ init(){
+ this.chartConfig0.isLoading = false
+ this.chartConfig1.isLoading = false
+ this.loading = true;
+ this.$axios.get(this.$api.report.businessStatisticsByDay).then(res => {
+ if (res.code == 201) return
+ this.pageData = this.HaveJson(res.data)
+ let xData = res.data.DAYS.map(m=>{
+ return `${m[1]}-${m[2]}`
+ })
+ this.chartData0.xData = xData
+ this.chartData1.xData = xData
+ this.chartData0.yData[0].data = this.pageData.RECETENDAYS
+ this.chartData1.yData[0].data = this.pageData.RECETENDAYS
+ this.chartData1.yData[1].data = this.pageData.FINISHTENDAYS
+ this.loading = false;
+ this.chartConfig0.isLoading = true
+ this.chartConfig1.isLoading = true
+ })
+ },
+ handleData(val){
+ if(val){
+ return Math.abs(val)*100;
+ }else{
+ return '0'
}
}
}
--
Gitblit v1.9.3