WxxyDeveloper/Jsl-OA-Web-Re
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: WxxyDeveloper:9d074840947cf4204894d63ee234649ef2d8983d
Branches Tags
WxxyDeveloper:master
WxxyDeveloper:dev
WxxyDeveloper:guji
WxxyDeveloper:feature-sht
WxxyDeveloper:feature-yaojie
WxxyDeveloper:feature-guji
WxxyDeveloper:sht
...
compare: WxxyDeveloper:6c9eb114ac3196cb9b36ae1d8e978b9b89da3bb4
Branches Tags
WxxyDeveloper:dev
WxxyDeveloper:guji
WxxyDeveloper:master
WxxyDeveloper:feature-sht
WxxyDeveloper:feature-yaojie
WxxyDeveloper:feature-guji
WxxyDeveloper:sht

3 Commits
9d07484094 ... 6c9eb114ac

Author SHA1 Message Date
GUjiYN
6c9eb114ac 拉取dev分支 2024-04-25 16:52:57 +08:00
GUjiYN
f578e57657 Merge branch 'refs/heads/dev' into guji 
# Conflicts:
#	components.d.ts
 2024-04-25 16:50:19 +08:00
GUjiYN
753e2700d2 内容补丁 2024-04-09 13:27:20 +08:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
components.d.ts vendored
View File

@ -13,7 +13,7 @@ declare module '@vue/runtime-core' {
DropdownMenu: typeof import('./src/components/Share/DropdownMenu.vue')['default'] DropdownMenu: typeof import('./src/components/Share/DropdownMenu.vue')['default']
Dropzone: typeof import('./src/components/Dropzone/index.vue')['default'] Dropzone: typeof import('./src/components/Dropzone/index.vue')['default']
EditorImage: typeof import('./src/components/Tinymce/components/EditorImage.vue')['default'] EditorImage: typeof import('./src/components/Tinymce/components/EditorImage.vue')['default']
ElAlert: typeof import('element-plus/es')['ElAlert'] ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
ElBadge: typeof import('element-plus/es')['ElBadge'] ElBadge: typeof import('element-plus/es')['ElBadge']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
@ -24,6 +24,7 @@ declare module '@vue/runtime-core' {
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdown: typeof import('element-plus/es')['ElDropdown']
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@ -35,7 +36,6 @@ declare module '@vue/runtime-core' {
ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption'] ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination'] ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover']
ElProgress: typeof import('element-plus/es')['ElProgress'] ElProgress: typeof import('element-plus/es')['ElProgress']
ElRow: typeof import('element-plus/es')['ElRow'] ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar']

2
src/views/personal/project/detail/charge.vue
View File

@ -53,7 +53,7 @@
<el-dialog <el-dialog
title="删除子模块" title="删除子模块"
width="450" width="450"
align-center align-center c
v-model="DeleteDialogVisible" v-model="DeleteDialogVisible"
> >
<span>确认删除该子模块吗?</span> <span>确认删除该子模块吗?</span>