From aaa2ea6c54a7f3f43544b489a132a3e7136ad5f7 Mon Sep 17 00:00:00 2001 From: GUjiYN <2946459904@qq.com> Date: Tue, 16 Apr 2024 16:51:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E8=B4=9F=E8=B4=A3=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto-imports.d.ts | 2 - components.d.ts | 10 +- src/api/{article.js => project.js} | 18 +- .../example/components/ArticleDetail.vue | 2 +- src/views/example/list.vue | 2 +- src/views/excel/export-excel.vue | 2 +- src/views/excel/merge-header.vue | 2 +- src/views/excel/select-excel.vue | 2 +- src/views/personal/project/charge.vue | 566 +++++++++++++++++- src/views/tab/components/TabPane.vue | 2 +- src/views/table/drag-table.vue | 10 +- src/views/table/inline-edit-table.vue | 2 +- src/views/zip/index.vue | 2 +- 13 files changed, 594 insertions(+), 28 deletions(-) rename src/api/{article.js => project.js} (66%) diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 07b6235..8139ac9 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -2,6 +2,4 @@ export {} declare global { const ElMessage: typeof import('element-plus/es')['ElMessage'] - const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] - const ElNotification: typeof import('element-plus/es')['ElNotification'] } diff --git a/components.d.ts b/components.d.ts index a12137f..407fbf7 100644 --- a/components.d.ts +++ b/components.d.ts @@ -13,6 +13,7 @@ declare module '@vue/runtime-core' { DropdownMenu: typeof import('./src/components/Share/DropdownMenu.vue')['default'] Dropzone: typeof import('./src/components/Dropzone/index.vue')['default'] EditorImage: typeof import('./src/components/Tinymce/components/EditorImage.vue')['default'] + ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] @@ -21,29 +22,30 @@ declare module '@vue/runtime-core' { ElCard: typeof import('element-plus/es')['ElCard'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] + ElDivider: typeof import('element-plus/es')['ElDivider'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] + ElForm: typeof import('element-plus/es')['ElForm'] + ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElProgress: typeof import('element-plus/es')['ElProgress'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] + ElTooltip: typeof import('element-plus/es')['ElTooltip'] ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default'] GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./src/components/Hamburger/index.vue')['default'] diff --git a/src/api/article.js b/src/api/project.js similarity index 66% rename from src/api/article.js rename to src/api/project.js index ce2b8fa..e1adc9a 100644 --- a/src/api/article.js +++ b/src/api/project.js @@ -2,24 +2,28 @@ import request from '@/utils/request'; function getCurrentTimestamp() { return new Date().getTime(); } -export function SystemGetByProjId(projectId, token) { +export function GetProject(projectId, token) { return request({ - url: '/module/get', + url: '/project/get/' + projectId, method: 'get', - params: { projectId }, headers: { - 'Authorization':'Bearer '+token, + 'Authorization':'Bearer '+ token, 'content-type': 'application/json;charset=utf-8', 'Timestamp': getCurrentTimestamp() } }); } -export function fetchArticle(id) { +export function GetProjectInfo(token,id) { return request({ - url: '/vue-element-admin/article/detail', + url: '/project/get/id/', method: 'get', - params: { id } + params: { id }, + headers: { + 'Authorization':'Bearer '+ token, + 'content-type': 'application/json;charset=utf-8', + 'Timestamp': getCurrentTimestamp() + } }); } diff --git a/src/views/example/components/ArticleDetail.vue b/src/views/example/components/ArticleDetail.vue index 17b7584..a8ce520 100644 --- a/src/views/example/components/ArticleDetail.vue +++ b/src/views/example/components/ArticleDetail.vue @@ -82,7 +82,7 @@ import Upload from '@/components/Upload/SingleImage3'; import MDinput from '@/components/MDinput'; import Sticky from '@/components/Sticky'; // 粘性header组件 import { validURL } from '@/utils/validate'; -import { fetchArticle } from '@/api/article'; +import { fetchArticle } from '@/api/project'; import { searchUser } from '@/api/remote-search'; import Warning from './Warning'; import { CommentDropdown, PlatformDropdown, SourceUrlDropdown } from './Dropdown'; diff --git a/src/views/example/list.vue b/src/views/example/list.vue index d803e9f..a5f9373 100644 --- a/src/views/example/list.vue +++ b/src/views/example/list.vue @@ -59,7 +59,7 @@ + + + + diff --git a/src/views/tab/components/TabPane.vue b/src/views/tab/components/TabPane.vue index 1b1aab8..7271b07 100644 --- a/src/views/tab/components/TabPane.vue +++ b/src/views/tab/components/TabPane.vue @@ -56,7 +56,7 @@ +--> - +