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 | 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 85a2cc5..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>
@@ -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,11 +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);
},
@@ -270,7 +265,10 @@
color:'#000',
},
// formatter:"鏃堕暱锛歿c}H",
- formatter:params=>String(params.value).length==2?`鏃堕暱锛�${String(params.value).slice(1)}H`:`鏃堕暱锛�${String(params.value)}H`
+ formatter:params=>{
+ const value=String(params.value)
+ return value.length==2&&value[0]==='0'?`鏃堕暱锛�${value.slice(1)}H`:`鏃堕暱锛�${value}H`
+ }
},
itemStyle: {
normal: {
@@ -314,7 +312,10 @@
tooltip: {
trigger: 'item',
// 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}%锛塦
+ 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',
@@ -338,7 +339,11 @@
show: true,
position: 'top',
// 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=>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'
+ }
}
}
},
@@ -358,7 +363,10 @@
tooltip: {
trigger: 'item',
// 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}%锛塦
+ 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',
@@ -371,7 +379,6 @@
name: '杩愯鏁堢巼',
type: 'pie',
radius: '70%',
- center: ['55%', '55%'],
itemStyle: {
normal: {
color: function (params) {
@@ -382,7 +389,10 @@
show: true,
position: 'top',
// 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'
+ }
}
}
},
@@ -409,16 +419,15 @@
this.closedLong = this.getTime(res.result.closeLong);
this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
this.draw();
- }else{
- this.draw()
}
})
},
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
@@ -427,7 +436,7 @@
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.queryStatistical()
} else {
@@ -456,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(){
@@ -467,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.equipmentId = val.equipmentId
- this.searchQuery()
}else{
this.queryParams.parentId = val.key
this.queryParams.equipmentId = ''
this.$set(this.queryParam, 'tierName', val.title)
- this.searchQuery()
}
this.searchQuery()
}
- // this.searchQuery();
-
-
}
-
}
</script>
--
Gitblit v1.9.3