From 311879ea7eacf92d05767e2b86127f5eb57f3dc7 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 26 四月 2024 18:25:16 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 399 ++++----------------------------------------------------
1 files changed, 33 insertions(+), 366 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index f3b14cf..c588cdf 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Author: lzhe lzhe@example.com
+ * @Date: 2024-04-26 09:36:18
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-04-26 18:07:52
+ * @FilePath: /smart-web/src/views/mdc/status-record.vue
+ * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
<template>
<div class="aposcope-main">
<div class="aposcope-left">
@@ -6,7 +14,7 @@
<el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/>
<div class="left-title-col">宸ヤ綅</div>
<div class="MYTree">
- <MYTree v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
+ <MYTree getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
</div>
<div class="footer">
<el-button @click="query" type="primary">鏌ヨ</el-button>
@@ -17,7 +25,7 @@
<el-tabs tab-position="top" v-model="activeName" type="card">
<el-tab-pane label="鎸夋棩鏈熸煡鐪�" name="shift">
<el-button-group>
- <el-button @click="btnListActive = item.id" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button>
+ <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>
<div class="status">
<div class="status-wrap align-left">
@@ -31,12 +39,10 @@
</div>
</div>
</div>
- <div>
- <div id="record" style="width: 100%;height:500px;"></div>
- </div>
- <div class="pagination">
- <el-pagination layout="prev, pager, next" :total="total" :default-page-size="6"/>
- </div>
+ <!-- collectionstatus 鍙嶉鐘舵��
+ date 鏃ユ湡
+ workstationInfoList 宸ヤ綅list -->
+ <record-charts :collectionstatus="collectionstatus" :date="date" :workstationInfoList="workstationInfoList" v-if="collectionstatus.length != 0"></record-charts>
</el-tab-pane>
<el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
鎸夊伐浣嶆煡鐪�
@@ -48,39 +54,28 @@
<script>
import moment from 'moment';
-import MYTree from './MYTree.vue'
-import Shift from './components/Shift.vue'
-import Time from './components/Time.vue'
-import * as echarts from 'echarts';
+import MYTree from './MYTree.vue';
+import recordCharts from './components/recordCharts.vue';
export default {
components: {
time: "",
MYTree,
- Shift,
- Time
+ recordCharts
},
watch: {
- activeName() {
- // this.$nextTick(() => {
- // this.query()
- // })
- },
- btnListActive(val) {
- // this.query({
- // ...this.params,
- // startDate: val,
- // endDate: val
- // })
- // this.queryChart({
- // ...this.params,
- // startDate: val,
- // endDate: val
- // })
+ treeChecked(select) {
+ var arr = [];
+ select.forEach(item=> {
+ arr.push({id: item.id,name: item.code})
+ })
+ this.select = arr;
}
},
data() {
return {
+ select: [],
workstationInfoList: [],
+ date: "",
checked1: true,
btnListActive: '',
btnList: [],
@@ -118,133 +113,21 @@
time: [],
treeChecked: [],
achievements: [],
- collectionstatus: [],
- current: "1",
- size: "6",
- total: 0,
- recordOptionLog: {
- tooltip: {
- trigger: 'axis',
- axisPointer: { // 鍧愭爣杞存寚绀哄櫒锛屽潗鏍囪酱瑙﹀彂鏈夋晥
- type: 'shadow' // 榛樿涓虹洿绾匡紝鍙�変负锛�'line' | 'shadow'
- },
- formatter: function (params) {
- var tar;
- if (params[1].value != '-') {
- tar = params[1];
- }
- else {
- tar = params[0];
- }
- return tar.name + '<br/>' + tar.seriesName + ' : ' + tar.value;
- }
- },
- grid: {
- top: 10,
- left: 70,
- bottom: 120
- },
- yAxis: {
- type: 'category',
- axisLabel: {
- formatter: function (value) {
- return value + "\n" + '{a|鐘舵�佸弽棣坿';
- },
- rich: {
- a: {
- color: '#409eff',
- cursor: 'pointer',
- fontSize: '12px'
- }
- }
- },
- data: ['123','345','789','888','666','222']
- },
- xAxis: {
- type: 'value',
- min: 0,
- max: 1440, // 鍗曚綅鍒嗛挓
- interval: 1440/6, //姣忛殧澶氬皯鍒嗛挓鏄剧ず涓�涓埢搴�
- axisLabel: {
- formatter: (value)=> {
- if(value == 0) {
- return "00:00:00";
- }else if(value == 240) {
- return "04:00:00";
- }else if(value == 480) {
- return "08:00:00";
- }else if(value == 720) {
- return "12:00:00";
- }else if(value == 960) {
- return "16:00:00";
- }else if(value == 1200) {
- return "18:00:00";
- }else if(value == 1440) {
- return "00:00:00";
- }
- }
- }
- },
- series: []
- // {
- // name: '杈呭姪',
- // type: 'bar',
- // stack: 'grouup',
- // itemStyle: {
- // borderColor: 'transparent',
- // color: 'transparent'
- // },
- // emphasis: {
- // itemStyle: {
- // borderColor: 'transparent',
- // color: 'transparent'
- // }
- // },
- // data: [{value:100}, {value:0}, {value:0}, {value:240}, {value:360}, {value:540}] //浠庝粈涔堟椂鍊欏紑濮嬬殑
- // //data: []
- // },
- // {
- // name: 'time',
- // type: 'bar',
- // stack: 'grouup',
- // data: [{value: 200}, {value: null}, {value: null}, {value:1200}, {value:240}, {value:900}] //鏁板�兼槸鍑狅紝濡�(20锛屽氨鏄粠4寮�濮嬶紝20鏍兼暟鎹�)
- // //data: []
- // },
- // {
- // name: '杈呭姪',
- // type: 'bar',
- // stack: 'grouup',
- // itemStyle: {
- // borderColor: 'transparent',
- // color: 'transparent'
- // },
- // emphasis: {
- // itemStyle: {
- // borderColor: 'transparent',
- // color: 'transparent'
- // }
- // },
- // data: [{value:400}, {value:null}, {value:null}, {value:null}, {value:10}, {value:null}] //浠庝粈涔堟椂鍊欏紑濮嬬殑
- // //data: []
- // },
- // {
- // name: 'time',
- // type: 'bar',
- // stack: 'grouup',
- // data: [{value: 45}, {value: null}, {value: null}, {value:null}, {value:32}, {value:null}] //鏁板�兼槸鍑狅紝濡�(20锛屽氨鏄粠4寮�濮嬶紝20鏍兼暟鎹�)
- // //data: []
- // }
- }
+ collectionstatus: []
}
},
created() {
},
mounted() {
- this.getCharts();
- //this.init();
+ this.date = moment().format('YYYY-MM-DD');
+ this.init();
},
methods: {
+ changeTab(item) {
+ this.btnListActive = item.id;
+ this.date = item.id;
+ },
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
if(res.code == 200) {
@@ -283,220 +166,17 @@
}
})
},
- getCharts() {
- var obj = {
- //date: this.time[1],
- date: "2024-04-24",
- humanFeedback: true,
- machineFeedback: true,
- workstationInfoList: this.workstationInfoList
- }
- // var recordDom = document.getElementById('record');
- // var myChart = echarts.init(recordDom);
- // myChart.setOption(this.recordOptionLog);
- // return;
- this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-date?current=${this.current}&size=${this.size}`,obj).then(res => {
- if (res.code === 200) {
- var yAxis = []; //璁＄畻y杞存暟鎹�
- var seriesData = []; //鏄剧ず鐨勬暟鎹�
- res.data.records.forEach(item=> {
- yAxis.push(item.workstationInfo.name);
- //璁＄畻寮�濮嬫椂闂达紝鏄剧ず鏃堕棿
- item.statusRecordList.forEach(item1=> {
- var endTime = item1.endTime;
- var startTime = item1.startTime;
- var initstart = item1.startTime.split(" ")[0];
- item1.startMinutes = moment(item1.startTime).diff(moment(initstart + " 00:00:00"), 'minutes') //浠庝粈涔堟椂鍊欏紑濮�
- item1.diff = moment(item1.endTime).diff(moment(item1.startTime), 'minutes') //寮�濮嬩簡澶氫箙
- })
- })
- //demo
- //璁＄畻鏈�澶х殑length
- var ln = [],maxln = 0;
- res.data.records.forEach(item=> {
- ln.push(item.statusRecordList.length);
- })
- maxln = ln.sort().reverse()[0];
- function bq(arr) { //琛ュ叏
- // 纭繚姣忎釜瀵硅薄閮芥湁value灞炴��
- arr.forEach(item => {
- if (!item.value) {
- item.value = null;
- }
- });
- // 琛ュ叏鏁扮粍
- while (arr.length < maxln) {
- arr.push({value: null});
- }
- return arr;
- }
- function getdata(arr) { //鍋氭暟鎹�
- var data = [];
- for(var i=0;i<maxln;i++) {
- if(i == 0) {
- data.push([{value: arr[i].startMinutes || null}]); //骞曞竷
- }else {
- data.push([{value: (arr[i].startMinutes - (arr[i-1].startMinutes+arr[i-1].diff) || null)}]); //骞曞竷
- }
- data.push([{value: arr[i].diff || null,name: 'time'}]); //鍐呭
- }
- return data;
- }
- function hebing(arr) {
- // 鍚堝苟鍚庣殑鏁扮粍锛屽垵濮嬪寲涓虹┖鏁扮粍
- var mergedArray = [];
- // 閬嶅巻姣忎釜绱㈠紩浣嶇疆
- for (let i = 0; i < maxln*2; i++) {
- // 鍒濆鍖栧綋鍓嶄綅缃殑瀵硅薄鏁扮粍
- var currentMerged = [];
- // 閬嶅巻姣忎釜瑕佸悎骞剁殑鏁扮粍
- arr.forEach(arr => {
- // 灏濊瘯鑾峰彇褰撳墠鏁扮粍鍦ㄨ浣嶇疆鐨勫璞★紝濡傛灉涓嶅瓨鍦ㄥ垯娣诲姞涓�涓寘鍚玽alue: null鐨勫璞�
- var obj = arr[i] && arr[i][0] || {value: null};
- currentMerged.push(obj);
- });
- // 灏嗗綋鍓嶄綅缃殑瀵硅薄鏁扮粍娣诲姞鍒板悎骞跺悗鐨勬暟缁勪腑
- mergedArray.push(currentMerged);
- }
- return mergedArray;
- }
- var everyArr = [];
- res.data.records.forEach((item,index)=> {
- everyArr.push(getdata(bq(item.statusRecordList)))
- })
- console.log(everyArr,hebing(everyArr))
- return;
- //鏈�鍚庡鐞�
- var record = [];
- hebing(everyArr).forEach((item,index)=> {
- if(index%2 == 0) {
- record.push({
- name: '杈呭姪',
- type: 'bar',
- stack: 'grouup',
- itemStyle: {
- borderColor: 'transparent',
- color: 'transparent'
- },
- emphasis: {
- itemStyle: {
- borderColor: 'transparent',
- color: 'transparent'
- }
- },
- data: item
- })
- }else {
- record.push({
- name: 'time',
- type: 'bar',
- stack: 'grouup',
- data: item
- })
- }
- })
- //end
-
- var recordDom = document.getElementById('record');
- var myChart = echarts.init(recordDom);
- this.recordOptionLog.yAxis.data = yAxis; //y杞存暟鎹�
- this.recordOptionLog.series = record;
- console.log(this.recordOptionLog.yAxis.data,record)
- myChart.setOption(this.recordOptionLog);
- // 妫�鏌ユ槸鍚﹀瓨鍦╥d涓�'parentNodeDom'鐨凞OM鍏冪礌,鏈夊氨鍏堝垹闄�
- var parentNodeDom = document.getElementById('parentNodeDom');
- if (parentNodeDom) {
- parentNodeDom.parentNode.removeChild(parentNodeDom);
- }
- this.domlocation(); //閲嶆柊娣诲姞锛岃绠椾綅缃�
- this.total = res.data.total;
- }
- })
- },
- domlocation() {
- var recordDom = document.getElementById('record');
- //娣诲姞dom锛屽畾浣�
- var parentNodeDom = document.createElement('div');
- parentNodeDom.id="parentNodeDom";
- recordDom.appendChild(parentNodeDom);
- for(var i=0;i<this.recordOptionLog.yAxis.data.length;i++) {
- var dom = document.createElement('span');
- dom.className = "domSpan spanIndex" + i;
- if(this.recordOptionLog.yAxis.data.length == 1) {
- dom.style.top = 220 + "px"; //瀹氫綅top
- }
- if(this.recordOptionLog.yAxis.data.length == 2) {
- if(i==0){
- dom.style.top = 325 + "px";
- }else if(i==1){
- dom.style.top = 116 + "px"; //瀹氫綅top
- }
- }
- if(this.recordOptionLog.yAxis.data.length == 3) {
- if(i==0){
- dom.style.top = 360 + "px";
- }else if(i==1){
- dom.style.top = 220 + "px"; //瀹氫綅top
- }else if(i==2){
- dom.style.top = 80 + "px"; //瀹氫綅top
- }
- }
- if(this.recordOptionLog.yAxis.data.length == 4) {
- if(i==0){
- dom.style.top = 377 + "px";
- }else if(i==1){
- dom.style.top = 272 + "px"; //瀹氫綅top
- }else if(i==2){
- dom.style.top = 168 + "px"; //瀹氫綅top
- }else if(i==3){
- dom.style.top = 62 + "px"; //瀹氫綅top
- }
- }
- if(this.recordOptionLog.yAxis.data.length == 5) {
- if(i==0){
- dom.style.top = 387 + "px";
- }else if(i==1){
- dom.style.top = 303 + "px"; //瀹氫綅top
- }else if(i==2){
- dom.style.top = 220 + "px"; //瀹氫綅top
- }else if(i==3){
- dom.style.top = 135 + "px"; //瀹氫綅top
- }else if(i==4){
- dom.style.top = 51 + "px"; //瀹氫綅top
- }
- }
- if(this.recordOptionLog.yAxis.data.length == 6) {
- if(i==0){
- dom.style.top = 348 + "px";
- }else if(i==1){
- dom.style.top = 287 + "px"; //瀹氫綅top
- }else if(i==2){
- dom.style.top = 225 + "px"; //瀹氫綅top
- }else if(i==3){
- dom.style.top = 163 + "px"; //瀹氫綅top
- }else if(i==4){
- dom.style.top = 102 + "px"; //瀹氫綅top
- }else if(i==5){
- dom.style.top = 40 + "px"; //瀹氫綅top
- }
- }
- dom.style.left = recordDom.offsetLeft + "px"; //瀹氫綅left
- parentNodeDom.appendChild(dom);
- }
- },
init() {
this.time = [moment().subtract(2, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'}); //鏃ユ湡sort
this.getachievements(); //閲囬泦鐘舵�乷r浜哄伐鍙嶉鐘舵��
- this.getCharts();
},
timeBtnChange() {
},
query() {
this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
- //this.getCharts();
- console.log(this.treeChecked,2)
+ this.workstationInfoList = this.select;
}
}
}
@@ -506,7 +186,6 @@
.aposcope-main {
display: flex;
min-height: 100%;
- height: 100%;
margin: 8px;
}
.aposcope-left {
@@ -609,17 +288,5 @@
text-align: right;
display: flex;
justify-content: end;
- }
- #record {
- position: relative;
- margin-bottom: 120px;
- }
- #record /deep/ .domSpan {
- display: inline-block;
- width: 70px;
- height: 20px;
- background: green;
- position: absolute;
- cursor: pointer;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3