yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-ui

Browse Source
master
yinq 1 year ago
parent 12f461cf9b 5b56db98d9
commit d7c8591415
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
public/data.json
Unescape Escape View File

@ -1296,7 +1296,7 @@
], ],
"y": [ "y": [
{ {
"name": "目标产量", "name": "实际产量",
"data": [ "data": [
300, 300,
300, 300,
@ -1310,7 +1310,7 @@
] ]
}, },
{ {
"name": "实际产量", "name": "目标产量",
"data": [ "data": [
300, 300,
290, 290,

8
src/views/board/foaming/index2.vue
Unescape Escape View File

@ -754,7 +754,7 @@
<div style="width: 33%;display: inline-block">产量</div> <div style="width: 33%;display: inline-block">产量</div>
</div> </div>
<div v-for="i in 10" <div v-for="i in 10"
:style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color: '+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')"> :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color: '+ (i === 2 ? '#bed4ce' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')">
<div style="width: 33%;display: inline-block">{{ i }}</div> <div style="width: 33%;display: inline-block">{{ i }}</div>
<div style="width: 33%;display: inline-block">487JFY</div> <div style="width: 33%;display: inline-block">487JFY</div>
<div style="width: 33%;display: inline-block">15-15</div> <div style="width: 33%;display: inline-block">15-15</div>
@ -767,7 +767,7 @@
<div style="width: 33%;display: inline-block">产量</div> <div style="width: 33%;display: inline-block">产量</div>
</div> </div>
<div v-for="i in 10" <div v-for="i in 10"
:style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#ff000088' : '#1be40944')"> :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#ff5959' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#ff000088' : '#1be40944')">
<div style="width: 33%;display: inline-block">{{ i }}</div> <div style="width: 33%;display: inline-block">{{ i }}</div>
<div style="width: 33%;display: inline-block">487JFY</div> <div style="width: 33%;display: inline-block">487JFY</div>
<div style="width: 33%;display: inline-block">15-15</div> <div style="width: 33%;display: inline-block">15-15</div>
@ -780,7 +780,7 @@
<div style="width: 33%;display: inline-block">产量</div> <div style="width: 33%;display: inline-block">产量</div>
</div> </div>
<div v-for="i in 10" <div v-for="i in 10"
:style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#ff800088' : '#1be40944')"> :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#ffb769' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#ff800088' : '#1be40944')">
<div style="width: 33%;display: inline-block">{{ i }}</div> <div style="width: 33%;display: inline-block">{{ i }}</div>
<div style="width: 33%;display: inline-block">487JFY</div> <div style="width: 33%;display: inline-block">487JFY</div>
<div style="width: 33%;display: inline-block">15-15</div> <div style="width: 33%;display: inline-block">15-15</div>
@ -793,7 +793,7 @@
<div style="width: 33%;display: inline-block">产量</div> <div style="width: 33%;display: inline-block">产量</div>
</div> </div>
<div v-for="i in 10" <div v-for="i in 10"
:style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')"> :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#bed4ce' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')">
<div style="width: 33%;display: inline-block">{{ i }}</div> <div style="width: 33%;display: inline-block">{{ i }}</div>
<div style="width: 33%;display: inline-block">487JFY</div> <div style="width: 33%;display: inline-block">487JFY</div>
<div style="width: 33%;display: inline-block">15-15</div> <div style="width: 33%;display: inline-block">15-15</div>

25
src/views/board/scanDown/index.vue
Unescape Escape View File

@ -7,6 +7,9 @@
</div> </div>
<div class="loss">{{loss}}</div> <div class="loss">{{loss}}</div>
<div class="meter">{{meter}}</div> <div class="meter">{{meter}}</div>
<span style="position: absolute;top: 10%;left: 14%;color: #fff;font-size: 1vw;">目标：1000&nbsp;&nbsp;进度目标：1000&nbsp;&nbsp;实际：1000&nbsp;&nbsp;差异：0&nbsp;&nbsp;达成率：100% </span>
<span style="position: absolute;top: 54.3%;left: 19%;color: #fff;font-size: 1vw">目标：3% &nbsp;&nbsp;&nbsp;实际：1% &nbsp;&nbsp;&nbsp;累计不良数：1</span>
<span style="position: absolute;top: 54.3%;left: 66.7%;color: #CFD2D0;font-size: 1.0vw">合计：111</span>
<div class="scrollTable"> <div class="scrollTable">
<div style="background-color: #094170"> <div style="background-color: #094170">
@ -260,6 +263,15 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
barBorderRadius: 5, barBorderRadius: 5,
color: function (val) {
console.log()
if (e.chart11.y[0].data[val.dataIndex] >= e.chart11.y[1].data[val.dataIndex]) {
return '#30e391'
} else {
return '#FE70A6'
}
// return "#0D81ED"
},
}, },
}, },
data: e.chart11.y[0].data, data: e.chart11.y[0].data,
@ -379,6 +391,19 @@ export default {
{ {
name: e.chart12.y[0].name, name: e.chart12.y[0].name,
type: 'bar', type: 'bar',
itemStyle: {
normal: {
color: function (val) {
console.log()
if (e.chart12.y[1].data[val.dataIndex] < e.chart12.y[2].data[val.dataIndex]) {
return '#30e391'
} else {
return '#FE70A6'
}
// return "#0D81ED"
},
},
},
data: e.chart12.y[0].data, data: e.chart12.y[0].data,
label: { label: {
show: true, show: true,

Write Preview
Loading…
Cancel
Save