From c7f3fd5215399b37d0511b3bd555150ff1b13507 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 29 四月 2024 10:39:30 +0800
Subject: [PATCH] fix:回退原先版本
---
src/api/index.ts | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 273 insertions(+), 12 deletions(-)
diff --git a/src/api/index.ts b/src/api/index.ts
index 03bc1c8..5e47e92 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,14 +1,22 @@
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'
import type { Problem } from './problem'
+import type { ReportingRecord } from './reporting'
export interface BaseResponse<T = any> {
code: number
data: T
msg: string
+}
+
+export interface ListResponse<T = any> {
+ code: number
+ data: T
+ msg: string
+ total: number
}
export interface TaskListParams {
@@ -20,6 +28,8 @@
offset: number
/** 鏌ュ灏戞潯 */
limit: number
+ /** 璁惧id */
+ deviceID: string
}
/**
@@ -28,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
})
@@ -36,7 +65,7 @@
export interface ProductProgressParams {
channel: number
- procedureId: number
+ procedureId?: number
}
/**
@@ -98,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'
})
}
@@ -113,11 +160,26 @@
}
/**
- * 鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�
+ * 璁惧畾褰撳墠璁惧
*/
export function apiSetCurrentDevice(data: SetCurrentDeviceParams) {
- return request<BaseResponse<Devices>>({
- url: `/v1/device/setCurrentDeviceId`,
+ return request<BaseResponse>({
+ url: `/api-s/v1/reportWork/setCurrentDeviceId`,
+ method: 'post',
+ data
+ })
+}
+
+export interface SetCurrentDeviceConfigParams {
+ needSetProcessParams: boolean
+}
+
+/**
+ * 璁惧畾褰撳墠璁惧閰嶇疆
+ */
+export function apiSetCurrentDeviceConfig(data: SetCurrentDeviceConfigParams) {
+ return request<BaseResponse>({
+ url: `/v1/device/config`,
method: 'post',
data
})
@@ -134,7 +196,7 @@
* @param params
*/
export function apiGetCraftModelList(params: CraftModelListParams) {
- return request<BaseResponse<CraftModel[]>>({
+ return request<ListResponse<CraftModel[]>>({
url: '/v1/processModel/list',
method: 'get',
params
@@ -160,9 +222,208 @@
/**
* 鑾峰彇闂璇婃柇闂鍒楄〃
*/
-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
+ workOrderProcedureID: number
+}
+
+/**
+ * 鑾峰彇鎶ュ伐璁板綍鍒楄〃
+ */
+export function apiGetReportingRecordList(params: ReportingRecordListParams) {
+ return request<ListResponse<ReportingRecord[]>>({
+ url: '/api-s/v1/reportWork/list',
+ method: 'get',
+ params
+ })
+}
+
+export interface ReportWorkParams {
+ workOrderProcedureID: number
+ reportAmount: number
+ workerID: string
+ workerName: string
+}
+
+/**
+ * 鎶ュ伐
+ */
+export function apiReportWork(params: ReportWorkParams) {
+ return request<BaseResponse>({
+ 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
+ })
+}
+
+export interface qualityParams {
+ reportAmount: number
+ workOrderProcedureID: number
+ workerID: string
+ workerName: string
+}
+/**
+ * 鐪嬫澘璐ㄦ
+ */
+export function bulletinQualityInspection(params: qualityParams) {
+ return request({
+ url: '/api-s/v1/reportWork/bulletinQualityInspection',
+ method: 'post',
+ data: params
+ })
+}
+
+export interface getQualityParams {
+ workOrderId: string
+ procedureId: string
+}
+/**
+ * 鐪嬫澘鑾峰彇璐ㄦ淇℃伅
+ */
+export function getQualityInspection(params: getQualityParams) {
+ return request({
+ url: '/api-s/v1/reportWork/bulletinGetQualityInspection',
+ method: 'post',
+ data: params
+ })
+}
+
+export interface bulletinReportParams {
+ reportAmount: number
+ workOrderProcedureID: number
+ workerID: string
+ workerName: string
+ ids: any[]
+}
+/**
+ * 鐪嬫澘鎶ュ伐
+ */
+export function bulletinReport(params: bulletinReportParams) {
+ return request({
+ url: '/api-s/v1/reportWork/bulletinReport',
+ method: 'post',
+ data: params
+ })
+}
+
+type basicType = number | null | string | undefined
+export interface qualityProcedureParams {
+ projectId: basicType
+ workOrderId: basicType
+ status: basicType
+ page: number
+ pageSize: number
+}
+
+/*
+ * 鑾峰彇璐ㄦ宸ュ簭
+ * */
+export function getQualityProcedureApi(params: qualityProcedureParams) {
+ return request({
+ url: '/api-s/v1/app/getQualityProcedure',
+ method: 'post',
+ data: params
+ })
+}
+export interface IPage {
+ page: number
+ pageSize: number
+}
+/**
+ * 鑾峰彇鎵�鏈夌殑椤圭洰
+ * */
+export function getProjectApi(params: IPage) {
+ return request({
+ url: '/api-s/v1/project/projectList',
+ method: 'post',
+ data: params
+ })
+}
+/**
+ * 鏍规嵁椤圭洰鑾峰彇鎵�鏈変骇鍝�
+ * */
+export interface IProduct {
+ page: number
+ pageSize: number
+ projectId: string
+}
+export function getProductApi(params: IProduct) {
+ return request({
+ url: '/api-s/v1/app/getProductListByProject',
+ method: 'post',
+ data: params
+ })
+}
+/**
+ * 鑾峰彇鍔犲伐浜哄憳鍒楄〃
+ * */
+export function getWorkerApi(params: IPage) {
+ return request({
+ url: 'api-s/v1/worker/getWorkerList',
+ method: 'post',
+ data: params
+ })
+}
+
+export interface IUpdateQualityProcedureParams {
+ id: number
+ passAmount: number
+ scrappedAmount: number
+ workerName: string
+}
+/**
+ * 鏇存柊宸ュ簭璐ㄦ鏁版嵁
+ * */
+export function updateQualityProcedureApi(params: IUpdateQualityProcedureParams) {
+ return request({
+ url: '/api-s/v1/app/updateQualityProcedure',
+ method: 'post',
+ data: params
+ })
+}
+export interface IQualityCountParams {
+ projectId: string
+ productId: string
+}
+export function qualityCountApi(params: IQualityCountParams) {
+ return request({
+ url: '/api-s/v1/app/appViewShow',
+ method: 'post',
+ data: params
})
}
--
Gitblit v1.8.0