From 8c9bf09057ac66f3123b114c1ad5e7ecf45823f4 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 12 Oct 2023 11:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/taskmanage.vue | 18 +++++++--------
 pages/modules/zlmanage.vue   | 20 ++++++++---------
 utils/getData1.js            | 43 ++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 19 deletions(-)
 create mode 100644 utils/getData1.js

diff --git a/pages/modules/taskmanage.vue b/pages/modules/taskmanage.vue
index 76df826..02679f5 100644
--- a/pages/modules/taskmanage.vue
+++ b/pages/modules/taskmanage.vue
@@ -42,7 +42,7 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {queryTask, taskOperation} from '@/utils/getData2.js'
+	import {tasks, taskoperation} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar
@@ -60,11 +60,11 @@
 			};
 		},
 		created () {
-		    this._queryTask(this.keyword, this.startPoint, this.endPoint)
+		    this._tasks(this.keyword, this.startPoint, this.endPoint)
 		  },
 		methods: {
-			async _queryTask () {
-				let res = await queryTask(this.keyword, this.startPoint, this.endPoint)
+			async _tasks () {
+				let res = await tasks(this.keyword, this.startPoint, this.endPoint)
 				if (res.code === '1') {
 					this.dataList = [...res.result]
 				} else {
@@ -74,14 +74,14 @@
 					})
 				}
 			},
-			async _taskOperation (type) {
+			async _taskoperation (type) {
 				try {
-					let res = await taskOperation(this.pkId, type)
+					let res = await taskoperation(type, this.pkId)
 					if (res.code === '1') {
 						this.disabled1 = false
 						this.disabled2 = false
 						this.pkId = ''
-						this._queryTask()
+						this._tasks()
 						uni.showToast({
 							title: res.desc,
 							icon: 'none'
@@ -108,7 +108,7 @@
 					this.disabled1 = false
 					return
 				}
-				this._taskOperation(type)
+				this._taskoperation(type)
 			},
 			toSure2 (type) {
 				this.disabled2 = true
@@ -116,7 +116,7 @@
 					this.disabled2 = false
 					return
 				}
-				this._taskOperation(type)
+				this._taskoperation(type)
 			}
 		}
 	}
diff --git a/pages/modules/zlmanage.vue b/pages/modules/zlmanage.vue
index 4b9047a..58238fd 100644
--- a/pages/modules/zlmanage.vue
+++ b/pages/modules/zlmanage.vue
@@ -47,7 +47,7 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {queryInstraction, instOperation} from '@/utils/getData2.js'
+	import {insts, inst} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar
@@ -65,11 +65,11 @@
 			};
 		},
 		created () {
-		    this._queryInstraction(this.keyword, this.startPoint, this.endPoint)
+		    this._insts(this.keyword, this.startPoint, this.endPoint)
 		  },
 		methods: {
-			async _queryInstraction () {
-				let res = await queryInstraction(this.keyword, this.startPoint, this.endPoint)
+			async _insts () {
+				let res = await insts(this.keyword, this.startPoint, this.endPoint)
 				if (res.code === '1') {
 					this.dataList = [...res.result]
 				} else {
@@ -79,15 +79,15 @@
 					})
 				}
 			},
-			async _instOperation (type) {
+			async _inst (type) {
 				try {
-					let res = await instOperation(this.pkId, type)
+					let res = await inst(type, this.pkId)
 					if (res.code === '1') {
 						this.disabled1 = false
 						this.disabled2 = false
 						this.disabled3 = false
 						this.pkId = ''
-						this._queryInstraction()
+						this._insts()
 						uni.showToast({
 							title: res.desc,
 							icon: 'none'
@@ -116,7 +116,7 @@
 					this.disabled1 = false
 					return
 				}
-				this._instOperation(type)
+				this._inst(type)
 			},
 			toSure2 (type) {
 				this.disabled2 = true
@@ -124,7 +124,7 @@
 					this.disabled2 = false
 					return
 				}
-				this._instOperation(type)
+				this._inst(type)
 			},
 			toSure3 (type) {
 				this.disabled3 = true
@@ -132,7 +132,7 @@
 					this.disabled3 = false
 					return
 				}
-				this._instOperation(type)
+				this._inst(type)
 			}
 		}
 	}
diff --git a/utils/getData1.js b/utils/getData1.js
new file mode 100644
index 0000000..8b59dd5
--- /dev/null
+++ b/utils/getData1.js
@@ -0,0 +1,43 @@
+import request from './request.js'
+
+/**
+ * 指令管理
+ */
+// 1.1查询未完成指令
+export const insts = (keyword, scode, ncode) => request({
+	url:'api/hand/insts',
+	data: {
+		keyword: keyword,
+		start_devicecode: scode,
+		next_devicecode: ncode
+	}
+})
+// 1.2 指令操作
+export const inst = (type, uuid) => request({
+	url:'api/hand/inst',
+	data: {
+		type: type,
+		inst_uuid: uuid
+	}
+})
+
+/**
+ * 任务管理
+ */
+// 1.1 查询无指令的任务
+export const tasks = (keyword, scode, ncode) => request({
+	url:'api/hand/tasks',
+	data: {
+		keyword: keyword,
+		start_devicecode: scode,
+		next_devicecode: ncode
+	}
+})
+// 1.2 指令操作
+export const taskoperation = (type, uuid) => request({
+	url:'api/hand/taskoperation',
+	data: {
+		type: type,
+		inst_uuid: uuid
+	}
+})