From a144a18ab582fd3a8c945cba60bc364dbe7f31e8 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 28 三月 2024 16:59:55 +0800
Subject: [PATCH] 1、新增点击设备运行状态图标跳转至设备监控页面并根据状态及当前层级筛选页面对应数据 2、新增点击设备利用率的横向柱状图跳转至统计分析页面并根据所点击层级筛选页面对应数据 3、解决router.push以及router.replace跳转后报错
---
src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue | 904 +++++++++++++++++++++++++++++--------------------------
1 files changed, 478 insertions(+), 426 deletions(-)
diff --git a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
index 4444581..90fddfd 100644
--- a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
+++ b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
@@ -1,5 +1,6 @@
<template>
- <div id="StatisticsLegend" style="width: 100%; height: 100%; overflow: hidden;display: flex;flex-direction: column;background-color: #f5f4f4">
+ <div id="StatisticsLegend"
+ style="width: 100%; height: 100%; overflow: hidden;display: flex;flex-direction: column;background-color: #f5f4f4">
<!-- 鏌ヨ鍖哄煙 -->
<div style="width: 100%; height: 44px; background-color: #fff" class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -11,24 +12,25 @@
</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>
</div>
<!--寮�鏈虹巼-->
<div class="PowerOnRate Line-box">
- <div class="title">
- <div class="circle"></div>
- <div class="text">鍒╃敤鐜�</div>
- </div>
+ <div class="title">
+ <div class="circle"></div>
+ <div class="text">鍒╃敤鐜�</div>
+ </div>
<div class="PowerOnRate-box box-bottom">
<div class="PowerOnRate-left" ref="PowerOnRatePie" id="PowerOnRatePie"></div>
<div class="PowerOnRate-right" ref="PowerOnRateLine" id="PowerOnRateLine"></div>
@@ -91,304 +93,298 @@
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: 'StatisticsLegend',
- components:{
- AFormItem
-
- },
props: { equip: {} },
- data(){
- return{
- readOnly:true,
- showday:true,
- StatCharOpeningRate:0,
- StatCharUsedRate:0,
- StatCharUsedopeningRate:0,
- openingLong:0,
- waitingLong:0,
- processLong:0,
- closedLong:0,
- totalLong:0,
- UtilizationHeight:0,
- StartupHeight:0,
- quip:{},
+ data() {
+ return {
+ readOnly: true,
+ showday: true,
+ StatCharOpeningRate: 0,
+ StatCharUsedRate: 0,
+ StatCharUsedopeningRate: 0,
+ openingLong: 0,
+ waitingLong: 0,
+ processLong: 0,
+ closedLong: 0,
+ totalLong: 0,
+ UtilizationHeight: 0,
+ StartupHeight: 0,
+ quip: {},
dates: [],
queryParam: {},
- queryParams:{
- collectTime:undefined,
+ queryParams: {
+ collectTime: undefined
},
shiftSubList: [],
shiftList: [],
url: {
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
- dayStatisticalRate:'/mdc/efficiencyReport/dayStatisticalRate',
- getBaseTree: '/mdc/mdcEquipment/queryTreeListByProduction',
- },
+ dayStatisticalRate: '/mdc/efficiencyReport/dayStatisticalRate',
+ getBaseTree: '/mdc/mdcEquipment/queryTreeListByProduction'
+ }
}
},
- 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.queryStatistical();
- // this.getTime(37800);
+ created() {
+ 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()
},
- methods:{
- disabledDate(current){
+ methods: {
+ disabledDate(current) {
//Can not slect days before today and today
- return current && current > moment().subtract('days', 1);
+ return current && current > moment().subtract('days', 1)
},
//鎶婄璁＄畻鎴愬搴旂殑鏃跺垎绉掔殑鍑芥暟
- getTime(time){
+ getTime(time) {
//杞崲涓烘椂鍒嗙
let h = Math.round(time / 60 / 60)
- h = h <10 ? '0' + h : h
+ h = h < 10 ? '0' + h : h
//浣滀负杩斿洖鍊艰繑鍥�
// console.log(h);
- return h;
+ return h
},
moment,
- draw(){
+ draw() {
//鍒╃敤鐜�
//楗煎浘
- let PowerOnRatePie = this.$echarts.init(document.getElementById('PowerOnRatePie'), 'macarons');
+ let PowerOnRatePie = this.$echarts.init(document.getElementById('PowerOnRatePie'), 'macarons')
let PowerOnRatePie_option = {
- // color: ["#3859fa", '#ccc'],
- title: {
- text: this.StatCharUsedRate+'%',
- subtext:'鍒╃敤鐜�',
- textStyle: {
- color: '#268e80',
- fontSize: 18,
+ // color: ["#3859fa", '#ccc'],
+ title: {
+ text: this.StatCharUsedRate + '%',
+ subtext: '鍒╃敤鐜�',
+ textStyle: {
+ color: '#268e80',
+ fontSize: 18
- },
- subtextStyle:{
- color:'#292929'
- },
- x: 'center',
- y: 'center',
},
- series: [{
- name: '',
- type: 'pie',
- radius: ['55%', '70%'],
- itemStyle:{
- normal:{
- borderWidth:4,//鎵囧尯闂村姞闂撮殧
- borderColor:'#fff'//闂撮殧涓虹櫧鑹�
- }
- },
- label: {
- normal: {
- show: false,
- },
- },
- data: [{
- value: 100,
- itemStyle:{
- color:new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:'#88a8fd'
- },
- {
- offset:1,
- color:'#544cee'
- }],false)
- }
- },
- {
- value: 100-this.StatCharUsedRate,
- itemStyle:{
- color:'#f0f3f5'
- }
- },
- ]
+ subtextStyle: {
+ color: '#292929'
},
+ x: 'center',
+ y: 'center'
+ },
+ series: [{
+ name: '',
+ type: 'pie',
+ radius: ['55%', '70%'],
+ itemStyle: {
+ normal: {
+ borderWidth: 4,//鎵囧尯闂村姞闂撮殧
+ borderColor: '#fff'//闂撮殧涓虹櫧鑹�
+ }
+ },
+ label: {
+ normal: {
+ show: false
+ }
+ },
+ data: [{
+ value: 100,
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: '#88a8fd'
+ },
+ {
+ offset: 1,
+ color: '#544cee'
+ }], false)
+ }
+ },
+ {
+ value: 100 - this.StatCharUsedRate,
+ itemStyle: {
+ color: '#f0f3f5'
+ }
+ }
]
}
- PowerOnRatePie.setOption(PowerOnRatePie_option);
- let PowerOnRateLine = this.$echarts.init(document.getElementById('PowerOnRateLine'), 'macarons');
+ ]
+ }
+ PowerOnRatePie.setOption(PowerOnRatePie_option)
+ let PowerOnRateLine = this.$echarts.init(document.getElementById('PowerOnRateLine'), 'macarons')
let PowerOnRateLine_option = {
- tooltip:{
- trigger: 'axis',
- },
- grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
- top: 60,
- containLabel: true
- },
- legend:{
- //璁剧疆榛樿涓嶆樉绀�
- selected:{
- "鏇茬嚎":false,
- },
- top:'0',
- right:'10',
+ tooltip: {
+ trigger: 'axis'
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ top: 60,
+ containLabel: true
+ },
+ legend: {
+ // selected:{
+ // "鏇茬嚎":false,
+ // },
+ top: '0',
+ right: '10',
//璁剧疆鍗曢�夊閫夋ā寮�
- selectedMode:'single',
- icon:"pin",
- data:[
+ // selectedMode:'single',
+ icon: 'pin',
+ data: [
+ // {
+ // name:'鏇茬嚎',
+ // textStyle:{
+ // padding:4,
+ // color:'#e957ff',
+ // // borderWidth:1,
+ // fontSize:16,
+ // // borderColor:'#50E6D7'
+ // }
+ // },
{
- name:'鏇茬嚎',
- textStyle:{
- padding:4,
- color:'#e957ff',
- // borderWidth:1,
- fontSize:16,
- // borderColor:'#50E6D7'
- }
- },
- {
- name:'鏌辩姸鍥�',
- textStyle:{
- padding:4,
- fontSize:16,
- color:'#9996f8',
+ name: '鏌辩姸鍥�',
+ textStyle: {
+ padding: 4,
+ fontSize: 16,
+ color: '#9996f8'
// borderWidth:1,
// borderColor:'#50E6D7'
}
}
]
},
- xAxis :{
- type : 'category',
- data:['寮�鏈烘椂闀�','鍏虫満鏃堕暱','杩愯鏃堕暱','寰呮満鏃堕暱'],
- axisLabel:{ //鍧愭爣杞村瓧浣撻鑹�
- textStyle:{
- color: '#000'
- }
- },
- axisLine:{
- lineStyle:{
- color:"#e5e5e5"
- }
- },
- axisTick:{ //y杞村埢搴︾嚎
- show:false
- },
- splitLine:{ //缃戞牸
- show: false,
- },
- boundaryGap: true,
- },
- yAxis :{
- name: '鏃堕棿/灏忔椂',
- type : 'value',
- axisLabel:{ //鍧愭爣杞村瓧浣撻鑹�
- textStyle:{
- color: '#000'
- }
- },
- axisLine:{
- show:false,
- },
- axisTick:{ //y杞村埢搴︾嚎
- show:false
- },
- splitLine:{ //缃戞牸
- show: true,
- lineStyle:{
- color:'#dadde4',
- type:"dashed"
- }
+ xAxis: {
+ type: 'category',
+ data: ['寮�鏈烘椂闀�', '鍏虫満鏃堕暱', '杩愯鏃堕暱', '寰呮満鏃堕暱'],
+ axisLabel: { //鍧愭爣杞村瓧浣撻鑹�
+ textStyle: {
+ color: '#000'
}
},
- series:[
- {
- name:'鏇茬嚎',
- type: 'line',
- smooth:true,
- symbol: 'circle',
- symbolSize: 8,
- label:{
- show:true,
- position:"top",
- textStyle:{
- color:'#000',
- },
- formatter:"鏃堕暱锛歿c}H"
- },
- itemStyle: {
- color: "rgb(87, 120, 225)",
- borderColor: "#fff",
- borderWidth: 2,
- shadowColor: 'rgba(0, 0, 0, .3)',
- },
+ axisLine: {
lineStyle: {
- normal: {
- color:"rgb(87, 120, 225)",
- shadowColor: 'rgba(87, 120, 225, .4)',
- shadowBlur: 8,
- shadowOffsetY: 10,
- shadowOffsetX: 0,
+ color: '#e5e5e5'
+ }
+ },
+ axisTick: { //y杞村埢搴︾嚎
+ show: false
+ },
+ splitLine: { //缃戞牸
+ show: false
+ },
+ boundaryGap: true
+ },
+ yAxis: {
+ name: '鏃堕棿/灏忔椂',
+ type: 'value',
+ axisLabel: { //鍧愭爣杞村瓧浣撻鑹�
+ textStyle: {
+ color: '#000'
+ }
+ },
+ axisLine: {
+ show: false
+ },
+ axisTick: { //y杞村埢搴︾嚎
+ show: false
+ },
+ splitLine: { //缃戞牸
+ show: true,
+ lineStyle: {
+ color: '#dadde4',
+ type: 'dashed'
+ }
+ }
+ },
+ series: [
+ // {
+ // name:'鏇茬嚎',
+ // type: 'line',
+ // smooth:true,
+ // symbol: 'circle',
+ // symbolSize: 8,
+ // label:{
+ // show:true,
+ // position:"top",
+ // textStyle:{
+ // color:'#000',
+ // },
+ // formatter:"鏃堕暱锛歿c}H"
+ // },
+ // itemStyle: {
+ // color: "rgb(87, 120, 225)",
+ // borderColor: "#fff",
+ // borderWidth: 2,
+ // shadowColor: 'rgba(0, 0, 0, .3)',
+ // },
+ // lineStyle: {
+ // normal: {
+ // color:"rgb(87, 120, 225)",
+ // shadowColor: 'rgba(87, 120, 225, .4)',
+ // shadowBlur: 8,
+ // shadowOffsetY: 10,
+ // shadowOffsetX: 0,
+ // },
+ // },
+ // areaStyle: {
+ // normal: {
+ // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ // offset: 0,
+ // color: 'rgba(87, 120, 225, .6)'
+ // }, {
+ // offset: 1,
+ // color: 'rgba(87, 120, 225, .3)'
+ // }]),
+ // }
+ // },
+ // data: [this.openingLong, this.closedLong, this.processLong,this.waitingLong],
+ // },
+ {
+ name: '鏌辩姸鍥�',
+ type: 'bar',
+ data: [this.openingLong, this.closedLong, this.processLong, this.waitingLong],
+ // data:[22,3,5,6],
+ barWidth: 25,
+ label: {
+ show: true,
+ position: 'top',
+ textStyle: {
+ color: '#000'
},
- },
- areaStyle: {
- normal: {
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
- offset: 0,
- color: 'rgba(87, 120, 225, .6)'
- }, {
- offset: 1,
- color: 'rgba(87, 120, 225, .3)'
- }]),
+ // formatter:"鏃堕暱锛歿c}H",
+ formatter: params => {
+ const value = String(params.value)
+ return value.length == 2 && value[0] === '0' ? `鏃堕暱锛�${value.slice(1)}H` : `鏃堕暱锛�${value}H`
}
},
- data: [this.openingLong, this.closedLong, this.processLong,this.waitingLong],
- },
- {
- name:'鏌辩姸鍥�',
- type: 'bar',
- data: [this.openingLong, this.closedLong, this.processLong,this.waitingLong],
- barWidth: 25,
- label:{
- show:true,
- position:"top",
- textStyle:{
- color:'#000',
- },
- formatter:"鏃堕暱锛歿c}H"
- },
- itemStyle: {
- normal: {
- color: function(params) {
- let colorList = [
- ["#6496e9","#6bded3"],
- ["#ffbb65","#fdc68b"],
- ["#4fe1c5","#4ecee1"],
- ["#9978fa","#88a1fa"],
- ];
- // return colorList[params.dataIndex];
- let colorItem = colorList[params.dataIndex];
- return new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:colorItem[0]
- },
- {
- offset:1,
- color:colorItem[1]
- }],false)
+ itemStyle: {
+ normal: {
+ color: function(params) {
+ let colorList = [
+ ['#6496e9', '#6bded3'],
+ ['#849db8', '#b4b8cc'],
+ ['#4fe1c5', '#4ecee1'],
+ // ["#9978fa","#88a1fa"],
+ ['#ffbb65', '#fdc68b']
+ ]
+ // return colorList[params.dataIndex];
+ let colorItem = colorList[params.dataIndex]
+ return new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: colorItem[0]
},
- barBorderRadius: [5, 5, 0, 0],
- }
- },
- }]
- }
- PowerOnRateLine.setOption(PowerOnRateLine_option);
+ {
+ offset: 1,
+ color: colorItem[1]
+ }], false)
+ },
+ barBorderRadius: [5, 5, 0, 0]
+ }
+ }
+ }]
+ }
+ PowerOnRateLine.setOption(PowerOnRateLine_option)
//寮�鏈虹巼
- let UtilizationLine = this.$echarts.init(document.getElementById('UtilizationLine'), 'macarons');
+ let UtilizationLine = this.$echarts.init(document.getElementById('UtilizationLine'), 'macarons')
let UtilizationLine_option = {
tooltip: {
trigger: 'axis',
@@ -411,14 +407,14 @@
}
},
axisTick: {
- show: false,
+ show: false
},
axisLabel: {
// color: 'rgba(111, 132, 189, 1)',
textStyle: {
fontSize: 14
- },
- },
+ }
+ }
}],
yAxis: [{
type: 'value',
@@ -427,15 +423,15 @@
// color: 'rgba(111, 132, 189, 1)'
},
axisLabel: {
- formatter: '{value}',
+ formatter: '{value}'
// color: 'rgba(111, 132, 189, 1)',
},
axisTick: {
- show: false,
+ show: false
},
axisLine: {
- show: false,
+ show: false
},
splitLine: {
lineStyle: {
@@ -445,35 +441,48 @@
}],
series: [
{
- type: 'bar',
- data: [this.openingLong,this.totalLong],
- barWidth: 25,
- itemStyle: {
- normal: {
- color: function(params) {
- let colorList = [
- ["#6496e9","#6bded3"],
- ["#ffbb65","#fdc68b"],
- ];
- // return colorList[params.dataIndex];
- let colorItem = colorList[params.dataIndex];
- return new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:colorItem[0]
- },
- {
- offset:1,
- color:colorItem[1]
- }],false)
+ type: 'bar',
+ data: [this.openingLong, this.totalLong],
+ // data:[22,22],
+ barWidth: 25,
+ label: {
+ show: true,
+ position: 'top',
+ textStyle: {
+ color: '#000'
},
- barBorderRadius: [5, 5, 0, 0],
+ // 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'],
+ ['#9978fa', '#88a1fa']
+ ]
+ // return colorList[params.dataIndex];
+ let colorItem = colorList[params.dataIndex]
+ return new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: colorItem[0]
+ },
+ {
+ offset: 1,
+ color: colorItem[1]
+ }], false)
+ },
+ barBorderRadius: [5, 5, 0, 0]
+ }
}
- },
- }]
- };
- UtilizationLine.setOption(UtilizationLine_option);
+ }]
+ }
+ UtilizationLine.setOption(UtilizationLine_option)
//寮�鍔ㄧ巼
- let StartupLine = this.$echarts.init(document.getElementById('StartupLine'), 'macarons');
+ let StartupLine = this.$echarts.init(document.getElementById('StartupLine'), 'macarons')
let StartupLine_option = {
tooltip: {
trigger: 'axis',
@@ -496,14 +505,14 @@
}
},
axisTick: {
- show: false,
+ show: false
},
axisLabel: {
// color: 'rgba(111, 132, 189, 1)',
textStyle: {
fontSize: 14
- },
- },
+ }
+ }
}],
yAxis: [{
type: 'value',
@@ -512,15 +521,15 @@
// color: 'rgba(111, 132, 189, 1)'
},
axisLabel: {
- formatter: '{value}',
+ formatter: '{value}'
// color: 'rgba(111, 132, 189, 1)',
},
axisTick: {
- show: false,
+ show: false
},
axisLine: {
- show: false,
+ show: false
},
splitLine: {
lineStyle: {
@@ -530,224 +539,261 @@
}],
series: [{
type: 'bar',
- data: [this.processLong,this.openingLong],
+ data: [this.processLong, this.openingLong],
+ // data:[22,22],
barWidth: 25,
+ label: {
+ show: true,
+ position: 'top',
+ textStyle: {
+ color: '#000'
+ },
+ // 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 = [
- ["#4fe1c5","#4ecee1"],
- ["#9978fa","#88a1fa"],
- ];
+ ['#4fe1c5', '#4ecee1'],
+ ['#6496e9', '#6bded3']
+ ]
// return colorList[params.dataIndex];
- let colorItem = colorList[params.dataIndex];
- return new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:colorItem[0]
+ let colorItem = colorList[params.dataIndex]
+ return new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: colorItem[0]
},
{
- offset:1,
- color:colorItem[1]
- }],false)
+ offset: 1,
+ color: colorItem[1]
+ }], false)
},
- barBorderRadius: [5, 5, 0, 0],
+ barBorderRadius: [5, 5, 0, 0]
}
- },
- }]
- };
- StartupLine.setOption(StartupLine_option);
- },
- queryStatistical(){
- getAction(this.url.dayStatisticalRate,this.queryParams).then(res =>{
- if(res.success){
- // console.log(res);
- this.StatCharOpeningRate = res.result.openRate;
- this.StatCharUsedRate = res.result.utilizationRate;
- this.UtilizationHeight = res.result.openRate;
- this.StatCharUsedopeningRate = res.result.StartupHeight;
- this.StartupHeight = res.result.StartupHeight;
- this.openingLong = this.getTime(res.result.openLong)
- this.waitingLong = this.getTime(res.result.waitLong);
- this.processLong = this.getTime(res.result.processLong);
- this.closedLong = this.getTime(res.result.closeLong);
- this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
- this.draw();
}
- })
+ }]
+ }
+ StartupLine.setOption(StartupLine_option)
+ },
+ queryStatistical() {
+ getAction(this.url.dayStatisticalRate, this.queryParams).then(res => {
+ if (res.success) {
+ this.StatCharOpeningRate = res.result.openRate
+ this.StatCharUsedRate = res.result.utilizationRate
+ this.UtilizationHeight = res.result.openRate
+ this.StatCharUsedopeningRate = res.result.usedOpenRate
+ this.StartupHeight = res.result.usedOpenRate
+ this.openingLong = this.getTime(res.result.openLong)
+ this.waitingLong = this.getTime(res.result.waitLong)
+ this.processLong = this.getTime(res.result.processLong)
+ this.closedLong = this.getTime(res.result.closeLong)
+ this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong)
+ 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(id) {
+ initEquipmentNode() {
let _this = this
getAction(this.url.getBaseTree).then((res) => {
if (res.success) {
- // console.log(res.result[0].entity.tierName)
- _this.$set(this.queryParam, 'tierName', res.result[0].title)
+ const { isEquipment, productionId, tierName } = this.$route.params
+ // 鍒ゆ柇鏄惁鏄粠鐪嬫澘璺宠浆杩囨潵锛宲roductionId 瀛樺湪鍒欎负浠庣湅鏉胯烦杞�
+ if (productionId) {
+ _this.$set(this.queryParam, 'tierName', tierName)
+ // 鍒ゆ柇鏄惁鐐瑰嚮鐨勬槸璁惧灞傜骇
+ if (!isEquipment) _this.$set(this.queryParams, 'parentId', productionId)
+ else _this.$set(this.queryParams, 'equipmentId', productionId)
+ } else {
+ if (res.result[0]) {
+ _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)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
this.loading = false
this.cardLoading = false
})
- // getAction(this.url.getEquipmentByPid, { pid: id }).then((res) => {
- // if (res.success) {
- // if (res.result) {
- // _this.$set(this.queryParam, 'tierName', res.result.tierName)
- // _this.$set(this.queryParam, 'equipmentId', res.result.equipmentId)
- // // _this.quip = res.result
- // _this.searchQuery()
- // } else {
- // _this.$message.warning('璇烽厤缃澶囷紒')
- // }
- // }
- // })
},
searchReset() {
this.queryParam = {}
- this.queryParams = {}
- // this.dates = []
- this.queryStatistical()
- // this.onClearSelected()
+ this.queryParams = {
+ collectTime: moment().add(-1, 'd').format('YYYY-MM-DD'),
+ dateTime: moment().add(-1, 'd').format('YYYYMMDD')
+ }
+ this.initEquipmentNode()
},
- searchQuery(){
- this.queryStatistical();
+ searchQuery() {
+ this.queryStatistical()
}
},
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()
- }else{
- this.queryParams.parentId = val.key
- this.queryParams.equipmentIds = ''
- this.$set(this.queryParam, 'tierName', val.title)
- this.searchQuery()
- }
- this.searchQuery()
- }
- // this.searchQuery();
-
-
+ // 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
+ } else {
+ this.queryParams.parentId = val.key
+ this.queryParams.equipmentId = ''
+ this.$set(this.queryParam, 'tierName', val.title)
+ }
+ this.searchQuery()
}
+ // this.searchQuery();
+ }
}
</script>
<style scoped>
- .charContent{
+ .charContent {
display: flex;
}
- @media screen and (min-width: 1920px){
- #StatisticsLegend{
- height: 748px!important;
+
+ @media screen and (min-width: 1920px) {
+ #StatisticsLegend {
+ height: 748px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1680px) and (max-width: 1920px){
- #StatisticsLegend{
- height: 748px!important;
+
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ #StatisticsLegend {
+ height: 748px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1400px) and (max-width: 1680px){
- #StatisticsLegend{
- height: 600px!important;
+
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ #StatisticsLegend {
+ height: 600px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1280px) and (max-width: 1400px){
- #StatisticsLegend{
- height: 501px!important;
+
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ #StatisticsLegend {
+ height: 501px !important;
overflow: scroll;
}
}
- @media screen and (max-width: 1280px){
- #StatisticsLegend{
- height: 501px!important;
+
+ @media screen and (max-width: 1280px) {
+ #StatisticsLegend {
+ height: 501px !important;
overflow: scroll;
}
}
- #StatisticsLegend .PowerOnRate{
+
+ #StatisticsLegend .PowerOnRate {
flex: 1;
margin-bottom: 15px;
background-color: #fff;
}
- #StatisticsLegend .UtilizationStartup{
+
+ #StatisticsLegend .UtilizationStartup {
flex: 1;
display: flex;
}
- #StatisticsLegend .UtilizationStartup>div{
+
+ #StatisticsLegend .UtilizationStartup > div {
flex: 1;
background-color: #fff;
}
- #StatisticsLegend .UtilizationStartup .Utilization{
+
+ #StatisticsLegend .UtilizationStartup .Utilization {
margin-right: 15px;
}
- .title{
+
+ .title {
display: flex;
align-items: center;
padding-left: 15px;
padding-top: 5px;
}
- .title .circle{
+
+ .title .circle {
width: 15px;
height: 15px;
background-color: #7282ec;
border-radius: 100%;
margin-right: 10px;
}
- .title .text{
+
+ .title .text {
font-size: 2vh;
}
- .Line-box{
+
+ .Line-box {
display: flex;
flex-direction: column;
}
- .Line-box .box-bottom{
+
+ .Line-box .box-bottom {
flex: 1;
}
- .PowerOnRate-box{
+
+ .PowerOnRate-box {
display: flex;
}
- .PowerOnRate-box .PowerOnRate-left{
+
+ .PowerOnRate-box .PowerOnRate-left {
width: 25%;
}
- .PowerOnRate-box .PowerOnRate-right{
+
+ .PowerOnRate-box .PowerOnRate-right {
flex: 1;
}
- .Utilization-box{
+
+ .Utilization-box {
display: flex;
}
- .Utilization-box .Utilization-left{
+
+ .Utilization-box .Utilization-left {
width: 25%;
}
- .Utilization-box .Utilization-right{
+
+ .Utilization-box .Utilization-right {
flex: 1;
}
- .Startup-box{
+
+ .Startup-box {
display: flex;
}
- .Startup-box .Startup-left{
+
+ .Startup-box .Startup-left {
width: 25%;
}
- .Startup-box .Startup-right{
+
+ .Startup-box .Startup-right {
flex: 1;
}
- .left{
+
+ .left {
display: flex;
align-items: center;
}
- .left .left-box{
+
+ .left .left-box {
width: 65%;
height: 60%;
margin: 0 auto;
@@ -758,7 +804,8 @@
/*!*background-color: yellow;*!*/
/*border-image: linear-gradient(to top, #2bf3c7, #06a8f8) 1;*/
}
- .left-box-con{
+
+ .left-box-con {
width: 100%;
height: 100%;
position: relative;
@@ -767,16 +814,18 @@
/*background-color: yellow;*/
border-image: linear-gradient(to top, #2bf3c7, #06a8f8) 1;
}
- .left .left-box .Rate-box-kong{
+
+ .left .left-box .Rate-box-kong {
width: 100%;
background: -moz-linear-gradient(bottom, #b5dec2 0%, #f4f5ba 100%);
- background: -webkit-gradient(linear, bottom bottom, top top, color-stop(0%,#b5dec2), color-stop(100%,#f4f5ba));
- background: -webkit-linear-gradient(bottom, #b5dec2 0%,#f4f5ba 100%);
- background: -o-linear-gradient(bottom, #b5dec2 0%,#f4f5ba 100%);
- background: -ms-linear-gradient(bottom, #b5dec2 0%,#f4f5ba 100%);
- background: linear-gradient(to top, #b5dec2 0%,#f4f5ba 100%);
+ background: -webkit-gradient(linear, bottom bottom, top top, color-stop(0%, #b5dec2), color-stop(100%, #f4f5ba));
+ background: -webkit-linear-gradient(bottom, #b5dec2 0%, #f4f5ba 100%);
+ background: -o-linear-gradient(bottom, #b5dec2 0%, #f4f5ba 100%);
+ background: -ms-linear-gradient(bottom, #b5dec2 0%, #f4f5ba 100%);
+ background: linear-gradient(to top, #b5dec2 0%, #f4f5ba 100%);
}
- .left .left-box .Rate-box{
+
+ .left .left-box .Rate-box {
position: absolute;
text-align: center;
bottom: 0;
@@ -784,27 +833,30 @@
height: 89%;
/*background-color: green;*/
background: -moz-linear-gradient(bottom, #06a8f8 0%, #2bf3c7 100%);
- background: -webkit-gradient(linear, bottom bottom, top top, color-stop(0%,#06a8f8), color-stop(100%,#2bf3c7));
- background: -webkit-linear-gradient(bottom, #06a8f8 0%,#2bf3c7 100%);
- background: -o-linear-gradient(bottom, #06a8f8 0%,#2bf3c7 100%);
- background: -ms-linear-gradient(bottom, #06a8f8 0%,#2bf3c7 100%);
- background: linear-gradient(to top, #06a8f8 0%,#2bf3c7 100%);
+ background: -webkit-gradient(linear, bottom bottom, top top, color-stop(0%, #06a8f8), color-stop(100%, #2bf3c7));
+ background: -webkit-linear-gradient(bottom, #06a8f8 0%, #2bf3c7 100%);
+ background: -o-linear-gradient(bottom, #06a8f8 0%, #2bf3c7 100%);
+ background: -ms-linear-gradient(bottom, #06a8f8 0%, #2bf3c7 100%);
+ background: linear-gradient(to top, #06a8f8 0%, #2bf3c7 100%);
}
- .left .left-box .Rate-box p{
+
+ .left .left-box .Rate-box p {
position: absolute;
bottom: 0;
color: #fff;
width: 100%;
text-align: center;
}
- .con-left{
+
+ .con-left {
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
align-items: center;
}
- .con-left>span{
+
+ .con-left > span {
flex: 1;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3