From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b4-daily-business-statistics.vue | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/src/components/view/b4-daily-business-statistics.vue b/src/components/view/b4-daily-business-statistics.vue
index 743edf6..d8c0c0c 100644
--- a/src/components/view/b4-daily-business-statistics.vue
+++ b/src/components/view/b4-daily-business-statistics.vue
@@ -1,9 +1,9 @@
<template>
<div class="daily-main" v-loading="loading">
<div class="daily-content" style="height:100%">
- <p style="font-size: 16px;padding:19.5px 0px">姣忔棩涓氬姟缁熻</p>
+ <!-- <p style="font-size: 16px;padding:19.5px 0px">姣忔棩涓氬姟缁熻</p> -->
<el-row :gutter="20">
- <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩浠诲姟鎺ユ敹</h4>
@@ -17,7 +17,7 @@
<img src="../../../static/img/daliy-0.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩浠诲姟瀹屾垚</h4>
@@ -31,7 +31,7 @@
<img src="../../../static/img/daliy-1.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩浠诲姟鍓╀綑</h4>
@@ -45,7 +45,7 @@
<img src="../../../static/img/daliy-2.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩妫�娴嬭垂鐢�</h4>
@@ -59,7 +59,7 @@
<img src="../../../static/img/daliy-3.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩妫�娴嬪伐鏃�</h4>
@@ -73,7 +73,7 @@
<img src="../../../static/img/daliy-4.svg" alt="" srcset="">
</div>
</el-col>
- <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 30px;">
+ <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;">
<div class="daily-card daily-head">
<div class="daily-head-left">
<h4>浠婃棩妫�娴嬩汉鍛�</h4>
@@ -88,17 +88,17 @@
</div>
</el-col>
</el-row>
- <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">
+ <el-row :gutter="20" style="height: calc(100% - 170px);">
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 16px;height: 100%;">
+ <div class="daily-card chart-box" style="height: 100%;">
<h4>杩�10鏃ヤ换鍔℃帴鏀堕噺</h4>
- <echart-module :id="'daily-left'" :config="chartConfig0" :datas="chartData0"></echart-module>
+ <echart-module :id="'daily-left'" :config="chartConfig0" :datas="chartData0" style="height: calc(100% - 32px);"></echart-module>
</div>
</el-col>
- <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 30px;">
- <div class="daily-card chart-box">
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 16px;height: 100%;">
+ <div class="daily-card chart-box" style="height: 100%;">
<h4>杩�10鏃ュ疄闄呭畬鎴愪换鍔′笌鎺ユ敹浠诲姟瀵规瘮</h4>
- <echart-module :id="'daily-right'" :config="chartConfig1" :datas="chartData1"></echart-module>
+ <echart-module :id="'daily-right'" :config="chartConfig1" :datas="chartData1" style="height: calc(100% - 32px);"></echart-module>
</div>
</el-col>
</el-row>
@@ -114,7 +114,7 @@
data(){
return{
chartConfig0:{
- height: '435px',
+ height: '',
isLoading:false,
type:'line'
},
@@ -128,7 +128,7 @@
]
},
chartConfig1:{
- height: '435px',
+ height: '',
isLoading:false,
type:'bar'
},
@@ -147,10 +147,13 @@
},
pageData:{},
loading:false,
+ timers:null,
}
},
mounted(){
this.init()
+ this.timers&&clearInterval(this.timers);
+ setInterval(this.init(),1000*60*5)
},
methods:{
init(){
@@ -161,7 +164,8 @@
if (res.code == 201) return
this.pageData = this.HaveJson(res.data)
let xData = res.data.DAYS.map(m=>{
- return `${m[1]}-${m[2]}`
+ let arr = m.split('-')
+ return `${arr[1]}-${arr[2]}`
})
this.chartData0.xData = xData
this.chartData1.xData = xData
@@ -175,11 +179,14 @@
},
handleData(val){
if(val){
- return Math.abs(val)*100;
+ return (Math.abs(val)*100).tofixed(0);
}else{
return '0'
}
}
+ },
+ deactivated(){
+ this.timers&&clearInterval(this.timers);
}
}
</script>
@@ -189,6 +196,10 @@
height: 100%;
overflow-y: auto;
overflow-x: hidden;
+}
+.daily-content{
+ padding: 20px 0;
+ box-sizing: border-box;
}
.daily-card{
width: 100%;
@@ -209,7 +220,7 @@
color: #202224;
font-size: 16px;
font-weight: 400;
- margin-bottom: 20px;
+ margin-bottom: 16px;
opacity: 0.8;
}
@@ -218,7 +229,7 @@
font-weight: bold;
font-size: 28px;
display: inline-block;
- margin-bottom: 30px;
+ margin-bottom: 16px;
}
.daily-head-left .daily-head-left-info{
@@ -236,7 +247,7 @@
}
.chart-box{
- padding: 30px 24px;
+ padding: 16px 24px;
box-sizing: border-box;
}
--
Gitblit v1.9.3