Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test

src/views/base/coreEquipment/index.vue

@@ -424,6 +424,7 @@ export default {
 			// 表单参数
 			form: {
 				id: null,
+				files: []
 			},
 			showUploadComponents: false, // 是否显示上传组件
 		};
@@ -506,6 +507,7 @@ export default {
 				spec: undefined,
 				description: undefined,
 				remark: undefined,
+				files: []
 			};
 			this.resetForm('form');
 		},

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

@@ -127,8 +127,8 @@ export default {
 					lineData[it.recordTime + '_area'] = it.area
 				})
 				console.log('你好', this.monitorList)
+				if (this.monitorList.length > 0) {
 					this.monitorList.forEach(m => {
-					console.log('455', m)
 						if (m.lineName === lineData.proLineName) {
 							m.data.forEach(bad => {
 								// 转成时间戳
@@ -139,6 +139,7 @@ export default {
 							})
 						}
 					})
+				}
 				lineData['workOrderName'] = works.join(',')
 				lineData['spec'] = specs.join(',')
 				this.tableData.push(lineData)