From e3f069b4fbb1ddcbc9f1c0832634200555789268 Mon Sep 17 00:00:00 2001
From: master <master@163.com>
Date: 星期二, 22 三月 2022 17:42:53 +0800
Subject: [PATCH] 新增采集数据相关页面

---
 src/cool/modules/deviceGroup/views/deviceGroup.vue |   95 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/src/cool/modules/deviceGroup/views/deviceGroup.vue b/src/cool/modules/deviceGroup/views/deviceGroup.vue
index 13d8177..b3bdba1 100644
--- a/src/cool/modules/deviceGroup/views/deviceGroup.vue
+++ b/src/cool/modules/deviceGroup/views/deviceGroup.vue
@@ -45,6 +45,15 @@
 		const upsert = reactive<Upsert>({
 			items: [
 				{
+					label: "鍚嶇О",
+					prop: "name",
+					component: {
+						name: "el-input"
+					},
+					//鏄惁涓哄繀濉」,娉細鎺ュ彛閰嶇疆瀛楁鏃舵病鏈夎缃粯璁ゅ�兼椂锛岄兘闇�瑕侀�夋嫨蹇呭~
+					required: true
+				},
+				{
 					label: "閫昏緫ID",
 					prop: "logic_id",
 					component: {
@@ -53,16 +62,45 @@
 					required: true
 				},
 				{
-					label: "閰嶇疆浜哄悕绉�",
-					prop: "configurator",
+					label: "鐗╃悊ID",
+					prop: "device_id",
 					component: {
 						name: "el-input"
 					},
 					required: true
 				},
 				{
-					label: "澶囨敞",
-					prop: "remark",
+					label: "璐熻矗浜�",
+					prop: "operator",
+					component: {
+						name: "el-input"
+					},
+					required: true
+				},
+				{
+					label: "缁忓害",
+					prop: "longitude",
+					component: {
+						name: "el-input"
+					}
+				},
+				{
+					label: "绾害",
+					prop: "latitude",
+					component: {
+						name: "el-input"
+					}
+				},
+				{
+					label: "楂樺害",
+					prop: "altitude",
+					component: {
+						name: "el-input"
+					}
+				},
+				{
+					label: "瀹夎浣嶇疆",
+					prop: "location",
 					component: {
 						name: "el-input"
 					}
@@ -70,6 +108,13 @@
 				{
 					label: "鐘舵��",
 					prop: "status",
+					component: {
+						name: "el-input"
+					}
+				},
+				{
+					label: "澶囨敞",
+					prop: "remark",
 					component: {
 						name: "el-input"
 					}
@@ -85,25 +130,50 @@
 					align: "center"
 				},
 				{
-					label: "搴忓彿",
+					label: "id",
 					prop: "id",
 					sortable: true //鏄惁鎺掑簭鍔熻兘
+				},
+				{
+					label: "杩愯鐘舵��",
+					prop: "status",
+					filters: [
+						{ text: 0, value: 0 },
+						{ text: 1, value: 1 }
+					]
+					// filters:"[{ text: '瀹�', value: '瀹�' }, { text: '鍏徃', value: '鍏徃' }]"
+				},
+				{
+					label: "鍚嶇О",
+					prop: "name"
+				},
+				{
+					label: "浣嶇疆",
+					prop: "location",
+					width: 200
 				},
 				{
 					label: "閫昏緫ID",
 					prop: "logic_id"
 				},
 				{
-					label: "閰嶇疆浜哄悕绉�",
-					prop: "configurator"
+					label: "鐗╃悊ID",
+					prop: "device_id",
+					width: 100
 				},
 				{
-					label: "澶囨敞",
-					prop: "remark"
+					label: "缁忓害",
+					prop: "longitude",
+					width: 150
 				},
 				{
-					label: "鐘舵��",
-					prop: "status"
+					label: "绾害",
+					prop: "latitude",
+					width: 150
+				},
+				{
+					label: "楂樺害",
+					prop: "altitude"
 				},
 				{
 					label: "鎿嶄綔",
@@ -115,7 +185,8 @@
 		// crud 鍔犺浇
 		function onLoad({ ctx, app }: CrudLoad) {
 			// 缁戝畾 service
-			ctx.service(service.deviceGroup.deviceGroup).done();
+			console.log(service);
+			ctx.service(service.business.devicegroup).done();
 			app.refresh();
 		}
 

--
Gitblit v1.9.1