From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue | 98 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
index d5c8ead..bdfde0f 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>
@@ -63,19 +63,19 @@
<!--鍒╃敤鐜囧拰寮�鍔ㄧ巼-->
<div class="UtilizationStartup">
<div class="Utilization Line-box">
- <!--<div class="title">-->
+ <div class="title">
<!--<div class="circle"></div>-->
- <!--<div class="text">寮�鏈虹巼</div>-->
- <!--</div>-->
+ <!--<div class="text"></div>-->
+ </div>
<div class="Utilization-box box-bottom">
<div class="Utilization-right" ref="UtilizationLine" id="UtilizationLine"></div>
</div>
</div>
<div class="Startup Line-box">
- <!--<div class="title">-->
+ <div class="title">
<!--<div class="circle"></div>-->
- <!--<div class="text">寮�鍔ㄧ巼</div>-->
- <!--</div>-->
+ <!--<div class="text"></div>-->
+ </div>
<div class="Startup-box box-bottom">
<div class="Startup-right" ref="StartupLine" id="StartupLine"></div>
</div>
@@ -127,15 +127,10 @@
}
},
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('-1')
+ this.initEquipmentNode()
this.queryStatistical();
// this.getTime(37800);
},
@@ -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,
@@ -280,9 +276,10 @@
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];
@@ -304,18 +301,23 @@
//寮�鏈烘椂闂碶鍏虫満鏃堕棿
let UtilizationLine = this.$echarts.init(document.getElementById('UtilizationLine'), 'macarons');
let statChartPieOption1 = {
- title: {
- x: 'left',
- subtext: '寮�鏈烘晥鐜�'
- },
+ // title: {
+ // x: 'left',
+ // subtext: '寮�鏈烘晥鐜�',
+ // textStyle: {
+ // color: '#268e80',
+ // fontSize: 20,
+ //
+ // },
+ // },
tooltip: {
trigger: 'item',
formatter: "{a} <br/>{b} : {c} ({d}%)"
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿']
},
calculable: true,
@@ -327,7 +329,7 @@
itemStyle: {
normal: {
color: function (params) {
- let colorList = ['#4169E1', '#A8A8A8'];
+ let colorList = [ '#6496e9','#849db8'];
return colorList[params.dataIndex]
},
label: {
@@ -346,18 +348,18 @@
//杩愯鏃堕棿\寰呮満鏃堕棿
let StartupLine = this.$echarts.init(document.getElementById('StartupLine'), 'macarons');
let statChartPieOption2 = {
- title: {
- x: 'left',
- subtext: '杩愯鏁堢巼'
- },
+ // title: {
+ // x: 'left',
+ // subtext: '杩愯鏁堢巼'
+ // },
tooltip: {
trigger: 'item',
formatter: "{a} <br/>{b} : {c} ({d}%)"
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['杩愯鏃堕棿', '寰呮満鏃堕棿']
},
calculable: true,
@@ -369,7 +371,7 @@
itemStyle: {
normal: {
color: function (params) {
- var colorList = ['#00ee00', '#FCCE10'];
+ var colorList = ['#4ecee1', '#FCCE10'];
return colorList[params.dataIndex]
},
label: {
@@ -387,7 +389,7 @@
},
queryStatistical(){
getAction(this.url.dayStatisticalRate,this.queryParams).then(res =>{
- if(res.success){
+ if(res.success) {
// console.log(res);
this.StatCharOpeningRate = res.result.openRate;
//鍒╃敤鐜�
@@ -402,6 +404,8 @@
this.closedLong = this.getTime(res.result.closeLong);
this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
this.draw();
+ }else{
+ this.draw()
}
})
},
@@ -411,14 +415,22 @@
this.queryParams.collectTime = val.format('YYYY-MM-DD');
},
- initEquipmentNode(id) {
+ initEquipmentNode() {
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.queryStatistical()
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -455,11 +467,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