Compare commits

..

No commits in common. "ce617bf906e85869e01bc0bcc292ff565f219ef4" and "36a465ac563596cecd086141f2932327dee1c42f" have entirely different histories.

2 changed files with 288 additions and 296 deletions

View File

@ -607,233 +607,233 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
}, },
] ]
}, },
// { {
// path: '/limits', path: '/limits',
// name: 'limits', name: 'limits',
// component: () => import('/@/layout/routerView/parent.vue'), component: () => import('/@/layout/routerView/parent.vue'),
// redirect: '/limits/frontEnd', redirect: '/limits/frontEnd',
// meta: { meta: {
// title: 'message.router.limits', title: 'message.router.limits',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-quanxian', icon: 'iconfont icon-quanxian',
// }, },
// children: [ children: [
// { {
// path: '/limits/frontEnd', path: '/limits/frontEnd',
// name: 'limitsFrontEnd', name: 'limitsFrontEnd',
// component: () => import('/@/layout/routerView/parent.vue'), component: () => import('/@/layout/routerView/parent.vue'),
// redirect: '/limits/frontEnd/page', redirect: '/limits/frontEnd/page',
// meta: { meta: {
// title: 'message.router.limitsFrontEnd', title: 'message.router.limitsFrontEnd',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: '', icon: '',
// }, },
// children: [ children: [
// { {
// path: '/limits/frontEnd/page', path: '/limits/frontEnd/page',
// name: 'limitsFrontEndPage', name: 'limitsFrontEndPage',
// component: () => import('/@/views/limits/frontEnd/page/index.vue'), component: () => import('/@/views/limits/frontEnd/page/index.vue'),
// meta: { meta: {
// title: 'message.router.limitsFrontEndPage', title: 'message.router.limitsFrontEndPage',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: '', icon: '',
// }, },
// }, },
// { {
// path: '/limits/frontEnd/btn', path: '/limits/frontEnd/btn',
// name: 'limitsFrontEndBtn', name: 'limitsFrontEndBtn',
// component: () => import('/@/views/limits/frontEnd/btn/index.vue'), component: () => import('/@/views/limits/frontEnd/btn/index.vue'),
// meta: { meta: {
// title: 'message.router.limitsFrontEndBtn', title: 'message.router.limitsFrontEndBtn',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: '', icon: '',
// }, },
// }, },
// ], ],
// }, },
// { {
// path: '/limits/backEnd', path: '/limits/backEnd',
// name: 'limitsBackEnd', name: 'limitsBackEnd',
// component: () => import('/@/layout/routerView/parent.vue'), component: () => import('/@/layout/routerView/parent.vue'),
// meta: { meta: {
// title: 'message.router.limitsBackEnd', title: 'message.router.limitsBackEnd',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: '', icon: '',
// }, },
// children: [ children: [
// { {
// path: '/limits/backEnd/page', path: '/limits/backEnd/page',
// name: 'limitsBackEndEndPage', name: 'limitsBackEndEndPage',
// component: () => import('/@/views/limits/backEnd/page/index.vue'), component: () => import('/@/views/limits/backEnd/page/index.vue'),
// meta: { meta: {
// title: 'message.router.limitsBackEndEndPage', title: 'message.router.limitsBackEndEndPage',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: '', icon: '',
// }, },
// }, },
// ], ],
// }, },
// ], ],
// }, },
// { {
// path: '/menu', path: '/menu',
// name: 'menu', name: 'menu',
// component: () => import('/@/layout/routerView/parent.vue'), component: () => import('/@/layout/routerView/parent.vue'),
// redirect: '/menu/menu1', redirect: '/menu/menu1',
// meta: { meta: {
// title: 'message.router.menu', title: 'message.router.menu',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// children: [ children: [
// { {
// path: '/menu/menu1', path: '/menu/menu1',
// name: 'menu1', name: 'menu1',
// component: () => import('/@/layout/routerView/parent.vue'), component: () => import('/@/layout/routerView/parent.vue'),
// redirect: '/menu/menu1/menu11', redirect: '/menu/menu1/menu11',
// meta: { meta: {
// title: 'message.router.menu1', title: 'message.router.menu1',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// children: [ children: [
// { {
// path: '/menu/menu1/menu11', path: '/menu/menu1/menu11',
// name: 'menu11', name: 'menu11',
// component: () => import('/@/views/menu/menu1/menu11/index.vue'), component: () => import('/@/views/menu/menu1/menu11/index.vue'),
// meta: { meta: {
// title: 'message.router.menu11', title: 'message.router.menu11',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// }, },
// { {
// path: '/menu/menu1/menu12', path: '/menu/menu1/menu12',
// name: 'menu12', name: 'menu12',
// component: () => import('/@/layout/routerView/parent.vue'), component: () => import('/@/layout/routerView/parent.vue'),
// redirect: '/menu/menu1/menu12/menu121', redirect: '/menu/menu1/menu12/menu121',
// meta: { meta: {
// title: 'message.router.menu12', title: 'message.router.menu12',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// children: [ children: [
// { {
// path: '/menu/menu1/menu12/menu121', path: '/menu/menu1/menu12/menu121',
// name: 'menu121', name: 'menu121',
// component: () => import('/@/views/menu/menu1/menu12/menu121/index.vue'), component: () => import('/@/views/menu/menu1/menu12/menu121/index.vue'),
// meta: { meta: {
// title: 'message.router.menu121', title: 'message.router.menu121',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// }, },
// { {
// path: '/menu/menu1/menu12/menu122', path: '/menu/menu1/menu12/menu122',
// name: 'menu122', name: 'menu122',
// component: () => import('/@/views/menu/menu1/menu12/menu122/index.vue'), component: () => import('/@/views/menu/menu1/menu12/menu122/index.vue'),
// meta: { meta: {
// title: 'message.router.menu122', title: 'message.router.menu122',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// }, },
// ], ],
// }, },
// { {
// path: '/menu/menu1/menu13', path: '/menu/menu1/menu13',
// name: 'menu13', name: 'menu13',
// component: () => import('/@/views/menu/menu1/menu13/index.vue'), component: () => import('/@/views/menu/menu1/menu13/index.vue'),
// meta: { meta: {
// title: 'message.router.menu13', title: 'message.router.menu13',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// }, },
// ], ],
// }, },
// { {
// path: '/menu/menu2', path: '/menu/menu2',
// name: 'menu2', name: 'menu2',
// component: () => import('/@/views/menu/menu2/index.vue'), component: () => import('/@/views/menu/menu2/index.vue'),
// meta: { meta: {
// title: 'message.router.menu2', title: 'message.router.menu2',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-caidan', icon: 'iconfont icon-caidan',
// }, },
// }, },
// ], ],
// }, },
{ {
path: '/fun', path: '/fun',
name: 'funIndex', name: 'funIndex',
@ -1541,21 +1541,21 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
}, },
], ],
}, },
// { {
// path: '/chart', path: '/chart',
// name: 'chartIndex', name: 'chartIndex',
// component: () => import('/@/views/chart/index.vue'), component: () => import('/@/views/chart/index.vue'),
// meta: { meta: {
// title: 'message.router.chartIndex', title: 'message.router.chartIndex',
// isLink: '', isLink: '',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin', 'common'], roles: ['admin', 'common'],
// icon: 'iconfont icon-ico_shuju', icon: 'iconfont icon-ico_shuju',
// }, },
// }, },
// { // {
// path: '/personal', // path: '/personal',
// name: 'personal', // name: 'personal',
@ -1586,51 +1586,51 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
icon: 'iconfont icon-gongju', icon: 'iconfont icon-gongju',
}, },
}, },
// { {
// path: '/link', path: '/link',
// name: 'layoutLinkView', name: 'layoutLinkView',
// component: () => import('/@/layout/routerView/link.vue'), component: () => import('/@/layout/routerView/link.vue'),
// meta: { meta: {
// title: 'message.router.layoutLinkView', title: 'message.router.layoutLinkView',
// isLink: 'https://element-plus.gitee.io/#/zh-CN/component/installation', isLink: 'https://element-plus.gitee.io/#/zh-CN/component/installation',
// isHide: false, isHide: false,
// isKeepAlive: false, isKeepAlive: false,
// isAffix: false, isAffix: false,
// isIframe: false, isIframe: false,
// roles: ['admin'], roles: ['admin'],
// icon: 'iconfont icon-caozuo-wailian', icon: 'iconfont icon-caozuo-wailian',
// }, },
// }, },
// { {
// path: '/iframesOne', path: '/iframesOne',
// name: 'layoutIframeViewOne', name: 'layoutIframeViewOne',
// component: () => import('/@/layout/routerView/iframes.vue'), component: () => import('/@/layout/routerView/iframes.vue'),
// meta: { meta: {
// title: 'message.router.layoutIframeViewOne', title: 'message.router.layoutIframeViewOne',
// isLink: 'https://nodejs.org/zh-cn/', isLink: 'https://nodejs.org/zh-cn/',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: true,
// isIframe: true, isIframe: true,
// roles: ['admin'], roles: ['admin'],
// icon: 'iconfont icon-neiqianshujuchucun', icon: 'iconfont icon-neiqianshujuchucun',
// }, },
// }, },
// { {
// path: '/iframesTwo', path: '/iframesTwo',
// name: 'layoutIframeViewTwo', name: 'layoutIframeViewTwo',
// component: () => import('/@/layout/routerView/iframes.vue'), component: () => import('/@/layout/routerView/iframes.vue'),
// meta: { meta: {
// title: 'message.router.layoutIframeViewTwo', title: 'message.router.layoutIframeViewTwo',
// isLink: 'https://undraw.co/illustrations', isLink: 'https://undraw.co/illustrations',
// isHide: false, isHide: false,
// isKeepAlive: true, isKeepAlive: true,
// isAffix: false, isAffix: true,
// isIframe: true, isIframe: true,
// roles: ['admin'], roles: ['admin'],
// icon: 'iconfont icon-neiqianshujuchucun', icon: 'iconfont icon-neiqianshujuchucun',
// }, },
// }, },
], ],
} }
]; ];

View File

@ -41,7 +41,7 @@
添加图片 添加图片
</el-button> </el-button>
</div> </div>
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%" class="custom-table"> <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="name" label="图片名称" show-overflow-tooltip width="180px"></el-table-column> <el-table-column prop="name" label="图片名称" show-overflow-tooltip width="180px"></el-table-column>
<el-table-column label="素材" width="300px" align="center"> <el-table-column label="素材" width="300px" align="center">
@ -574,20 +574,12 @@ onMounted(() => {
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
overflow: auto; overflow: auto;
.el-table { .el-table {
flex: 1; flex: 1;
width: 100%;
table-layout: fixed;
} }
} }
}; };
::v-deep .el-table__body{
width: 100% !important;
}
::v-deep .el-image { ::v-deep .el-image {
width: 250px; // width: 250px; //
height: 150px; // height: 150px; //