From 3efe2606474fba1905fa4edab82b713b9cfb5ef3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 01 八月 2023 08:22:03 +0800
Subject: [PATCH] 完成车间大屏

---
 src/views/dry/dataDefine/DryOrder.data.ts |  204 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 150 insertions(+), 54 deletions(-)

diff --git a/src/views/dry/dataDefine/DryOrder.data.ts b/src/views/dry/dataDefine/DryOrder.data.ts
index e79267e..e11c75c 100644
--- a/src/views/dry/dataDefine/DryOrder.data.ts
+++ b/src/views/dry/dataDefine/DryOrder.data.ts
@@ -23,6 +23,16 @@
 		dataIndex: 'herbId_dictText',
 	},
 	{
+		title: '璁惧',
+		align: 'center',
+		dataIndex: 'equId_dictText',
+	},
+	{
+		title: '杞﹂棿',
+		align: 'center',
+		dataIndex: 'shopId_dictText',
+	},
+	{
 		title: '鍒濆鍚按鐜�',
 		align: 'center',
 		dataIndex: 'initial',
@@ -38,6 +48,11 @@
 		dataIndex: 'feed',
 	},
 	{
+		title: '鍒濆閲嶉噺',
+		align: 'center',
+		dataIndex: 'originWeight',
+	},
+	{
 		title: '棰勮骞茬嚗鏃堕棿',
 		align: 'center',
 		dataIndex: 'et',
@@ -50,23 +65,39 @@
 	{
 		title: '骞茬嚗鏃堕棿',
 		align: 'center',
-		dataIndex: 'drying',
+		dataIndex: 'dryTime',
+	},
+	{
+		title: '鐑娓╁害',
+		align: 'center',
+		dataIndex: 'windTemp',
+	},
+	{
+		title: '鐜娓╁害',
+		align: 'center',
+		dataIndex: 'envTemp',
+	},
+	{
+		title: '鐜婀垮害',
+		align: 'center',
+		dataIndex: 'envHum',
+	},
+	{
+		title: '鑽℃枡寤舵椂锛坢s锛�',
+		align: 'center',
+		dataIndex: 'delay',
+	},
+	{
+		title: '缈绘枡娆℃暟',
+		align: 'center',
+		dataIndex: 'turn',
 	},
 	{
 		title: '棰勮鍓╀綑鏃堕棿',
 		align: 'center',
 		dataIndex: 'remain',
 	},
-	{
-		title: '璁惧',
-		align: 'center',
-		dataIndex: 'equId_dictText',
-	},
-	{
-		title: '杞﹂棿',
-		align: 'center',
-		dataIndex: 'shopId_dictText',
-	},
+
 	{
 		title: '宸ュ崟鐘舵��',
 		align: 'center',
@@ -102,6 +133,10 @@
 		label: '宸ュ崟鏃堕棿',
 		field: 'orderTime',
 		component: 'DatePicker',
+		componentProps: {
+			showTime: true,
+			valueFormat: 'YYYY-MM-DD HH:mm:ss',
+		},
 	},
 	{
 		label: '宸ュ崟鍙�',
@@ -119,41 +154,71 @@
 			dictCode: 'dry_herb,name,id,tenant_id=' + getTenantId(),
 		},
 	},
-	{
-		label: '鍒濆鍚按鐜�',
-		field: 'initial',
-		component: 'InputNumber',
-	},
-	{
-		label: '鐩爣鍚按鐜�',
-		field: 'target',
-		component: 'InputNumber',
-	},
+	// {
+	// 	label: '鍒濆鍚按鐜�',
+	// 	field: 'initial',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐩爣鍚按鐜�',
+	// 	field: 'target',
+	// 	component: 'InputNumber',
+	// },
 	{
 		label: '鎶曟枡閲�',
 		field: 'feed',
 		component: 'InputNumber',
 	},
-	{
-		label: '棰勮骞茬嚗鏃堕棿',
-		field: 'et',
-		component: 'InputNumber',
-	},
-	{
-		label: '骞叉枡閲嶉噺',
-		field: 'yield',
-		component: 'InputNumber',
-	},
-	{
-		label: '骞茬嚗鏃堕棿',
-		field: 'drying',
-		component: 'InputNumber',
-	},
-	{
-		label: '棰勮鍓╀綑鏃堕棿',
-		field: 'remain',
-		component: 'InputNumber',
-	},
+	// {
+	// 	label: '鍘熷閲嶉噺',
+	// 	field: 'originWeight',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '棰勮骞茬嚗鏃堕棿',
+	// 	field: 'et',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '骞叉枡閲嶉噺',
+	// 	field: 'yield',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '骞茬嚗鏃堕棿',
+	// 	field: 'dryTime',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐑娓╁害',
+	// 	field: 'windTemp',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐜娓╁害',
+	// 	field: 'envTemp',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐜婀垮害',
+	// 	field: 'envHum',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鑽℃枡寤舵椂锛坢s锛�',
+	// 	field: 'delay',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '缈绘枡娆℃暟',
+	// 	field: 'turn',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '棰勮鍓╀綑鏃堕棿',
+	// 	field: 'remain',
+	// 	component: 'InputNumber',
+	// },
 	{
 		label: '璁惧',
 		field: 'equId',
@@ -170,19 +235,19 @@
 			dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
 		},
 	},
-	{
-		label: '宸ュ崟鐘舵��',
-		field: 'orderStatus',
-		component: 'InputNumber',
-	},
-	{
-		label: '鎿嶄綔浜�',
-		field: 'operator',
-		component: 'JDictSelectTag',
-		componentProps: {
-			dictCode: 'sys_user,realname,id,tenant_id=' + getTenantId(),
-		},
-	},
+	// {
+	// 	label: '宸ュ崟鐘舵��',
+	// 	field: 'orderStatus',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鎿嶄綔浜�',
+	// 	field: 'operator',
+	// 	component: 'JDictSelectTag',
+	// 	componentProps: {
+	// 		dictCode: 'sys_user,realname,id,tenant_id=' + getTenantId(),
+	// 	},
+	// },
 	// TODO 涓婚敭闅愯棌瀛楁锛岀洰鍓嶅啓姝讳负ID
 	{
 		label: '',
@@ -200,3 +265,34 @@
 	// 榛樿鍜屽師濮嬭〃鍗曚繚鎸佷竴鑷� 濡傛灉娴佺▼涓厤缃簡鏉冮檺鏁版嵁锛岃繖閲岄渶瑕佸崟鐙鐞唂ormSchema
 	return formSchema
 }
+
+export interface dryOrder {
+	id: string
+	order_time: Date
+	code: string
+	herb_id: string
+	herb_name: string
+	initial: number
+	target: number
+	feed: number
+	origin_weight: number
+	et: number
+	yield: number
+	dry_time: number
+	wind_temp: number
+	env_temp: number
+	env_hum: number
+	delay: number
+	turn: number
+	remain: number
+	equ_id: string
+	shop_id: string
+	tenant_id: string
+	create_by: string
+	create_time: Date
+	update_by: string
+	update_time: Date
+	order_status: number
+	operator: string
+	temps: string
+}

--
Gitblit v1.9.3