diff --git a/src/api/admin/CultureProtocolApi.ts b/src/api/admin/CultureProtocolApi.ts new file mode 100644 index 0000000..a119f49 --- /dev/null +++ b/src/api/admin/CultureProtocolApi.ts @@ -0,0 +1,93 @@ +import { RequestParams } from './http-client' +import { ContentType, HttpClient } from './http-client' +import type { + CultureProtocolDto, + CultureProtocolPageInput, + CultureProtocolPageResponse, + CultureProtocolOutput, + CultureProtocolAddInput, + CultureProtocolUpdateInput +} from '/@/api/types/cultureprotocol' + +export class CultureProtocolApi extends HttpClient { + /** + * 获取分页列表 + */ + getPage = (data: CultureProtocolPageInput, params: RequestParams = {}) => + this.request({ + path: `/api/admin/culture-protocol/get-page`, + method: 'POST', + body: data, + type: ContentType.Json, + ...params, + }) + + /** + * 获取单条数据 + */ + get = (params: { id: number }, requestParams: RequestParams = {}) => + this.request({ + path: `/api/admin/culture-protocol/get`, + method: 'GET', + query: params, + ...requestParams, + }) + + /** + * 新增 + */ + add = (data: CultureProtocolAddInput, params: RequestParams = {}) => + this.request({ + path: `/api/admin/culture-protocol/add`, + method: 'POST', + body: data, + type: ContentType.Json, + ...params, + }) + + /** + * 更新 + */ + update = (data: CultureProtocolUpdateInput, params: RequestParams = {}) => + this.request({ + path: `/api/admin/culture-protocol/update`, + method: 'PUT', + body: data, + type: ContentType.Json, + ...params, + }) + + /** + * 软删除 + */ + softDelete = (params: { id: number }, requestParams: RequestParams = {}) => + this.request({ + path: `/api/admin/culture-protocol/soft-delete`, + method: 'DELETE', + query: params, + ...requestParams, + }) + + /** + * 复制培养方案 + */ + copy = (params: { id: number; reactorId: number }, requestParams: RequestParams = {}) => + this.request({ + path: `/api/admin/culture-protocol/copy`, + method: 'POST', + body: params, + type: ContentType.Json, + ...requestParams, + }) + + /** + * 切换培养方案状态 + */ + toggleStatus = (params: { id: number; isEnabled: boolean }, requestParams: RequestParams = {}) => + this.request({ + path: `/api/admin/culture-protocol/toggle-status`, + method: 'POST', + query: params, + ...requestParams, + }) +} \ No newline at end of file diff --git a/src/api/admin/ReactorApi.ts b/src/api/admin/ReactorApi.ts index dfd7ea4..35792eb 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 } from '/@/api/types/reactorType' import { RequestParams } from './http-client' import { ContentType, HttpClient } from './http-client' diff --git a/src/api/types/ReactorType.ts b/src/api/types/ReactorType.ts index 0d43842..5f74c89 100644 --- a/src/api/types/ReactorType.ts +++ b/src/api/types/ReactorType.ts @@ -75,8 +75,10 @@ export interface ReactorDto { createdTime?: string | null /** 修改时间 */ modifiedTime?: string | null - /** 压力单位 */ - pressureUnit?: string | null + /** 压力单位 */ + pressureUnit?: string | null + /** 是否外置泵 */ + isExternalPump?: boolean } /** 反应器添加和更新输入接口 */ diff --git a/src/api/types/cultureprotocol.ts b/src/api/types/cultureprotocol.ts new file mode 100644 index 0000000..82fef97 --- /dev/null +++ b/src/api/types/cultureprotocol.ts @@ -0,0 +1,146 @@ +import { ServiceResponse } from './response' +import { ServiceRequestPage } from './pageInput' +import { PageResponse } from './pageResponse' + +// 过滤条件 +export interface CultureProtocolFilter { + /** 设备编号 */ + keyWord?: string | null + /** 开始时间 */ + stDate?: string | null + /** 结束时间 */ + edDate?: string | null + /** 反应器Id */ + equReactorId?: number | null +} + + +/** + * 培养方案实体接口 + */ +export interface CultureProtocolPageDto { + /** 主键ID */ + id: number + /** 培养方案名称 */ + cultureProtocolName: string + /** 反应器ID */ + equReactorId: number + /** 补料秤ID */ + equFeedingScaleId: number + /** 培养天数 */ + days: number + /** 初始工作体积 */ + initialWorkingVolume: number + /** 初始工作培养基ID */ + initialWorkingMediumId: number + /** 转种细胞体积 */ + transferCellVolume: number + /** 转种细胞类型ID */ + transferCellTypeId: number + /** 实验组ID */ + experimentalGroupId: number + /** 葡萄糖补料验证 */ + glucoseFeedingVerification: boolean + /** 备注 */ + remark: string + /** 是否启用 */ + enabled: boolean + /** 创建时间 */ + createdTime: string +} + +export interface CultureProtocolDto { + /** 主键ID */ + id: number + /** 培养方案名称 */ + cultureProtocolName: string + /** 反应器ID */ + equReactorId?: number + /** 补料秤ID */ + equFeedingScaleId?: number + /** 培养天数 */ + days: number + /** 初始工作体积 */ + initialWorkingVolume: number + /** 初始工作培养基ID */ + initialWorkingMediumId: number + /** 转种细胞体积 */ + transferCellVolume: number + /** 转种细胞类型ID */ + transferCellTypeId: number + /** 葡萄糖补料验证 */ + glucoseFeedingVerification: boolean + /** 备注 */ + remark: string + /** 自动葡萄糖补料规则 */ + autoGlucoseFeedingRules: AutoGlucoseFeedingRule[] + /** 补料任务 */ + feedingTasks: FeedingTask[] + /** 固定补料泵配置 */ + fixedFeedingPumps: FixedFeedingPump[] +} + +/** 自动葡萄糖补料规则 */ +export interface AutoGlucoseFeedingRule { + /** 主键ID */ + id: number + /** 培养方案ID */ + cultureProtocolId: number + /** 培养开始天数 */ + cultureDayStarting: number + /** 培养结束天数 */ + cultureDayEnding: number + /** 下限值 */ + lowerLimit: number + /** 补料目标值 */ + feedingTo: number + /** 下限操作符 */ + lowerLimitOperator: string + /** 计算模式 */ + calculationMode: number +} + +/** 补料任务 */ +export interface FeedingTask { + /** 主键ID */ + id: number + /** 培养方案ID */ + cultureProtocolId: number + /** 补料泵编号 */ + feedingPumpNo: number + /** 培养天数 */ + day: number + /** 补料时间 */ + feedingTime: string + /** 补料类型 */ + feedingType: number + /** 补料体积百分比 */ + feedingVolumePercent: number + /** 补料体积 */ + feedingVolume: number +} + +/** 固定补料泵配置 */ +export interface FixedFeedingPump { + /** 主键ID */ + id: number + /** 培养方案ID */ + cultureProtocolId?: number + /** 配置ID */ + configId?: number + /** 补料泵编号 */ + feedingPumpNo: number + /** 物料定义袋ID */ + itemDefBagID?: number + /** 物料定义培养基ID */ + itemDefFeedingMediumID?: number + /** 设备泵ID */ + equPumpId?: number +} + +export type CultureProtocolPageInput = ServiceRequestPage +export type CultureProtocolPageResponse = ServiceResponse>; + +export type CultureProtocolOutput = ServiceResponse; +export type CultureProtocolAddInput = CultureProtocolDto; +export type CultureProtocolUpdateInput = CultureProtocolDto; \ No newline at end of file diff --git a/src/api/types/revokeType.ts b/src/api/types/revokeType.ts index 9e2d461..05ea341 100644 --- a/src/api/types/revokeType.ts +++ b/src/api/types/revokeType.ts @@ -1,5 +1,5 @@ import { ServiceResponse } from './response'; -import { ServiceRequstPage } from './pageInput' +import { ServiceRequestPage } from './pageInput' import { PageResponse } from './pageResponse' // 过滤 @@ -93,7 +93,7 @@ export interface RevokeTypeEnumItem { label: string } -export type RevokeReasonPageInput = ServiceRequstPage; +export type RevokeReasonPageInput = ServiceRequestPage; export type RevokeReasonPageResponse = ServiceResponse>; export type RevokeReasonOutput = ServiceResponse; diff --git a/src/views/admin/template/components/culture-protocol-form.vue b/src/views/admin/template/components/culture-protocol-form.vue new file mode 100644 index 0000000..37bb27e --- /dev/null +++ b/src/views/admin/template/components/culture-protocol-form.vue @@ -0,0 +1,515 @@ + + + + + \ No newline at end of file diff --git a/src/views/admin/template/index.vue b/src/views/admin/template/index.vue new file mode 100644 index 0000000..7de1cda --- /dev/null +++ b/src/views/admin/template/index.vue @@ -0,0 +1,285 @@ + + + + + \ No newline at end of file diff --git a/src/views/admin/uspsreactor/components/reactor-form.vue b/src/views/admin/uspsreactor/components/reactor-form.vue deleted file mode 100644 index 12a874a..0000000 --- a/src/views/admin/uspsreactor/components/reactor-form.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - - diff --git a/src/views/admin/uspsreactor/index.vue b/src/views/admin/uspsreactor/index.vue deleted file mode 100644 index d053e68..0000000 --- a/src/views/admin/uspsreactor/index.vue +++ /dev/null @@ -1,224 +0,0 @@ - - - - -