diff --git a/.env.dev b/.env.dev index 5d905f0a..24a898c4 100644 --- a/.env.dev +++ b/.env.dev @@ -14,9 +14,9 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +VUE_APP_BASE_API = 'http://192.168.0.33:48082' -VUE_APP_BASE_API = 'http://10.70.2.2:8080' +# VUE_APP_BASE_API = 'http://10.70.2.2:8080' # VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' diff --git a/src/main.js b/src/main.js index 9e38edca..bb3be6b6 100644 --- a/src/main.js +++ b/src/main.js @@ -9,7 +9,7 @@ import store from './store'; import router from './router'; import directive from './directive'; // directive import plugins from './plugins'; // plugins -// import { borderBox1 } from '@jiaminghi/data-view' +import { scrollBoard } from '@jiaminghi/data-view' import './assets/icons'; // icon import './permission'; // permission control @@ -79,7 +79,7 @@ Vue.use(CodeBrickZj) Vue.use(directive); Vue.use(plugins); Vue.use(VueMeta); -// Vue.use(dataV) +Vue.use(scrollBoard) // Vue.use(hljs.vuePlugin); // bpmnProcessDesigner 需要引入 diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 7966e519..9964e201 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -24,7 +24,57 @@ const state = { israWeekStatistic: [],//缺陷统计 israMonthStatistic: [],//缺陷统计 israYearStatistic: [],//缺陷统计 - productline: [] // 产线产量及良品率 + productline: [{ + "creator": "1", + "sumOutputNum": 15, + "outputNum": 15, + "passRate": 0.6, + "lineName": "3#深加工", + "updateTime": "2024-01-04T16:00:19", + "updater": "1", + "inputNum": 15, + "deleted": false, + "recordTime": "2023-12-25T20:00:00", + "createTime": "2023-10-13T10:44:27", + "tenantId": 1, + "id": 1712660539187441666, + "productionLineId": 1737313260027285506, + "sumInputNum": 15 + }, { + "creator": "1", + "sumOutputNum": 49, + "outputNum": 16, + "passRate": 0.3, + "lineName": "2#深加工", + "updateTime": "2024-01-04T16:00:19", + "updater": "1", + "inputNum": 17, + "deleted": false, + "recordTime": "2023-12-25T20:00:00", + "createTime": "2023-10-13T10:44:27", + "tenantId": 1, + "id": 1712660539187441665, + "productionLineId": 1737313119178362881, + "sumInputNum": 47 + }, { + "creator": "1", + "sumOutputNum": 29, + "outputNum": 18, + "passRate": 0.5, + "lineName": "1#深加工", + "updateTime": "2024-01-04T16:00:19", + "updater": "1", + "inputNum": 20, + "deleted": false, + "recordTime": "2023-12-25T20:00:00", + "createTime": "2023-10-13T10:43:17", + "tenantId": 1, + "id": 1712660244285927426, + "productionLineId": 1737312466842456065, + "sumInputNum": 27 + }], // SJG产线产量及良品率 + sjgEquipment:[],// SJG设备报警 + }; const mutations = { SET_FANFREQUENCYINFO: (state, fanFrequencyInfo) => { diff --git a/src/views/databoard/components/EnergeMonitoringChart.vue b/src/views/databoard/components/EnergeMonitoringChart.vue index c845341d..5c8e59fa 100644 --- a/src/views/databoard/components/EnergeMonitoringChart.vue +++ b/src/views/databoard/components/EnergeMonitoringChart.vue @@ -118,7 +118,7 @@ export default { { name: '电耗能', type: 'bar', - // barWidth: 12, + barWidth: 20, tooltip: { valueFormatter: function (value) { return value + ' ml'; diff --git a/src/views/databoard/components/NumRateChart.vue b/src/views/databoard/components/NumRateChart.vue index f8d4c00c..f18000bf 100644 --- a/src/views/databoard/components/NumRateChart.vue +++ b/src/views/databoard/components/NumRateChart.vue @@ -47,9 +47,9 @@ export default { let outputNum = [] let passRate = [] this.productline && this.productline.length > 0 && this.productline.map(item => { - xData.push(itme.productionLineId) - outputNum.push(itme.outputNum) - passRate.push(item.passRate) + xData.push(item.lineName) + outputNum.push(item.outputNum) + passRate.push(item.passRate*100) }) var option = { grid: { top: 32, right: 60, bottom: 20, left: 60 }, @@ -70,7 +70,7 @@ export default { xAxis: [ { type: 'category', - data: ['Y61', 'Y62', 'Y63', 'Y64', 'Y65', 'Y66', 'Y67'], + data: xData, axisLabel: { color: "#fff", fontSize: 12, @@ -91,9 +91,6 @@ export default { { type: 'value', name: '产量/片', - // min: 0, - // max: 250, - // interval: 50, axisLabel: { color: "#fff", fontSize: 12, @@ -114,9 +111,6 @@ export default { { type: 'value', name: '良品率', - min: 0, - max: 25, - interval: 5, axisLabel: { color: "#fff", fontSize: 12, @@ -151,9 +145,7 @@ export default { { offset: 1, color: '#364BFE' } ]) }, - data: [ - 2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3 - ] + data: outputNum }, { name: '合格率', @@ -177,7 +169,7 @@ export default { lineStyle: { width: 1 }, - data: [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2] + data: passRate } ] }; diff --git a/src/views/databoard/components/ScrollBoard.vue b/src/views/databoard/components/ScrollBoard.vue new file mode 100644 index 00000000..033c602f --- /dev/null +++ b/src/views/databoard/components/ScrollBoard.vue @@ -0,0 +1,38 @@ + + + \ No newline at end of file diff --git a/src/views/databoard/deepProcessing/DefectSum.vue b/src/views/databoard/deepProcessing/DefectSum.vue index fca3dbaa..1fc95112 100644 --- a/src/views/databoard/deepProcessing/DefectSum.vue +++ b/src/views/databoard/deepProcessing/DefectSum.vue @@ -1,14 +1,43 @@ \ No newline at end of file diff --git a/src/views/databoard/deepProcessing/EqAlarm.vue b/src/views/databoard/deepProcessing/EqAlarm.vue index ef7be248..6b6fc21f 100644 --- a/src/views/databoard/deepProcessing/EqAlarm.vue +++ b/src/views/databoard/deepProcessing/EqAlarm.vue @@ -1,14 +1,43 @@ \ No newline at end of file diff --git a/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue b/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue index b3fab7f4..47271bc5 100644 --- a/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue +++ b/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue @@ -1,14 +1,43 @@ \ No newline at end of file diff --git a/src/views/databoard/deepProcessing/index.vue b/src/views/databoard/deepProcessing/index.vue index f2cdefcf..48d32fd4 100644 --- a/src/views/databoard/deepProcessing/index.vue +++ b/src/views/databoard/deepProcessing/index.vue @@ -17,7 +17,7 @@ gap: 24px; " :style="{transform:'scale('+scaleNum+')'}"> - +
- -
- - - - - - + +
+
- \ 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 diff --git a/src/websocket/wsInterface.js b/src/websocket/wsInterface.js index a28bf552..6e2d708b 100644 --- a/src/websocket/wsInterface.js +++ b/src/websocket/wsInterface.js @@ -180,11 +180,12 @@ const mesIS = new WsConnect( } ) -// 产线产量及良品率 SJG +// 深加工生产运行驾驶舱（除能源） SJG const mesSJG = new WsConnect( // websocket地址 // 'ws://10.70.2.2:8080/websocket/message?userId=SJG'+timestr, - 'ws://192.168.1.104:48082/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, // 传递给后台的数据 '', // 成功拿到后台返回的数据的回调函数 @@ -197,6 +198,10 @@ const mesSJG = new WsConnect( store.dispatch({type: "websocket/setProductline", payload:msgData.detData}) break; } + case "equipment": { + store.dispatch({type: "websocket/setSJGEq", payload:msgData.detData}) + break; + } default: } }, @@ -214,7 +219,7 @@ export const getDcsMsg = () => { mesEN.createWebSoket() mesGAS.createWebSoket() mesIS.createWebSoket() - // mesSJG.createWebSoket() + mesSJG.createWebSoket() } export const closeDcsMsg = () => { dcsConn.closeWebsocket() @@ -223,5 +228,5 @@ export const closeDcsMsg = () => { mesEN.closeWebsocket() mesGAS.closeWebsocket() mesIS.closeWebsocket() - // mesSJG.closeWebsocket() + mesSJG.closeWebsocket() } \ No newline at end of file