Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

src/views/core/monitoring/data24/index.vue

@@ -120,8 +120,12 @@ export default {
 				lineData['proLineName'] = item[0].lineName
 				let works = [], specs = []
 				item.forEach(it => {
-					works.push(it.workOrderName)
-					specs.push(it.specifications)
+					if (it.workOrderName) {
+						works.push(it.workOrderName)
+					}
+					if (it.specifications) {
+						specs.push(it.specifications)
+					}
 					lineData[it.recordTime + '_up'] = it.inputNum
 					lineData[it.recordTime + '_down'] = it.outputNum
 					lineData[it.recordTime + '_area'] = it.area
@@ -140,8 +144,8 @@ export default {
 						}
 					})
 				}
-				lineData['workOrderName'] = works.join(',')
-				lineData['spec'] = specs.join(',')
+				lineData['workOrderName'] = Array.from(new Set(works)).join(',')
+				lineData['spec'] = Array.from(new Set(specs)).join(',')
 				this.tableData.push(lineData)
 			})
 			console.log('打印', this.tableData)