-
-
-
-
-
+
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/databoard/wholePlant/YieldRate.vue b/src/views/databoard/wholePlant/YieldRate.vue
index 91421ee1..6c82ae63 100644
--- a/src/views/databoard/wholePlant/YieldRate.vue
+++ b/src/views/databoard/wholePlant/YieldRate.vue
@@ -1,127 +1,45 @@
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/databoard/components/Switcher.vue b/src/views/databoard/components/Switcher.vue
index 341e8946..026f6e01 100644
--- a/src/views/databoard/components/Switcher.vue
+++ b/src/views/databoard/components/Switcher.vue
@@ -7,7 +7,7 @@
-
@@ -17,18 +17,31 @@
export default {
name: 'Switcher',
components: {},
- props: {},
+ props: {
+ showTitle:{
+ type: Array,
+ required: true,
+ default: () => {
+ return []
+ }
+ }
+ },
data() {
return {
- value: true,
+ value: false,
};
},
computed: {
mode() {
- return this.value ? '历史详情' : '实时数据';
+ return this.value ? this.showTitle[0]: this.showTitle[1];
},
},
- methods: {},
+ methods: {
+ handleClick(v) {
+ this.value = v;
+ this.$emit('emitFun', v);
+ }
+ },
};
diff --git a/src/views/databoard/components/YieldRateChart.vue b/src/views/databoard/components/YieldRateChart.vue
new file mode 100644
index 00000000..8575bb5e
--- /dev/null
+++ b/src/views/databoard/components/YieldRateChart.vue
@@ -0,0 +1,317 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/databoard/deepProcessing/DefectSum.vue b/src/views/databoard/deepProcessing/DefectSum.vue
index 1fc95112..60ca0a60 100644
--- a/src/views/databoard/deepProcessing/DefectSum.vue
+++ b/src/views/databoard/deepProcessing/DefectSum.vue
@@ -2,17 +2,21 @@
-
-
-
-
-
+
+
-
\ No newline at end of file
diff --git a/src/websocket/wsInterface.js b/src/websocket/wsInterface.js
index 6e2d708b..355c39ae 100644
--- a/src/websocket/wsInterface.js
+++ b/src/websocket/wsInterface.js
@@ -6,7 +6,7 @@ import store from "@/store";
const timestr = new Date().getTime()
const dcsConn = new WsConnect(
// websocket地址
- 'ws://10.70.180.10:8081/xc-screen/websocket/dcsmsg'+timestr,
+ process.env.VUE_APP_Socket_Dcs_API + '/xc-screen/websocket/dcsmsg'+timestr,
// 传递给后台的数据
'',
(data) => {
@@ -39,7 +39,7 @@ const dcsConn = new WsConnect(
)
// ISRA
const mesIsra = new WsConnect(
- 'ws://10.70.2.2:8080/websocket/message?userId=KILN'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=KILN'+timestr,
'',
(data) => {
// console.log('mes ISRA成功的回调函数, 接收到的data数据: ', data)
@@ -51,10 +51,6 @@ const mesIsra = new WsConnect(
store.dispatch({type: "websocket/setIsraKiln", payload:msgData.detData.dayStatistic})
break;
}
- // case "KilnInfo": {
- // // store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
- // break;
- // }
default:
}
},
@@ -65,7 +61,7 @@ const mesIsra = new WsConnect(
// 原料 MA
const mesMA = new WsConnect(
- 'ws://10.70.2.2:8080/websocket/message?userId=MA'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=MA'+timestr,
'',
(data) => {
// console.log('mes 原料成功的回调函数, 接收到的data数据: ', data)
@@ -76,10 +72,6 @@ const mesMA = new WsConnect(
store.dispatch({type: "websocket/setMaterial", payload:msgData.data})
break;
}
- // case "KilnInfo": {
- // // store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
- // break;
- // }
default:
}
},
@@ -90,7 +82,7 @@ const mesMA = new WsConnect(
// 能耗 EN
const mesEN = new WsConnect(
// websocket地址
- 'ws://10.70.2.2:8080/websocket/message?userId=ENERGY'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=ENERGY'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -122,7 +114,7 @@ const mesEN = new WsConnect(
// 烟气 GAS
const mesGAS = new WsConnect(
// websocket地址
- 'ws://10.70.2.2:8080/websocket/message?userId=GAS'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=GAS'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -153,7 +145,7 @@ const mesGAS = new WsConnect(
// 缺陷分类/统计 IS
const mesIS = new WsConnect(
// websocket地址
- 'ws://10.70.2.2:8080/websocket/message?userId=IS'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=IS'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -164,6 +156,7 @@ const mesIS = new WsConnect(
switch (msgData?.type) {
case "isra": {
store.dispatch({type: "websocket/setDefectChart", payload:{
+ checkType: msgData.detData.checkType,
dayStatistic: msgData.detData.dayStatistic,
weekStatistic: msgData.detData.weekStatistic,
monthStatistic: msgData.detData.monthStatistic,
@@ -183,9 +176,7 @@ const mesIS = new WsConnect(
// 深加工生产运行驾驶舱（除能源） SJG
const mesSJG = new WsConnect(
// websocket地址
- // 'ws://10.70.2.2:8080/websocket/message?userId=SJG'+timestr,
- // 'ws://192.168.0.33:48082/websocket/message?userId=SJG'+timestr,
- 'ws://192.168.1.62:48082/websocket/message?userId=SJG'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=SJG'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -202,6 +193,14 @@ const mesSJG = new WsConnect(
store.dispatch({type: "websocket/setSJGEq", payload:msgData.detData})
break;
}
+ case "order": {
+ store.dispatch({type: "websocket/setWorkOrder", payload:msgData.detData})
+ break;
+ }
+ case "defectSum": {
+ store.dispatch({type: "websocket/setDefectSum", payload:msgData.detData})
+ break;
+ }
default:
}
},
@@ -211,6 +210,76 @@ const mesSJG = new WsConnect(
}
)
+// 订单完成情况 OV
+const mesOV = new WsConnect(
+ // websocket地址
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=OV'+timestr,
+ // 'ws://192.168.0.33:48082/websocket/message?userId=OV'+timestr,
+ // 传递给后台的数据
+ '',
+ // 成功拿到后台返回的数据的回调函数
+ (data) => {
+ // console.log('mes 产线产量及良品率成功的回调函数, 接收到的data数据: ', data)
+ let msgData = JSON.parse(data)
+ if (msgData == null) return;
+ switch (msgData?.type) {
+ case "order": {
+ store.dispatch({type: "websocket/setOrder", payload:msgData.detData})
+ break;
+ }
+ default:
+ }
+ },
+ // websocket连接失败的回调函数
+ (err) => {
+ console.log('失败的回调函数', err)
+ }
+)
+
+// 本日生产良品率 CUTTING
+const mesCUTTING = new WsConnect(
+ // websocket地址
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=CUTTING'+timestr,
+ // 传递给后台的数据
+ '',
+ // 成功拿到后台返回的数据的回调函数
+ (data) => {
+ // console.log('mes 产线产量及良品率成功的回调函数, 接收到的data数据: ', data)
+ let msgData = JSON.parse(data)
+ if (msgData == null) return;
+ console.log(msgData)
+ switch (msgData?.type) {
+ case "cutting": {
+ if (msgData?.name === 'table') {
+ store.dispatch({type: "websocket/setYieldRateTable", payload:msgData.data})
+ return
+ }
+ if (msgData?.dateType === 'day') {
+ store.dispatch({type: "websocket/setCutChartDay", payload:msgData.detData})
+ return
+ }
+ if (msgData?.dateType === 'weekly') {
+ store.dispatch({type: "websocket/setCutChartWeek", payload:msgData.detData})
+ return
+ }
+ if (msgData?.dateType === 'month') {
+ store.dispatch({type: "websocket/setCutChartMonth", payload:msgData.detData})
+ return
+ }
+ if (msgData?.dateType === 'year') {
+ store.dispatch({type: "websocket/setCutChartYear", payload:msgData.detData})
+ return
+ }
+ break;
+ }
+ default:
+ }
+ },
+ // websocket连接失败的回调函数
+ (err) => {
+ console.log('失败的回调函数', err)
+ }
+)
export const getDcsMsg = () => {
dcsConn.createWebSoket()
@@ -220,6 +289,8 @@ export const getDcsMsg = () => {
mesGAS.createWebSoket()
mesIS.createWebSoket()
mesSJG.createWebSoket()
+ mesOV.createWebSoket()
+ mesCUTTING.createWebSoket()
}
export const closeDcsMsg = () => {
dcsConn.closeWebsocket()
@@ -229,4 +300,6 @@ export const closeDcsMsg = () => {
mesGAS.closeWebsocket()
mesIS.closeWebsocket()
mesSJG.closeWebsocket()
+ mesOV.closeWebsocket()
+ mesCUTTING.closeWebsocket()
}
\ No newline at end of file
+
+
+
+
+ + 生产良品率 +
+
+ 总量
+ 白班
+ 夜班
+
+
+
+
+
+