From 738f76adfcbf102dfbf890b044ba9a25a034cb8c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 27 三月 2024 16:17:38 +0800
Subject: [PATCH] 1、用户管理页面修改身份字段名称为首页权限并调整其选项值 2、按照新需求完成客户操作工进入后页面所有布局100% 3、调整全局页脚内容
---
src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue | 165 ++++++++++++++++++++++++++++++------------------------
1 files changed, 91 insertions(+), 74 deletions(-)
diff --git a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
index fcfc498..6185aa3 100644
--- a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
+++ b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
@@ -11,14 +11,14 @@
</a-col>
<a-col :md="4" :sm="4" :xs="4">
<a-form-item label="鏃ユ湡">
- <a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" format='YYYY-MM-DD' @change="dataChange"/>
+ <a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" format='YYYY-MM-DD' @change="dataChange" :allowClear="false"/>
</a-form-item>
</a-col>
- <a-col :md="3" :sm="3" :xs="3">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- </a-col>
<a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
</a-col>
</a-row>
</a-form>
@@ -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>
@@ -88,14 +88,9 @@
import moment from 'moment'
import { putAction, getAction } from '@/api/manage'
import $ from 'jquery'
- import AFormItem from 'ant-design-vue/es/form/FormItem'
import * as echarts from 'echarts'
export default {
name: 'StatisticalAnalysisMain',
- components:{
- AFormItem
-
- },
props: { equip: {} },
data(){
return{
@@ -115,7 +110,7 @@
dates: [],
queryParam: {},
queryParams:{
- collectTime:undefined,
+ collectTime:null,
},
shiftSubList: [],
shiftList: [],
@@ -127,16 +122,11 @@
}
},
created(){
-
-
- let collectTime = moment(moment().add(-1,'d'),'YYYY-MM-DD');
-
-
- this.queryParams.collectTime = collectTime;
-
- this.queryParams.dateTime = this.queryParams.collectTime.format('YYYYMMDD')
+ // let collectTime = moment(moment().add(-1,'d'),'YYYY-MM-DD');
+ this.queryParams.collectTime = moment().add(-1,'d').format('YYYY-MM-DD')
+ this.queryParams.dateTime = moment().add(-1,'d').format('YYYYMMDD')
this.initEquipmentNode()
- this.queryStatistical();
+ // this.queryStatistical();
// this.getTime(37800);
},
@@ -169,13 +159,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 +256,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 +264,21 @@
textStyle:{
color:'#000',
},
- formatter:"鏃堕暱锛歿c}H"
+ // formatter:"鏃堕暱锛歿c}H",
+ formatter:params=>{
+ const value=String(params.value)
+ return value.length==2&&value[0]==='0'?`鏃堕暱锛�${value.slice(1)}H`:`鏃堕暱锛�${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];
@@ -304,18 +300,27 @@
//寮�鏈烘椂闂碶鍏虫満鏃堕棿
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}%)"
+ // formatter: "{a} <br/>{b} : {c} ({d}%)"锛�
+ formatter:params=>{
+ const value=String(params.value)
+ return value.length==2&&value[0]==='0'?`${params.seriesName}<br/>${params.name}锛�${value.slice(1)}H锛�${params.percent}%锛塦:`${params.seriesName}<br/>${params.name}锛�${value}H锛�${params.percent}%锛塦
+ }
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿']
},
calculable: true,
@@ -327,13 +332,18 @@
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)
+ formatter:params=>{
+ const value=String(params.value)
+ return value.length==2&&value[0]==='0'?params.name+' '+value.slice(1)+'H':params.name+' '+value+'H'
+ }
}
}
},
@@ -346,18 +356,22 @@
//杩愯鏃堕棿\寰呮満鏃堕棿
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}%)"
+ // formatter: "{a} <br/>{b} : {c} ({d}%)",
+ formatter:params=>{
+ const value=String(params.value)
+ return value.length==2&&value[0]==='0'?`${params.seriesName}<br/>${params.name}锛�${value.slice(1)}H锛�${params.percent}%锛塦:`${params.seriesName}<br/>${params.name}锛�${value}H锛�${params.percent}%锛塦
+ }
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['杩愯鏃堕棿', '寰呮満鏃堕棿']
},
calculable: true,
@@ -365,17 +379,20 @@
name: '杩愯鏁堢巼',
type: 'pie',
radius: '70%',
- center: ['55%', '55%'],
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=>{
+ const value=String(params.value)
+ return value.length==2&&value[0]==='0'?params.name+' '+value.slice(1)+'H':params.name+' '+value+'H'
+ }
}
}
},
@@ -387,7 +404,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,17 +424,20 @@
},
dataChange(val) {
this.queryParam.collectTime1 = "";
- this.queryParams.dateTime = val.format('YYYYMMDD')
- this.queryParams.collectTime = val.format('YYYY-MM-DD');
-
+ if(val){
+ this.queryParams.dateTime = val.format('YYYYMMDD')
+ this.queryParams.collectTime = val.format('YYYY-MM-DD');
+ }
},
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)
+ }
// 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)
@@ -445,9 +465,13 @@
},
searchReset() {
this.queryParam = {}
- this.queryParams = {}
+ this.queryParams = {
+ collectTime:moment().add(-1,'d').format('YYYY-MM-DD'),
+ dateTime:moment().add(-1,'d').format('YYYYMMDD')
+ }
+ this.initEquipmentNode()
// this.dates = []
- this.queryStatistical()
+ // this.queryStatistical()
// this.onClearSelected()
},
searchQuery(){
@@ -456,26 +480,19 @@
},
watch: {
equip(val) {
- // console.log(val);
if (val && val.equipmentId) {
this.$set(this.queryParam, 'tierName', val.title)
this.$set(this.queryParam, 'equipmentId', val.equipmentId)
this.queryParams.parentId = ''
- this.queryParams.equipmentIds = val.equipmentId
- this.searchQuery()
+ this.queryParams.equipmentId = val.equipmentId
}else{
this.queryParams.parentId = val.key
- this.queryParams.equipmentIds = ''
+ this.queryParams.equipmentId = ''
this.$set(this.queryParam, 'tierName', val.title)
- this.searchQuery()
}
this.searchQuery()
}
- // this.searchQuery();
-
-
}
-
}
</script>
--
Gitblit v1.9.3