From f3e57aff6030b629e5387fcbb43507fe4a4a2da4 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 19 五月 2024 00:30:56 +0800
Subject: [PATCH] 1
---
src/views/mdc/time-analysis.vue | 231 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 97 deletions(-)
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index bf2fcd3..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-04-28 18:58:58
+ * @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
-->
@@ -59,9 +59,9 @@
</el-collapse-item>
</el-collapse>
</div>
- <div class="paginationwork">
+ <!-- <div class="paginationwork">
<el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
- </div>
+ </div> -->
</div>
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
@@ -83,6 +83,7 @@
<template #title>
<el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
<span class="collr-title">{{item.name}}</span>
+ <el-button size="small" v-if="index != 0">{{item.indexName}}</el-button>
</template>
<div>
<el-button-group>
@@ -135,6 +136,7 @@
btnLeftList: [{title: "鎸夊伐浣嶇粺璁�",id:"1"},{title: "鎸夊伐浣嶇粍缁熻",id:"2"}],
btnLeftctive: "1",
isshowempty: true,
+ getGlobalColorList: [],
shortcuts: [
{
text: '鏈�杩�3澶�',
@@ -179,6 +181,7 @@
params.forEach(item=> {
dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
})
+ console.log(params)
return dom;
}
},
@@ -233,7 +236,7 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value + "%";
+ return value * 100 + "%";
}
},
data: [2,20,40,60,80,100]
@@ -269,7 +272,7 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value + "%";
+ return value * 100 + "%";
}
},
data: [2,20,40,60,80,100]
@@ -305,7 +308,7 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value + "%";
+ return value * 100 + "%";
}
},
data: [2,20,40,60,80,100]
@@ -321,63 +324,28 @@
this.init();
this.getTree2List(); //鎸夊伐浣嶇粺璁℃爲
this.getDataA();
+ this.getGlobal(); //鑾峰彇棰滆壊
},
methods: {
- convertArrayToPercentage(inputArray) {
- return inputArray.map((subarray, index) => {
- // 璁＄畻瀛愭暟缁勭殑鎬诲拰
- var total = subarray.reduce((acc, obj) => acc + obj.count, 0);
-
- // 纭繚鎬诲拰涓嶄负0锛屼互閬垮厤闄や互0鐨勯敊璇�
- if (total === 0) {
- return {
- name: `Direct${index + 1}`,
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: subarray.map(() => 0) // 濡傛灉鎬诲拰涓�0锛屽垯杩斿洖鍏ㄤ负'0%'鐨勭櫨鍒嗘瘮鏁扮粍
- };
- }
-
- // 璁＄畻鐧惧垎姣斿苟鍒涘缓鏂扮殑data鏁扮粍
- var percentages = subarray.map(obj => ((obj.count / total) * 100).toFixed(2));
-
- // 杩斿洖缁撴灉瀵硅薄
- return {
- name: `Direct${index + 1}`,
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: percentages // 灏嗚绠楀緱鍒扮殑鐧惧垎姣旀暟缁勪綔涓篸ata
- };
- });
+ 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
}
@@ -411,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',
@@ -431,10 +425,14 @@
emphasis: {
focus: 'series'
},
- data
- }
- });
- return lastData;
+ itemStyle: {
+ "color": colorObj[key]
+ },
+ barWidth: 60,
+ data: resultObject[key]
+ })
+ })
+ return lastData.reverse();
},
getDataChartsA(index) {
var obj = {
@@ -451,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=> {
@@ -463,13 +461,13 @@
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))
}
})
},
- getDataChartsB(enums) {
+ getDataChartsB(enums,month) {
var obj = {
enums: enums,
groupCategory: 1,
@@ -481,14 +479,19 @@
week: moment(this.date).get('week'),
year: moment(this.date).get('year')
}
+ if(month) {
+ obj.month = month;
+ }
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);
})
@@ -530,24 +533,47 @@
this.activeName = val;
if(val == "time") { //鎸夋椂闂村懆鏈熺粺璁�
if(this.setTitle.length != 0) {
- var arr = [];
- arr.push({
- btnList: this.btnList,
- name: '鎸夋棩鏌ョ湅',
- btnListActive: this.btnList[0].id
- },{
- btnList: [{title:moment(this.date).get('week') + "鍛�",id: moment(this.date).get('week') + "鍛�"}],
- name: '鎸夊懆鏌ョ湅',
- btnListActive: moment(this.date).get('week') + "鍛�"
- },{
- btnList: [{title:moment(this.date).get('month') + 1 + "鏈�",id: moment(this.date).get('month') + 1 + "鏈�"}],
- name: '鎸夋湀鏌ョ湅',
- btnListActive: moment(this.date).get('month') + 1 + "鏈�"
- });
- this.setTitle1 = arr;
- this.getDataChartsB("DAY");
- this.getDataChartsB("MONTH");
- this.getDataChartsB("WEEK");
+ var obj = {
+ endDate: this.btnList[0].id,
+ startDate: this.btnList[0].id,
+ statisticalMethod: "WEEK"
+ }
+ this.$HTTP.post(`/api/blade-mdc/efficiency-analysis/interval`,obj).then(res=> {
+ if(res.code == 200) {
+ var dateInJuly = moment(this.btnList[0].id);
+ // 鑾峰彇璇ユ湀浠界殑绗竴澶�
+ var firstDayOfJuly = dateInJuly.startOf('month').format('YYYY-MM-DD');
+ // 鑾峰彇璇ユ湀浠界殑鏈�鍚庝竴澶�
+ var lastDayOfJuly = dateInJuly.endOf('month').format('YYYY-MM-DD');
+ //璺ㄦ湀
+ var startDate = moment(res.data[0].startDate).month() + 1;
+ var endDate = moment(res.data[0].endDate).month() + 1;
+ var arrMonth = [];
+ for (var i = startDate; i <= endDate; i++) {
+ arrMonth.push({title: (i + "鏈�"),id: (i + "鏈�")});
+ }
+ var arr = [];
+ arr.push({
+ btnList: this.btnList,
+ name: '鎸夋棩鏌ョ湅',
+ btnListActive: this.btnList[0].id
+ },{
+ btnList: [{title:moment(this.date).get('week') + "鍛�",id: moment(this.date).get('week') + "鍛�"}],
+ name: '鎸夊懆鏌ョ湅',
+ btnListActive: moment(this.date).get('week') + "鍛�",
+ indexName : res.data[0].startDate + "鑷�" + res.data[0].endDate
+ },{
+ btnList: arrMonth.reverse(),
+ name: '鎸夋湀鏌ョ湅',
+ btnListActive: moment(this.date).get('month') + 1 + "鏈�",
+ indexName : firstDayOfJuly + "鑷�" + lastDayOfJuly
+ });
+ this.setTitle1 = arr;
+ this.getDataChartsB("DAY");
+ this.getDataChartsB("MONTH");
+ this.getDataChartsB("WEEK");
+ }
+ })
}
}else if(val == "shift") { //鎸夌彮娆＄粺璁�
@@ -572,10 +598,16 @@
},
changeTabB(item,index,index1) {
this.setTitle1[index].btnListActive = item.id;
- this.date = item.id;
- this.getDataChartsB("DAY");
- this.getDataChartsB("MONTH");
- this.getDataChartsB("WEEK");
+ this.date = this.setTitle1[0].btnListActive;
+ if(index == 0) {
+ this.getDataChartsB("DAY");
+ }
+ if(index == 1) {
+ this.getDataChartsB("WEEK");
+ }
+ if(index == 2) { //鏈�
+ this.getDataChartsB("MONTH",this.setTitle1[2].btnListActive.split("鏈�")[0]);
+ }
},
getTime(data) {
this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
@@ -603,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