diff --git a/src/api/date/type.ts b/src/api/date/type.ts index 045f4e09e..ed2c52acd 100644 --- a/src/api/date/type.ts +++ b/src/api/date/type.ts @@ -65,3 +65,115 @@ export interface dataBaseStruct { id?: string; redashDatasourceId?: number; } + +/** +@ 作者: 秦东 +@ 时间: 2024-04-22 11:43:21 +@ 功能: 自建应用菜单树结构 +*/ +export interface appMenuTreeInfo { + id:string; //节点唯一识别符 + label:string; //节点名称 + type:number; //节点类型 1：目录；2：菜单；3：必定存在 + svg?:string; //图标 + pcIsShow:number; //pc端显示与隐藏 + wapIsShow:number; //移动端显示与隐藏 + isLock:number; + children?:appMenuTreeInfo[]; //子级 +} +/** +@ 作者: 秦东 +@ 时间: 2024-04-22 08:31:22 +@ 功能: 实验拖拽树 +*/ +export let threeShiyanData = [ + { + id:"1", + svg:"chaoSongWoDe", + label:"Hr管理", + type:1, + children:[ + { + id:"2", + svg:"chaoSongWoDe", + label:"Hr看板", + type:2, + children:[] + }, + { + id:"3", + svg:"chaoSongWoDe", + label:"员工档案", + type:2, + children:[] + }, + { + id:"4", + svg:"chaoSongWoDe", + label:"绩效考核", + type:1, + children:[ + { + id:"5", + svg:"chaoSongWoDe", + label:"统计分析", + type:1, + children:[ + { + id:"6", + svg:"chaoSongWoDe", + label:"综合成绩", + type:2, + children:[] + }, + { + id:"7", + svg:"chaoSongWoDe", + label:"指标分析", + type:2, + children:[] + } + ] + }, + { + id:"8", + svg:"chaoSongWoDe", + label:"考核方案", + type:1, + children:[ + { + id:"9", + svg:"chaoSongWoDe", + label:"方案生成", + type:2, + children:[] + } + ] + } + ] + }, + { + id:"10", + svg:"chaoSongWoDe", + label:"考勤管理", + type:2, + children:[] + }, + ] + }, + { + id:"11", + svg:"chaoSongWoDe", + label:"应用管理", + type:1, + children:[ + { + id:"", + svg:"chaoSongWoDe", + label:"应用中心", + type:2, + children:[] + }, + ] + } +]; diff --git a/src/assets/icons/chaoSongWoDe.svg b/src/assets/icons/chaoSongWoDe.svg new file mode 100644 index 000000000..6168047d4 --- /dev/null +++ b/src/assets/icons/chaoSongWoDe.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/daiWoCuLi.svg b/src/assets/icons/daiWoCuLi.svg new file mode 100644 index 000000000..e9722ef28 --- /dev/null +++ b/src/assets/icons/daiWoCuLi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/fenZhu.svg b/src/assets/icons/fenZhu.svg new file mode 100644 index 000000000..21d2b6ad6 --- /dev/null +++ b/src/assets/icons/fenZhu.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/liuChengBiaoDan.svg b/src/assets/icons/liuChengBiaoDan.svg new file mode 100644 index 000000000..bb660b041 --- /dev/null +++ b/src/assets/icons/liuChengBiaoDan.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/puTongBiaoDan.svg b/src/assets/icons/puTongBiaoDan.svg new file mode 100644 index 000000000..2395bf465 --- /dev/null +++ b/src/assets/icons/puTongBiaoDan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/woChuangJianDe.svg b/src/assets/icons/woChuangJianDe.svg new file mode 100644 index 000000000..1723efbf7 --- /dev/null +++ b/src/assets/icons/woChuangJianDe.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/woYiChuLi.svg b/src/assets/icons/woYiChuLi.svg new file mode 100644 index 000000000..a1b4454a2 --- /dev/null +++ b/src/assets/icons/woYiChuLi.svg @@ -0,0 +1 @@ + diff --git a/src/assets/images/13.png b/src/assets/images/13.png new file mode 100644 index 000000000..96e90550b Binary files /dev/null and b/src/assets/images/13.png differ diff --git a/src/assets/images/3.png b/src/assets/images/3.png index 96e90550b..9c3543358 100644 Binary files a/src/assets/images/3.png and b/src/assets/images/3.png differ diff --git a/src/components/IconSelect/appMenuSvgPage.vue b/src/components/IconSelect/appMenuSvgPage.vue new file mode 100644 index 000000000..c31ed9569 --- /dev/null +++ b/src/components/IconSelect/appMenuSvgPage.vue @@ -0,0 +1,82 @@ + + + + diff --git a/src/components/IconSelect/svgPage.vue b/src/components/IconSelect/svgPage.vue new file mode 100644 index 000000000..5511eece8 --- /dev/null +++ b/src/components/IconSelect/svgPage.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index 07b65e8dd..f49176214 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -21,7 +21,7 @@ const props = defineProps({ }, color: { type: String, - default: "", + default: "currentColor", }, size: { type: String, diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 003d20446..7a1a67917 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -11,6 +11,7 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default'] AddNode: typeof import('./../components/workflow/addNode.vue')['default'] + AppMenuSvgPage: typeof import('./../components/IconSelect/appMenuSvgPage.vue')['default'] ApproverDrawer: typeof import('./../components/workflow/drwer/approverDrawer.vue')['default'] BianXian: typeof import('./../components/DesignForm/designLayout/bianXian.vue')['default'] Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] @@ -22,7 +23,6 @@ declare module '@vue/runtime-core' { DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] ElAffix: typeof import('element-plus/es')['ElAffix'] - ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -53,17 +53,15 @@ declare module '@vue/runtime-core' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] - ElIconExpand: typeof import('@element-plus/icons-vue')['Expand'] - ElIconFold: typeof import('@element-plus/icons-vue')['Fold'] ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup'] + ElMenuMenu: typeof import('element-plus/es')['ElMenuMenu'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] @@ -76,7 +74,6 @@ declare module '@vue/runtime-core' { ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSelectV2: typeof import('element-plus/es')['ElSelectV2'] ElSlider: typeof import('element-plus/es')['ElSlider'] ElSpace: typeof import('element-plus/es')['ElSpace'] ElStep: typeof import('element-plus/es')['ElStep'] @@ -93,7 +90,6 @@ declare module '@vue/runtime-core' { ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTransfer: typeof import('element-plus/es')['ElTransfer'] ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] @@ -116,35 +112,17 @@ declare module '@vue/runtime-core' { Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] HeadTools: typeof import('./../components/DesignForm/public/headTools.vue')['default'] HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] + Icon: typeof import('./../components/IconSelect/icon.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] - IEpCollection: typeof import('~icons/ep/collection')['default'] IEpDelete: typeof import('~icons/ep/delete')['default'] - IEpDownload: typeof import('~icons/ep/download')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] -<<<<<<< HEAD - IEpMinus: typeof import('~icons/ep/minus')['default'] -======= - IEpMoreFilled: typeof import('~icons/ep/more-filled')['default'] ->>>>>>> yjf_v3 - IEpOperation: typeof import('~icons/ep/operation')['default'] - IEpPicture: typeof import('~icons/ep/picture')['default'] IEpPlus: typeof import('~icons/ep/plus')['default'] - IEpPosition: typeof import('~icons/ep/position')['default'] IEpRefresh: typeof import('~icons/ep/refresh')['default'] - IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default'] IEpSearch: typeof import('~icons/ep/search')['default'] IEpSetting: typeof import('~icons/ep/setting')['default'] -<<<<<<< HEAD - IEpTop: typeof import('~icons/ep/top')['default'] - IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default'] -======= - IEpStar: typeof import('~icons/ep/star')['default'] ->>>>>>> yjf_v3 - IEpUser: typeof import('~icons/ep/user')['default'] IEpView: typeof import('~icons/ep/view')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default'] @@ -170,6 +148,7 @@ declare module '@vue/runtime-core' { SingleUpload: typeof import('./../components/Upload/SingleUpload.vue')['default'] SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default'] SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default'] + SvgPage: typeof import('./../components/IconSelect/svgPage.vue')['default'] TableListPage: typeof import('./../components/DesignForm/tableListPage/index.vue')['default'] Template: typeof import('./../components/DesignForm/template.vue')['default'] TextPage: typeof import('./../components/DesignForm/designLayout/textPage.vue')['default'] diff --git a/src/views/sysworkflow/codepage/page.vue b/src/views/sysworkflow/codepage/page.vue index 5a09352da..217e483f1 100644 --- a/src/views/sysworkflow/codepage/page.vue +++ b/src/views/sysworkflow/codepage/page.vue @@ -54,68 +54,7 @@ const deleteCard = (index: number) => { }; diff --git a/src/views/sysworkflow/lowcodepage/appPage/index.vue b/src/views/sysworkflow/lowcodepage/appPage/index.vue index 1bbf864b8..92b71e149 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/index.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/index.vue @@ -4,6 +4,10 @@ @ 备注: 设置自建应用 --> diff --git a/src/views/sysworkflow/lowcodepage/workFlow.vue b/src/views/sysworkflow/lowcodepage/workFlow.vue index a45b51b58..f47cbfd3e 100644 --- a/src/views/sysworkflow/lowcodepage/workFlow.vue +++ b/src/views/sysworkflow/lowcodepage/workFlow.vue @@ -543,6 +543,7 @@ onMounted(()=>{ @@ -566,6 +567,10 @@ onMounted(()=>{ display: flex; align-items: center; justify-content: center; + .imgBox{ + height: calc(100vh - 400px); + // height: 10%; + } } /* 去掉tabs标签栏下的下划线 */ ::v-deep .el-tabs__nav-wrap::after {