Compare commits
No commits in common. "0337b54202e857b45d9d77e1d58ddec77b208694" and "5584a47575a9e58035d38cc5a3b18434ad388e5a" have entirely different histories.
0337b54202
...
5584a47575
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-01-29 16:50:26
|
* @Date: 2024-01-29 16:50:26
|
||||||
* @LastEditTime: 2024-04-16 13:44:14
|
* @LastEditTime: 2024-04-11 09:55:04
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -635,34 +635,32 @@ export default {
|
|||||||
// this.cutConfig.data = cutArr
|
// this.cutConfig.data = cutArr
|
||||||
// this.$refs['cutScrollBoard'].updateRows(cutArr)
|
// this.$refs['cutScrollBoard'].updateRows(cutArr)
|
||||||
} else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
|
} else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
|
||||||
if (this.cutWsData.coldDetData.length !== 0) {
|
let nameList = []
|
||||||
let nameList = []
|
let nameWasteList = []
|
||||||
let nameWasteList = []
|
let topNameList = []
|
||||||
let topNameList = []
|
let productList = []
|
||||||
let productList = []
|
let wasteList = []
|
||||||
let wasteList = []
|
let sumAreaList = []
|
||||||
let sumAreaList = []
|
let yieldList = []
|
||||||
let yieldList = []
|
this.coldDetData = this.cutWsData.coldDetData
|
||||||
this.coldDetData = this.cutWsData.coldDetData
|
// this.cutTableDataList =
|
||||||
// this.cutTableDataList =
|
this.cutWsData.coldDetData.forEach((ele, index) => {
|
||||||
this.cutWsData.coldDetData.forEach((ele, index) => {
|
nameList.push(ele.lineName)
|
||||||
nameList.push(ele.lineName)
|
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
|
||||||
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
|
productList.push(ele.productArea)
|
||||||
productList.push(ele.productArea)
|
wasteList.push(ele.wastArea)
|
||||||
wasteList.push(ele.wastArea)
|
nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
|
||||||
nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
|
sumAreaList.push(ele.sumArea)
|
||||||
sumAreaList.push(ele.sumArea)
|
yieldList.push(parseFloat((ele.yield * 100).toFixed(0)))
|
||||||
yieldList.push(parseFloat((ele.yield * 100).toFixed(0)))
|
})
|
||||||
})
|
this.$nextTick(() => {
|
||||||
this.$nextTick(() => {
|
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
|
||||||
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
|
this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
|
||||||
this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
|
this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
|
||||||
this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
|
this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
|
||||||
this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
|
this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
|
||||||
this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
|
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
|
||||||
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
|
})
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
// if (typeof (WebSocket) === 'undefined') {
|
// if (typeof (WebSocket) === 'undefined') {
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-01-29 13:45:56
|
* @Date: 2024-01-29 13:45:56
|
||||||
* @LastEditTime: 2024-04-16 13:43:05
|
* @LastEditTime: 2024-04-15 09:28:21
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -126,22 +126,22 @@ export default {
|
|||||||
color: '#fff00',
|
color: '#fff00',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
// legend: {
|
legend: {
|
||||||
// bottom: '10%',
|
bottom: '10%',
|
||||||
// left: 'center',
|
left: 'center',
|
||||||
// itemWidth: 12,
|
itemWidth: 12,
|
||||||
// itemHeight:12,
|
itemHeight:12,
|
||||||
// icon: 'roundRect',
|
icon: 'roundRect',
|
||||||
// textStyle: {
|
textStyle: {
|
||||||
// color: '#fff'
|
color: '#fff'
|
||||||
// },
|
},
|
||||||
// data:this.chartData && this.chartData.length > 0 && this.chartData.map((item,index)=>({
|
data:this.chartData && this.chartData.length > 0 && this.chartData.map((item,index)=>({
|
||||||
// name:item.name,
|
name:item.name,
|
||||||
// itemStyle:{
|
itemStyle:{
|
||||||
// color: this.colors[index%4]
|
color: this.colors[index%4]
|
||||||
// }
|
}
|
||||||
// }))
|
}))
|
||||||
// },
|
},
|
||||||
series:[{
|
series:[{
|
||||||
name: 'ISRA缺陷检测',
|
name: 'ISRA缺陷检测',
|
||||||
type: 'pie',
|
type: 'pie',
|
||||||
@ -168,7 +168,7 @@ export default {
|
|||||||
},
|
},
|
||||||
textStyle: { // 提示文字的样式
|
textStyle: { // 提示文字的样式
|
||||||
// color: '#595959',
|
// color: '#595959',
|
||||||
fontSize: 18
|
fontSize: 16
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-09-21 09:06:28
|
* @Date: 2023-09-21 09:06:28
|
||||||
* @LastEditTime: 2024-04-16 13:39:25
|
* @LastEditTime: 2024-04-09 15:24:39
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -156,8 +156,6 @@ export default {
|
|||||||
this.chart.setOption({
|
this.chart.setOption({
|
||||||
// color: colors,
|
// color: colors,
|
||||||
tooltip: {
|
tooltip: {
|
||||||
trigger: 'item',
|
|
||||||
className: "isra-chart-tooltip",
|
|
||||||
trigger: 'axis',
|
trigger: 'axis',
|
||||||
axisPointer: {
|
axisPointer: {
|
||||||
type: 'cross'
|
type: 'cross'
|
||||||
@ -320,16 +318,8 @@ export default {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
|
|
||||||
.coldProductChart{
|
.coldProductChart{
|
||||||
top: -10px;
|
top: -10px;
|
||||||
}
|
}
|
||||||
.isra-chart-tooltip {
|
|
||||||
background: #0a2b4f77 !important;
|
|
||||||
border: none !important;
|
|
||||||
backdrop-filter: blur(12px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.isra-chart-tooltip * {
|
|
||||||
color: #fff !important;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-09-21 09:06:28
|
* @Date: 2023-09-21 09:06:28
|
||||||
* @LastEditTime: 2024-04-16 13:37:38
|
* @LastEditTime: 2024-04-09 15:24:28
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -162,8 +162,6 @@ export default {
|
|||||||
this.chart.setOption({
|
this.chart.setOption({
|
||||||
// color: colors,
|
// color: colors,
|
||||||
tooltip: {
|
tooltip: {
|
||||||
trigger: 'item',
|
|
||||||
className: "isra-chart-tooltip",
|
|
||||||
trigger: 'axis',
|
trigger: 'axis',
|
||||||
axisPointer: {
|
axisPointer: {
|
||||||
type: 'cross'
|
type: 'cross'
|
||||||
@ -329,13 +327,4 @@ export default {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
top: -30px;
|
top: -30px;
|
||||||
}
|
}
|
||||||
.isra-chart-tooltip {
|
|
||||||
background: #0a2b4f77 !important;
|
|
||||||
border: none !important;
|
|
||||||
backdrop-filter: blur(12px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.isra-chart-tooltip * {
|
|
||||||
color: #fff !important;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -128,8 +128,6 @@ export default {
|
|||||||
this.chart.setOption({
|
this.chart.setOption({
|
||||||
tooltip: {
|
tooltip: {
|
||||||
trigger: 'axis',
|
trigger: 'axis',
|
||||||
trigger: 'item',
|
|
||||||
className: "isra-chart-tooltip",
|
|
||||||
axisPointer: {
|
axisPointer: {
|
||||||
// 坐标轴指示器，坐标轴触发有效
|
// 坐标轴指示器，坐标轴触发有效
|
||||||
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
|
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
|
||||||
@ -228,13 +226,4 @@ export default {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
top: -30px;
|
top: -30px;
|
||||||
}
|
}
|
||||||
.isra-chart-tooltip {
|
|
||||||
background: #0a2b4f77 !important;
|
|
||||||
border: none !important;
|
|
||||||
backdrop-filter: blur(12px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.isra-chart-tooltip * {
|
|
||||||
color: #fff !important;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-27 13:54:52
|
* @Date: 2023-12-27 13:54:52
|
||||||
* @LastEditTime: 2024-04-16 13:16:34
|
* @LastEditTime: 2024-04-03 18:12:18
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -101,14 +101,11 @@ export default {
|
|||||||
});;
|
});;
|
||||||
},
|
},
|
||||||
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
|
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
|
||||||
if (topNameList.length === 0 && nameWasteList.length === 0 && passRateList === 0 && wasteList === 0) {
|
let rawData = []
|
||||||
return
|
let colors = ['#0fdedb', '#2359ec']
|
||||||
} else {
|
|
||||||
let rawData = []
|
|
||||||
let colors = ['#0fdedb', '#2359ec']
|
|
||||||
rawData.push(passRateList, wasteList)
|
rawData.push(passRateList, wasteList)
|
||||||
const totalData = [];
|
const totalData = [];
|
||||||
// if (rawData.length != 0 && raw,Data,length != 0) {
|
// if (rawData.length != 0 && raw,Data,length != 0) {
|
||||||
for (let i = 0; i < rawData[0].length; ++i) {
|
for (let i = 0; i < rawData[0].length; ++i) {
|
||||||
let sum = 0;
|
let sum = 0;
|
||||||
for (let j = 0; j < rawData.length; ++j) {
|
for (let j = 0; j < rawData.length; ++j) {
|
||||||
@ -116,152 +113,150 @@ export default {
|
|||||||
}
|
}
|
||||||
totalData.push(sum);
|
totalData.push(sum);
|
||||||
}
|
}
|
||||||
// }
|
// }
|
||||||
// rawData[1].map((d, did) =>
|
// rawData[1].map((d, did) =>
|
||||||
// console.log((d / totalData[did]).toFixed(3))
|
// console.log((d / totalData[did]).toFixed(3))
|
||||||
// // totalData[did] <= 0 ? 0 : d / totalData[did]
|
// // totalData[did] <= 0 ? 0 : d / totalData[did]
|
||||||
// )
|
// )
|
||||||
console.log('total', totalData)
|
console.log('total', totalData)
|
||||||
const series = [
|
const series = [
|
||||||
'良品',
|
'良品',
|
||||||
'废品',
|
'废品',
|
||||||
// 'Affiliate Ad',
|
// 'Affiliate Ad',
|
||||||
// 'Video Ad',
|
// 'Video Ad',
|
||||||
// 'Search Engine'
|
// 'Search Engine'
|
||||||
].map((name, sid) => {
|
].map((name, sid) => {
|
||||||
// console.log(sid)
|
// console.log(sid)
|
||||||
return {
|
return {
|
||||||
name,
|
name,
|
||||||
type: 'bar',
|
type: 'bar',
|
||||||
stack: 'total',
|
stack: 'total',
|
||||||
barWidth: 12,
|
barWidth: 12,
|
||||||
// label: {
|
// label: {
|
||||||
// show: true,
|
// show: true,
|
||||||
// formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
|
// formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
|
||||||
// },
|
// },
|
||||||
color: colors[sid],
|
color:colors[sid],
|
||||||
data: rawData.length != 0 ? rawData[sid].map((d, did) =>
|
data: rawData.length != 0 ? rawData[sid].map((d, did) =>
|
||||||
totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4)
|
totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4)
|
||||||
) : []
|
) : []
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
// this.charts.resize({
|
// this.charts.resize({
|
||||||
// //width: width,
|
// //width: width,
|
||||||
// //height: height,
|
// //height: height,
|
||||||
// // es6解构
|
// // es6解构
|
||||||
// width,
|
// width,
|
||||||
// height
|
// height
|
||||||
// })
|
// })
|
||||||
this.chart = echarts.init(document.getElementById(this.id))
|
this.chart = echarts.init(document.getElementById(this.id))
|
||||||
let isFinished = false //标记 isFinished
|
let isFinished = false //标记 isFinished
|
||||||
this.chart.on('finished', _ => {
|
this.chart.on('finished', _ => {
|
||||||
if (!isFinished) {
|
if (!isFinished) {
|
||||||
console.log('我只执行一次')
|
console.log('我只执行一次')
|
||||||
isFinished = true
|
isFinished = true
|
||||||
// this.isLoading = false //关闭loading
|
// this.isLoading = false //关闭loading
|
||||||
this.chart.resize() //重新渲染charts大小
|
this.chart.resize() //重新渲染charts大小
|
||||||
|
}
|
||||||
|
console.log(113, 'finished')
|
||||||
|
})
|
||||||
|
this.chart.setOption({
|
||||||
|
legend: {
|
||||||
|
formatter: function (name) {
|
||||||
|
//通过name获取到数组对象中的单个对象
|
||||||
|
let singleData = series.filter(function (item) {
|
||||||
|
return item.name == name
|
||||||
|
})
|
||||||
|
return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%'
|
||||||
|
},
|
||||||
|
itemWidth: 12,
|
||||||
|
itemHeight: 12,
|
||||||
|
bottom: '20',
|
||||||
|
left: '20',
|
||||||
|
icon: 'roundRect',
|
||||||
|
textStyle: {
|
||||||
|
color: 'rgba(255,255,255,.9)',
|
||||||
|
fontSize:12,
|
||||||
}
|
}
|
||||||
console.log(113, 'finished')
|
},
|
||||||
})
|
grid: {
|
||||||
this.chart.setOption({
|
top:'0',
|
||||||
legend: {
|
left: '3%',
|
||||||
formatter: function (name) {
|
right: '4%',
|
||||||
//通过name获取到数组对象中的单个对象
|
// bottom: '3%',
|
||||||
let singleData = series.filter(function (item) {
|
width: 'auto',
|
||||||
return item.name == name
|
height: '95',
|
||||||
})
|
containLabel: true
|
||||||
return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%'
|
},
|
||||||
|
yAxis: [
|
||||||
|
{
|
||||||
|
type: 'category',
|
||||||
|
inverse: true,
|
||||||
|
splitLine: {
|
||||||
|
show: false
|
||||||
},
|
},
|
||||||
itemWidth: 12,
|
axisTick: {
|
||||||
itemHeight: 12,
|
show: false
|
||||||
bottom: '20',
|
|
||||||
left: '20',
|
|
||||||
icon: 'roundRect',
|
|
||||||
textStyle: {
|
|
||||||
color: 'rgba(255,255,255,.9)',
|
|
||||||
fontSize: 12,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
grid: {
|
|
||||||
top: '0',
|
|
||||||
left: '3%',
|
|
||||||
right: '4%',
|
|
||||||
// bottom: '3%',
|
|
||||||
width: 'auto',
|
|
||||||
height: '95',
|
|
||||||
containLabel: true
|
|
||||||
},
|
|
||||||
yAxis: [
|
|
||||||
{
|
|
||||||
type: 'category',
|
|
||||||
inverse: true,
|
|
||||||
splitLine: {
|
|
||||||
show: false
|
|
||||||
},
|
|
||||||
axisTick: {
|
|
||||||
show: false
|
|
||||||
},
|
|
||||||
axisLine: {
|
|
||||||
show: false
|
|
||||||
},
|
|
||||||
axisLabel: {
|
|
||||||
show: true,
|
|
||||||
inside: true,
|
|
||||||
interval: 0, //横轴信息全部显
|
|
||||||
splitNumber: 50,
|
|
||||||
// boundaryGap: [20, 20],
|
|
||||||
textStyle: {
|
|
||||||
color: 'rgba(255,255,255,.9)',
|
|
||||||
verticalAlign: 'bottom',
|
|
||||||
fontSize: 16,
|
|
||||||
align: 'left',
|
|
||||||
padding: [0, 0, 10, -5]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data: topNameList
|
|
||||||
},
|
},
|
||||||
{
|
axisLine: {
|
||||||
type: 'category',
|
show: false
|
||||||
inverse: true,
|
},
|
||||||
splitLine: {
|
axisLabel: {
|
||||||
show: false
|
show: true,
|
||||||
},
|
inside: true,
|
||||||
axisTick: {
|
interval: 0, //横轴信息全部显
|
||||||
show: false
|
splitNumber: 50,
|
||||||
},
|
// boundaryGap: [20, 20],
|
||||||
axisLine: {
|
textStyle: {
|
||||||
show: false
|
color: 'rgba(255,255,255,.9)',
|
||||||
},
|
verticalAlign: 'bottom',
|
||||||
axisLabel: {
|
fontSize: 16,
|
||||||
show: true,
|
align: 'left',
|
||||||
inside: true,
|
padding: [0, 0, 10, -5]
|
||||||
interval: 0, //横轴信息全部显
|
}
|
||||||
splitNumber: 50,
|
},
|
||||||
// boundaryGap: [20, 20],
|
data: topNameList
|
||||||
textStyle: {
|
|
||||||
color: 'rgba(255,255,255,.9)',
|
|
||||||
verticalAlign: 'bottom',
|
|
||||||
fontSize: 16,
|
|
||||||
align: 'right',
|
|
||||||
padding: [0, 0, 10, -5]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data: nameWasteList
|
|
||||||
}
|
|
||||||
],
|
|
||||||
xAxis: {
|
|
||||||
// max: 120,
|
|
||||||
show: false,
|
|
||||||
},
|
},
|
||||||
series: series
|
{
|
||||||
})
|
type: 'category',
|
||||||
this.$nextTick(() => {
|
inverse: true,
|
||||||
setTimeout(() => {
|
splitLine: {
|
||||||
this.resize()
|
show: false
|
||||||
}, 1000);
|
},
|
||||||
})
|
axisTick: {
|
||||||
}
|
show: false
|
||||||
|
},
|
||||||
|
axisLine: {
|
||||||
|
show: false
|
||||||
|
},
|
||||||
|
axisLabel: {
|
||||||
|
show: true,
|
||||||
|
inside: true,
|
||||||
|
interval: 0, //横轴信息全部显
|
||||||
|
splitNumber: 50,
|
||||||
|
// boundaryGap: [20, 20],
|
||||||
|
textStyle: {
|
||||||
|
color: 'rgba(255,255,255,.9)',
|
||||||
|
verticalAlign: 'bottom',
|
||||||
|
fontSize: 16,
|
||||||
|
align: 'right',
|
||||||
|
padding: [0, 0, 10, -5]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data: nameWasteList
|
||||||
|
}
|
||||||
|
],
|
||||||
|
xAxis: {
|
||||||
|
// max: 120,
|
||||||
|
show: false,
|
||||||
|
},
|
||||||
|
series:series
|
||||||
|
})
|
||||||
|
this.$nextTick(() => {
|
||||||
|
setTimeout(() => {
|
||||||
|
this.resize()
|
||||||
|
},1000);
|
||||||
|
})
|
||||||
// this.chart.resize({
|
// this.chart.resize({
|
||||||
// width: 'auto',
|
// width: 'auto',
|
||||||
// height: 90
|
// height: 90
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2021-07-19 15:18:30
|
* @Date: 2021-07-19 15:18:30
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-16 14:03:31
|
* @LastEditTime: 2024-04-10 16:10:11
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -42,16 +42,14 @@
|
|||||||
<el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
|
<el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
|
||||||
<!-- <el-col :span="12"> -->
|
<!-- <el-col :span="12"> -->
|
||||||
<!-- <div style="height: 34px;"> -->
|
<!-- <div style="height: 34px;"> -->
|
||||||
<span style="display: inline-block;width: 330px;">
|
<span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
|
||||||
<span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
|
<el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
|
||||||
<el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
|
<!-- <span v-if="op.size" class="split"></span> -->
|
||||||
<!-- <span v-if="op.size" class="split"></span> -->
|
<span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
|
||||||
<span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
|
op.specifications }}</span>
|
||||||
op.specifications }}</span>
|
<el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
|
||||||
<el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
|
<span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
|
||||||
<span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
|
op.planQuantity }}</span>
|
||||||
op.planQuantity }}</span>
|
|
||||||
</span>
|
|
||||||
<span v-if="op.actualQuantity" class="orderFinish"
|
<span v-if="op.actualQuantity" class="orderFinish"
|
||||||
style="font-size: 14px;opacity: calc(.6);margin-left: 130px;">{{
|
style="font-size: 14px;opacity: calc(.6);margin-left: 130px;">{{
|
||||||
op.actualQuantity
|
op.actualQuantity
|
||||||
@ -110,80 +108,80 @@ const qualityYearList = [
|
|||||||
{
|
{
|
||||||
name: '翻转机',
|
name: '翻转机',
|
||||||
code: 'EQ20240110112358000235',
|
code: 'EQ20240110112358000235',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'true',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '烘干炉',
|
name: '烘干炉',
|
||||||
code: 'EQ20240110112537000241',
|
code: 'EQ20240110112537000241',
|
||||||
status: '计划停机',
|
status: '运行',
|
||||||
error: 'true',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '清洗机',
|
name: '清洗机',
|
||||||
code: ' EQ20240110112310000232',
|
code: ' EQ20240110112310000232',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'true',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '钢化清洗机',
|
name: '钢化清洗机',
|
||||||
code: 'EQ20240110111700000208',
|
code: 'EQ20240110111700000208',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'true',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '固化机',
|
name: '固化机',
|
||||||
code: 'EQ20240110111700000201',
|
code: 'EQ20240110111700000201',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'true',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '磨边清洗机',
|
name: '磨边清洗机',
|
||||||
code: ' EQ20240110111700000208',
|
code: ' EQ20240110111700000208',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'true',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '预热机',
|
name: '预热机',
|
||||||
code: 'EQ20240110111700000205',
|
code: 'EQ20240110111700000205',
|
||||||
status: '故障',
|
status: '故障',
|
||||||
error: 'true',
|
error: '是',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '下片机',
|
name: '下片机',
|
||||||
code: 'EQ20240115151435000279',
|
code: 'EQ20240115151435000279',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'false',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '冷却机',
|
name: '冷却机',
|
||||||
code: 'EQ20240110111700000203',
|
code: 'EQ20240110111700000203',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'false',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'A储片机106',
|
name: 'A储片机106',
|
||||||
code: 'EQ20240110111700000202',
|
code: 'EQ20240110111700000202',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'false',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '二次清洗机',
|
name: '二次清洗机',
|
||||||
code: 'EQ20240110111700000209',
|
code: 'EQ20240110111700000209',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'false',
|
error: '否',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '二次磨边机',
|
name: '二次磨边机',
|
||||||
code: ' EQ20240110110927000181',
|
code: ' EQ20240110110927000181',
|
||||||
status: '正常',
|
status: '故障',
|
||||||
error: 'false',
|
error: '是',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '测试设备',
|
name: '测试设备',
|
||||||
code: 'EQ20240110111700000201',
|
code: 'EQ20240110111700000201',
|
||||||
status: '正常',
|
status: '运行',
|
||||||
error: 'true',
|
error: '否',
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
const qualityMonthList = [
|
const qualityMonthList = [
|
||||||
@ -382,7 +380,7 @@ export default {
|
|||||||
progressRate: 0.933333,
|
progressRate: 0.933333,
|
||||||
specifications: '1100*5554*22',
|
specifications: '1100*5554*22',
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity:111,
|
finish:111,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '2',
|
id: '2',
|
||||||
@ -390,7 +388,7 @@ export default {
|
|||||||
progressRate: 0.932323,
|
progressRate: 0.932323,
|
||||||
size: '1100*5554*22',
|
size: '1100*5554*22',
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity: 111,
|
finish: 111,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '3',
|
id: '3',
|
||||||
@ -398,7 +396,7 @@ export default {
|
|||||||
progressRate: 0.23232,
|
progressRate: 0.23232,
|
||||||
size: '1100*5554*22',
|
size: '1100*5554*22',
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity: 111,
|
finish: 111,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '4',
|
id: '4',
|
||||||
@ -406,7 +404,7 @@ export default {
|
|||||||
progressRate: 0.32323,
|
progressRate: 0.32323,
|
||||||
size: '1100*5554*22',
|
size: '1100*5554*22',
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity: 111,
|
finish: 111,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '5',
|
id: '5',
|
||||||
@ -414,7 +412,7 @@ export default {
|
|||||||
progressRate: 0.32323,
|
progressRate: 0.32323,
|
||||||
size: '1100*5554*22',
|
size: '1100*5554*22',
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity: 111,
|
finish: 111,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '6',
|
id: '6',
|
||||||
@ -422,7 +420,7 @@ export default {
|
|||||||
size: '1100*5554*22',
|
size: '1100*5554*22',
|
||||||
progressRate: 0.32323,
|
progressRate: 0.32323,
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity: 111,
|
finish: 111,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '7',
|
id: '7',
|
||||||
@ -430,7 +428,7 @@ export default {
|
|||||||
size: '1100*5554*22',
|
size: '1100*5554*22',
|
||||||
progressRate: 0.32323,
|
progressRate: 0.32323,
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity: 111,
|
finish: 111,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '8',
|
id: '8',
|
||||||
@ -438,7 +436,7 @@ export default {
|
|||||||
progressRate: 0.32323,
|
progressRate: 0.32323,
|
||||||
size: '1100*5554*22',
|
size: '1100*5554*22',
|
||||||
plan: 11111,
|
plan: 11111,
|
||||||
actualQuantity: 111,
|
finish: 111,
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// id: '5',
|
// id: '5',
|
||||||
@ -458,7 +456,7 @@ export default {
|
|||||||
progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
|
progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
|
||||||
specifications: ele.specifications ? '规格' + ele.specifications :null,
|
specifications: ele.specifications ? '规格' + ele.specifications :null,
|
||||||
planQuantity: ele.plan ? '计划' + ele.plan + '片' : null,
|
planQuantity: ele.plan ? '计划' + ele.plan + '片' : null,
|
||||||
actualQuantity: ele.actualQuantity + '片',
|
finish: ele.finish + '片',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -482,8 +480,8 @@ export default {
|
|||||||
<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
|
<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
|
||||||
</span>`,
|
</span>`,
|
||||||
`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
|
`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
|
||||||
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
|
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
|
||||||
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '}"></div> ${item.error || ''}</span>`,
|
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div> ${item.error || ''}</span>`,
|
||||||
]);
|
]);
|
||||||
this.eqConfig.data = eqArr;
|
this.eqConfig.data = eqArr;
|
||||||
let data = [
|
let data = [
|
||||||
@ -749,8 +747,8 @@ export default {
|
|||||||
`<span style="color:rgba(255,255,255,0.5)">${
|
`<span style="color:rgba(255,255,255,0.5)">${
|
||||||
item.code || ''
|
item.code || ''
|
||||||
}</span>`,
|
}</span>`,
|
||||||
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
|
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
|
||||||
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:10px 10px 0 0 '}"></div> ${item.error || ''}</span>`,
|
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.error || ''}</span>`,
|
||||||
]);
|
]);
|
||||||
this.eqConfig.data = eqArr;
|
this.eqConfig.data = eqArr;
|
||||||
// this.$nextTick(() => {
|
// this.$nextTick(() => {
|
||||||
@ -792,23 +790,7 @@ export default {
|
|||||||
outputNumList
|
outputNumList
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
} else if (this.SJGWsData.type === 'inspection') {
|
} else if (this.SJGInitWebSocket === 'inspection') {
|
||||||
let processArr = this.SJGWsData.detData.map((item, index) => [
|
|
||||||
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
|
|
||||||
</span>`,
|
|
||||||
`<span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
|
|
||||||
</span>`,
|
|
||||||
`<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''
|
|
||||||
}</span>`,
|
|
||||||
`<span style="color:rgba(255,255,255,0.5)">${item.count || ''
|
|
||||||
}</span>`,
|
|
||||||
`<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''
|
|
||||||
}</span>`,
|
|
||||||
]);
|
|
||||||
this.processConfig.data = processArr;
|
|
||||||
// this.$nextTick(() => {
|
|
||||||
this.$refs['processScrollBoard'].updateRows(processArr);
|
|
||||||
// })
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user