From a2a58769cb07fad466ba2c1f84100dc895d067d9 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期日, 28 四月 2024 18:59:45 +0800
Subject: [PATCH] 1
---
/dev/null | 101 ----------
src/views/mdc/components/recordChartsByDate.vue | 3
src/views/mdc/time-analysis.vue | 477 +++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 452 insertions(+), 129 deletions(-)
diff --git a/src/views/mdc/components/analysisA.vue b/src/views/mdc/components/analysisA.vue
deleted file mode 100644
index e4f8cf0..0000000
--- a/src/views/mdc/components/analysisA.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<template>
- <div id="analysisA">
- <div class="demo-collapse">
- <el-collapse accordion>
- <el-collapse-item v-for="(item,index) in setTitle" :name="index + 1">
- <template #title>
- <el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
- <span class="collr-title">鐝{{index + 1}}</span>
- <el-button size="small">{{item.indexName}}</el-button>
- </template>
- <div>
- BAI
- </div>
- </el-collapse-item>
- </el-collapse>
- </div>
- <div class="paginationwork">
- <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
- </div>
- </div>
-</template>
-
-<script>
-import * as ElementPlusIconsVue from '@element-plus/icons-vue'
-let icons = []
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
- icons.push(key)
-}
-import moment from 'moment';
-import * as echarts from 'echarts';
-export default {
- components: {
- ...ElementPlusIconsVue
- },
- props: ['setDataA','setTitle'],
- watch: {
- setDataA(val) {
- this.current = "1";
- alert(1)
- //this.getCharts();
- }
- },
- data() {
- return {
- titleList: [],
- current: "1",
- size: "10",
- total: "0"
- }
- },
- mounted() {
- alert(4)
- },
- methods: {
- recordChange() {
-
- },
- getDataChartsA(index) {
- var obj = {
- enums: "SHIFT",
- groupCategory: 1,
- groupType: "group_workstation",
- ids: [],
- month: moment(this.date).get('month') + 1,
- queryTime: this.date,
- shiftIndex: index,
- type: 0,
- week: moment(this.date).get('week'),
- year: moment(this.date).get('year')
- }
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
- if(res.code == 200) {
- this.setChartsA = res.data;
- }
- })
- },
- }
-}
-</script>
-
-<style scoped>
-.demo-collapse {
-
-}
-.collr-title {
- margin-left:8px;
- margin-right: 8px;
- font-weight: bold;
-}
-.demo-collapse /deep/ .el-collapse-item__header {
- background-color: #d8e8e8;
- margin: 8px;
- height: 32px;
- padding-left: 16px;
- border-radius: 4px;
-}
-.demo-collapse /deep/ .el-collapse-item__content {
- margin: 8px;
- padding-left: 16px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/mdc/components/recordChartsByDate.vue b/src/views/mdc/components/recordChartsByDate.vue
index f78a063..90f7f05 100644
--- a/src/views/mdc/components/recordChartsByDate.vue
+++ b/src/views/mdc/components/recordChartsByDate.vue
@@ -128,8 +128,7 @@
var option = {
tooltip: {
formatter: function (params) {
- console.log(params)
- return `<span class="tipdesc">宸ヤ綅</span>${params.data.name}</br>
+ return `<span class="tipdesc">宸ヤ綅</span>${params.data.name}</br>
<span class="tipdesc">鐘舵��</span>${params.data.wcsDesc}</br>
<span class="tipdesc">鎻忚堪</span>${params.data.feedbackDesc}</br>
<span class="tipdesc">鐘舵�佹椂闂�</span>${params.data.startTime} 锝� ${params.data.endTime}</br>
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 5de5429..bf2fcd3 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-26 18:07:52
+ * @LastEditTime: 2024-04-28 18:58:58
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -18,7 +18,7 @@
</el-button-group>
<div class="MYTree">
<MYTree v-if="btnLeftctive == '1'" getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
- <el-tree v-if="btnLeftctive == '2'" :data="tree2" :expand-on-click-node="false" default-expand-all show-checkbox :props="{label: 'name', children: 'children'}" class="treeActive" @check-change="treeListNode" />
+ <el-tree v-if="btnLeftctive == '2'" :data="tree2" :expand-on-click-node="false" default-expand-all show-checkbox :props="{label: 'name', children: 'children'}" class="treeActive" @check="treeListNode" />
</div>
<div class="footer">
<el-button @click="query" type="primary">鏌ヨ</el-button>
@@ -28,6 +28,7 @@
<div class="aposcope-right">
<el-tabs tab-position="top" v-model="activeName" type="card" @tab-change="tabChange">
<el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
+ <!-- 鏃ユ湡 -->
<el-button-group>
<el-button @click="changeTab(item)" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button>
</el-button-group>
@@ -41,10 +42,30 @@
</div>
</div>
</div>
- <analysis-a :setDataA="setDataA" v-if="setTitle.length != 0"></analysis-a>
+ <!-- 鎸夌彮娆＄粺璁harts -->
+ <div id="analysisA" v-if="setTitle.length != 0">
+ <div class="demo-collapse">
+ <el-collapse v-model="activeNames" accordion>
+ <el-collapse-item v-for="(item,index) in setTitle" :name="index + 1">
+ <template #title>
+ <el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
+ <span class="collr-title">鐝{{index + 1}}</span>
+ <el-button size="small">{{item.indexName}}</el-button>
+ </template>
+ <div>
+ <!-- charts -->
+ <div :id="'recordwork' + item.shiftIndex" style="height:300px;"></div>
+ </div>
+ </el-collapse-item>
+ </el-collapse>
+ </div>
+ <div class="paginationwork">
+ <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
+ </div>
+ </div>
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <div class="fact-analysis-realtim">
+ <div class="fact-analysis-realtim" v-if="setTitle.length == 0">
<div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);">
<div class="wimi-empty-img" style="width: 150px; height: 150px;">
<img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
@@ -54,6 +75,29 @@
</div>
</div>
</div>
+ <!-- 鎸夋椂闂村懆鏈熺粺璁harts -->
+ <div id="analysisA" v-if="setTitle.length != 0">
+ <div class="demo-collapse">
+ <el-collapse v-model="activeNames1" accordion>
+ <el-collapse-item v-for="(item,index) in setTitle1" :name="index + 1">
+ <template #title>
+ <el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
+ <span class="collr-title">{{item.name}}</span>
+ </template>
+ <div>
+ <el-button-group>
+ <el-button @click="changeTabB(item1,index,index1)" :type="item.btnListActive == item1.id ? 'primary' : ''" v-for="(item1,index1) in item.btnList" :key="item1.id" size="small">{{item1.title }}</el-button>
+ </el-button-group>
+ <!-- charts -->
+ <div :id="'chartsB' + index" style="height:300px;"></div>
+ </div>
+ </el-collapse-item>
+ </el-collapse>
+ </div>
+ <!-- <div class="paginationwork">
+ <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
+ </div> -->
+ </div>
</el-tab-pane>
</el-tabs>
</div>
@@ -61,19 +105,30 @@
</template>
<script>
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+let icons = []
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+ icons.push(key)
+}
+import * as echarts from 'echarts';
import moment from 'moment';
import MYTree from './MYTree.vue';
-import analysisA from './components/analysisA.vue';
export default {
components: {
- MYTree,analysisA
+ ...ElementPlusIconsVue,MYTree
},
data() {
return {
- setDataA: {},
+ treeListNodeList: [],
+ ids: [],
+ activeNames: [],
+ activeNames1: [1,2,3],
+ current: "1",
+ size: "10",
+ total: "0",
setTitle: [],
+ setTitle1: [],
date: "",
- setChartsA: {},
btnListActive: "",
tree2: [],
btnList: [],
@@ -112,7 +167,151 @@
activeName: 'shift',
time: [],
workstationId: "",
- treeChecked: []
+ treeChecked: [],
+ chartOptionA: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ },
+ chartOptionB1: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ },
+ chartOptionB2: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ },
+ chartOptionB3: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ }
}
},
created() {
@@ -124,19 +323,192 @@
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=> {
ids.push(item.id);
})
- var obj = {
- ids: ids,
- localDate: this.date,
- type: 0
+ if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
+ var obj = {
+ ids: ids,
+ localDate: this.date,
+ type: 0
+ }
+ }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ var obj = {
+ groupCategory: 1,
+ groupType: "group_workstation",
+ ids: ids,
+ localDate: this.date,
+ type: 1
+ }
}
this.$HTTP.post(`/api/blade-mdc/time-used-analysis/workstation/shiftName`,obj).then(res=> {
if(res.code == 200) {
this.setTitle = res.data.shiftDetails;
+ res.data.shiftDetails.forEach(item=> {
+ this.activeNames.push(item.shiftIndex); //榛樿閮芥槸鍏ㄩ儴灞曞紑
+ this.getDataChartsA(item.shiftIndex); //娓叉煋charts
+ })
+ }
+ })
+ },
+ formatChartData(originalObject) {
+ var resultObject = originalObject.reduce(function(acc, currArray) {
+ currArray.forEach(function(item) {
+ // 濡傛灉acc涓繕娌℃湁杩欎釜statusName鐨勯敭锛屽垯鍒濆鍖栦竴涓┖鏁扮粍
+ if (!acc[item.statusName]) {
+ acc[item.statusName] = [];
+ }
+ // 灏哻ount鍊兼坊鍔犲埌瀵瑰簲statusName鐨勬暟缁勪腑
+ acc[item.statusName].push(item.count);
+ });
+ return acc;
+ }, {}); // 绗簩涓弬鏁皗}鏄痑ccumulator鐨勫垵濮嬪��
+ // 璁＄畻姣忎釜鐘舵�佺殑鏃堕棿鎬诲拰
+ var timeSums = Object.values(resultObject).reduce((acc, curr) => {
+ return acc.map((sum, index) => sum + curr[index]);
+ }, new Array(Object.values(resultObject)[0].length).fill(0));
+
+ // 鎺掗櫎杩愯鏃堕棿涓�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 {
+ name: key,
+ type: 'bar',
+ stack: 'total',
+ label: {
+ show: false
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data
+ }
+ });
+ return lastData;
+ },
+ getDataChartsA(index) {
+ var obj = {
+ enums: "SHIFT",
+ groupCategory: 1,
+ groupType: "group_workstation",
+ ids: this.ids,
+ month: moment(this.date).get('month') + 1,
+ queryTime: this.date,
+ shiftIndex: index,
+ type: 0,
+ week: moment(this.date).get('week'),
+ year: moment(this.date).get('year')
+ }
+ if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
+ obj.type = 0;
+ }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ 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.forEach(item=> {
+ xAxis.push(item.name);
+ })
+ 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);
+ }
+ })
+ },
+ getDataChartsB(enums) {
+ var obj = {
+ enums: enums,
+ groupCategory: 1,
+ groupType: "group_workstation",
+ ids: this.ids,
+ month: moment(this.date).get('month') + 1,
+ queryTime: this.date,
+ type: 0,
+ week: moment(this.date).get('week'),
+ year: moment(this.date).get('year')
+ }
+ if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
+ obj.type = 0;
+ }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ 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.forEach(item=> {
+ xAxis.push(item.name);
+ })
+ var option = "";
+ var index = 0;
+ if(enums == "DAY") {
+ option = "chartOptionB1";
+ index = 0;
+ }else if(enums == "MONTH") {
+ option = "chartOptionB2";
+ index = 2;
+ }else if(enums == "WEEK") {
+ option = "chartOptionB3";
+ index = 1;
+ }
+ this[option].xAxis.data = xAxis;
+ var recordDom = document.getElementById('chartsB' + index);
+ this[option].series = this.formatChartData(res.data.countStatus);
+ var myChart = echarts.init(recordDom);
+ myChart.setOption(this[option]);
}
})
},
@@ -147,16 +519,37 @@
}
})
},
- treeListNode(data) {
-
+ treeListNode(data,checked) {
+ this.treeListNodeList = checked.checkedNodes;
},
changeLeftTab(item) {
this.btnLeftctive = item.id;
+ this.ids = [];
},
tabChange(val) {
- if(val == "time") { //鎸夌彮娆＄粺璁�
-
- }else if(val == "shift") { //鎸夋椂闂村懆鏈熺粺璁�
+ 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");
+ }
+ }else if(val == "shift") { //鎸夌彮娆＄粺璁�
}
},
@@ -176,6 +569,13 @@
this.btnListActive = item.id;
this.date = item.id;
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");
},
getTime(data) {
this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
@@ -203,15 +603,21 @@
this.date = this.time[1];
},
query() {
- this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
- var ids = [];
- this.treeChecked.forEach(item=> {
- ids.push(item.id)
- })
- this.setDataA = {
- ids: ids,
- localDate: 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) { //鎸夊伐浣嶇粍缁熻
+ 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();
}
}
}
@@ -318,4 +724,23 @@
margin-top: -16px;
line-height: 28px;
}
+ .demo-collapse {
+
+ }
+ .collr-title {
+ margin-left:8px;
+ margin-right: 8px;
+ font-weight: bold;
+ }
+ .demo-collapse /deep/ .el-collapse-item__header {
+ background-color: #d8e8e8;
+ margin: 8px;
+ height: 32px;
+ padding-left: 16px;
+ border-radius: 4px;
+ }
+ .demo-collapse /deep/ .el-collapse-item__content {
+ margin: 8px;
+ padding-left: 16px;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3