mt-fe-group/yudao-dev
12
0
複製 0
程式碼 問題管理 合併請求 版本發佈 Wiki Activity

Merge pull request 'projects/mesxc-zhp' (#164) from projects/mesxc-zhp into projects/mesxc-test

瀏覽代碼 
Reviewed-on: #164
This commit is contained in:
高天泽 2023-12-29 16:32:28 +08:00
當前提交 9d34ca02f1
共有 4 個文件被更改，包括 186 次插入 和 233 次删除
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
src/views/OperationalOverview/coldBoard.vue
查看文件

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2023-12-28 11:52:08
* @LastEditTime: 2023-12-29 16:19:38
* @Description:
-->
<template>
@ -132,6 +132,8 @@ import doubleYChart from './components/doubleYChart '
// import elementResizeDetectorMaker from 'element-resize-detector';
// var erd = elementResizeDetectorMaker(); //创建实例
// let resizeFun = null
import { parseTime } from '../core/mixins/code-filter';
import LinearBarChart from './components/linearBarChart'
const qualityYearTableProps= []
@ -153,7 +155,10 @@ const EqMonitoringProps = [
]
const cutProps = [
{ prop: 'lineName', label: '产线' },
{ prop: 'time', label: '时间' },
{
prop: 'time', label: '时间',
filter: parseTime
},
{ prop: 'size', label: '规格' },
{ prop: 'productArea', label: '良品面积' },
{ prop: 'wasteArea', label: '废片面积' },
@ -303,7 +308,10 @@ export default {
this.init()
},
mounted() {
this.initWebSocket()
this.funInitWebSocket()
this.CutInitWebSocket()
this.SJGInitWebSocket()
this.getTimes()
const _this = this;
_this.beilv2 = document.documentElement.clientWidth / 1920
@ -353,13 +361,13 @@ export default {
// status: obj.data.FanFrequencyInfo[i]
// })
// }
this.funList = arr``
// this.funList = arr``
this.$axios.get(
'/monitoring/equipment-monitor/realtime-page',
'get',
this.queryParams
).then((res) => {
console.log(res);
console.log('222222222222222', res);
this.realEqList = res.data.list;
// this.total = response.data.total;
// this.loading = false;
@ -389,7 +397,7 @@ export default {
//拼接格式化当前时间
this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
},
initWebSocket() {
SJGInitWebSocket() {
if (typeof (WebSocket) === 'undefined') {
alert('您的浏览器不支持WebSocket')
} else {
@ -397,7 +405,7 @@ export default {
// const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
let date = new Date().valueOf()
console.log(date);
const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=COLD${date}`
const SJGWsUrl = `ws://192.168.0.30:8888/websocket/message?userId=COLD${date}`
this.SJGWebsocket = new WebSocket(SJGWsUrl)
// 监听 WebSocket 连接
this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
@ -407,7 +415,17 @@ export default {
this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
// 监听 webSocket 断开信息
this.SJGWebsocket.onclose = this.SJGWebsocketClose
const cutWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=CUTTING${date}`
}
},
CutInitWebSocket() {
if (typeof (WebSocket) === 'undefined') {
alert('您的浏览器不支持WebSocket')
} else {
// const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
// const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
let date = new Date().valueOf()
console.log(date);
const cutWsUrl = `ws://192.168.0.30:8888/websocket/message?userId=CUTTING${date}`
this.cutWebsocket = new WebSocket(cutWsUrl)
// 监听 WebSocket 连接
@ -418,29 +436,27 @@ export default {
this.cutWebsocket.onmessage = this.cutWebsocketOnMessage
// 监听 webSocket 断开信息
this.cutWebsocket.onclose = this.cutWebsocketClose
const funWsUrl = `ws://10.70.180.10:8081/xc-screen/websocket/${date}`
this.funWebsocket = new WebSocket(funWsUrl)
// 监听 WebSocket 连接
this.funWebsocket.onopen = this.funWebsocketOnOpen
// 监听 WebSocket 错误信息
this.funWebsocket.onerror = this.funWebsocketOnError
// 监听 WebSocket 消息
this.funWebsocket.onmessage = this.funWebsocketOnMessage
// 监听 webSocket 断开信息
this.funWebsocket.onclose = this.funWebsocketClose
// const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
// 实例化 WebSocket
// this.websocket = new WebSocket(wsUrl)
// // 监听 WebSocket 连接
// this.websocket.onopen = this.websocketOnOpen
// // 监听 WebSocket 错误信息
// this.websocket.onerror = this.websocketOnError
// // 监听 WebSocket 消息
// this.websocket.onmessage = this.websocketOnMessage
// // 监听 webSocket 断开信息
// this.websocket.onclose = this.websocketClose
}
},
funInitWebSocket() {
// if (typeof (WebSocket) === 'undefined') {
// alert('您的浏览器不支持WebSocket')
// } else {
// // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
// // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
// let date = new Date().valueOf()
// const funWsUrl = `ws://10.70.2.2:8080/xc-screen/websocket/${date}`
// this.funWebsocket = new WebSocket(funWsUrl)
// // 监听 WebSocket 连接
// this.funWebsocket.onopen = this.funWebsocketOnOpen
// // 监听 WebSocket 错误信息
// this.funWebsocket.onerror = this.funWebsocketOnError
// // 监听 WebSocket 消息
// this.funWebsocket.onmessage = this.funWebsocketOnMessage
// // 监听 webSocket 断开信息
// this.funWebsocket.onclose = this.funWebsocketClose
// }
},
funWebsocketOnOpen() {
console.log('socket连接成功')
// console.log(this.SJGWebsocket.onmessage);
@ -449,23 +465,23 @@ export default {
// 连接建立失败重连
funWebsocketOnError(e) {
console.log('222222', e)
this.initWebSocket()
this.funInitWebSocket()
},
// 数据接收
funWebsocketOnMessage(e) {
// console.log(1111, e)
// console.log(this.wsData)
// console.log('22222', this.wsData.data)
this.wsData = JSON.parse(e.data)
if (this.wsData.type === 'FanFrequencyInfo') {
// let arr = []
// for (let i in this.wsData.FanFrequencyInfo) {
// arr.push({
// equipmentName: i,
// status: obj.data.FanFrequencyInfo[i]
// })
// }
// this.funList = arr
this.funWsData = JSON.parse(e.data)
if (this.funWsData.type === 'FanFrequencyInfo') {
let arr = []
for (let i in this.funWsData.FanFrequencyInfo) {
arr.push({
equipmentName: i,
status: obj.data.FanFrequencyInfo[i]
})
}
this.funList = arr
}
},
cutWebsocketOnOpen() {
@ -476,16 +492,16 @@ export default {
// 连接建立失败重连
cutWebsocketOnError(e) {
console.log('11111', e)
this.initWebSocket()
this.CutInitWebSocket()
},
// 数据接收
cutWebsocketOnMessage(e) {
// console.log(1111, e)
this.wsData = JSON.parse(e.data)
console.log(this.wsData)
this.cutWsData = JSON.parse(e.data)
// console.log('22222', this.wsData.data)
if (this.wsData.type === 'cutting' && this.wsData.name === 'table' ) {
this.cutTableDataList = this.wsData.productHourData.map((ele, index) => {
console.log('table', this.cutWsData)
if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') {
this.cutTableDataList = this.cutWsData.productHourData.map((ele, index) => {
// if (ele.progressRate != 1) {
return {
id: ele.id,
@ -500,7 +516,7 @@ export default {
// }
});
// console.log(this.orderList)
} else if (this.wsData.type === 'cutting' && this.wsData.name === 'chart') {
} else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
let nameList = []
let nameWasteList = []
let topNameList = []
@ -508,14 +524,18 @@ export default {
let wasteList = []
let sumAreaList = []
let yieldList = []
this.cutTableDataList = this.wsData.detData.forEach((ele, index) => {
this.cutTableDataList = this.cutWsData.coldDetData.forEach((ele, index) => {
nameList.push(ele.lineName)
topNameList.push(ele.lineName + ' ' + '总面积' + ele.sumArea)
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea)
productList.push(ele.productArea)
wasteList.push(ele.wastArea)
nameWasteList.push('缺陷面积:'+ele.wastArea)
nameWasteList.push('缺陷面积:' + ele.wastArea)
sumAreaList.push(ele.sumArea)
yieldList.push(ele.yield)
})
this.$refs.pileChart.initChart(nameList, topNameList, nameWasteList, productList, wasteList)
// console.log(this.cutWsData)
// console.log('chart',nameList, topNameList, nameWasteList, productList, wasteList);
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
// this.$refs.pileChart.initWebSocket
// console.log(this.orderList)
@ -529,7 +549,7 @@ export default {
// 连接建立失败重连
SJGWebsocketOnError(e) {
console.log('11111', e)
this.initWebSocket()
this.SJGInitWebSocket()
},
// 数据接收
SJGWebsocketOnMessage(e) {
@ -538,11 +558,11 @@ export default {
// let data = { "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }
// let obj = JSON.parse(data.data)
// console.log(obj);
this.wsData = JSON.parse(e.data)
console.log(this.wsData)
this.SJGWsData = JSON.parse(e.data)
console.log(this.SJGWsData)
// console.log('22222', this.wsData.data)
if (this.wsData.type === 'isra') {
this.ISRAList = this.wsData.detData.map((ele, index) => {
if (this.SJGWsData.type === 'isra') {
this.ISRAList = this.SJGWsData.detData.map((ele, index) => {
// if (ele.progressRate != 1) {
return {
id: ele.id,
@ -557,63 +577,6 @@ export default {
// console.log(this.orderList)
}
},
// 数据发送
// SJGWebsocketSend() {
// this.websocket.send('11111')
// },
// // 关闭
// SJGWebsocketClose(e) {
// console.log('WebSocket 断开连接', e)
// },
// // 连接建立之后执行send方法发送数据
// websocketOnOpen() {
// console.log('socket连接成功')
// this.websocket.onmessage()
// },
// // 连接建立失败重连
// websocketOnError(e) {
// console.log('11111', e)
// this.initWebSocket()
// },
// // 数据接收
// websocketOnMessage(e) {
// console.log(1111, e)
// this.wsData = JSON.parse(e.data)
// // console.log('22222', this.wsData.data)
// if (this.wsData.type === 'EnergyMonitoring') {
// let EnergyNameList = []
// this.wsData.data.forEach((ele) => {
// EnergyNameList.push(ele.lineName)
// })
// this.EnergyMonitoringNameList = EnergyNameList
// let EnergyDataList = []
// this.wsData.data.forEach((ele) => {
// EnergyDataList.push(ele.useQuantity
// // {
// // type: 'bar',
// // data: ele.useQuantity,
// // barWidth: 6
// // }
// )
// })
// this.EnergyMonitoringList = EnergyDataList
// console.log(EnergyDataList)
// // console.log(this.EnergyMonitoringNameList)
// // console.log(this.EnergyMonitoringList)
// // this.$nextTick(() => {
// this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
// // })
// }
// },
// // 数据发送
// websocketSend() {
// this.websocket.send('11111')
// },
// // 关闭
// websocketClose(e) {
// console.log('WebSocket 断开连接', e)
// },
windowWidth(value) {
this.clientWidth = value
this.beilv2 = this.clientWidth / 1920

4
src/views/OperationalOverview/components/doubleYChart .vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-09-21 09:06:28
* @LastEditTime: 2023-12-27 18:28:45
* @LastEditTime: 2023-12-29 16:18:17
* @LastEditors: zhp
* @Description:
-->
@ -138,7 +138,7 @@ export default {
}
},
grid: {
left: "3%",
left: "4%",
right: "4%",
bottom: "3%",
width: 'auto',

168
src/views/OperationalOverview/components/pileBarChart.vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-27 13:54:52
* @LastEditTime: 2023-12-27 19:47:27
* @LastEditTime: 2023-12-29 16:28:26
* @LastEditors: zhp
* @Description:
-->
@ -93,54 +93,50 @@ export default {
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
// console.log(1)
this.chart = echarts.init(document.getElementById(this.id))
let series = [{
name: '成品面积',
type: 'bar',
stack: 'total',
// label: {
// show: true
// },
emphasis: {
focus: 'series'
let series = [
{
// 辅助系列
name: '良品',
type: 'bar',
stack: 'total',
// silent: true,
// itemStyle: {
color: '#0fdedb',
// },
barWidth: 10,
data: passRateList
},
data: passRateList,
itemStyle: {
normal: { color: '#2359ec' }
{
type: 'bar',
stack: 'total',
name: '废品',
data: wasteList,
barWidth: 10,
// barWidth: 15,
// label: {
// position: [10, 10],
// normal: {
// position: [800, -24],
// show: true,
// textStyle: {
// color: '#2359ec',
// fontSize: 16,
// },
// },
// },
}
},
{
name: '废片面积',
type: 'bar',
stack: 'total',
// label: {
// show: true
// },
emphasis: {
focus: 'series'
},
barWidth: 12,
data: wasteList,
itemStyle: {
normal: { color: '#745fe4' }
}
},]
]
// for (i = 0; i < 5; i++) {
// series.push({
// })
// }
const yAxisDataLeft = topNameList;
// const yAxisDataRight = ['服装', '矿产', '服务业', '建筑业', '金融业'];
const yAxisDataRight = nameWasteList
this.chart.setOption({
tooltip: {
trigger: 'axis',
axisPointer: {
// Use axis to trigger tooltip
type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
legend: {
textStyle: {
color: '#ffffff'
}
},
// legend: {},
grid: {
left: '3%',
right: '4%',
@ -149,73 +145,38 @@ export default {
height: 'auto',
containLabel: true
},
xAxis: {
type: 'value',
show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
axisTick: {
show: false // 不显示坐标轴刻度线
},
axisLine: {
show: false, // 不显示坐标轴线
},
axisLabel: {
show: false, // 不显示坐标轴上的文字
},
splitLine: {
show: false // 不显示网格线
},
},
yAxis: [
{
type: 'category',
inverse: true,
data: yAxisDataLeft,
splitLine: {
show: false
},
axisTick: {
show: false
},
axisLine: {
show: false
},
axisLabel: {
show: true,
inside: true,
interval: 0, //横轴信息全部显
splitNumber: 50,
// boundaryGap: [20, 20],
textStyle: {
color: '#ffffff',
verticalAlign: 'bottom',
fontSize: 12,
align: 'left',
},
formatter: '{value}\n{a|占位}\n{a|占位}',
rich: {
a: {
color: 'transparent',
lineHeight: 24,
}
padding: [0, 0, 15, -5]
}
},
//offset: 30,
splitLine: {
show: false
},
axisTick: {
show: false
},
axisLine: {
show: false
}
data: topNameList
},
{
inverse: false,
data: yAxisDataRight,
axisLabel: {
inside: true,
textStyle: {
color: '#ffffff',
fontSize: 12,
align: 'right',
},
formatter: '{value}\n{a|占位}\n{a|占位}',
rich: {
a: {
color: 'transparent',
lineHeight: 24,
fontFamily: 'digital'
}
}
},
offset: 0,
type: 'category',
inverse: true,
splitLine: {
show: false
},
@ -224,10 +185,29 @@ export default {
},
axisLine: {
show: false
}
},
axisLabel: {
show: true,
inside: true,
interval: 0, //横轴信息全部显
splitNumber: 50,
// boundaryGap: [20, 20],
textStyle: {
color: '#ffffff',
verticalAlign: 'bottom',
fontSize: 12,
align: 'right',
padding: [0, 0, 15, -5]
}
},
data: nameWasteList
}
],
series: series
xAxis: {
// max: 120,
show: false,
},
series:series
})
}
}

62
src/views/OperationalOverview/processingBoard.vue
查看文件

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2023-12-28 10:22:06
* @LastEditTime: 2023-12-29 15:15:50
* @Description:
-->
<template>
@ -557,6 +557,7 @@ export default {
mounted() {
this.getList()
this.initWebSocket()
this.SJGInitWebSocket()
this.getTimes()
const _this = this;
_this.beilv2 = document.documentElement.clientWidth / 1920
@ -597,14 +598,14 @@ export default {
'get',
this.queryParams
).then((res) => {
console.log('11111', res);
// console.log('11111', res);
this.productLineList = res.data
})
this.$axios.get(
'base/quality-inspection-record/dayStatistics',
'get',
).then((res) => {
console.log('11111', res);
// console.log('11111', res);
this.qualityMonthList = res.data
})
},
@ -639,17 +640,6 @@ export default {
const wsUrl = `ws://192.168.0.33:48082/websocket/message?userId=EN${date}`
// const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
let date = new Date().valueOf()
console.log(date);
const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=SJG${date}`
this.SJGWebsocket = new WebSocket(SJGWsUrl)
// 监听 WebSocket 连接
this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
// 监听 WebSocket 错误信息
this.SJGWebsocket.onerror = this.SJGWebsocketOnError
// 监听 WebSocket 消息
this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
// 监听 webSocket 断开信息
this.SJGWebsocket.onclose = this.SJGWebsocketClose
// const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
// 实例化 WebSocket
this.websocket = new WebSocket(wsUrl)
@ -663,6 +653,26 @@ export default {
this.websocket.onclose = this.websocketClose
}
},
SJGInitWebSocket() {
if (typeof (WebSocket) === 'undefined') {
alert('您的浏览器不支持WebSocket')
} else {
// const wsUrl = `ws://192.168.0.33:48082/websocket/message?userId=EN${date}`
// const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
let date = new Date().valueOf()
// console.log(date);
const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=SJG${date}`
this.SJGWebsocket = new WebSocket(SJGWsUrl)
// 监听 WebSocket 连接
this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
// 监听 WebSocket 错误信息
this.SJGWebsocket.onerror = this.SJGWebsocketOnError
// 监听 WebSocket 消息
this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
// 监听 webSocket 断开信息
this.SJGWebsocket.onclose = this.SJGWebsocketClose
}
},
SJGWebsocketOnOpen() {
console.log('socket连接成功')
console.log(this.SJGWebsocket.onmessage);
@ -671,16 +681,16 @@ export default {
// 连接建立失败重连
SJGWebsocketOnError(e) {
// console.log('11111', e)
this.initWebSocket()
this.SJGInitWebSocket()
},
// 数据接收
SJGWebsocketOnMessage(e) {
// console.log(1111, e)
this.wsData = JSON.parse(e.data)
this.SJGWsData = JSON.parse(e.data)
// console.log(this.wsData.detData);
// console.log('22222', this.wsData.data)
if (this.wsData.type === 'order') {
this.orderList = this.wsData.detData.map((ele, index) => {
if (this.SJGWsData.type === 'order') {
this.orderList = this.SJGWsData.detData.map((ele, index) => {
if (ele.progressRate != 1) {
return {
id: ele.id,
@ -690,8 +700,8 @@ export default {
}
});
console.log(this.orderList)
} else if (this.wsData.type === 'equipment') {
this.equipmentList = this.wsData.detData.map((ele, index) => {
} else if (this.SJGWsData.type === 'equipment') {
this.equipmentList = this.SJGWsData.detData.map((ele, index) => {
// if (ele.progressRate != 1) {
return {
id: ele.id,
@ -702,16 +712,16 @@ export default {
}
// }
});
// console.log(this.orderList)
} else if (this.wsData.type === 'productline') {
console.log(this.wsData.detData);
// console.log(SJGWsData.orderList)
} else if (this.SJGWsData.type === 'productline') {
// console.log(this.wsData.detData);
let nameList = []
let passRateList = []
let outputNumList = []
// console.log('2222222222', this.productLineList);
this.productLineList.forEach((item) => {
this.wsData.detData.forEach((ele) => {
this.SJGWsData.detData.forEach((ele) => {
if (item.id == ele.productionLineId) {
nameList.push(item.name)
}
@ -720,11 +730,11 @@ export default {
console.log(Array.from(new Set(nameList)))
// progressRateList = EnergyNameList
// let EnergyDataList = []
this.wsData.detData.forEach((ele) => {
this.SJGWsData.detData.forEach((ele) => {
passRateList.push(ele.passRate *100
)
})
this.wsData.detData.forEach((ele) => {
this.SJGWsData.detData.forEach((ele) => {
outputNumList.push(ele.outputNum
)
})