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 | 233 ++++++++++++++++++++++++++++++++++++++++++++++------------
src/views/login/components/passwordForm.vue | 2
2 files changed, 185 insertions(+), 50 deletions(-)
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 380479c..9703717 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -141,7 +141,7 @@
permissions: ["list.add", "list.edit", "list.delete", "user.add", "user.edit", "user.delete"]
}
this.$TOOL.data.set("MENU", obj.menu);
- console.log(obj.menu,289)
+ console.log(obj.menu,'menu')
this.$TOOL.data.set("PERMISSIONS", obj.permissions)
this.$TOOL.data.set("DASHBOARDGRID", obj.dashboardGrid)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index df06253..78f83ff 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',
@@ -193,30 +189,50 @@
{
name: '杈呭姪',
type: 'bar',
- stack: '鎬婚噺',
+ stack: 'grouup',
itemStyle: {
borderColor: 'transparent',
color: 'transparent'
},
emphasis: {
itemStyle: {
- borderColor: 'transparent',
- color: 'transparent'
+ borderColor: 'transparent',
+ color: 'transparent'
}
},
- data: [0, 0, 0, 240, 360, 540] //浠庝粈涔堟椂鍊欏紑濮嬬殑
+ data: [{value:100}, {value:0}, {value:0}, {value:240}, {value:360}, {value:540}] //浠庝粈涔堟椂鍊欏紑濮嬬殑
+ //data: []
},
{
- name: '鏃堕棿',
+ name: 'time',
type: 'bar',
- stack: '鎬婚噺',
- label: {
- normal: {
- show: true,
- position: 'top'
- }
+ 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'
},
- data: ['-', '-', '-', 1200, 240, 900] //鏁板�兼槸鍑狅紝濡�(20锛屽氨鏄粠4寮�濮嬶紝20鏍兼暟鎹�)
+ 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 +287,164 @@
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') //寮�濮嬩簡澶氫箙
+ })
+ // 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;
- 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')];
@@ -438,15 +574,14 @@
justify-content: end;
}
#record {
- background: red;
- position: re lative;
+ position: relative;
}
#record /deep/ .domSpan {
display: inline-block;
- width: 60px;
+ width: 70px;
height: 20px;
background: green;
position: absolute;
- left: 55px;
+ cursor: pointer;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3