From 863ac22b4f3f51ef77dff715b741a55b1c33fe6f Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 01 五月 2024 22:46:31 +0800
Subject: [PATCH] 1
---
src/views/mdc/time-analysis.vue | 129 +++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 66 deletions(-)
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index bf2fcd3..6308394 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-01 22:44:46
* @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>
@@ -323,45 +324,6 @@
this.getDataA();
},
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
- };
- });
- },
getDataA() {
var ids = [];
this.treeChecked.forEach(item=> {
@@ -431,6 +393,7 @@
emphasis: {
focus: 'series'
},
+ barWidth: 60,
data
}
});
@@ -469,7 +432,7 @@
}
})
},
- getDataChartsB(enums) {
+ getDataChartsB(enums,month) {
var obj = {
enums: enums,
groupCategory: 1,
@@ -480,6 +443,9 @@
type: 0,
week: moment(this.date).get('week'),
year: moment(this.date).get('year')
+ }
+ if(month) {
+ obj.month = month;
}
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
obj.type = 0;
@@ -530,24 +496,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") { //鎸夌彮娆＄粺璁�
@@ -571,11 +560,19 @@
this.getDataA();
},
changeTabB(item,index,index1) {
- this.setTitle1[index].btnListActive = item.id;
- this.date = item.id;
- this.getDataChartsB("DAY");
- this.getDataChartsB("MONTH");
- this.getDataChartsB("WEEK");
+ if(index == 0) {
+ this.setTitle1[0].btnListActive = item.id;
+ }
+ 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', {
--
Gitblit v1.9.3