From a0d0246d2848e5b3f0fbb50c6d5cc28a1f5a37d2 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期四, 25 四月 2024 23:50:46 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 539 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 356 insertions(+), 183 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index df06253..f3b14cf 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -47,11 +47,6 @@
</template>
<script>
-// 妯℃嫙鏁版嵁锛岃〃绀烘瘡涓皬鏃剁殑鍗犵敤鎯呭喌
-var data = [];
-for (var i = 0; i < 24; i++) {
- data.push(Math.random() * 100); // 闅忔満鐢熸垚鍗犵敤鎸囨暟
-}
import moment from 'moment';
import MYTree from './MYTree.vue'
import Shift from './components/Shift.vue'
@@ -145,7 +140,9 @@
}
},
grid: {
- top: 10
+ top: 10,
+ left: 70,
+ bottom: 120
},
yAxis: {
type: 'category',
@@ -161,8 +158,7 @@
}
}
},
- //data: ['461', '462', '516', '517', '512', '513']
- data: ['461', '462', '516']
+ data: ['123','345','789','888','666','222']
},
xAxis: {
type: 'value',
@@ -189,36 +185,55 @@
}
}
},
- series: [
- {
- name: '杈呭姪',
- type: 'bar',
- stack: '鎬婚噺',
- itemStyle: {
- borderColor: 'transparent',
- color: 'transparent'
- },
- emphasis: {
- itemStyle: {
- borderColor: 'transparent',
- color: 'transparent'
- }
- },
- data: [0, 0, 0, 240, 360, 540] //浠庝粈涔堟椂鍊欏紑濮嬬殑
- },
- {
- name: '鏃堕棿',
- type: 'bar',
- stack: '鎬婚噺',
- label: {
- normal: {
- show: true,
- position: 'top'
- }
- },
- data: ['-', '-', '-', 1200, 240, 900] //鏁板�兼槸鍑狅紝濡�(20锛屽氨鏄粠4寮�濮嬶紝20鏍兼暟鎹�)
- }
- ]
+ 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: []
+ // }
}
}
},
@@ -271,44 +286,203 @@
getCharts() {
var obj = {
//date: this.time[1],
- date: "2024-04-16",
+ 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);
- chart.on('finished', function () {
- // 鑾峰彇Y杞村埢搴︽爣绛剧殑DOM鍏冪礌
- var yAxisLabels = document.querySelectorAll('.echarts-yaxis-label');
- conosle.log(yAxisLabels)
- });
- return;
+ // 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;
- dom.style.top = i*70 + 40 + "px";
+ 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);
}
- //鍒犻櫎dom
- //parentNodeDom.remove();
- 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) {
- //this.recordOptionLog.series[0].data = res.data.records.statusRecordList;
- // var yAxis = [];
- // res.data.records.forEach(item=> {
- // item.value = item.workstationInfo.name;
- // })
- // this.recordOptionLog.yAxis.data = res.data.records;
- this.total = res.data.total;
- }
- })
},
init() {
this.time = [moment().subtract(2, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
@@ -329,124 +503,123 @@
</script>
<style scoped>
-.aposcope-main {
- display: flex;
- min-height: 100%;
- height: 100%;
- overflow: hidden;
- margin: 8px;
-}
-.aposcope-left {
- position: relative;
- width: 240px;
- margin-right: 8px;
- padding: 4px;
- height: 100%;
- background-color: #fff;
- border-radius: 2px;
- overflow: hidden;
-}
-.aposcope-right {
- flex: 1;
- padding: 8px;
- background-color: #fff;
-}
-.left-title {
- font-size: 16px;
- text-align: center;
- height: 38px;
- line-height: 38px;
- border-bottom: 1px solid #e2e2e2;
- background-color: #409eff;
- color: #fff;
- border-radius: 2px 2px 0 0;
-}
-.left-title-col {
- margin-bottom: 8px;
- font-size: 14px;
- margin-top: 8px;
-}
-.footer {
- padding: 0px 32px;
- border-radius: 0 0 2px 2px;
- background: #fff;
- box-shadow: -1px 0 3px rgba(92, 92, 92, .16);
- height: 48px;
- display: flex;
- align-items: center;
- justify-content: center;
- position: absolute;
- bottom: 0;
- left: 0;
- width: 100%;
- padding: 0 10px;
- box-sizing: border-box;
- z-index: 99;
-}
-.MYTree {
- height: calc(100% - 200px);
- overflow: hidden;
- overflow-y: auto;
-}
-.status {
- display: flex;
- align-items: start;
- flex-direction: column;
- justify-content: start;
- margin: 20px 0 8px;
- position: relative;
- width: 100%;
- font-size: 16px;
- cursor: pointer;
-}
-.status-wrap.align-left, .status-wrap:first-child {
- padding-left: 24px;
-}
-.status-wrap {
- display: flex;
- flex-wrap: wrap;
- justify-content: start;
-}
-.collect-status {
- color: #409eff;
- margin-right: 16px;
- font-size: 14px;
-}
-.status-box {
- margin: 0 8px;
- display: flex;
- align-items: center;
- justify-content: flex-start;
-}
-.status-color {
- width: 40px;
- height: 15px;
- border-radius: 2px;
- margin-right: 8px;
-}
-.status-wrap .status-con {
- display: flex;
- flex: 1;
- flex-wrap: wrap;
-}
-.status-wrap /deep/ .el-checkbox.el-checkbox--large {
- color: #3b8e8e;
-}
-.pagination {
- text-align: right;
- display: flex;
- justify-content: end;
-}
-#record {
- background: red;
- position: re lative;
-}
-#record /deep/ .domSpan {
- display: inline-block;
- width: 60px;
- height: 20px;
- background: green;
- position: absolute;
- left: 55px;
-}
+ .aposcope-main {
+ display: flex;
+ min-height: 100%;
+ height: 100%;
+ margin: 8px;
+ }
+ .aposcope-left {
+ position: relative;
+ width: 240px;
+ margin-right: 8px;
+ padding: 4px;
+ height: 100%;
+ background-color: #fff;
+ border-radius: 2px;
+ overflow: hidden;
+ }
+ .aposcope-right {
+ flex: 1;
+ padding: 8px;
+ background-color: #fff;
+ }
+ .left-title {
+ font-size: 16px;
+ text-align: center;
+ height: 38px;
+ line-height: 38px;
+ border-bottom: 1px solid #e2e2e2;
+ background-color: #409eff;
+ color: #fff;
+ border-radius: 2px 2px 0 0;
+ }
+ .left-title-col {
+ margin-bottom: 8px;
+ font-size: 14px;
+ margin-top: 8px;
+ }
+ .footer {
+ padding: 0px 32px;
+ border-radius: 0 0 2px 2px;
+ background: #fff;
+ box-shadow: -1px 0 3px rgba(92, 92, 92, .16);
+ height: 48px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 0 10px;
+ box-sizing: border-box;
+ z-index: 99;
+ }
+ .MYTree {
+ height: calc(100% - 200px);
+ overflow: hidden;
+ overflow-y: auto;
+ }
+ .status {
+ display: flex;
+ align-items: start;
+ flex-direction: column;
+ justify-content: start;
+ margin: 20px 0 8px;
+ position: relative;
+ width: 100%;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ .status-wrap.align-left, .status-wrap:first-child {
+ padding-left: 24px;
+ }
+ .status-wrap {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: start;
+ }
+ .collect-status {
+ color: #409eff;
+ margin-right: 16px;
+ font-size: 14px;
+ }
+ .status-box {
+ margin: 0 8px;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ }
+ .status-color {
+ width: 40px;
+ height: 15px;
+ border-radius: 2px;
+ margin-right: 8px;
+ }
+ .status-wrap .status-con {
+ display: flex;
+ flex: 1;
+ flex-wrap: wrap;
+ }
+ .status-wrap /deep/ .el-checkbox.el-checkbox--large {
+ color: #3b8e8e;
+ }
+ .pagination {
+ 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