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

修改接口

Browse Source
master
夜笙歌 11 months ago
parent c420a3ce14
commit ddc83ecaa5
6 changed files with 195 additions and 53 deletions
Show Stats Download Patch File Download Diff File

BIN
src/assets/board/foamingMachine1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 462 KiB

After

Width:  |  Height:  |  Size: 316 KiB

BIN
src/assets/board/foamingMachine2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 337 KiB

BIN
src/assets/board/foamingMachine3.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 462 KiB

44
src/views/board/caseShell/index2.vue
Unescape Escape View File

@ -146,7 +146,6 @@ export default {
e: 'xkqhb-01',
i: "scada_xk_bz_pro_01('')",
f: (e) => {
console.log(e[0].COLUMN_A)
this.team = e[0].COLUMN_A
this.planNum = e[0].COLUMN_B
this.practicalNum = e[0].COLUMN_C
@ -229,6 +228,12 @@ export default {
normal: {
show: true,
position: "top",
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
@ -262,6 +267,12 @@ export default {
normal: {
show: true,
position: "top",
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
@ -366,6 +377,12 @@ export default {
label: {
normal: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#a8aab0",
@ -399,6 +416,12 @@ export default {
label: {
normal: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#a8aab0",
@ -507,6 +530,12 @@ export default {
label: {
normal: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#a8aab0",
@ -540,6 +569,12 @@ export default {
label: {
normal: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#a8aab0",
@ -639,6 +674,12 @@ export default {
normal: {
show: true,
position: "top",
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
@ -683,7 +724,6 @@ export default {
},
methods: {},
beforeDestroy() {
console.log(1)
if(intervalFun){
clearInterval(intervalFun)
intervalFun = null

154
src/views/board/foaming/index.vue
Unescape Escape View File

@ -23,33 +23,33 @@
<div>发泡线 - 运行状态：</div>
</div>
<div class="info1">
A1：
A：
</div>
<div class="status1"
:style="'background-color:'+(statusArr.find(e=>e.X_VALUE === 'A1')&&statusArr.find(e=>e.X_VALUE === 'A1').Y_VALUE >0 ? '#00ff00':'#ff0000')"></div>
<div class="info2">
B1：
B：
</div>
<div class="status2"
:style="'background-color:'+(statusArr.find(e=>e.X_VALUE === 'B1')&&statusArr.find(e=>e.X_VALUE === 'B1').Y_VALUE >0 ? '#00ff00':'#ff0000')"></div>
<div class="info3" v-if="$route.query.id === '1' || id === '1'">
A2：
C：
</div>
<div class="status3" v-if="$route.query.id === '1' || id === '1'"
:style="'background-color:'+(statusArr.find(e=>e.X_VALUE === 'A2')&&statusArr.find(e=>e.X_VALUE === 'A2').Y_VALUE >0 ? '#00ff00':'#ff0000')"></div>
<div class="info4" v-if="$route.query.id === '1' || id === '1'">
B2：
D：
</div>
<div class="status4" v-if="$route.query.id === '1' || id === '1'"
:style="'background-color:'+(statusArr.find(e=>e.X_VALUE === 'B2')&&statusArr.find(e=>e.X_VALUE === 'B2').Y_VALUE >0 ? '#00ff00':'#ff0000')"></div>
<div class="info5">
A：
1#系统：
</div>
<div class="status5"
:style="'background-color:'+(statusArr.find(e=>e.X_VALUE === 'A')&&statusArr.find(e=>e.X_VALUE === 'A').Y_VALUE >0 ? '#00ff00':'#ff0000')"></div>
<div class="info6">
B：
2#系统：
</div>
<div class="status6"
:style="'background-color:'+(statusArr.find(e=>e.X_VALUE === 'B')&&statusArr.find(e=>e.X_VALUE === 'B').Y_VALUE >0 ? '#00ff00':'#ff0000')"></div>
@ -493,6 +493,12 @@ export default {
barWidth: "40%",
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#49d9ff",
@ -551,7 +557,7 @@ export default {
}
})
this.scrollTableData1 = table
let totalArr = table.slice(0, 6)
let totalArr = table
this.total = {
value1: ((totalArr.filter(val => val.value3 === '生产中').length / 6) * 100).toFixed(2),
value2: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0),
@ -644,6 +650,12 @@ export default {
barWidth: "30%",
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#49d9ff",
@ -664,7 +676,13 @@ export default {
borderRadius: 2,
},
},
data: e.map(val => val.Y_VALUE_ONE),
data: e.map(val => {
if (val.Y_VALUE_ONE === 0) {
return null
} else {
return val.Y_VALUE_ONE
}
}),
},
{
name: 'ISO压力',
@ -673,6 +691,12 @@ export default {
barGap: '40%',
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#49d9ff",
@ -693,7 +717,13 @@ export default {
borderRadius: 2,
},
},
data: e.map(val => val.Y_VALUE_TWO),
data: e.map(val => {
if (val.Y_VALUE_TWO === 0) {
return null
} else {
return val.Y_VALUE_TWO
}
}),
},
],
})
@ -818,6 +848,12 @@ export default {
label: {
show: true,
position: "top",
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
textStyle: {
color: "#49d9ff",
},
@ -866,6 +902,12 @@ export default {
label: {
show: true,
position: "top",
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
textStyle: {
color: "#668e84",
},
@ -959,6 +1001,12 @@ export default {
type: "bar",
barWidth: "33%",
label: {
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
show: true,
position: "top",
textStyle: {
@ -1067,6 +1115,12 @@ export default {
barMaxWidth: 40,
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#49d9ff",
@ -1126,7 +1180,7 @@ export default {
})
this.scrollTableData1 = table
let totalArr = table.slice(0, 6)
let totalArr = table
this.total = {
value1: ((totalArr.filter(val => val.value3 === '生产中').length / 6) * 100).toFixed(2),
value2: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0),
@ -1218,6 +1272,12 @@ export default {
label: {
show: true,
position: "top",
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
textStyle: {
color: "#49d9ff",
},
@ -1237,7 +1297,14 @@ export default {
borderRadius: 2,
},
},
data: e.map(val => val.Y_VALUE_ONE),
data: e.map(val => {
if (val.Y_VALUE_ONE === 0) {
return null
} else {
return val.Y_VALUE_ONE
}
}),
},
{
name: 'ISO压力',
@ -1246,6 +1313,12 @@ export default {
barGap: '40%',
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#49d9ff",
@ -1266,7 +1339,13 @@ export default {
borderRadius: 2,
},
},
data: e.map(val => val.Y_VALUE_TWO),
data: e.map(val => {
if (val.Y_VALUE_TWO === 0) {
return null
} else {
return val.Y_VALUE_TWO
}
}),
},
],
})
@ -1390,6 +1469,12 @@ export default {
},
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#49d9ff",
@ -1438,6 +1523,12 @@ export default {
},
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#668e84",
@ -1533,6 +1624,12 @@ export default {
barWidth: "33%",
label: {
show: true,
formatter:(e)=>{
if(e.data === 0){
return ''
}else{}
return e.data
},
position: "top",
textStyle: {
color: "#49d9ff",
@ -1580,25 +1677,6 @@ export default {
num = num % num1
this.show = num
let totalArr = this.scrollTableData1.slice(num * 6, (num + 1) * 6)
this.total = {
value1: ((totalArr.filter(val => val.value3 === '生产中').length / 6) * 100).toFixed(2),
value2: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0),
value3: totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0),
value4: ((totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0) / totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0)) * 100).toFixed(2),
value5: totalArr.map(val => val.value8).reduce((acc, curr) => acc + curr, 0),
value6: totalArr.map(val => val.value9).reduce((acc, curr) => acc + curr, 0),
value7: totalArr.map(val => val.value10).reduce((acc, curr) => acc + curr, 0),
value8: totalArr.map(val => val.value11).reduce((acc, curr) => acc + curr, 0),
value9: totalArr.map(val => val.value12).reduce((acc, curr) => acc + curr, 0),
value10: totalArr.map(val => val.value13).reduce((acc, curr) => acc + curr, 0),
value11: totalArr.map(val => val.value14).reduce((acc, curr) => acc + curr, 0),
value12: totalArr.map(val => val.value15).reduce((acc, curr) => acc + curr, 0),
value13: totalArr.map(val => val.value16).reduce((acc, curr) => acc + curr, 0),
value14: totalArr.map(val => val.value17).reduce((acc, curr) => acc + curr, 0),
value15: totalArr.map(val => val.value18).reduce((acc, curr) => acc + curr, 0),
value16: totalArr.map(val => val.value19).reduce((acc, curr) => acc + curr, 0),
}
}, 30 * 1000)
if (this.$route.query.id === '1' || this.id === '1') {
this.RequestDataSet.forEach(val => {
@ -1895,18 +1973,18 @@ export default {
.info5 {
position: absolute;
transform: translate(-50%, -50%);
transform: translateY(-50%);
top: 28%;
left: 56%;
left: 55%;
font-size: 1vw;
color: #fff;
}
.status5 {
position: absolute;
transform: translate(-50%, -50%);
transform: translateY(-50%);
top: 28%;
left: 59%;
left: 59.5%;
width: 1.5vw;
height: 1.5vw;
background: #00ff00;
@ -1915,7 +1993,7 @@ export default {
.info6 {
position: absolute;
transform: translate(-50%, -50%);
transform: translateY(-50%);
top: 28%;
left: 62%;
font-size: 1vw;
@ -1924,9 +2002,9 @@ export default {
.status6 {
position: absolute;
transform: translate(-50%, -50%);
transform: translateY(-50%);
top: 28%;
left: 65%;
left: 66.5%;
width: 1.5vw;
height: 1.5vw;
background: #00ff00;

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

@ -25,8 +25,8 @@
</div>
<div style="position: absolute; top: 23%;left: 60%;width:10vw;color: #fff;font-size: 0.8vw;line-height: 1.5vw">
<div>生产节拍：</div>
<div>线体1圈 {{ meter1 }}s</div>
<div>台车1位 {{ meter2 }}s</div>
<div>线体1圈 <span style="margin-left: 10px">{{ ' ' + meter1 }}</span>s</div>
<div>台车1位 <span style="margin-left: 10px">{{ ' ' + meter2 }}</span>s</div>
</div>
<div class="foamingMachine"></div>
@ -387,7 +387,13 @@ export default {
borderRadius: 2,
},
},
data: e.map(val => val.Y_VALUE_ONE),
data: e.map(val => {
if (val.Y_VALUE_ONE === 0) {
return null
} else {
return val.Y_VALUE_ONE
}
}),
},
{
name: 'ISO压力',
@ -416,7 +422,13 @@ export default {
borderRadius: 2,
},
},
data: e.map(val => val.Y_VALUE_TWO),
data: e.map(val => {
if (val.Y_VALUE_TWO === 0) {
return null
} else {
return val.Y_VALUE_TWO
}
}),
},
],
})
@ -571,7 +583,13 @@ export default {
shadowBlur: 20,
},
},
data: e.map(val => val.Y_VALUE_ONE),
data: e.map(val => {
if (val.Y_VALUE_ONE === 0) {
return null
} else {
return val.Y_VALUE_ONE
}
}),
},
{
name: 'ISO温度',
@ -620,7 +638,13 @@ export default {
shadowBlur: 20,
},
},
data: e.map(val => val.Y_VALUE_TWO),
data: e.map(val => {
if (val.Y_VALUE_TWO === 0) {
return null
} else {
return val.Y_VALUE_TWO
}
}),
},
],
})
@ -773,7 +797,7 @@ export default {
top: 35%;
left: 50%;
width: 36vw;
height: 10.755vw;
height: 8.7vw;
}
.app-container {

Write Preview
Loading…
Cancel
Save