From c3f7f719b7c4f132253c0a7e936f1e46fd6598e2 Mon Sep 17 00:00:00 2001 From: "Asoka.Wang" Date: Wed, 18 Jun 2025 15:02:33 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=96=B9=E6=A1=88=E6=A8=A1=E6=9D=BF=20?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=8F=8A=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E6=B3=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/admin/ReactorApi.ts | 9 +- src/api/types/ReactorType.ts | 20 + src/api/types/cultureprotocol.ts | 10 +- .../reactor/components/alarm-setting-form.vue | 2 +- src/views/admin/reactor/index.vue | 2 +- .../components/culture-protocol-form.vue | 385 +++++++++++++----- src/views/admin/template/index.vue | 35 +- 7 files changed, 354 insertions(+), 109 deletions(-) diff --git a/src/api/admin/ReactorApi.ts b/src/api/admin/ReactorApi.ts index 35792eb..6a269d5 100644 --- a/src/api/admin/ReactorApi.ts +++ b/src/api/admin/ReactorApi.ts @@ -1,4 +1,4 @@ -import { ReactorPageInput, ReactorPageResponse, ReactorOutput, ReactorAddInput, ReactorUpdateInput, ReactorTypeEnumListOutput } from '/@/api/types/reactorType' +import { ReactorPageInput, ReactorPageResponse, ReactorOutput, ReactorAddInput, ReactorUpdateInput, ReactorTypeEnumListOutput, ReactorListResponse } from '/@/api/types/reactorType' import { RequestParams } from './http-client' import { ContentType, HttpClient } from './http-client' @@ -15,6 +15,13 @@ export class ReactorApi extends HttpClient { ...params, }) + getList = (params: RequestParams = {}) => + this.request({ + path: `/api/admin/equ-reactor/get-list`, + method: 'GET', + ...params, + }) + /** * 获取单条数据 */ diff --git a/src/api/types/ReactorType.ts b/src/api/types/ReactorType.ts index 5f74c89..6abc4fe 100644 --- a/src/api/types/ReactorType.ts +++ b/src/api/types/ReactorType.ts @@ -81,6 +81,25 @@ export interface ReactorDto { isExternalPump?: boolean } +export interface ReactorDtoWithList extends ReactorDto { + pump1Speed?: number + pump2Speed?: number + pump3Speed?: number + pump4Speed?: number + pump5Speed?: number + pump6Speed?: number + pump7Speed?: number + pump8Speed?: number + pump1ConfigId?: number + pump2ConfigId?: number + pump3ConfigId?: number + pump4ConfigId?: number + pump5ConfigId?: number + pump6ConfigId?: number + pump7ConfigId?: number + pump8ConfigId?: number +} + /** 反应器添加和更新输入接口 */ export interface ReactorAddInputAndUpdateInput { /** 设备编号 */ @@ -191,6 +210,7 @@ export const defaultPumpConfig: PumpConfig = { // API 类型定义 export type ReactorPageInput = ServiceRequestPage; export type ReactorPageResponse = ServiceResponse>; +export type ReactorListResponse = ServiceResponse; export type ReactorOutput = ServiceResponse; export type ReactorAddInput = ReactorDto; export type ReactorUpdateInput = ReactorDto; diff --git a/src/api/types/cultureprotocol.ts b/src/api/types/cultureprotocol.ts index 82fef97..fa57835 100644 --- a/src/api/types/cultureprotocol.ts +++ b/src/api/types/cultureprotocol.ts @@ -46,7 +46,9 @@ export interface CultureProtocolPageDto { /** 是否启用 */ enabled: boolean /** 创建时间 */ - createdTime: string + createdTime: string, + /** 补料任务数量 */ + feedingTaskCount: number } export interface CultureProtocolDto { @@ -136,6 +138,12 @@ export interface FixedFeedingPump { itemDefFeedingMediumID?: number /** 设备泵ID */ equPumpId?: number + /** 补料泵名称 */ + feedingPumpName?: string + /** 量程(g/min) */ + pumpSpeed?: number + /** 是否是糖补料 */ + isGlucose?: boolean } export type CultureProtocolPageInput = ServiceRequestPage diff --git a/src/views/admin/reactor/components/alarm-setting-form.vue b/src/views/admin/reactor/components/alarm-setting-form.vue index 00ce193..865e536 100644 --- a/src/views/admin/reactor/components/alarm-setting-form.vue +++ b/src/views/admin/reactor/components/alarm-setting-form.vue @@ -68,7 +68,7 @@ import { ref, reactive } from 'vue' import { ElMessage } from 'element-plus' import { ReactorEPSettingApi } from '/@/api/admin/ReactorEPSettingApi' import { ReactorEPSetting } from '/@/api/types/reactorEPSetting' -import { ReactorDto } from '/@/api/types/ReactorType' +import { ReactorDto } from '/@/api/types/reactorType' defineOptions({ name: 'AlarmSettingForm' }) diff --git a/src/views/admin/reactor/index.vue b/src/views/admin/reactor/index.vue index 0dc4b01..a012c6c 100644 --- a/src/views/admin/reactor/index.vue +++ b/src/views/admin/reactor/index.vue @@ -90,7 +90,7 @@ import type { ReactorPageInput, ReactorDto, ReactorTypeEnumItem -} from '/@/api/types/ReactorType' +} from '/@/api/types/reactorType' const AlarmSettingForm = defineAsyncComponent(() => import('./components/alarm-setting-form.vue')) const ReactorForm = defineAsyncComponent(() => import('./components/reactor-form.vue')) diff --git a/src/views/admin/template/components/culture-protocol-form.vue b/src/views/admin/template/components/culture-protocol-form.vue index 37bb27e..b59d781 100644 --- a/src/views/admin/template/components/culture-protocol-form.vue +++ b/src/views/admin/template/components/culture-protocol-form.vue @@ -1,17 +1,26 @@