From 032f03375eedf06e7c03e264799299cb56681b74 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 11 Feb 2025 12:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/agv-task.vue |  27 ++++-
 utils/getData0.js          | 236 ++++++++++++++++++-------------------
 2 files changed, 144 insertions(+), 119 deletions(-)

diff --git a/pages/modules/agv-task.vue b/pages/modules/agv-task.vue
index 9c1b22d..2f44f3d 100644
--- a/pages/modules/agv-task.vue
+++ b/pages/modules/agv-task.vue
@@ -37,8 +37,23 @@
 		</view>
 		<view class="zd-row submit-bar_new">
 			<button class="zd-col-7 submit-button_c" @tap="toClear">清空</button>
-			<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled" @tap="_callTask">确认</button>
+			<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled" @tap="toPop">确认</button>
 		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确认下发任务？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_callTask">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
 	</view>
 </template>
 
@@ -51,6 +66,7 @@
 		},
 		data() {
 			return {
+				show: false,
 				disabled: false,
 				options1: [],
 				index1: '',
@@ -159,6 +175,11 @@
 				this.options4 = []
 				this.options5 = []
 			},
+			toPop () {
+				if (this.index1 && this.index2 && this.index3 && this.index4) {
+					this.show = true
+				}
+			},
 			async _callTask () {
 				this.disabled = true
 				if (!this.index1 || !this.index2) {
@@ -181,4 +202,8 @@
 </script>
 
 <style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
 </style>
diff --git a/utils/getData0.js b/utils/getData0.js
index 799a24d..48bf0f5 100644
--- a/utils/getData0.js
+++ b/utils/getData0.js
@@ -8,12 +8,12 @@ export const queryArea = () => request({
 })
 
 // 根据区域查询点位
-export const queryPointByArea = (rcode) => request({
-	url:'api/hand/queryPointByArea',
-	data: {
-        region_code: rcode
-    }
-})
+// export const queryPointByArea = (rcode) => request({
+// 	url:'api/hand/queryPointByArea',
+// 	data: {
+//         region_code: rcode
+//     }
+// })
 
 /**
  * 搬运任务
@@ -31,117 +31,117 @@ export const callTask = (sdcode, ndcode, type, material) => request({
 })
 
 // 查询任务模式以及每个任务模式下对应的区域名称
-export const queryBusinessProcesses = () => request({
-	url:'api/hand/queryBusinessProcesses',
-	data: {}
-})
+// export const queryBusinessProcesses = () => request({
+// 	url:'api/hand/queryBusinessProcesses',
+// 	data: {}
+// })
 
 // 模拟数据
-// export const queryBusinessProcesses = () => {
-// 	let res = {
-//         "data": [
-//         {
-//                     "createBy": "System",
-//                     "updatedBy": "System",
-//                     "createTime": 1738984469000,
-//                     "updateTime": 1738984469000,
-//                     "id": 46,
-//                     "dictDetails": [
-//                         {
-//                             "createBy": "System",
-//                             "updatedBy": "System",
-//                             "createTime": 1738984714000,
-//                             "updateTime": 1738984714000,
-//                             "id": 320,
-//                             "dict": {
-//                                 "id": 46
-//                             },
-//                             "label": "Ⅵ区空托回流区",
-//                             "value": "07",
-//                             "dictSort": 1
-//                         },
-//                         {
-//                             "createBy": "System",
-//                             "updatedBy": "System",
-//                             "createTime": 1738984739000,
-//                             "updateTime": 1738984739000,
-//                             "id": 321,
-//                             "dict": {
-//                                 "id": 46
-//                             },
-//                             "label": "箱体物料区",
-//                             "value": "08",
-//                             "dictSort": 2
-//                         }
-//                     ],
-//                     "name": "BusinessProcesses_1",
-//                     "description": "箱体入库"
-//                 },
-//                 {
-//                     "createBy": "System",
-//                     "updatedBy": "System",
-//                     "createTime": 1738984482000,
-//                     "updateTime": 1738984482000,
-//                     "id": 47,
-//                     "dictDetails": [
-//                         {
-//                             "createBy": "System",
-//                             "updatedBy": "System",
-//                             "createTime": 1738984785000,
-//                             "updateTime": 1738984785000,
-//                             "id": 322,
-//                             "dict": {
-//                                 "id": 47
-//                             },
-//                             "label": "Ⅵ区空托回流区",
-//                             "value": "07",
-//                             "dictSort": 1
-//                         },
-//                         {
-//                             "createBy": "System",
-//                             "updatedBy": "System",
-//                             "createTime": 1738984803000,
-//                             "updateTime": 1738984803000,
-//                             "id": 323,
-//                             "dict": {
-//                                 "id": 47
-//                             },
-//                             "label": "箱体物料区",
-//                             "value": "08",
-//                             "dictSort": 1
-//                         },
-//                         {
-//                             "createBy": "System",
-//                             "updatedBy": "System",
-//                             "createTime": 1738984903000,
-//                             "updateTime": 1738984903000,
-//                             "id": 324,
-//                             "dict": {
-//                                 "id": 47
-//                             },
-//                             "label": "模组下线区",
-//                             "value": "01",
-//                             "dictSort": 2
-//                         }
-//                     ],
-//                     "name": "BusinessProcesses_2",
-//                     "description": "模组下线"
-//                 },
-//         ],
-//         "message": "200"
-//         }
-// 	return res
-// }
-// export const queryPointByArea = () => {
-// 	let res = {
-//         data: [
-//         {
-//         device_name: "147",
-//         device_id: "178a645c3b874818b6c0576e1dc6e616",
-//         device_code: "147"
-//         }
-//         ],
-//         message: "200"
-//         }
-// 	return res
-// }
+export const queryBusinessProcesses = () => {
+	let res = {
+        "data": [
+        {
+                    "createBy": "System",
+                    "updatedBy": "System",
+                    "createTime": 1738984469000,
+                    "updateTime": 1738984469000,
+                    "id": 46,
+                    "dictDetails": [
+                        {
+                            "createBy": "System",
+                            "updatedBy": "System",
+                            "createTime": 1738984714000,
+                            "updateTime": 1738984714000,
+                            "id": 320,
+                            "dict": {
+                                "id": 46
+                            },
+                            "label": "Ⅵ区空托回流区",
+                            "value": "07",
+                            "dictSort": 1
+                        },
+                        {
+                            "createBy": "System",
+                            "updatedBy": "System",
+                            "createTime": 1738984739000,
+                            "updateTime": 1738984739000,
+                            "id": 321,
+                            "dict": {
+                                "id": 46
+                            },
+                            "label": "箱体物料区",
+                            "value": "08",
+                            "dictSort": 2
+                        }
+                    ],
+                    "name": "BusinessProcesses_1",
+                    "description": "箱体入库"
+                },
+                {
+                    "createBy": "System",
+                    "updatedBy": "System",
+                    "createTime": 1738984482000,
+                    "updateTime": 1738984482000,
+                    "id": 47,
+                    "dictDetails": [
+                        {
+                            "createBy": "System",
+                            "updatedBy": "System",
+                            "createTime": 1738984785000,
+                            "updateTime": 1738984785000,
+                            "id": 322,
+                            "dict": {
+                                "id": 47
+                            },
+                            "label": "Ⅵ区空托回流区",
+                            "value": "07",
+                            "dictSort": 1
+                        },
+                        {
+                            "createBy": "System",
+                            "updatedBy": "System",
+                            "createTime": 1738984803000,
+                            "updateTime": 1738984803000,
+                            "id": 323,
+                            "dict": {
+                                "id": 47
+                            },
+                            "label": "箱体物料区",
+                            "value": "08",
+                            "dictSort": 1
+                        },
+                        {
+                            "createBy": "System",
+                            "updatedBy": "System",
+                            "createTime": 1738984903000,
+                            "updateTime": 1738984903000,
+                            "id": 324,
+                            "dict": {
+                                "id": 47
+                            },
+                            "label": "模组下线区",
+                            "value": "01",
+                            "dictSort": 2
+                        }
+                    ],
+                    "name": "BusinessProcesses_2",
+                    "description": "模组下线"
+                },
+        ],
+        "message": "200"
+        }
+	return res
+}
+export const queryPointByArea = () => {
+	let res = {
+        data: [
+        {
+        device_name: "147",
+        device_id: "178a645c3b874818b6c0576e1dc6e616",
+        device_code: "147"
+        }
+        ],
+        message: "200"
+        }
+	return res
+}