From ba44951b714f70bb5a4cdde08e8d81b43fd40ae9 Mon Sep 17 00:00:00 2001
From: g7hoo <liubin_9396@163.com>
Date: Fri, 12 Aug 2022 09:01:44 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BA=A7=E7=BA=BF=E5=92=8C=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/monitoring/product.vue        | 12 +++++++++---
 src/views/modules/monitoring/productionLine.vue |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/monitoring/product.vue b/src/views/modules/monitoring/product.vue
index 4f1cfa0..805c2ce 100644
--- a/src/views/modules/monitoring/product.vue
+++ b/src/views/modules/monitoring/product.vue
@@ -105,8 +105,6 @@ const addOrUpdateConfigs = {
 				}
 			]
 		},
-		'remark',
-		'specifications',
 		{
 			name: 'typeDictValue',
 			label: '产品类型', // 对于非常见属性，最好自己指定label
@@ -123,7 +121,15 @@ const addOrUpdateConfigs = {
 			options: [
 				// 动态获取
 			]
-		}
+		},
+		{
+			name: 'area',
+			label: '单位平方数',
+			type: 'number',
+			rules: [{ type: 'number', transform: val => Number(val), message: '请输入数字', trigger: 'blur' }]
+		},
+		'specifications',
+		'remark'
 	],
 	operations: [
 		{ name: 'cancel', url: true, showAlways: true },
diff --git a/src/views/modules/monitoring/productionLine.vue b/src/views/modules/monitoring/productionLine.vue
index 1d9b524..5a5164c 100644
--- a/src/views/modules/monitoring/productionLine.vue
+++ b/src/views/modules/monitoring/productionLine.vue
@@ -60,7 +60,7 @@ import TableOperateComponent from '@/components/base-table/components/operationC
 
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
-	{ prop: 'factoryId', name: '工厂ID' },
+	{ prop: 'factoryName', name: '工厂' },
 	{ prop: 'name', name: '产线名称' },
 	{ prop: 'code', name: '产线编码' },
 	{ prop: 'status', name: '产线状态' },