From 9bd7af8eb41d3b04ae3dfeb6dd7a1739498e0f87 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 22 Apr 2024 14:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue            |  6 +++---
 pages/manage/agv-call-manage.vue |  4 ++--
 pages/manage/call-manage.vue     |  2 +-
 utils/mork2.js                   | 30 ++++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index f4d4df9..db0377e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -67,9 +67,9 @@
 				})
 			},
 			async toLogin() {
-				uni.redirectTo({
-					url: '/pages/home/home'
-				})
+				// uni.redirectTo({
+				// 	url: '/pages/home/home'
+				// })
 				this.disabled = true
 				if (this.user === '') {
 					uni.showToast({
diff --git a/pages/manage/agv-call-manage.vue b/pages/manage/agv-call-manage.vue
index a9bb7c3..c8a4bca 100644
--- a/pages/manage/agv-call-manage.vue
+++ b/pages/manage/agv-call-manage.vue
@@ -88,8 +88,8 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {agvqueryArea, queryPointByArea} from '@/utils/mork2.js'
-	import {agvcallTask} from '@/utils/getData2.js'
+	// import {agvqueryArea, queryPointByArea} from '@/utils/mork2.js'
+	import {agvqueryArea, queryPointByArea, agvcallTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar
diff --git a/pages/manage/call-manage.vue b/pages/manage/call-manage.vue
index 9fdd4a9..d7c5b50 100644
--- a/pages/manage/call-manage.vue
+++ b/pages/manage/call-manage.vue
@@ -68,7 +68,7 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {queryArea, queryPointByArea, callTask} from '@/utils/mork2.js'
+	import {queryArea, queryPointByArea, callTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar
diff --git a/utils/mork2.js b/utils/mork2.js
index e622776..b2711bf 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -111,6 +111,36 @@ export const queryPointByArea = () => {
 	}, {
 		device_code: 'B2_ED_1_7_K',
 		device_name: 'JLDFJLLJ7'
+	}, {
+		device_code: 'B3_ED_1_3_K',
+		device_name: 'JLDFJLLJ3'
+	}, {
+		device_code: 'B3_ED_1_4_K',
+		device_name: 'JLDFJLLJ4'
+	}, {
+		device_code: 'B3_ED_1_5_K',
+		device_name: 'JLDFJLLJ5'
+	}, {
+		device_code: 'B3_ED_1_6_K',
+		device_name: 'JLDFJLLJ6'
+	}, {
+		device_code: 'B3_ED_1_7_K',
+		device_name: 'JLDFJLLJ7'
+	}, {
+		device_code: 'B4_ED_1_3_K',
+		device_name: 'JLDFJLLJ3'
+	}, {
+		device_code: 'B4_ED_1_4_K',
+		device_name: 'JLDFJLLJ4'
+	}, {
+		device_code: 'B4_ED_1_5_K',
+		device_name: 'JLDFJLLJ5'
+	}, {
+		device_code: 'B4_ED_1_6_K',
+		device_name: 'JLDFJLLJ6'
+	}, {
+		device_code: 'B4_ED_1_7_K',
+		device_name: 'JLDFJLLJ7'
 	}]
   }
   return res