Merge branch 'feature-yaojie' into dev

# Conflicts:
#	components.d.ts
This commit is contained in:
妖姐 2024-04-23 00:36:05 +08:00
commit 0935915657
15 changed files with 1226 additions and 356 deletions

View File

@ -4,3 +4,4 @@ NODE_ENV = 'development'
# 开发模式连生产服 # 开发模式连生产服
VUE_APP_BASE_API = '/api-prod' VUE_APP_BASE_API = '/api-prod'
VUE_APP_COOKIE = '' VUE_APP_COOKIE = ''
VUE_APP_APIII = 'http://nbxt.oa.x-lf.cn'

3
auto-imports.d.ts vendored
View File

@ -1,6 +1,5 @@
// Generated by 'unplugin-auto-import' // Generated by 'unplugin-auto-import'
export {} export {}
declare global { declare global {
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
} }

6
components.d.ts vendored
View File

@ -13,13 +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']
ElButton: typeof import('element-plus/es')['ElButton']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElInput: typeof import('element-plus/es')['ElInput']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default'] ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default']
GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default'] GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default']
Hamburger: typeof import('./src/components/Hamburger/index.vue')['default'] Hamburger: typeof import('./src/components/Hamburger/index.vue')['default']

View File

@ -1,5 +1,5 @@
import request from '@/utils/request'; import request from '@/utils/request';
const a = process.env.VUE_APP_APIII;
export function fetchList(query) { export function fetchList(query) {
return request({ return request({
url: '/vue-element-admin/article/list', url: '/vue-element-admin/article/list',

View File

@ -1,9 +1,10 @@
<template> <template>
<el-breadcrumb class="app-breadcrumb" separator="/"> <el-breadcrumb class="app-breadcrumb" separator="/">
<transition-group name="breadcrumb"> <transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path"> <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
<span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{
item.meta.title item.meta.title
}}</span> }}</span>
<a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
</el-breadcrumb-item> </el-breadcrumb-item>

View File

@ -1,4 +1,5 @@
<template> <template>
<!-- 顶部缩放侧边栏icon-->
<div style="padding: 0 15px;" @click="toggleClick"> <div style="padding: 0 15px;" @click="toggleClick">
<svg :class="{ 'is-active': isActive }" class="hamburger" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" <svg :class="{ 'is-active': isActive }" class="hamburger" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"
width="64" height="64"> width="64" height="64">

View File

@ -1,4 +1,5 @@
<template> <template>
<!-- 顶部全屏icon-->
<div> <div>
<svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" @click="click" /> <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" @click="click" />
</div> </div>

View File

@ -1,9 +1,9 @@
<template> <template>
<div v-if="!isItemHidden" class="root-sidebar-item"> <div v-if="!isItemHidden" class="root-sidebar-item" >
<template <template
v-if="hasOneShowingChild(item.children, item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !(item.meta && item.meta.alwaysShow)"> v-if="hasOneShowingChild(item.children, item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !(item.meta && item.meta.alwaysShow)">
<app-link class="link" :to="resolvePath(onlyOneChild.path)"> <app-link class="link" :to="resolvePath(onlyOneChild.path)">
<el-menu-item class="left-menu-item" v-if="onlyOneChild.meta" :index="resolvePath(onlyOneChild.path)" <el-menu-item class="left-menu-item" v-if="onlyOneChild.meta" :index="resolvePath(onlyOneChild.path)"
:class="{ 'submenu-title-noDropdown': !isNest }"> :class="{ 'submenu-title-noDropdown': !isNest }">
<!-- <item :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" :title="onlyOneChild.meta.title" /> --> <!-- <item :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" :title="onlyOneChild.meta.title" /> -->

View File

@ -1,15 +1,15 @@
import { markRaw } from 'vue'; // import { markRaw } from 'vue';
import { createRouter, createWebHistory } from 'vue-router'; // createWebHashHistory, createWebHistory import { createRouter, createWebHistory } from 'vue-router'; // createWebHashHistory, createWebHistory
import type { Router, RouteRecordRaw, RouteComponent } from 'vue-router'; import type { Router, RouteRecordRaw, RouteComponent } from 'vue-router';
import { Help as IconHelp } from '@element-plus/icons-vue'; // import { Help as IconHelp } from '@element-plus/icons-vue';
/* Layout */ /* Layout */
const Layout = ():RouteComponent => import('@/layout/index.vue'); const Layout = ():RouteComponent => import('@/layout/index.vue');
/* Router Modules */ /* Router Modules */
import componentsRouter from './modules/components'; // import componentsRouter from './modules/components';
import chartsRouter from './modules/charts'; // import chartsRouter from './modules/charts';
import nestedRouter from './modules/nested'; // import nestedRouter from './modules/nested';
import tableRouter from './modules/table'; import tableRouter from './modules/table';
/** /**
@ -51,44 +51,44 @@ export const constantRoutes:RouteRecordRaw[] = [
component: () => import('@/views/error-page/401.vue'), component: () => import('@/views/error-page/401.vue'),
meta: { hidden: true } meta: { hidden: true }
}, },
{ // {
path: '/', // path: '/',
component: Layout, // component: Layout,
redirect: '/dashboard', // redirect: '/dashboard',
children: [ // children: [
{ // {
path: 'dashboard', // path: 'dashboard',
component: () => import('@/views/dashboard/index.vue'), // component: () => import('@/views/dashboard/index.vue'),
name: 'Dashboard', // name: 'Dashboard',
meta: { title: 'Dashboard', icon: 'dashboard', affix: true } // meta: { title: 'Dashboard', icon: 'dashboard', affix: true }
} // }
] // ]
}, // },
{ // {
path: '/documentation', // path: '/documentation',
component: Layout, // component: Layout,
children: [ // children: [
{ // {
path: 'index', // path: 'index',
component: () => import('@/views/documentation/index.vue'), // component: () => import('@/views/documentation/index.vue'),
name: 'Documentation', // name: 'Documentation',
meta: { title: 'Documentation', icon: 'documentation', affix: true } // meta: { title: 'Documentation', icon: 'documentation', affix: true }
} // }
] // ]
}, // },
{ // {
path: '/guide', // path: '/guide',
component: Layout, // component: Layout,
redirect: '/guide/index', // redirect: '/guide/index',
children: [ // children: [
{ // {
path: 'index', // path: 'index',
component: () => import('@/views/guide/index.vue'), // component: () => import('@/views/guide/index.vue'),
name: 'Guide', // name: 'Guide',
meta: { title: 'Guide', icon: 'guide', noCache: true } // meta: { title: 'Guide', icon: 'guide', noCache: true }
} // }
] // ]
}, // },
{ {
path: '/profile', path: '/profile',
component: Layout, component: Layout,
@ -118,91 +118,91 @@ export const asyncRoutes:RouteRecordRaw[] = [
redirect: '/permission/page', redirect: '/permission/page',
name: 'Permission', name: 'Permission',
meta: { meta: {
alwaysShow: true, // will always show the root menu // alwaysShow: true, // will always show the root menu
title: 'Permission', title: '内部系统'
icon: 'lock', // icon: 'lock'
roles: ['admin', 'editor'] // you can set roles in root nav // roles: ['admin', 'editor'] // you can set roles in root nav
}, },
children: [ children: [
{ // {
path: 'page', // path: 'page',
component: () => import('@/views/permission/page.vue'), // component: () => import('@/views/permission/page.vue'),
name: 'PagePermission', // name: 'PagePermission',
meta: { // meta: {
title: 'Page Permission', // title: 'Page Permission',
roles: ['admin'] // or you can only set roles in sub nav // roles: ['admin'] // or you can only set roles in sub nav
} // }
}, // },
{ // {
path: 'directive', // path: 'directive',
component: () => import('@/views/permission/directive.vue'), // component: () => import('@/views/permission/directive.vue'),
name: 'DirectivePermission', // name: 'DirectivePermission',
meta: { // meta: {
title: 'Directive Permission' // title: 'Directive Permission'
// if do not set roles, means: this page does not require permission // // if do not set roles, means: this page does not require permission
} // }
}, // },
{ // {
path: 'role', // path: 'role',
component: () => import('@/views/permission/role.vue'), // component: () => import('@/views/permission/role.vue'),
name: 'RolePermission', // name: 'RolePermission',
meta: { // meta: {
title: 'Role Permission', // title: 'Role Permission',
roles: ['admin'] // roles: ['admin']
} // }
} // }
] ]
}, },
{ // {
path: '/icon', // path: '/icon',
component: Layout, // component: Layout,
children: [ // children: [
{ // {
path: 'index', // path: 'index',
component: () => import('@/views/icons/index.vue'), // component: () => import('@/views/icons/index.vue'),
name: 'Icons', // name: 'Icons',
meta: { title: 'Icons', icon: 'icon', noCache: true } // meta: { title: 'Icons', icon: 'icon', noCache: true }
} // }
] // ]
}, // },
// /** when your routing map is too long, you can split it into small modules **/ // /** when your routing map is too long, you can split it into small modules **/
componentsRouter, // componentsRouter,
chartsRouter, // chartsRouter,
nestedRouter, // nestedRouter,
tableRouter, tableRouter,
//
{ // {
path: '/example', // path: '/example',
component: Layout, // component: Layout,
redirect: '/example/list', // redirect: '/example/list',
name: 'Example', // name: 'Example',
meta: { // meta: {
title: 'Example', // title: 'Example',
icon: markRaw(IconHelp) // icon: markRaw(IconHelp)
}, // },
children: [ // children: [
{ // {
path: 'create', // path: 'create',
component: () => import('@/views/example/create.vue'), // component: () => import('@/views/example/create.vue'),
name: 'CreateArticle', // name: 'CreateArticle',
meta: { title: 'Create Article', icon: 'edit' } // meta: { title: 'Create Article', icon: 'edit' }
}, // },
{ // {
path: 'edit/:id(\\d+)', // path: 'edit/:id(\\d+)',
component: () => import('@/views/example/edit.vue'), // component: () => import('@/views/example/edit.vue'),
name: 'EditArticle', // name: 'EditArticle',
meta: { hidden: true, title: 'Edit Article', noCache: true, activeMenu: '/example/list' } // meta: { hidden: true, title: 'Edit Article', noCache: true, activeMenu: '/example/list' }
}, // },
{ // {
path: 'list', // path: 'list',
component: () => import('@/views/example/list.vue'), // component: () => import('@/views/example/list.vue'),
name: 'ArticleList', // name: 'ArticleList',
meta: { title: 'Article List', icon: 'list' } // meta: { title: 'Article List', icon: 'list' }
} // }
] // ]
}, // },
{ {
path: '/tab', path: '/tab',
@ -212,35 +212,35 @@ export const asyncRoutes:RouteRecordRaw[] = [
path: 'index', path: 'index',
component: () => import('@/views/tab/index.vue'), component: () => import('@/views/tab/index.vue'),
name: 'Tab', name: 'Tab',
meta: { title: 'Tab', icon: 'tab' } meta: { title: '日报', icon: 'tab' }
} }
] ]
}, },
{ // {
path: '/error', // path: '/error',
component: Layout, // component: Layout,
redirect: 'noRedirect', // redirect: 'noRedirect',
name: 'ErrorPages', // name: 'ErrorPages',
meta: { // meta: {
title: 'Error Pages', // title: 'Error Pages',
icon: '404' // icon: '404'
}, // },
children: [ // children: [
{ // {
path: '401', // path: '401',
component: () => import('@/views/error-page/401.vue'), // component: () => import('@/views/error-page/401.vue'),
name: 'Page401', // name: 'Page401',
meta: { title: '401', noCache: true } // meta: { title: '401', noCache: true }
}, // },
{ // {
path: '404', // path: '404',
component: () => import('@/views/error-page/404.vue'), // component: () => import('@/views/error-page/404.vue'),
name: 'Page404', // name: 'Page404',
meta: { title: '404', noCache: true } // meta: { title: '404', noCache: true }
} // }
] // ]
}, // },
{ {
path: '/error-log', path: '/error-log',
@ -250,7 +250,7 @@ export const asyncRoutes:RouteRecordRaw[] = [
path: 'log', path: 'log',
component: () => import('@/views/error-log/index.vue'), component: () => import('@/views/error-log/index.vue'),
name: 'ErrorLog', name: 'ErrorLog',
meta: { title: 'Error Log', icon: 'bug' } meta: { title: '消息', icon: 'bug' }
} }
] ]
}, },
@ -261,7 +261,7 @@ export const asyncRoutes:RouteRecordRaw[] = [
redirect: '/excel/export-excel', redirect: '/excel/export-excel',
name: 'Excel', name: 'Excel',
meta: { meta: {
title: 'Excel', title: '申请和审批',
icon: 'excel' icon: 'excel'
}, },
children: [ children: [
@ -269,63 +269,63 @@ export const asyncRoutes:RouteRecordRaw[] = [
path: 'export-excel', path: 'export-excel',
component: () => import('@/views/excel/export-excel.vue'), component: () => import('@/views/excel/export-excel.vue'),
name: 'ExportExcel', name: 'ExportExcel',
meta: { title: 'Export Excel' } meta: { title: '提交申请' }
}, },
{ {
path: 'export-selected-excel', path: 'export-selected-excel',
component: () => import('@/views/excel/select-excel.vue'), component: () => import('@/views/excel/select-excel.vue'),
name: 'SelectExcel', name: 'SelectExcel',
meta: { title: 'Export Selected' } meta: { title: '我的审批' }
}, },
{ {
path: 'export-merge-header', path: 'export-merge-header',
component: () => import('@/views/excel/merge-header.vue'), component: () => import('@/views/excel/merge-header.vue'),
name: 'MergeHeader', name: 'MergeHeader',
meta: { title: 'Merge Header' } meta: { title: '记录查询' }
},
{
path: 'upload-excel',
component: () => import('@/views/excel/upload-excel.vue'),
name: 'UploadExcel',
meta: { title: 'Upload Excel' }
} }
// {
// path: 'upload-excel',
// component: () => import('@/views/excel/upload-excel.vue'),
// name: 'UploadExcel',
// meta: { title: 'Upload Excel' }
// }
] ]
}, },
{ // {
path: '/zip', // path: '/zip',
component: Layout, // component: Layout,
redirect: '/zip/download', // redirect: '/zip/download',
name: 'Zip', // name: 'Zip',
meta: { alwaysShow: true, title: 'Zip', icon: 'zip' }, // meta: { alwaysShow: true, title: 'Zip', icon: 'zip' },
children: [ // children: [
{ // {
path: 'download', // path: 'download',
component: () => import('@/views/zip/index.vue'), // component: () => import('@/views/zip/index.vue'),
name: 'ExportZip', // name: 'ExportZip',
meta: { title: 'Export Zip' } // meta: { title: 'Export Zip' }
} // }
] // ]
}, // },
{ // {
path: '/pdf', // path: '/pdf',
component: Layout, // component: Layout,
redirect: '/pdf/index', // redirect: '/pdf/index',
children: [ // children: [
{ // {
path: 'index', // path: 'index',
component: () => import('@/views/pdf/index.vue'), // component: () => import('@/views/pdf/index.vue'),
name: 'PDF', // name: 'PDF',
meta: { title: 'PDF', icon: 'pdf' } // meta: { title: 'PDF', icon: 'pdf' }
} // }
] // ]
}, // },
{ // {
path: '/pdf/download', // path: '/pdf/download',
component: () => import('@/views/pdf/download.vue'), // component: () => import('@/views/pdf/download.vue'),
meta: { hidden: true } // meta: { hidden: true }
}, // },
{ {
path: '/theme', path: '/theme',
@ -335,65 +335,65 @@ export const asyncRoutes:RouteRecordRaw[] = [
path: 'index', path: 'index',
component: () => import('@/views/theme/index.vue'), component: () => import('@/views/theme/index.vue'),
name: 'Theme', name: 'Theme',
meta: { title: 'Theme', icon: 'theme' } meta: { title: '个人信息管理', icon: 'theme' }
} }
] ]
}, },
{ // {
path: '/clipboard', // path: '/clipboard',
component: Layout, // component: Layout,
children: [ // children: [
{ // {
path: 'index', // path: 'index',
component: () => import('@/views/clipboard/index.vue'), // component: () => import('@/views/clipboard/index.vue'),
name: 'ClipboardDemo', // name: 'ClipboardDemo',
meta: { title: 'Clipboard', icon: 'clipboard' } // meta: { title: 'Clipboard', icon: 'clipboard' }
} // }
] // ]
}, // },
{ // {
path: '/external-link', // path: '/external-link',
component: Layout, // component: Layout,
children: [ // children: [
{ // {
path: 'https://element-plus.midfar.com', // path: 'https://element-plus.midfar.com',
meta: { title: 'External Link', icon: 'link' }, // meta: { title: 'External Link', icon: 'link' },
redirect: '' // redirect: ''
} // }
] // ]
}, // },
//
{ // {
path: '/my-demo', // path: '/my-demo',
component: Layout, // component: Layout,
name: 'MyDemo', // name: 'MyDemo',
meta: { // meta: {
title: 'MyDemo', // title: 'MyDemo',
icon: 'component' // icon: 'component'
}, // },
children: [ // children: [
{ // {
path: 'element-demo', // path: 'element-demo',
component: () => import('@/views/mydemo/ElementDemo.vue'), // component: () => import('@/views/mydemo/ElementDemo.vue'),
name: 'ElementDemo', // name: 'ElementDemo',
meta: { title: 'ElementDemo', icon: 'skill' } // meta: { title: 'ElementDemo', icon: 'skill' }
}, // },
{ // {
path: 'store-demo', // path: 'store-demo',
component: () => import('@/views/mydemo/StoreDemo.vue'), // component: () => import('@/views/mydemo/StoreDemo.vue'),
name: 'StoreDemo', // name: 'StoreDemo',
meta: { title: 'StoreDemo', icon: 'lock' } // meta: { title: 'StoreDemo', icon: 'lock' }
}, // },
{ // {
path: 'webSocket-demo', // path: 'webSocket-demo',
component: () => import('@/views/mydemo/WebSocketDemo.vue'), // component: () => import('@/views/mydemo/WebSocketDemo.vue'),
name: 'WebSocketDemo', // name: 'WebSocketDemo',
meta: { title: 'WebSocketDemo', icon: 'lock' } // meta: { title: 'WebSocketDemo', icon: 'lock' }
} // }
] // ]
}, // },
// 404 page must be placed at the end !!! // 404 page must be placed at the end !!!
{ path: '/:pathMatch(.*)*', redirect: '/404', meta: { hidden: true }} { path: '/:pathMatch(.*)*', redirect: '/404', meta: { hidden: true }}

View File

@ -8,7 +8,7 @@ const tableRouter = {
redirect: '/table/complex-table', redirect: '/table/complex-table',
name: 'Table', name: 'Table',
meta: { meta: {
title: 'Table', title: '个人项目',
icon: 'table' icon: 'table'
}, },
children: [ children: [
@ -16,25 +16,25 @@ const tableRouter = {
path: 'dynamic-table', path: 'dynamic-table',
component: () => import('@/views/table/dynamic-table/index.vue'), component: () => import('@/views/table/dynamic-table/index.vue'),
name: 'DynamicTable', name: 'DynamicTable',
meta: { title: 'Dynamic Table' } meta: { title: '我参与的' }
}, },
{ {
path: 'drag-table', path: 'drag-table',
component: () => import('@/views/table/drag-table.vue'), component: () => import('@/views/table/drag-table.vue'),
name: 'DragTable', name: 'DragTable',
meta: { title: 'Drag Table' } meta: { title: '我管理的' }
},
{
path: 'inline-edit-table',
component: () => import('@/views/table/inline-edit-table.vue'),
name: 'InlineEditTable',
meta: { title: 'Inline Edit' }
}, },
// {
// path: 'inline-edit-table',
// component: () => import('@/views/table/inline-edit-table.vue'),
// name: 'InlineEditTable',
// meta: { title: 'Inline Edit' }
// },
{ {
path: 'complex-table', path: 'complex-table',
component: () => import('@/views/table/complex-table.vue'), component: () => import('@/views/table/complex-table.vue'),
name: 'ComplexTable', name: 'ComplexTable',
meta: { title: 'Complex Table' } meta: { title: '我负责的' }
} }
] ]
}; };

View File

@ -1,33 +1,239 @@
<template> <template>
<div class="errPage-container">
<ErrorA /> <div style=" width:100%">
<ErrorB /> <el-card style="max-width: 100vw;margin: 1.5vw;">
<h3>Please click the bug icon in the upper right corner</h3> <template #header>
<aside> <span>消息</span>
Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions. </template>
<a target="_blank" class="link-type" href="https://vue3-element-admin-site.midfar.com/guide/advanced/error.html"> <div style="display:flex;flex-direction:row;justify-content: space-around ">
Document introduction <div>
</a> 时间
</aside> <el-date-picker
<a href="#"> v-model="value2"
<img src="https://wpimg.wallstcn.com/360e4842-4db5-42d0-b078-f9a84a825546.gif"> type="daterange"
</a> unlink-panels
</div> range-separator="——"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:size="large"
style="margin-left:0.5vw"
/>
</div>
<div>
状态
<el-select
v-model="value"
clearable
placeholder="Status"
style="width: 240px;margin-left:0.5vw"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div>
<el-button type="primary" style="width:80px">查询</el-button>
<el-button style="width:80px">重置</el-button>
</div>
</div>
</el-card>
<el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
<div style="display:flex;flex-direction: row;justify-content: space-between">
<el-button
text
type=''
>历史记录</el-button
>
</div>
<div v-for="(row, index) in tableData" :key="index" class="table-row">
<div class="table-cell">
<div class="date" style="display:flex;flex-direction: column">
<span style="color:skyblue">{{row.name}}</span>
<span>{{ row.date }}</span>
</div>
</div>
<div class="table-cell">
<div>address: {{ row.address }}</div>
</div>
<div class="table-cell table-cell-right">
<el-button size="small" type="danger" @click="handleDelete(index, row);centerDialogVisible = true">Delete</el-button>
<el-dialog v-model="centerDialogVisible" title="删除" width="500" :modal="false">
<span>
是否确认删除此条信息
</span>
<template #footer>
<div class="dialog-footer">
<el-button @click="centerDialogVisible = false">取消</el-button>
<el-button type="primary" @click="centerDialogVisible = false">
确认
</el-button>
</div>
</template>
</el-dialog>
</div>
</div>
<el-pagination
size="large"
background
layout="prev, pager, next"
:total="50"
style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
/>
</el-card>
</div>
</template> </template>
<script> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { ref } from 'vue';
import ErrorA from './components/ErrorTestA'; //
import ErrorB from './components/ErrorTestB'; const centerDialogVisible = ref(false);
//
export default defineComponent({ const value2 = ref('');
name: 'ErrorLog',
components: { ErrorA, ErrorB }
});
</script>
<style scoped> const shortcuts = [
.errPage-container { {
padding: 30px; text: 'Last week',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
}
},
{
text: 'Last month',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
}
},
{
text: 'Last 3 months',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
}
} }
];
//
const value = ref('');
const options = [
{
value: 'Option1',
label: '未开始'
},
{
value: 'Option2',
label: '进行中'
},
{
value: 'Option3',
label: '暂停'
},
{
value: 'Option4',
label: '已完成'
}
];
//
interface User {
date: string
name: string
address: string
}
const handleDelete = (index: number, row: User) => {
console.log(index, row);
};
const tableData: User[] = [
{
date: '2016-05-03',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
}
];
</script>
<style>
.my-autocomplete li {
line-height: normal;
padding: 7px;
}
.my-autocomplete li .name {
text-overflow: ellipsis;
overflow: hidden;
}
.my-autocomplete li .addr {
font-size: 12px;
color: #b4b4b4;
}
.my-autocomplete li .highlighted .addr {
color: #ddd;
}
.table-row {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.table-cell {
flex: 1;
padding: 5px;
display: flex;
justify-content: space-between;
align-items: center;
}
.table-cell-right {
justify-content: flex-end;
margin-right:5vw;
}
.date {
display: flex;
/*align-items: center;*/
}
.date el-icon {
margin-right: 10px;
}
</style> </style>

View File

@ -1,58 +1,284 @@
<template> <template>
<div class="tab-container">
<el-tag>mounted times {{ createdTimes }}</el-tag> <div style=" width:100%">
<el-alert :closable="false" style="width:200px;display:inline-block;vertical-align: middle;margin-left:30px;" title="Tab with keep-alive" type="success" /> <el-card style="max-width: 100vw;margin: 1.5vw;">
<el-tabs v-model="activeName" style="margin-top:15px;" type="border-card"> <template #header><span>日报</span></template>
<el-tab-pane v-for="item in tabMapOptions" :key="item.key" :label="item.label" :name="item.key"> <div style="display:flex;flex-direction:row;justify-content: space-around ">
<keep-alive> <div>
<tab-pane v-if="activeName==item.key" :type="item.key" @create="showCreatedTimes" /> 项目
</keep-alive> <el-autocomplete
</el-tab-pane> v-model="state"
</el-tabs> :fetch-suggestions="querySearch"
popper-class="my-autocomplete"
placeholder="Please input"
@select="handleSelect"
style="margin-left:0.5vw"
>
<template #suffix>
<el-icon class="el-input__icon" @click="handleIconClick">
<ArrowDownBold />
</el-icon>
</template>
<template #default="{ item }">
<div class="value">{{ item.value }}</div>
<span class="link">{{ item.link }}</span>
</template>
</el-autocomplete>
</div>
<div>
时间
<el-date-picker
v-model="value2"
type="daterange"
unlink-panels
range-separator="——"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
style="margin-left:0.5vw"
/>
</div>
<div>
<el-button type="primary" style="width: 80px">查询</el-button>
<el-button style="width: 80px">重置</el-button>
</div>
</div>
</el-card>
<el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
<div style="display:flex;flex-direction: row;justify-content: space-between">
<el-button
text
>历史记录</el-button
>
<el-button type="primary" @click="AddDialogVisible=true">新建</el-button>
<el-dialog v-model="AddDialogVisible" width="500" center :modal="false" :show-close="false">
<template #header>
<div style="display:flex;flex-direction: row;justify-content: flex-start;color:red;font-size:large" >新增日报</div>
<el-divider content-position="left" style="background:red"><el-icon><CaretTop /></el-icon></el-divider>
</template>
<div>
<div style="margin-top:-4vh ">
<span style="color:red">项目名称</span>
<el-input
v-model="input"
style="width: 200px"
placeholder="请输入"
/>
</div>
<div style="margin-top:2vh ">
<span style="color:red"> 工作时间</span>
<el-date-picker
v-model="value1"
type="date"
placeholder="请选择日期"
style="width: 200px"
:default-value="new Date(2010, 9, 1)"
/>
</div>
<div style="margin-top:2vh ;display:flex;flex-direction:row;">
<span style="color: red">日报内容</span>
<el-input
v-model="textarea"
style="width: 300px;"
:rows="4"
type="textarea"
placeholder="请输入"
/>
</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="AddDialogVisible = false" type="info" style="width: 80px">取消 </el-button>
<el-button type="danger" style="width:80px" @click="AddDialogVisible = false">
新增
</el-button>
</div>
</template>
</el-dialog>
</div>
<el-table
ref="multipleTableRef"
:data="tableData"
style="max-width: 100vw;"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column label="序号" width="120">
<template #default="scope">{{ scope.row.date }}</template>
</el-table-column>
<el-table-column property="name" label="项目名称" width="120" />
<el-table-column property="address" label="项目负责人" show-overflow-tooltip />
<el-table-column property="address" label="日报" />
<el-table-column property="address" label="日报填写者" />
<el-table-column property="address" label="填写时间" />
<el-table-column property="address" label="工作时间" />
<el-table-column property="address" label="操作" >
<el-button size="small" text style="color:deepskyblue" @click="EditDialogVisible = true">修改</el-button>
<el-dialog v-model="EditDialogVisible" title="删除" width="500" :modal="false">
<template #footer>
<div class="dialog-footer">
<el-button @click="EditDialogVisible = false">取消</el-button>
<el-button type="primary" @click="EditDialogVisible = false">
确认
</el-button>
</div>
</template>
</el-dialog>
</el-table-column>
</el-table>
<el-pagination
larger
background
layout="prev, pager, next"
:total="50"
class="mt-4"
style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
/>
</el-card>
</div> </div>
</template> </template>
<script> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { ref } from 'vue';
import TabPane from './components/TabPane'; import { ElTable } from 'element-plus';
import { ArrowDownBold, CaretTop } from '@element-plus/icons-vue';
const value1 = ref('');
//
const EditDialogVisible = ref(false);
//
const AddDialogVisible = ref(false);
interface User {
date: string
name: string
address: string
}
export default defineComponent({ const multipleTableRef = ref<InstanceType<typeof ElTable>>();
name: 'Tab', const multipleSelection = ref<User[]>([]);
components: { TabPane },
data() { const handleSelectionChange = (val: User[]) => {
return { multipleSelection.value = val;
tabMapOptions: [ };
{ label: 'China', key: 'CN' },
{ label: 'USA', key: 'US' }, const tableData: User[] = [
{ label: 'Japan', key: 'JP' }, {
{ label: 'Eurozone', key: 'EU' } date: '2016-05-03',
], name: 'Tom',
activeName: 'CN', address: 'No. 189, Grove St, Los Angeles'
createdTimes: 0
};
}, },
// watch: { {
// activeName(val) { // url date: '2016-05-02',
// this.$router.push(`${this.$route.path}?tab=${val}`); name: 'Tom',
// } address: 'No. 189, Grove St, Los Angeles'
// },
created() {
// init the default selected tab
const tab = this.$route.query.tab;
if (tab) {
this.activeName = tab;
}
}, },
methods: { {
showCreatedTimes() { date: '2016-05-04',
this.createdTimes = this.createdTimes + 1; name: 'Tom',
} address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
} }
];
// 1
import { onMounted } from 'vue';
interface LinkItem {
value: string
link: string
}
const state = ref('');
const links = ref<LinkItem[]>([]);
const querySearch = (queryString: string, cb) => {
const results = queryString
? links.value.filter(createFilter(queryString))
: links.value;
// call callback function to return suggestion objects
cb(results);
};
const createFilter = (queryString) => {
return (restaurant) => {
return (
restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
);
};
};
const loadAll = () => {
return [
{ value: '1' },
{ value: '2' },
{ value: '3' },
{ value: '4' },
{ value: '5' }
];
};
const handleSelect = (item: LinkItem) => {
console.log(item);
};
const handleIconClick = (ev: Event) => {
console.log(ev);
};
onMounted(() => {
links.value = loadAll();
}); });
</script>
<style scoped> //
.tab-container { const value2 = ref('');
margin: 30px;
const shortcuts = [
{
text: 'Last week',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
}
},
{
text: 'Last month',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
}
},
{
text: 'Last 3 months',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
}
} }
];
</script>
<style>
.my-autocomplete li {
line-height: normal;
padding: 7px;
}
.my-autocomplete li .name {
text-overflow: ellipsis;
overflow: hidden;
}
.my-autocomplete li .addr {
font-size: 12px;
color: #b4b4b4;
}
.my-autocomplete li .highlighted .addr {
color: #ddd;
}
</style> </style>

View File

@ -0,0 +1,137 @@
<template>
<div style=" width:100%">
<el-card style="max-width: 100vw;margin: 1.5vw;max-height:100vh;height:80vh ">
<template #header>
<strong>子模块1</strong>
</template>
<!-- <div style=" display: flex;flex-direction: column;justify-content: center">-->
<div class="ModuleData" style="margin-left: 30vw;width: 24vw;height: 55vh;display: flex;flex-direction: column;justify-content: space-around;
">
<div style="display: flex;flex-direction: row;justify-content: space-between">
<strong>01.模块名称 </strong>
<span style="width: 250px">子模块1</span>
</div>
<div style="display: flex;flex-direction: row;justify-content: space-between">
<strong>02.模块周期</strong>
<span style="width: 250px">13</span>
</div>
<div style="display: flex;flex-direction: row;justify-content: space-between">
<strong>03.工作量 </strong>
<span style="width: 250px">子模块1</span>
</div>
<div style="display: flex;flex-direction: row;justify-content: space-between">
<strong>04.负责人 </strong>
<span style="width: 250px">子模块1</span>
</div>
<div style="display: flex;flex-direction: row;justify-content: space-between">
<strong>05.状态 </strong>
<el-autocomplete
v-model="state"
:fetch-suggestions="querySearch"
popper-class="my-autocomplete"
placeholder="Please input"
@select="handleSelect"
style="width: 250px"
>
<template #suffix>
<el-icon class="el-input__icon" @click="handleIconClick">
<edit />
</el-icon>
</template>
<template #default="{ item }">
<div class="value">{{ item.value }}</div>
<span class="link">{{ item.link }}</span>
</template>
</el-autocomplete>
</div>
<div style="display: flex;flex-direction: row;justify-content: space-between">
<strong>06.截止时间 </strong>
<span style="width: 250px">子模块1</span>
</div>
<div style="display: flex;flex-direction: row;justify-content: space-between">
<strong>07.简介 </strong>
<el-input
v-model="textarea2"
style="width: 250px"
:autosize="{ minRows: 4, maxRows: 6 }"
type="textarea"
placeholder="Please input"
:row="4"
/>
</div>
</div>
<!-- </div>-->
</el-card>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { Edit } from '@element-plus/icons-vue';
interface LinkItem {
value: string
link: string
}
const state = ref('');
const links = ref<LinkItem[]>([]);
const querySearch = (queryString: string, cb) => {
const results = queryString
? links.value.filter(createFilter(queryString))
: links.value;
// call callback function to return suggestion objects
cb(results);
};
const createFilter = (queryString) => {
return (restaurant) => {
return (
restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
);
};
};
const loadAll = () => {
return [
{ value: 'vue', link: 'https://github.com/vuejs/vue' },
{ value: 'element', link: 'https://github.com/ElemeFE/element' },
{ value: 'cooking', link: 'https://github.com/ElemeFE/cooking' },
{ value: 'mint-ui', link: 'https://github.com/ElemeFE/mint-ui' },
{ value: 'vuex', link: 'https://github.com/vuejs/vuex' },
{ value: 'vue-router', link: 'https://github.com/vuejs/vue-router' },
{ value: 'babel', link: 'https://github.com/babel/babel' }
];
};
const handleSelect = (item: LinkItem) => {
console.log(item);
};
const handleIconClick = (ev: Event) => {
console.log(ev);
};
onMounted(() => {
links.value = loadAll();
});
</script>
<style>
.my-autocomplete li {
line-height: normal;
padding: 7px;
}
.my-autocomplete li .name {
text-overflow: ellipsis;
overflow: hidden;
}
.my-autocomplete li .addr {
font-size: 12px;
color: #b4b4b4;
}
.my-autocomplete li .highlighted .addr {
color: #ddd;
}
</style>

View File

@ -0,0 +1,203 @@
<template>
<div style=" width:100%">
<el-card style="max-width: 100vw;margin: 1.5vw;">
<template #header><strong >子系统1</strong></template>
<div style="display:flex;flex-direction:row;justify-content: space-around ">
<div>
名称
<el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
</div>
<div>
状态
<el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
</div>
<div>
<el-button type="primary" style="width:80px">查询</el-button>
<el-button style="width:80px">重置</el-button>
</div>
</div>
</el-card>
<el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
<div style="display:flex;flex-direction: row;justify-content: space-between">
<el-button
text
type=''
>子模块列表</el-button
>
</div>
<el-table
ref="multipleTableRef"
:data="tableData"
style="max-width: 100vw;"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column label="序号" width="120">
<template #default="scope">{{ scope.row.date }}</template>
</el-table-column>
<el-table-column property="name" label="子模块名称" width="120" />
<el-table-column property="address" label="工作量" show-overflow-tooltip />
<el-table-column property="address" label="周期" />
<el-table-column property="address" label="负责人" />
<el-table-column property="address" label="状态" />
<el-table-column property="address" label="子模块简介" />
<el-table-column property="address" label="截止时间" />
<el-table-column property="address" label="操作" >
<el-button
link
style="color:deepskyblue"
>查看详情</el-button
>
</el-table-column>
</el-table>
<el-pagination
larger
background
layout="prev, pager, next"
:total="50"
class="mt-4"
style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
/>
</el-card>
</div>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import { ElTable } from 'element-plus';
interface User {
date: string
name: string
address: string
}
const multipleTableRef = ref<InstanceType<typeof ElTable>>();
const multipleSelection = ref<User[]>([]);
const handleSelectionChange = (val: User[]) => {
multipleSelection.value = val;
};
const tableData: User[] = [
{
date: '2016-05-03',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
}
];
// 1
import { onMounted } from 'vue';
import { Edit } from '@element-plus/icons-vue';
interface LinkItem {
value: string
link: string
}
const state = ref('');
const links = ref<LinkItem[]>([]);
const querySearch = (queryString: string, cb) => {
const results = queryString
? links.value.filter(createFilter(queryString))
: links.value;
// call callback function to return suggestion objects
cb(results);
};
const createFilter = (queryString) => {
return (restaurant) => {
return (
restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
);
};
};
const loadAll = () => {
return [
{ value: '1' },
{ value: '2' },
{ value: '3' },
{ value: '4' },
{ value: '5' }
];
};
const handleSelect = (item: LinkItem) => {
console.log(item);
};
const handleIconClick = (ev: Event) => {
console.log(ev);
};
//
const value1 = ref('');
const value2 = ref('');
const shortcuts = [
{
text: 'Last week',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
}
},
{
text: 'Last month',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
}
},
{
text: 'Last 3 months',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
}
}
];
</script>
<style>
.my-autocomplete li {
line-height: normal;
padding: 7px;
}
.my-autocomplete li .name {
text-overflow: ellipsis;
overflow: hidden;
}
.my-autocomplete li .addr {
font-size: 12px;
color: #b4b4b4;
}
.my-autocomplete li .highlighted .addr {
color: #ddd;
}
</style>

View File

@ -1,25 +1,126 @@
<template> <template>
<div class="app-container">
<div style="margin:0 0 5px 20px">
Fixed header, sorted by header order,
</div>
<fixed-thead />
<div style="margin:30px 0 5px 20px"> <div style=" width:100%">
Not fixed header, sorted by click order <el-card style="max-width: 100vw;margin: 1.5vw;">
<template #header><strong >项目1</strong></template>
<div style="display:flex;flex-direction:row;justify-content: space-around ">
<div>
名称
<el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
</div>
<div>
状态
<el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
</div>
<div>
<el-button type="primary" style="width:80px">查询</el-button>
<el-button style="width:80px">重置</el-button>
</div>
</div>
</el-card>
<el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
<div style="display:flex;flex-direction: row;justify-content: space-between">
<el-button
text
type=''
>子系统列表</el-button
>
</div>
<el-table
ref="multipleTableRef"
:data="tableData"
style="max-width: 100vw;"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column label="序号" width="120">
<template #default="scope">{{ scope.row.date }}</template>
</el-table-column>
<el-table-column property="name" label="子系统名称" width="120" />
<el-table-column property="address" label="工作量" show-overflow-tooltip />
<el-table-column property="address" label="周期" />
<el-table-column property="address" label="负责人" />
<el-table-column property="address" label="状态" />
<el-table-column property="address" label="子系统简介" />
<el-table-column property="address" label="截止时间" />
<el-table-column property="address" label="操作" >
<el-button
link
style="color:deepskyblue"
>查看详情</el-button
>
</el-table-column>
</el-table>
<el-pagination
larger
background
layout="prev, pager, next"
:total="50"
class="mt-4"
style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
/>
</el-card>
</div> </div>
<unfixed-thead />
</div>
</template> </template>
<script> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { ref } from 'vue';
import FixedThead from './components/FixedThead'; import { ElTable } from 'element-plus';
import UnfixedThead from './components/UnfixedThead';
interface User {
date: string
name: string
address: string
}
const multipleTableRef = ref<InstanceType<typeof ElTable>>();
const multipleSelection = ref<User[]>([]);
const handleSelectionChange = (val: User[]) => {
multipleSelection.value = val;
};
const tableData: User[] = [
{
date: '2016-05-03',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
}
];
export default defineComponent({
name: 'DynamicTable',
components: { FixedThead, UnfixedThead }
});
</script> </script>
<style>
.my-autocomplete li {
line-height: normal;
padding: 7px;
}
.my-autocomplete li .name {
text-overflow: ellipsis;
overflow: hidden;
}
.my-autocomplete li .addr {
font-size: 12px;
color: #b4b4b4;
}
.my-autocomplete li .highlighted .addr {
color: #ddd;
}
</style>