From 2739d8db05a25509cebcf7b77b9a0fb5b6722001 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 25 四月 2024 19:08:02 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 331 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 308 insertions(+), 23 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 0c4a9ac..78f83ff 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -20,7 +20,6 @@
<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-group>
<div class="status">
- <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
<div class="status-wrap align-left">
<div class="collect-status">閲囬泦鐘舵��</div>
<div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
@@ -32,7 +31,12 @@
</div>
</div>
</div>
- <el-pagination layout="prev, pager, next" :total="total" :page-count="size" :default-page-size="size"/>
+ <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>
</el-tab-pane>
<el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
鎸夊伐浣嶆煡鐪�
@@ -47,6 +51,7 @@
import MYTree from './MYTree.vue'
import Shift from './components/Shift.vue'
import Time from './components/Time.vue'
+import * as echarts from 'echarts';
export default {
components: {
time: "",
@@ -75,6 +80,7 @@
},
data() {
return {
+ workstationInfoList: [],
checked1: true,
btnListActive: '',
btnList: [],
@@ -115,14 +121,129 @@
collectionstatus: [],
current: "1",
size: "6",
- total: 0
+ 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: []
+ }
+ ]
+ }
}
},
created() {
},
mounted() {
- this.init();
+ this.getCharts();
+ //this.init();
},
methods: {
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
@@ -148,24 +269,182 @@
...data
}).then(res => {
if (res.code === 200) {
- this.btnList = res.data
+ var today = moment().format('YYYY-MM-DD');
+ var yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD');
+ res.data.forEach(item=> {
+ if(item.title == today) {
+ item.title = "浠婂ぉ";
+ }
+ if(item.title == yesterday) {
+ item.title = "鏄ㄥぉ";
+ }
+ })
+ this.btnList = res.data.reverse();
this.btnListActive = res?.data?.[0]?.id
}
})
},
getCharts() {
var obj = {
- date: this.time[0],
+ //date: this.time[1],
+ date: "2024-04-24",
humanFeedback: true,
machineFeedback: true,
- workstationInfoList: []
+ 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) {
- console.log(res.data.records)
+ 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') //寮�濮嬩簡澶氫箙
+ })
+ // var data1 = [];
+ // var data2 = [];
+ //璁＄畻鏄剧ず鐨勬暟鎹�
+ // item.statusRecordList.forEach(item2=> {
+ // seriesData.push({
+ // name: '杈呭姪',
+ // type: 'bar',
+ // stack: 'grouup',
+ // itemStyle: {
+ // borderColor: 'transparent',
+ // color: 'transparent'
+ // },
+ // emphasis: {
+ // itemStyle: {
+ // borderColor: 'transparent',
+ // color: 'transparent'
+ // }
+ // },
+ // data: [{value:item.startMinutes}, {value:0}, {value:0}, {value:240}, {value:360}, {value:540}] //浠庝粈涔堟椂鍊欏紑濮嬬殑
+ // })
+ // arr.push({
+ // name: 'time',
+ // type: 'bar',
+ // stack: 'grouup',
+ // data: [{value: item.diff}, {value: null}, {value: null}, {value:1200}, {value:240}, {value:900}] //鏁板�兼槸鍑狅紝濡�(20锛屽氨鏄粠4寮�濮嬶紝20鏍兼暟鎹�)
+ // })
+ //})
+ })
+ //demo
+ // var data = [];
+ // var vb = a[0].statusRecordList;
+ // vb.forEach((item,index)=> {
+ // if(index == 0) {
+ // data.push({value: item.startMinutes}); //骞曞竷
+ // }else {
+ // data.push({value: item.startMinutes - (vb[index-1].startMinutes+vb[index-1].diff)}); //骞曞竷
+ // }
+ // data.push({value: item.diff}); //鍐呭
+ // })
+ // data;
+ //end
+
+ var recordDom = document.getElementById('record');
+ var myChart = echarts.init(recordDom);
+ this.recordOptionLog.yAxis.data = yAxis; //y杞存暟鎹�
+ var series0data = []; //浠庝粈涔堟椂鍊欏紑濮嬬殑
+ var series1data = []; //鏁板�兼槸鍑狅紝濡�(20锛屽氨鏄粠4寮�濮嬶紝20鏍兼暟鎹�)
+ console.log(JSON.stringify(res.data.records))
+ // res.data.records.forEach(item=> {
+ // item.statusRecordList.forEach(item1=> {
+
+ // })
+ // })
+
+ 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')];
@@ -177,13 +456,9 @@
},
query() {
- this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'})
- // this.$refs[this.activeName].init({
- // endDate: this.time[1],
- // startDate: this.time[0],
- // shiftIndexList: [1, 2],
- // workStationIdList: [...this.treeChecked]
- // })
+ this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
+ //this.getCharts();
+ console.log(this.treeChecked,2)
}
}
}
@@ -194,6 +469,7 @@
display: flex;
min-height: 100%;
height: 100%;
+ overflow: hidden;
margin: 8px;
}
.aposcope-left {
@@ -259,13 +535,6 @@
font-size: 16px;
cursor: pointer;
}
-.feed-button {
- position: absolute;
- right: 10px;
- top: -2px;
- color: #3b8e8e;
- cursor: pointer;
-}
.status-wrap.align-left, .status-wrap:first-child {
padding-left: 24px;
}
@@ -275,7 +544,7 @@
justify-content: start;
}
.collect-status {
- color: #3b8e8e;
+ color: #409eff;
margin-right: 16px;
font-size: 14px;
}
@@ -299,4 +568,20 @@
.status-wrap /deep/ .el-checkbox.el-checkbox--large {
color: #3b8e8e;
}
+.pagination {
+ text-align: right;
+ display: flex;
+ justify-content: end;
+}
+#record {
+ position: relative;
+}
+#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