From 67b6b6f8c9588a471f0cf8df07ac91dce1aaedd4 Mon Sep 17 00:00:00 2001 From: GUjiYN <2946459904@qq.com> Date: Tue, 9 Apr 2024 19:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=AE=A1=E7=90=86=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E6=88=91=E8=B4=9F=E8=B4=A3=E7=9A=84=E5=81=87=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.build_prod | 2 +- .env.dev_prod | 2 +- auto-imports.d.ts | 4 +- components.d.ts | 5 +- src/icons/svg/component.svg | 2 +- src/utils/request.js | 2 +- src/views/login/index.vue | 2 +- src/views/table/complex-table.vue | 111 +++++++++++++++++++++++++++--- src/views/table/drag-table.vue | 96 +++++++++++++++++++++++++- 9 files changed, 206 insertions(+), 20 deletions(-) diff --git a/.env.build_prod b/.env.build_prod index 5612e0c..b633924 100644 --- a/.env.build_prod +++ b/.env.build_prod @@ -2,4 +2,4 @@ NODE_ENV = 'production' # 打包模式连生产服 -VUE_APP_BASE_API = '/api-prod' \ No newline at end of file +VUE_APP_BASE_API = '/api-prod' diff --git a/.env.dev_prod b/.env.dev_prod index 08f44b5..aea24a6 100644 --- a/.env.dev_prod +++ b/.env.dev_prod @@ -3,4 +3,4 @@ NODE_ENV = 'development' # 开发模式连生产服 VUE_APP_BASE_API = '/api-prod' -VUE_APP_COOKIE = '' \ No newline at end of file +VUE_APP_COOKIE = '' diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 08908ed..07b6235 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -1,5 +1,7 @@ // Generated by 'unplugin-auto-import' 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 2b26012..f6d0d87 100644 --- a/components.d.ts +++ b/components.d.ts @@ -19,10 +19,9 @@ declare module '@vue/runtime-core' { ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - 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'] @@ -54,8 +53,6 @@ declare module '@vue/runtime-core' { ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElUpload: typeof import('element-plus/es')['ElUpload'] 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/icons/svg/component.svg b/src/icons/svg/component.svg index 207ada3..c1831df 100644 --- a/src/icons/svg/component.svg +++ b/src/icons/svg/component.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/utils/request.js b/src/utils/request.js index 42922e1..9e4e175 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,7 +4,7 @@ import { getToken } from '@/utils/auth'; // create an axios instance const service = axios.create({ - baseURL: process.env.VUE_APP_BASE_API = 'https://nbxt.oa.x-lf.cn', // url = base url + request url + baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests timeout: 5000 // request timeout }); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index d744fb6..a8fc437 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -87,7 +87,7 @@ export default defineComponent({ return { loginForm: { username: 'admin', - password: '111111' + password: '123456' }, loginRules: { username: [{ required: true, trigger: 'blur', validator: validateUsername }], diff --git a/src/views/table/complex-table.vue b/src/views/table/complex-table.vue index baa129b..281df00 100644 --- a/src/views/table/complex-table.vue +++ b/src/views/table/complex-table.vue @@ -1,3 +1,95 @@ + + + + + 项目1 + + + + + 名称 + + + 状态 + + + + 查询 + 重置 + + + + Footer content + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/table/drag-table.vue b/src/views/table/drag-table.vue index b67e774..c1e35a5 100644 --- a/src/views/table/drag-table.vue +++ b/src/views/table/drag-table.vue @@ -1,6 +1,99 @@ + + + + + 我管理的项目 + + + + + 名称 + + + 状态 + + + + 查询 + 重置 + + + + Footer content + + + + + + + + + + + + + + + + + + + + + + + + + <!– Note that row-key is necessary to get a correct row order. –> @@ -152,3 +245,4 @@ export default defineComponent({ margin-top: 15px; } +-->