mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mesxc-zjl' (#181) from projects/mesxc-zjl into projects/mesxc-test

Browse Source 
Reviewed-on: #181
This commit is contained in:
朱菊兰 2024-01-12 13:30:29 +08:00
commit 286204165a
11 changed files with 51 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/store/modules/websocket.js
View File

@ -25,58 +25,8 @@ const state = {
israWeekStatistic: [],//缺陷统计
israMonthStatistic: [],//缺陷统计
israYearStatistic: [],//缺陷统计
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:[
{name: 'sadd', error:false,code: 'EQ202312121624540000072',status: "正常"}
],// SJG设备报警
productline: [], // SJG产线产量及良品率
sjgEquipment:[],// SJG设备报警
workOrder: [], // 工单监控
defectSum: [], // 缺陷汇总
order: [],// 订单完成情况

6
src/views/databoard/components/FlueGasChart.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<NotMsg v-show="notMsg"/>
<div id='flueGasChart' class="flue-gas-chart" style="width:600px;height:250px;" v-show='!notMsg'></div>
<div id='flueGasChart' class="flue-gas-chart" style="width:575px;height:250px;" v-show='!notMsg'></div>
</div>
</template>
@ -149,8 +149,8 @@ export default {
}
temp2.map(i => {
xData.push(i.time)
yData.push(i.value)
})
yData.push((i.value)?(Number(i.value)).toFixed(2):null)
})
if (yData.length == 0) {
seriesData = []
}else {

2
src/views/databoard/components/NumRateChart.vue
View File

@ -29,7 +29,7 @@ export default {
if (newVal === oldVal) {
return false
}
// this.updateChart()
this.updateChart()
}
}
},

3
src/views/databoard/deepProcessing/DefectSum.vue
View File

@ -26,7 +26,8 @@ export default {
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60],
align: ['center'],
data: [[1, 'Y61', '破损','10','气泡']],
data: [],
// data: [[1, 'Y61', '破损','10','气泡']],
rowNum: 10
}
}

55
src/views/databoard/deepProcessing/EqAlarm.vue
View File

@ -26,38 +26,39 @@ export default {
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60, 150, 190],
align: ['center'],
data: [
[1, '四大线3小线铺纸机', 'EQ20240110130909000255', '正常', '否'],
[2, '四大线2小线铺纸机', 'EQ20240110130848000254', '正常', '否'],
[3, '四大线1小线铺纸机', 'EQ20240110130832000253', '正常', '否'],
[4, '12线下片台', 'EQ20240110130817000252', '正常', '否'],
[5, '11线下片台', ' EQ20240110130743000250', '正常', '否'],
[6, '10线下片台', ' EQ20240110130743000250', '正常', '否'],
[7, '4大线五区自动连线柜', 'EQ20240110130731000249', '正常', '否'],
[8, '四大线四区2小线清洗机', 'EQ20240110112716000248', '正常', '否'],
[9, '四大线四区1小线清洗机', 'EQ20240110112700000247', '正常', '否'],
[10, '4大线四区自动连线柜', 'EQ20240110112646000246', '正常', '否']
],
data: [],
// data: [
// [1, '四大线3小线铺纸机', 'EQ20240110130909000255', '正常', '否'],
// [2, '四大线2小线铺纸机', 'EQ20240110130848000254', '正常', '否'],
// [3, '四大线1小线铺纸机', 'EQ20240110130832000253', '正常', '否'],
// [4, '12线下片台', 'EQ20240110130817000252', '正常', '否'],
// [5, '11线下片台', ' EQ20240110130743000250', '正常', '否'],
// [6, '10线下片台', ' EQ20240110130743000250', '正常', '否'],
// [7, '4大线五区自动连线柜', 'EQ20240110130731000249', '正常', '否'],
// [8, '四大线四区2小线清洗机', 'EQ20240110112716000248', '正常', '否'],
// [9, '四大线四区1小线清洗机', 'EQ20240110112700000247', '正常', '否'],
// [10, '4大线四区自动连线柜', 'EQ20240110112646000246', '正常', '否']
// ],
rowNum: 10
}
}
},
mounted(){
},
// watch:{
// sjgEquipment: {
// handler(newVal, oldVal) {
// let outArr = this.sjgEquipment.map((item, index) => [
// index+1,
// item.name,
// item.code,
// item.status,
// item.error? '是': '否'
// ]);
// this.config.data = outArr
// this.$refs['eqScrollBoard'].updateRows(outArr)
// }
// }
// }
watch:{
sjgEquipment: {
handler(newVal, oldVal) {
let outArr = this.sjgEquipment.map((item, index) => [
index+1,
`<span title=${item.name || ''}>${item.name || ''}</span>`,
`<span title=${item.code || ''}>${item.code || ''}</span>`,
item.status,
item.error? '是': '否'
]);
this.config.data = outArr
this.$refs['eqScrollBoard'].updateRows(outArr)
}
}
}
}
</script>

4
src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
View File

@ -37,10 +37,10 @@ export default {
handler(newVal, oldVal) {
let outArr = this.order.map((item, index) => [
index+1,
item.name,
`<span title=${item.name || ''}>${item.name || ''}</span>`,
item.specifications,
item.lines,
['等待','已下发','已完成'][item.status],
this.getDictDatas(this.DICT_TYPE.ORDER_STATUS)[item.status]?.label,
formatDate(item.planFinishTime),
item.planQuantity,
item.planAssignQuantity

4
src/views/databoard/deepProcessing/index.vue
View File

@ -133,10 +133,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
wx = (rw-264) / bw
wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
wx = (rw-78) / bw
wx = (rw-85) / bw
hx = (rh-116) / bh
}
}

4
src/views/databoard/kiln/index.vue
View File

@ -126,10 +126,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
wx = (rw-264) / bw
wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
wx = (rw-78) / bw
wx = (rw-85) / bw
hx = (rh-116) / bh
}
}

4
src/views/databoard/wholePlant/index.vue
View File

@ -123,10 +123,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
wx = (rw-264) / bw
wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
wx = (rw-78) / bw
wx = (rw-85) / bw
hx = (rh-116) / bh
}
}

2
src/views/order/monitoring/components/monitoringRingCharts.vue
View File

@ -132,7 +132,7 @@ export default {
.chartBox {
width: 100%;
padding-right: 6px;
height: calc(100vh - 310px);
height: calc(100vh - 356px);
display: flex;
flex-flow: row wrap;
overflow: auto;

12
src/views/order/monitoring/orderCompletionMonitoring/index.vue
View File

@ -28,15 +28,15 @@
@clickBtn="handleClick"
/>
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getPage"
/>
</div>
<!-- 图 -->
<monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getPage"
/>
</div>
</template>
<script>