diff --git a/dist.rar b/dist.rar index 90af8d61..07c0540c 100644 Binary files a/dist.rar and b/dist.rar differ diff --git a/src/views/base/dataBoard/index.vue b/src/views/base/dataBoard/index.vue index 14699998..3b979572 100644 --- a/src/views/base/dataBoard/index.vue +++ b/src/views/base/dataBoard/index.vue @@ -59,6 +59,9 @@ export default { }, beforeDestroy() { this.closeSSE(); + }, + destroyed() { + window.removeEventListener('resize', this.boxReset); }, computed: { sidebarOpened() { @@ -145,7 +148,9 @@ export default { return data.trim().startsWith('data:{') && !data.includes('heartbeat'); }, upDateMsg(data) { - const jsonStr = data.replace(/^data:/, '').trim(); + const jsonStr = data.replace(/^data:/, '').trim(); + console.log('jsonStr', jsonStr); + try { const dataObj = JSON.parse(jsonStr); this.dataObj = dataObj @@ -229,6 +234,6 @@ export default { background-size: cover; background-position: 0 0; overflow: auto; - } + } } diff --git a/src/views/core/monitoring/lineAuto/index.vue b/src/views/core/monitoring/lineAuto/index.vue index f9548d2a..e191403d 100644 --- a/src/views/core/monitoring/lineAuto/index.vue +++ b/src/views/core/monitoring/lineAuto/index.vue @@ -48,7 +48,7 @@ const tableProps = [ prop: 'reportDate', label: '日期', width: 130, - fixed: true + fixed: true, }, { prop: 'factoryName', @@ -289,7 +289,11 @@ export default { { type: 'select', label: '维度', - selectOptions: [ + selectOptions: [ + // { + // id: '0', + // name: '班', + // }, { id: 1, name: '日', @@ -413,14 +417,18 @@ export default { }, buttonClick(val) { switch (val.btnName) { - case 'search': + case 'search': + this.listQuery.pageNo = 1; this.listQuery.pageSize = 10; this.listQuery.factoryId = val.factoryId || undefined; - this.listQuery.lineId = val.lineId ? [val.lineId] : []; - this.listQuery.reportType = val.reportType || undefined; + this.listQuery.lineId = val.lineId ? [val.lineId] : []; + console.log(val.reportType); + this.listQuery.reportType = val.reportType ? Number(val.reportType) :undefined this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined; - this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined; + this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined; + console.log(this.listQuery.reportType); + this.getDataList(); break; case 'export': @@ -433,10 +441,41 @@ export default { // 获取数据列表 getDataList() { this.dataListLoading = true; - const arr = ['日', '周', '月', '年']; + const arr = [ + { + id: 0, + name: '班', + }, + { + id: 1, + name: '日', + }, + { + id: 2, + name: '周', + }, + { + id: 3, + name: '月', + }, + { + id: 4, + name: '年', + }, + ] + const reportTypeNameMap = arr.reduce((map, item) => { + map[item.id] = item.name; + return map; + }, {}); + this.urlOptions.getDataListURL(this.listQuery).then((response) => { - this.tableData = response.data.list.map((item, index) => { - item.reportType = arr[item.reportType - 1]; + this.tableData = response.data.list.map((item, index) => { + const typeId = item.reportType; + item.reportType = reportTypeNameMap[typeId] || '未知'; + // item.reportType = arr[item.reportType - 1]; + + item.reportDate = item.reportDate; + item.originalLossNum = item.original?.lossNum; item.originalLossArea = item.original?.lossArea; item.edgeLossNum = item.edge?.lossNum;