From 2e41795247feb7b4d079dcd23f71fef4612f3dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Tue, 2 Dec 2025 10:39:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?---=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mdm/Testflow003/index.ts | 90 ++++ .../mdm/Testflow003/model/Testflow003Model.ts | 32 ++ .../header/components/notify/index.vue | 7 +- src/views/mdm/Testflow003/components/Form.vue | 224 ++++++++++ .../components/Testflow003Modal.vue | 108 +++++ .../mdm/Testflow003/components/config.ts | 220 ++++++++++ .../components/workflowPermission.ts | 47 ++ src/views/mdm/Testflow003/index.vue | 404 ++++++++++++++++++ 8 files changed, 1129 insertions(+), 3 deletions(-) create mode 100644 src/api/mdm/Testflow003/index.ts create mode 100644 src/api/mdm/Testflow003/model/Testflow003Model.ts create mode 100644 src/views/mdm/Testflow003/components/Form.vue create mode 100644 src/views/mdm/Testflow003/components/Testflow003Modal.vue create mode 100644 src/views/mdm/Testflow003/components/config.ts create mode 100644 src/views/mdm/Testflow003/components/workflowPermission.ts create mode 100644 src/views/mdm/Testflow003/index.vue diff --git a/src/api/mdm/Testflow003/index.ts b/src/api/mdm/Testflow003/index.ts new file mode 100644 index 0000000..113f1e2 --- /dev/null +++ b/src/api/mdm/Testflow003/index.ts @@ -0,0 +1,90 @@ +import { Testflow003PageModel, Testflow003PageParams, Testflow003PageResult } from './model/Testflow003Model'; +import { defHttp } from '/@/utils/http/axios'; +import { ErrorMessageMode } from '/#/axios'; + +enum Api { + Page = '/mdm/testflow003/page', + List = '/mdm/testflow003/list', + Info = '/mdm/testflow003/info', + Testflow003 = '/mdm/testflow003', + + + + + DataLog = '/mdm/testflow003/datalog', +} + +/** + * @description: 查询Testflow003分页列表 + */ +export async function getTestflow003Page(params: Testflow003PageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Page, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取Testflow003信息 + */ +export async function getTestflow003(id: String, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Info, + params: { id }, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增Testflow003 + */ +export async function addTestflow003(testflow003: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.Testflow003, + params: testflow003, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 更新Testflow003 + */ +export async function updateTestflow003(testflow003: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.put( + { + url: Api.Testflow003, + params: testflow003, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 删除Testflow003(批量删除) + */ +export async function deleteTestflow003(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.delete( + { + url: Api.Testflow003, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/api/mdm/Testflow003/model/Testflow003Model.ts b/src/api/mdm/Testflow003/model/Testflow003Model.ts new file mode 100644 index 0000000..bee46bb --- /dev/null +++ b/src/api/mdm/Testflow003/model/Testflow003Model.ts @@ -0,0 +1,32 @@ +import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; + +/** + * @description: Testflow003分页参数 模型 + */ +export interface Testflow003PageParams extends BasicPageParams { + name: string; + + code: string; + + note: string; +} + +/** + * @description: Testflow003分页返回值模型 + */ +export interface Testflow003PageModel { + id: string; + + name: string; + + code: string; + + note: string; +} + +0; + +/** + * @description: Testflow003分页返回值结构 + */ +export type Testflow003PageResult = BasicFetchResult; \ No newline at end of file diff --git a/src/layouts/default/header/components/notify/index.vue b/src/layouts/default/header/components/notify/index.vue index a4d2db1..9124cff 100644 --- a/src/layouts/default/header/components/notify/index.vue +++ b/src/layouts/default/header/components/notify/index.vue @@ -201,9 +201,10 @@ const listData = ref(tabListData); const simpleImage = ref(Empty.PRESENTED_IMAGE_SIMPLE); getDatas(); - times.value = setInterval(() => { - getDatas(); - }, 10000); + //停止循环获取通知 + // times.value = setInterval(() => { + // getDatas(); + // }, 10000); async function getDatas() { listData.value.forEach((o) => { o.list = []; diff --git a/src/views/mdm/Testflow003/components/Form.vue b/src/views/mdm/Testflow003/components/Form.vue new file mode 100644 index 0000000..e82ccd2 --- /dev/null +++ b/src/views/mdm/Testflow003/components/Form.vue @@ -0,0 +1,224 @@ + + \ No newline at end of file diff --git a/src/views/mdm/Testflow003/components/Testflow003Modal.vue b/src/views/mdm/Testflow003/components/Testflow003Modal.vue new file mode 100644 index 0000000..d10bc2b --- /dev/null +++ b/src/views/mdm/Testflow003/components/Testflow003Modal.vue @@ -0,0 +1,108 @@ + + \ No newline at end of file diff --git a/src/views/mdm/Testflow003/components/config.ts b/src/views/mdm/Testflow003/components/config.ts new file mode 100644 index 0000000..71ddd57 --- /dev/null +++ b/src/views/mdm/Testflow003/components/config.ts @@ -0,0 +1,220 @@ +import { FormProps, FormSchema } from '/@/components/Form'; +import { BasicColumn } from '/@/components/Table'; + +export const formConfig = { + useCustomConfig: false, +}; + +export const searchFormSchema: FormSchema[] = [ + { + field: 'name', + label: '名称', + component: 'Input', + }, + { + field: 'code', + label: '编码', + component: 'Input', + }, + { + field: 'note', + label: '备注', + component: 'Input', + }, +]; + +export const columns: BasicColumn[] = [ + { + dataIndex: 'name', + title: '名称', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'code', + title: '编码', + componentType: 'auto-code', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'note', + title: '备注', + componentType: 'textarea', + align: 'left', + + sorter: true, + }, +]; +//表单事件 +export const formEventConfigs = { + 0: [ + { + type: 'circle', + color: '#2774ff', + text: '开始节点', + icon: '#icon-kaishi', + bgcColor: '#D8E5FF', + isUserDefined: false, + }, + { + color: '#F6AB01', + icon: '#icon-chushihua', + text: '初始化表单', + bgcColor: '#f9f5ea', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 1: [ + { + color: '#B36EDB', + icon: '#icon-shujufenxi', + text: '获取表单数据', + detail: '(新增无此操作)', + bgcColor: '#F8F2FC', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 2: [ + { + color: '#F8625C', + icon: '#icon-jiazai', + text: '加载表单', + bgcColor: '#FFF1F1', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 3: [ + { + color: '#6C6AE0', + icon: '#icon-jsontijiao', + text: '提交表单', + bgcColor: '#F5F4FF', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 4: [ + { + type: 'circle', + color: '#F8625C', + text: '结束节点', + icon: '#icon-jieshuzhiliao', + bgcColor: '#FFD6D6', + isLast: true, + isUserDefined: false, + }, + ], +}; +export const formProps: FormProps = { + labelCol: { span: 3, offset: 0 }, + labelAlign: 'right', + layout: 'horizontal', + size: 'default', + schemas: [ + { + key: '824c88f926f34077ab2b2968d12a8f40', + field: 'name', + label: '名称', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入名称', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'c3006ee0baae4ceb90db1f91909ef0d5', + field: 'code', + label: '编码', + type: 'auto-code', + component: 'AutoCodeRule', + colProps: { span: 24 }, + componentProps: { + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + width: '100%', + span: '', + placeholder: '请输入编码', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + showLabel: true, + autoCodeRule: 'TestCode', + required: false, + isShow: true, + style: { width: '100%' }, + }, + }, + { + key: '7723c8847e854b55a815472fc79fb87c', + field: 'note', + label: '备注', + type: 'textarea', + component: 'InputTextArea', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: true, + placeholder: '请输入备注', + maxlength: null, + rows: 4, + autoSize: false, + showCount: false, + disabled: false, + showLabel: true, + allowClear: false, + required: false, + isShow: true, + rules: [], + events: {}, + style: { width: '100%' }, + }, + }, + ], + showActionButtonGroup: false, + buttonLocation: 'center', + actionColOptions: { span: 24 }, + showResetButton: false, + showSubmitButton: false, + hiddenComponent: [], +}; \ No newline at end of file diff --git a/src/views/mdm/Testflow003/components/workflowPermission.ts b/src/views/mdm/Testflow003/components/workflowPermission.ts new file mode 100644 index 0000000..693dd02 --- /dev/null +++ b/src/views/mdm/Testflow003/components/workflowPermission.ts @@ -0,0 +1,47 @@ +export const permissionList = [ + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '名称', + fieldId: 'name', + isSubTable: false, + showChildren: true, + type: 'input', + key: '824c88f926f34077ab2b2968d12a8f40', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '编码', + fieldId: 'code', + isSubTable: false, + showChildren: true, + type: 'auto-code', + key: 'c3006ee0baae4ceb90db1f91909ef0d5', + children: [], + }, + { + required: false, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '备注', + fieldId: 'note', + isSubTable: false, + showChildren: true, + type: 'textarea', + key: '7723c8847e854b55a815472fc79fb87c', + children: [], + }, +]; \ No newline at end of file diff --git a/src/views/mdm/Testflow003/index.vue b/src/views/mdm/Testflow003/index.vue new file mode 100644 index 0000000..d90975a --- /dev/null +++ b/src/views/mdm/Testflow003/index.vue @@ -0,0 +1,404 @@ + + + \ No newline at end of file From a6c308d5d72dd7bffe0ddf0e3dfa8ec5f79cc7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Tue, 2 Dec 2025 14:09:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?---=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 36e7c02..d4f9f1a 100644 --- a/.env.development +++ b/.env.development @@ -10,8 +10,9 @@ VITE_PUBLIC_PATH = / # 如果接口地址匹配到,则会转发到http://localhost:3000,防止本地出现跨域问题 # 可以有多个,注意多个不能换行,否则代理将会失效 #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]] -#VITE_PROXY=[["/api","http://10.10.2.102:9500"]] -VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] +VITE_PROXY=[["/api","http://10.10.2.102:9500"]] +#VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] +#VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] # 是否删除Console.log VITE_DROP_CONSOLE = false @@ -22,8 +23,6 @@ VITE_DROP_CONSOLE = false #VITE_GLOB_API_URL=http://127.0.0.1:8090 VITE_GLOB_API_URL=/api #VITE_GLOB_REQUEST_TIMEOUT=120000 -# VITE_GLOB_API_URL=http://10.4.126.67:30000 -# VITE_GLOB_API_URL=http://10.0.252.25:8090 #VITE_GLOB_REQUEST_TIMEOUT=20000 # 报表系统地址 #VITE_GLOB_REPORT_URL=http://10.133.96.105:3100 @@ -33,7 +32,7 @@ VITE_GLOB_REPORT_URL=http://localhost:8090/api VITE_GLOB_UPLOAD_URL = /system/oss/upload # 文件预览接口 可选 -VITE_GLOB_UPLOAD_PREVIEW = http://10.0.252.28:8012/onlinePreview?url= +VITE_GLOB_UPLOAD_PREVIEW = http://10.10.2.101:8012/onlinePreview?url= #外部url地址 VITE_GLOB_OUT_LINK_URL = ['http://localhost:4100']