diff --git a/src/api/admin/CultureProtocolApi.ts b/src/api/admin/ProtocolApi.ts similarity index 60% rename from src/api/admin/CultureProtocolApi.ts rename to src/api/admin/ProtocolApi.ts index 15ceb82..1bb3805 100644 --- a/src/api/admin/CultureProtocolApi.ts +++ b/src/api/admin/ProtocolApi.ts @@ -1,21 +1,21 @@ import { RequestParams } from './http-client' import { ContentType, HttpClient } from './http-client' import type { - CultureProtocolDto, - CultureProtocolPageInput, - CultureProtocolPageResponse, - CultureProtocolOutput, - CultureProtocolAddInput, - CultureProtocolUpdateInput -} from '/@/api/types/cultureprotocol' + ProtocolDto, + ProtocolPageInput, + ProtocolPageResponse, + ProtocolOutput, + ProtocolAddInput, + ProtocolUpdateInput +} from '/@/api/types/protocolType' -export class CultureProtocolApi extends HttpClient { +export class ProtocolApi extends HttpClient { /** * 获取分页列表 */ - getPage = (data: CultureProtocolPageInput, params: RequestParams = {}) => - this.request({ - path: `/api/admin/culture-protocol/get-page`, + getPage = (data: ProtocolPageInput, params: RequestParams = {}) => + this.request({ + path: `/api/admin/protocol/get-page`, method: 'POST', body: data, type: ContentType.Json, @@ -26,8 +26,8 @@ export class CultureProtocolApi extends HttpClient { * 获取单条数据 */ get = (params: { id: number }, requestParams: RequestParams = {}) => - this.request({ - path: `/api/admin/culture-protocol/get`, + this.request({ + path: `/api/admin/protocol/get`, method: 'GET', query: { id: params.id }, ...requestParams, @@ -36,9 +36,9 @@ export class CultureProtocolApi extends HttpClient { /** * 新增 */ - add = (data: CultureProtocolAddInput, params: RequestParams = {}) => + add = (data: ProtocolAddInput, params: RequestParams = {}) => this.request({ - path: `/api/admin/culture-protocol/add`, + path: `/api/admin/protocol/add`, method: 'POST', body: data, type: ContentType.Json, @@ -48,9 +48,9 @@ export class CultureProtocolApi extends HttpClient { /** * 更新 */ - update = (data: CultureProtocolUpdateInput, params: RequestParams = {}) => + update = (data: ProtocolUpdateInput, params: RequestParams = {}) => this.request({ - path: `/api/admin/culture-protocol/update`, + path: `/api/admin/protocol/update`, method: 'PUT', body: data, type: ContentType.Json, @@ -62,7 +62,7 @@ export class CultureProtocolApi extends HttpClient { */ softDelete = (params: { id: number }, requestParams: RequestParams = {}) => this.request({ - path: `/api/admin/culture-protocol/soft-delete`, + path: `/api/admin/protocol/soft-delete`, method: 'DELETE', query: params, ...requestParams, @@ -73,7 +73,7 @@ export class CultureProtocolApi extends HttpClient { */ copy = (params: { id: number; reactorId: number }, requestParams: RequestParams = {}) => this.request({ - path: `/api/admin/culture-protocol/copy`, + path: `/api/admin/protocol/copy`, method: 'POST', body: params, type: ContentType.Json, @@ -85,7 +85,7 @@ export class CultureProtocolApi extends HttpClient { */ toggleStatus = (params: { id: number; isEnabled: boolean }, requestParams: RequestParams = {}) => this.request({ - path: `/api/admin/culture-protocol/toggle-status`, + path: `/api/admin/protocol/toggle-status`, method: 'POST', query: params, ...requestParams, diff --git a/src/api/types/cultureprotocol.ts b/src/api/types/protocolType.ts similarity index 83% rename from src/api/types/cultureprotocol.ts rename to src/api/types/protocolType.ts index fa57835..d9bc869 100644 --- a/src/api/types/cultureprotocol.ts +++ b/src/api/types/protocolType.ts @@ -3,7 +3,7 @@ import { ServiceRequestPage } from './pageInput' import { PageResponse } from './pageResponse' // 过滤条件 -export interface CultureProtocolFilter { +export interface ProtocolFilter { /** 设备编号 */ keyWord?: string | null /** 开始时间 */ @@ -18,11 +18,11 @@ export interface CultureProtocolFilter { /** * 培养方案实体接口 */ -export interface CultureProtocolPageDto { +export interface ProtocolPageDto { /** 主键ID */ id: number /** 培养方案名称 */ - cultureProtocolName: string + ProtocolName: string /** 反应器ID */ equReactorId: number /** 补料秤ID */ @@ -51,11 +51,11 @@ export interface CultureProtocolPageDto { feedingTaskCount: number } -export interface CultureProtocolDto { +export interface ProtocolDto { /** 主键ID */ id: number /** 培养方案名称 */ - cultureProtocolName: string + protocolName: string /** 反应器ID */ equReactorId?: number /** 补料秤ID */ @@ -87,7 +87,7 @@ export interface AutoGlucoseFeedingRule { /** 主键ID */ id: number /** 培养方案ID */ - cultureProtocolId: number + protocolId: number /** 培养开始天数 */ cultureDayStarting: number /** 培养结束天数 */ @@ -107,7 +107,7 @@ export interface FeedingTask { /** 主键ID */ id: number /** 培养方案ID */ - cultureProtocolId: number + protocolId: number /** 补料泵编号 */ feedingPumpNo: number /** 培养天数 */ @@ -127,7 +127,7 @@ export interface FixedFeedingPump { /** 主键ID */ id: number /** 培养方案ID */ - cultureProtocolId?: number + protocolId?: number /** 配置ID */ configId?: number /** 补料泵编号 */ @@ -146,9 +146,9 @@ export interface FixedFeedingPump { isGlucose?: boolean } -export type CultureProtocolPageInput = ServiceRequestPage -export type CultureProtocolPageResponse = ServiceResponse>; +export type ProtocolPageInput = ServiceRequestPage +export type ProtocolPageResponse = ServiceResponse>; -export type CultureProtocolOutput = ServiceResponse; -export type CultureProtocolAddInput = CultureProtocolDto; -export type CultureProtocolUpdateInput = CultureProtocolDto; \ No newline at end of file +export type ProtocolOutput = ServiceResponse; +export type ProtocolAddInput = ProtocolDto; +export type ProtocolUpdateInput = ProtocolDto; \ No newline at end of file diff --git a/src/views/admin/project/components/project-form.vue b/src/views/admin/project/components/project-form.vue index ca98776..3a66c88 100644 --- a/src/views/admin/project/components/project-form.vue +++ b/src/views/admin/project/components/project-form.vue @@ -207,6 +207,8 @@ const getPrincipalOptions = async () => { id: item.id, name: item.name })) || [] + + } catch (error) { console.error('获取用户列表失败:', error) } diff --git a/src/views/admin/template/components/culture-protocol-form.vue b/src/views/admin/template/components/protocol-form.vue similarity index 93% rename from src/views/admin/template/components/culture-protocol-form.vue rename to src/views/admin/template/components/protocol-form.vue index 62c25dd..d232081 100644 --- a/src/views/admin/template/components/culture-protocol-form.vue +++ b/src/views/admin/template/components/protocol-form.vue @@ -9,9 +9,9 @@
- - + @@ -298,16 +298,16 @@
- + + \ No newline at end of file diff --git a/src/views/admin/template/index.vue b/src/views/admin/template/index.vue index 9a54920..5c4af85 100644 --- a/src/views/admin/template/index.vue +++ b/src/views/admin/template/index.vue @@ -35,7 +35,7 @@ 查询 - 新增 + 新增 @@ -53,7 +53,7 @@ row-key="id" border > - +