From 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 九月 2023 17:39:28 +0800
Subject: [PATCH] 项目优化
---
src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
index cb05cf0..85a2cc5 100644
--- a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
+++ b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
@@ -41,7 +41,7 @@
<div class="PowerOnRate_text" style="width: 8%">
<table width="85px;" align="center">
<tr>
- <td align="right"><div style="width: 15px;height: 15px;background-color: #4169E1;position: static;"/></td>
+ <td align="right"><div style="width: 15px;height: 15px;background-color: #6496e9;position: static;"/></td>
<td align="left">寮�鏈�</td>
</tr>
<tr>
@@ -49,7 +49,7 @@
<td align="left">鍏虫満</td>
</tr>
<tr>
- <td align="right"><div style="width: 15px;height: 15px;background-color: #00ee00"/></td>
+ <td align="right"><div style="width: 15px;height: 15px;background-color: #4ecee1"/></td>
<td align="left">杩愯</td>
</tr>
<tr>
@@ -64,8 +64,8 @@
<div class="UtilizationStartup">
<div class="Utilization Line-box">
<div class="title">
- <div class="circle"></div>
- <div class="text">杩愯鏁堢巼</div>
+ <!--<div class="circle"></div>-->
+ <!--<div class="text"></div>-->
</div>
<div class="Utilization-box box-bottom">
<div class="Utilization-right" ref="UtilizationLine" id="UtilizationLine"></div>
@@ -73,8 +73,8 @@
</div>
<div class="Startup Line-box">
<div class="title">
- <div class="circle"></div>
- <div class="text">杩愯鏁堢巼</div>
+ <!--<div class="circle"></div>-->
+ <!--<div class="text"></div>-->
</div>
<div class="Startup-box box-bottom">
<div class="Startup-right" ref="StartupLine" id="StartupLine"></div>
@@ -127,13 +127,8 @@
}
},
created(){
-
-
let collectTime = moment(moment().add(-1,'d'),'YYYY-MM-DD');
-
-
this.queryParams.collectTime = collectTime;
-
this.queryParams.dateTime = this.queryParams.collectTime.format('YYYYMMDD')
this.initEquipmentNode()
this.queryStatistical();
@@ -169,13 +164,13 @@
top: 60,
containLabel: true
},
- toolbox: {
- show : true,
- padding: 15,
- feature : {
- saveAsImage : {show: true,title:'淇濆瓨鍥剧墖',name :'璁惧鏁堢巼缁熻鎶ヨ〃'}
- }
- },
+ // toolbox: {
+ // show : true,
+ // padding: 15,
+ // feature : {
+ // saveAsImage : {show: true,title:'淇濆瓨鍥剧墖',name :'璁惧鏁堢巼缁熻鎶ヨ〃'}
+ // }
+ // },
xAxis :{
type : 'category',
data:['寮�鏈烘椂闀�','鍏虫満鏃堕暱','杩愯鏃堕暱','寰呮満鏃堕暱'],
@@ -266,6 +261,7 @@
name:'鏌辩姸鍥�',
type: 'bar',
data: [this.openingLong, this.closedLong, this.processLong,this.waitingLong],
+ // data:[22,3,4,5],
barWidth: 25,
label:{
show:true,
@@ -273,16 +269,18 @@
textStyle:{
color:'#000',
},
- formatter:"鏃堕暱锛歿c}H"
+ // formatter:"鏃堕暱锛歿c}H",
+ formatter:params=>String(params.value).length==2?`鏃堕暱锛�${String(params.value).slice(1)}H`:`鏃堕暱锛�${String(params.value)}H`
},
itemStyle: {
normal: {
color: function(params) {
let colorList = [
["#6496e9","#6bded3"],
- ["#ffbb65","#fdc68b"],
+ ["#849db8","#b4b8cc"],
["#4fe1c5","#4ecee1"],
- ["#9978fa","#88a1fa"],
+ // ["#9978fa","#88a1fa"],
+ ["#ffbb65","#fdc68b"],
];
// return colorList[params.dataIndex];
let colorItem = colorList[params.dataIndex];
@@ -315,12 +313,13 @@
// },
tooltip: {
trigger: 'item',
- formatter: "{a} <br/>{b} : {c} ({d}%)"
+ // formatter: "{a} <br/>{b} : {c} ({d}%)"锛�
+ formatter:params=>String(params.value).length==2?`${params.seriesName}<br/>${params.name}锛�${String(params.value).slice(1)}锛�${params.percent}%锛塦:`${params.seriesName}<br/>${params.name}锛�${params.value}锛�${params.percent}%锛塦
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿']
},
calculable: true,
@@ -332,13 +331,14 @@
itemStyle: {
normal: {
color: function (params) {
- let colorList = ['#4169E1', '#A8A8A8'];
+ let colorList = [ '#6496e9','#849db8'];
return colorList[params.dataIndex]
},
label: {
show: true,
position: 'top',
- formatter: '{b}\n{c}'
+ // formatter: '{b}\n{c}',
+ formatter:params=>String(params.value).length==2?params.name+String(params.value).slice(1):params.name+String(params.value)
}
}
},
@@ -357,12 +357,13 @@
// },
tooltip: {
trigger: 'item',
- formatter: "{a} <br/>{b} : {c} ({d}%)"
+ // formatter: "{a} <br/>{b} : {c} ({d}%)",
+ formatter:params=>String(params.value).length==2?`${params.seriesName}<br/>${params.name}锛�${String(params.value).slice(1)}锛�${params.percent}%锛塦:`${params.seriesName}<br/>${params.name}锛�${params.value}锛�${params.percent}%锛塦
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['杩愯鏃堕棿', '寰呮満鏃堕棿']
},
calculable: true,
@@ -374,13 +375,14 @@
itemStyle: {
normal: {
color: function (params) {
- var colorList = ['#00ee00', '#FCCE10'];
+ var colorList = ['#4ecee1', '#FCCE10'];
return colorList[params.dataIndex]
},
label: {
show: true,
position: 'top',
- formatter: '{b}\n{c}'
+ // formatter: '{b}\n{c}',
+ formatter:params=>String(params.value).length==2?params.name+String(params.value).slice(1):params.name+String(params.value)
}
}
},
@@ -392,7 +394,7 @@
},
queryStatistical(){
getAction(this.url.dayStatisticalRate,this.queryParams).then(res =>{
- if(res.success){
+ if(res.success) {
// console.log(res);
this.StatCharOpeningRate = res.result.openRate;
//鍒╃敤鐜�
@@ -407,6 +409,8 @@
this.closedLong = this.getTime(res.result.closeLong);
this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
this.draw();
+ }else{
+ this.draw()
}
})
},
@@ -420,9 +424,11 @@
let _this = this
getAction(this.url.getBaseTree).then((res) => {
if (res.success) {
+ if(res.result[0]){
+ _this.$set(this.queryParam, 'tierName', res.result[0].title)
+ _this.$set(this.queryParams, 'parentId', res.result[0].key)
+ _this.queryStatistical() }
// console.log(res.result[0].entity.tierName)
- _this.$set(this.queryParam, 'tierName', res.result[0].title)
- _this.$set(this.queryParams, 'parentId', res.result[0].key)
_this.queryStatistical()
} else {
// this.$message.warn(res.message)
@@ -466,11 +472,11 @@
this.$set(this.queryParam, 'tierName', val.title)
this.$set(this.queryParam, 'equipmentId', val.equipmentId)
this.queryParams.parentId = ''
- this.queryParams.equipmentIds = val.equipmentId
+ this.queryParams.equipmentId = val.equipmentId
this.searchQuery()
}else{
this.queryParams.parentId = val.key
- this.queryParams.equipmentIds = ''
+ this.queryParams.equipmentId = ''
this.$set(this.queryParam, 'tierName', val.title)
this.searchQuery()
}
--
Gitblit v1.9.3