From 7edf66cafb871c5fb28911dfb02611ef5c9910b2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 06 二月 2024 17:05:49 +0800
Subject: [PATCH] 登录请求接口取消、设备切换图标和弹窗关闭按钮增大

---
 src/api/index.ts |   95 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index b45f15f..03bbe0e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,5 +1,5 @@
 import { request } from '@/common/utils'
-import type { CraftParamsResponse, TasksGroupByChannel } from './task'
+import type { CraftParamsResponse, TasksGroupByChannel, Task } from './task'
 import type { PLCResponse } from './plc'
 import type { Devices } from './device'
 import type { CraftModel } from './craftModel'
@@ -28,6 +28,8 @@
   offset: number
   /** 鏌ュ灏戞潯 */
   limit: number
+  /** 璁惧id */
+  deviceID: string
 }
 
 /**
@@ -36,7 +38,26 @@
  */
 export function getTaskList(params: TaskListParams) {
   return request<BaseResponse<TasksGroupByChannel>>({
-    url: '/v1/task/list',
+    url: '/api-s/v1/reportWork/taskList',
+    method: 'get',
+    params
+  })
+}
+
+export interface TaskInfoParams {
+  /** 璁惧id */
+  deviceID: string
+  /** 宸ュ簭id */
+  procedureID: number
+}
+
+/**
+ * 鑾峰彇浠诲姟璇︽儏
+ * @param params
+ */
+export function getTaskInfo(params: TaskInfoParams) {
+  return request<BaseResponse<Task>>({
+    url: '/api-s/v1/reportWork/taskInfo',
     method: 'get',
     params
   })
@@ -106,12 +127,30 @@
   })
 }
 
+export interface ProcedureUpdateParams {
+  isFinish: boolean
+  isProcessing: boolean
+  workOrderProcedureID: number
+}
+
+/**
+ * 寮�濮嬩换鍔�/瀹屾垚浠诲姟 (鍘� 鑾峰彇宸ヨ壓鍙傛暟/缁撴潫浠诲姟)
+ * @param params
+ */
+export function procedureUpdate(params: ProcedureUpdateParams) {
+  return request<BaseResponse>({
+    url: `/api-s/v1/reportWork/procedureUpdate`,
+    method: 'post',
+    data: params
+  })
+}
+
 /**
  * 鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�
  */
 export function getDeviceList() {
   return request<BaseResponse<Devices>>({
-    url: `/v1/device/list`,
+    url: `/api-s/v1/reportWork/deviceList`,
     method: 'get'
   })
 }
@@ -125,7 +164,7 @@
  */
 export function apiSetCurrentDevice(data: SetCurrentDeviceParams) {
   return request<BaseResponse>({
-    url: `/v1/device/setCurrentDeviceId`,
+    url: `/api-s/v1/reportWork/setCurrentDeviceId`,
     method: 'post',
     data
   })
@@ -183,17 +222,17 @@
 /**
  * 鑾峰彇闂璇婃柇闂鍒楄〃
  */
-export function apiGetProblemList() {
-  return request<BaseResponse<Problem[]>>({
-    url: '/v1/system/problemList',
-    method: 'get'
-  })
-}
+// export function apiGetProblemList() {
+//   return request<BaseResponse<Problem[]>>({
+//     url: '/v1/system/problemList',
+//     method: 'get'
+//   })
+// }
 
 export interface ReportingRecordListParams {
   page?: number
   pageSize?: number
-  procedureId: number
+  workOrderProcedureID: number
 }
 
 /**
@@ -201,16 +240,17 @@
  */
 export function apiGetReportingRecordList(params: ReportingRecordListParams) {
   return request<ListResponse<ReportingRecord[]>>({
-    url: '/v1/reportWork/list',
+    url: '/api-s/v1/reportWork/list',
     method: 'get',
     params
   })
 }
 
 export interface ReportWorkParams {
-  procedureId: number
+  workOrderProcedureID: number
   reportAmount: number
   workerID: string
+  workerName: string
 }
 
 /**
@@ -218,7 +258,34 @@
  */
 export function apiReportWork(params: ReportWorkParams) {
   return request<BaseResponse>({
-    url: '/v1/reportWork/report',
+    url: '/api-s/v1/reportWork/report',
+    method: 'post',
+    data: params
+  })
+}
+
+/**
+ * 鑾峰彇楠岃瘉鐮�
+ */
+export function getCaptcha() {
+  return request({
+    url: '/api/base/captcha',
+    method: 'post'
+  })
+}
+
+export interface loginParams {
+  username: string
+  password: string
+  captcha: string
+  captchaId: string
+}
+/**
+ * 鐧诲綍
+ */
+export function login(params: loginParams) {
+  return request({
+    url: '/api/base/login',
     method: 'post',
     data: params
   })

--
Gitblit v1.8.0