From 55900c9b6519dbe3d0f02f914a1cb2b2be22a6a9 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 15 五月 2024 09:45:21 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/components/recordChartsByWorkstation.vue | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/components/recordChartsByWorkstation.vue b/src/views/mdc/components/recordChartsByWorkstation.vue
index 12753cc..6aec7e8 100644
--- a/src/views/mdc/components/recordChartsByWorkstation.vue
+++ b/src/views/mdc/components/recordChartsByWorkstation.vue
@@ -1,6 +1,6 @@
<template>
<div id="recordworkParse">
- <div id="recordwork" style="height:500px;"></div>
+ <div id="recordwork" style="height:400px;"></div>
<div class="paginationwork">
<el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
</div>
@@ -11,7 +11,7 @@
import moment from 'moment';
import * as echarts from 'echarts';
export default {
- props: ['setWork','collectionstatus',"select"],
+ props: ['setWork','achievements',"select"],
watch: {
setWork(val) {
this.current = "1";
@@ -67,8 +67,8 @@
},
getColor(name) {
var color = '';
- this.collectionstatus.forEach(item=> {
- if(item.name == name) {
+ this.achievements.forEach(item=> {
+ if(item.code == name) {
color = item.color;
}
})
@@ -90,7 +90,7 @@
var startTime = moment(item1.startTime).diff(moment(initstart + " 00:00:00"), 'minutes');
var endTime = moment(item1.endTime).diff(moment(initstart + " 00:00:00"), 'minutes');
var diff = moment(item1.endTime).diff(moment(item1.startTime), 'minutes') //寮�濮嬩簡澶氫箙
- var color = this.getColor(item1.wcsDesc);
+ var color = this.getColor(item1.wcs);
item1.value = [index,startTime,endTime,diff];
item1.itemStyle = {"normal": {"color": color}};
item1.code = item.date;
@@ -109,7 +109,6 @@
var option = {
tooltip: {
formatter: function (params) {
- console.log(params)
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>
@@ -121,7 +120,7 @@
grid: {
top: 10,
left: 100,
- bottom: 130,
+ bottom: 30,
right: 30
},
xAxis: {
@@ -203,8 +202,7 @@
text-align: right;
display: flex;
justify-content: end;
- margin-top: -60px;
+ margin-top: 20px;
position: relative;
- z-index: 99;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3