From a7b6aa5c857c091bc53a9f02fed855d926ecb90a Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期二, 14 五月 2024 23:43:48 +0800
Subject: [PATCH] 1
---
src/views/mdc/time-analysis.vue | 114 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 37 deletions(-)
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 6308394..5af9166 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-01 22:44:46
+ * @LastEditTime: 2024-05-14 18:30:07
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -136,6 +136,7 @@
btnLeftList: [{title: "鎸夊伐浣嶇粺璁�",id:"1"},{title: "鎸夊伐浣嶇粍缁熻",id:"2"}],
btnLeftctive: "1",
isshowempty: true,
+ getGlobalColorList: [],
shortcuts: [
{
text: '鏈�杩�3澶�',
@@ -180,6 +181,7 @@
params.forEach(item=> {
dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
})
+ console.log(params)
return dom;
}
},
@@ -234,7 +236,7 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value + "%";
+ return value * 100 + "%";
}
},
data: [2,20,40,60,80,100]
@@ -270,7 +272,7 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value + "%";
+ return value * 100 + "%";
}
},
data: [2,20,40,60,80,100]
@@ -306,7 +308,7 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value + "%";
+ return value * 100 + "%";
}
},
data: [2,20,40,60,80,100]
@@ -322,24 +324,28 @@
this.init();
this.getTree2List(); //鎸夊伐浣嶇粺璁℃爲
this.getDataA();
+ this.getGlobal(); //鑾峰彇棰滆壊
},
methods: {
+ getGlobal() {
+ this.$HTTP.get(`/api/blade-cps/global_wcs/list`).then(res=> {
+ if(res.code == 200) {
+ this.getGlobalColorList = res.data;
+ }
+ })
+ },
getDataA() {
- var ids = [];
- this.treeChecked.forEach(item=> {
- ids.push(item.id);
- })
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
var obj = {
- ids: ids,
+ ids: this.ids,
localDate: this.date,
type: 0
}
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
var obj = {
groupCategory: 1,
groupType: "group_workstation",
- ids: ids,
+ ids: this.ids,
localDate: this.date,
type: 1
}
@@ -373,17 +379,43 @@
// 鎺掗櫎杩愯鏃堕棿涓�0鐨勬儏鍐�
var totalRunTime = timeSums[0] || 1;
-
// 璁＄畻姣忎釜鐘舵�佺殑鐧惧垎姣旀暟鎹�
- var lastData = Object.keys(resultObject).map(key => {
- var data = resultObject[key].map((item, index) => {
- if (index === 0) { // 鍙绠楁椂闂寸殑鐧惧垎姣�
- return item == 0?0:Number((item / totalRunTime * 100).toFixed(2));
- } else {
- return item; // 璁℃暟淇濇寔涓嶅彉
- }
- });
- return {
+ // var lastData = Object.keys(resultObject).map(key => {
+ // var data = resultObject[key].map((item, index) => {
+ // if (index === 0) { // 鍙绠楁椂闂寸殑鐧惧垎姣�
+ // return item == 0?0:Number((item / totalRunTime * 100).toFixed(2));
+ // } else {
+ // return item; // 璁℃暟淇濇寔涓嶅彉
+ // }
+ // });
+ // return {
+ // name: key,
+ // type: 'bar',
+ // stack: 'total',
+ // label: {
+ // show: false
+ // },
+ // emphasis: {
+ // focus: 'series'
+ // },
+ // barWidth: 60,
+ // data
+ // }
+ // });
+ var lastData = [];
+ var colorObj = {}; //璁剧疆棰滆壊
+ this.getGlobalColorList.forEach(item=> {
+ colorObj[item.name] = item.color;
+ })
+ Object.keys(resultObject).map(key => {
+ resultObject[key].forEach((item,index)=> {
+ if(item != 0) {
+ var num = item/timeSums[index]* 100;
+ item = num.toFixed(2);
+ }
+ resultObject[key][index] = item;
+ })
+ lastData.push({
name: key,
type: 'bar',
stack: 'total',
@@ -393,11 +425,14 @@
emphasis: {
focus: 'series'
},
+ itemStyle: {
+ "color": colorObj[key]
+ },
barWidth: 60,
- data
- }
- });
- return lastData;
+ data: resultObject[key]
+ })
+ })
+ return lastData.reverse();
},
getDataChartsA(index) {
var obj = {
@@ -414,7 +449,7 @@
}
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
obj.type = 0;
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
obj.type = 1;
}
this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
@@ -426,9 +461,9 @@
this.chartOptionA.xAxis.data = xAxis;
var recordDom = document.getElementById('recordwork' + index);
this.chartOptionA.series = this.formatChartData(res.data.countStatus);
- console.log(this.chartOptionA.series)
var myChart = echarts.init(recordDom);
myChart.setOption(this.chartOptionA);
+ console.log(JSON.stringify(this.chartOptionA))
}
})
},
@@ -449,12 +484,14 @@
}
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
obj.type = 0;
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
obj.type = 1;
}
this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
if(res.code == 200) {
var xAxis = [];
+ res.data.workStationDetails == null ? res.data.workStationDetails = [] : res.data.workStationDetails;
+ res.data.countStatus == null ? res.data.countStatus = [] : res.data.countStatus;
res.data.workStationDetails.forEach(item=> {
xAxis.push(item.name);
})
@@ -560,9 +597,7 @@
this.getDataA();
},
changeTabB(item,index,index1) {
- if(index == 0) {
- this.setTitle1[0].btnListActive = item.id;
- }
+ this.setTitle1[index].btnListActive = item.id;
this.date = this.setTitle1[0].btnListActive;
if(index == 0) {
this.getDataChartsB("DAY");
@@ -600,21 +635,26 @@
this.date = this.time[1];
},
query() {
+ console.log(this.activeName)
+ this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
+ this.date = this.time[1];
this.ids = [];
- console.log(this.btnLeftctive)
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
this.treeChecked.forEach(item=> {
this.ids.push(item.id);
})
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
this.treeListNodeList.forEach(item=> {
this.ids.push(item.id);
})
}
- console.log(this.ids,2)
- this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
- this.date = this.time[1];
- this.getDataA();
+ if(this.activeName == "shift") { //鎸夌彮娆＄粺璁�
+ this.getDataA();
+ }else if(this.activeName == "time") { //鎸夊懆鏈熺粺璁�
+ this.getDataChartsB("DAY");
+ this.getDataChartsB("WEEK");
+ this.getDataChartsB("MONTH",this.setTitle1[2].btnListActive.split("鏈�")[0]);
+ }
}
}
}
--
Gitblit v1.9.3