From 62feac7e932a1faf6c05d7ac8df4c25a113eeb88 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 31 十月 2023 20:21:08 +0800
Subject: [PATCH] feat: 添加任务信息组件
---
src/views/dashboard/components/TaskControl.vue | 10 +++++++---
src/api/task.ts | 13 +++++++++++++
src/api/index.ts | 32 +++++++++++++++++++++++++++++++-
src/common/composable/index.ts | 4 ++--
4 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/api/index.ts b/src/api/index.ts
index 1517ce2..708b8b2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,5 +1,5 @@
import { request } from '@/common/utils'
-import type { TasksGroupByChannel } from './task'
+import type { CraftParamsResponse, TasksGroupByChannel } from './task'
import type { PLCResponse } from './plc'
export interface BaseResponse<T = any> {
@@ -36,6 +36,10 @@
procedureId: number
}
+/**
+ * 鑾峰彇PLC杩愯鏁版嵁
+ * @param params
+ */
export function getProductProgress(params: ProductProgressParams) {
return request<BaseResponse<PLCResponse>>({
url: '/v1/plc/productProgress',
@@ -43,3 +47,29 @@
data: params
})
}
+export interface CraftParamsParams {
+ id: number
+}
+
+/**
+ * 鑾峰彇宸ヨ壓鍙傛暟
+ * @param params
+ */
+export function getCraftParams(params: CraftParamsParams) {
+ return request<BaseResponse<CraftParamsResponse>>({
+ url: `v1/task/start/${params.id}`,
+ method: 'get',
+ data: params
+ })
+}
+
+export interface SendProcessParamsParams {
+ procedureId: number
+}
+export function sendProcessParams(params: SendProcessParamsParams) {
+ return request<BaseResponse>({
+ url: `v1/task/sendProcessParams`,
+ method: 'post',
+ data: params
+ })
+}
diff --git a/src/api/task.ts b/src/api/task.ts
index 405d0b4..8be45af 100644
--- a/src/api/task.ts
+++ b/src/api/task.ts
@@ -86,3 +86,16 @@
export interface TasksGroupByChannel {
[channel: number]: TasksResponse
}
+
+/**
+ * 宸ヨ壓鍙傛暟
+ */
+export interface CraftParam {
+ Key: string
+ Value: string
+}
+
+export interface CraftParamsResponse {
+ number: string
+ Params: CraftParam[]
+}
diff --git a/src/common/composable/index.ts b/src/common/composable/index.ts
index cf5a5a6..235f0e3 100644
--- a/src/common/composable/index.ts
+++ b/src/common/composable/index.ts
@@ -1,3 +1,3 @@
// 鏈枃浠舵斁缃�氱敤 composable (缁勫悎寮忓嚱鏁�), 娉ㄦ剰涓� utils 鍖哄垎
-
-export {}
+import { useCountDown } from './useCountDown'
+export { useCountDown }
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index bb55687..9a69334 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -27,23 +27,27 @@
</template>
</div>
</div>
+ <TaskControlModal v-model="showTaskControlModal" :task="task"></TaskControlModal>
</template>
<script setup lang="ts">
import type { Task } from '@/api/task'
-import { toRefs } from 'vue'
+import { ref, toRefs } from 'vue'
import BigButton from '@/views/dashboard/components/BigButton.vue'
import { useDateFormat } from '@vueuse/core'
+import TaskControlModal from '@/views/dashboard/components/TaskControlModal.vue'
const props = defineProps<{
task?: Task
}>()
const { task } = toRefs(props)
+
+const showTaskControlModal = ref(false)
+
/**
* 寮�濮嬬敓浜�
*/
function startProduce() {
- // TODO:
- // console.log(1)
+ showTaskControlModal.value = true
}
/**
--
Gitblit v1.8.0