Commit 86d4bd95 authored by wangqinghua's avatar wangqinghua

update

parent a979b7dd
...@@ -194,7 +194,7 @@ export const asyncRoutes = [ ...@@ -194,7 +194,7 @@ export const asyncRoutes = [
path: 'back-to-top', path: 'back-to-top',
component: 'views/components-demo/back-to-top', component: 'views/components-demo/back-to-top',
name: 'BackToTopDemo', name: 'BackToTopDemo',
meta: { title: 'backToTop' } meta: { title: '返回顶部' }
}, },
{ {
path: 'drag-dialog', path: 'drag-dialog',
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
}, },
watch: { // 侦听路由变化 watch: { // 侦听路由变化
$route(route) { $route(route) {
console.log(route)
// if you go to the redirect page, do not update the breadcrumbs // if you go to the redirect page, do not update the breadcrumbs
if (route.path.startsWith('/redirect/')) { if (route.path.startsWith('/redirect/')) {
return return
......
<template> <template>
<div class="upload-container"> <div class="upload-container">
<el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true"> <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
upload 上传本地图片
</el-button> </el-button>
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<el-upload <el-upload
......
...@@ -8,16 +8,12 @@ ...@@ -8,16 +8,12 @@
</template> </template>
<script> <script>
/**
* docs:
* https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
*/
import editorImage from './components/EditorImage' import editorImage from './components/EditorImage'
import plugins from './plugins' import plugins from './plugins'
import toolbar from './toolbar' import toolbar from './toolbar'
import load from './dynamicLoadScript' import load from './dynamicLoadScript'
// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js' const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
export default { export default {
...@@ -155,39 +151,6 @@ export default { ...@@ -155,39 +151,6 @@ export default {
_this.fullscreen = e.state _this.fullscreen = e.state
}) })
} }
// 整合七牛上传
// images_dataimg_filter(img) {
// setTimeout(() => {
// const $image = $(img);
// $image.removeAttr('width');
// $image.removeAttr('height');
// if ($image[0].height && $image[0].width) {
// $image.attr('data-wscntype', 'image');
// $image.attr('data-wscnh', $image[0].height);
// $image.attr('data-wscnw', $image[0].width);
// $image.addClass('wscnph');
// }
// }, 0);
// return img
// },
// images_upload_handler(blobInfo, success, failure, progress) {
// progress(0);
// const token = _this.$store.getters.token;
// getToken(token).then(response => {
// const url = response.data.qiniu_url;
// const formData = new FormData();
// formData.append('token', response.data.qiniu_token);
// formData.append('key', response.data.qiniu_key);
// formData.append('file', blobInfo.blob(), url);
// upload(formData).then(() => {
// success(url);
// progress(100);
// })
// }).catch(err => {
// failure('出现未知问题,刷新页面,或者联系程序员')
// console.log(err);
// });
// },
}) })
}, },
destroyTinymce() { destroyTinymce() {
......
...@@ -19,11 +19,6 @@ ...@@ -19,11 +19,6 @@
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<router-link to="/profile/index">
<el-dropdown-item>
个人中心
</el-dropdown-item>
</router-link>
<router-link to="/"> <router-link to="/">
<el-dropdown-item> <el-dropdown-item>
首页 首页
......
This diff is collapsed.
...@@ -53,7 +53,7 @@ export const constantRoutes = [ ...@@ -53,7 +53,7 @@ export const constantRoutes = [
path: 'dashboard', path: 'dashboard',
component: () => import('@/views/dashboard/index'), component: () => import('@/views/dashboard/index'),
name: 'Dashboard', name: 'Dashboard',
meta: { title: 'dashboard', icon: 'dashboard', affix: true } meta: { title: '首页', icon: 'dashboard', affix: true }
} }
] ]
}, },
...@@ -63,10 +63,10 @@ export const constantRoutes = [ ...@@ -63,10 +63,10 @@ export const constantRoutes = [
redirect: '/guide/index', redirect: '/guide/index',
children: [ children: [
{ {
path: 'pdf-view.vue', path: 'index',
component: () => import('@/views/guide/index'), component: () => import('@/views/guide/index'),
name: 'Guide', name: 'Guide',
meta: { title: 'guide', icon: 'guide', noCache: true } meta: { title: '引导页', icon: 'guide', noCache: true }
} }
] ]
}, },
...@@ -77,7 +77,7 @@ export const constantRoutes = [ ...@@ -77,7 +77,7 @@ export const constantRoutes = [
hidden: true, hidden: true,
children: [ children: [
{ {
path: 'pdf-view.vue', path: 'index',
component: () => import('@/views/profile/index'), component: () => import('@/views/profile/index'),
name: 'Profile', name: 'Profile',
meta: { title: 'profile', icon: 'user', noCache: true } meta: { title: 'profile', icon: 'user', noCache: true }
...@@ -138,10 +138,10 @@ export const asyncRoutes = [ ...@@ -138,10 +138,10 @@ export const asyncRoutes = [
component: Layout, component: Layout,
children: [ children: [
{ {
path: 'pdf-view.vue', path: 'index',
component: () => import('@/views/icons/index'), component: () => import('@/views/icons/index'),
name: 'Icons', name: 'Icons',
meta: { title: 'icons', icon: 'icon', noCache: true } meta: { title: '图标', icon: 'icon', noCache: true }
} }
] ]
}, },
...@@ -189,7 +189,7 @@ export const asyncRoutes = [ ...@@ -189,7 +189,7 @@ export const asyncRoutes = [
component: Layout, component: Layout,
children: [ children: [
{ {
path: 'pdf-view.vue', path: 'index',
component: () => import('@/views/tab/index'), component: () => import('@/views/tab/index'),
name: 'Tab', name: 'Tab',
meta: { title: 'tab', icon: 'tab' } meta: { title: 'tab', icon: 'tab' }
...@@ -211,13 +211,13 @@ export const asyncRoutes = [ ...@@ -211,13 +211,13 @@ export const asyncRoutes = [
path: '401', path: '401',
component: () => import('@/views/error-page/401'), component: () => import('@/views/error-page/401'),
name: 'Page401', name: 'Page401',
meta: { title: 'page401', noCache: true } meta: { title: '401', noCache: true }
}, },
{ {
path: '404', path: '404',
component: () => import('@/views/error-page/404'), component: () => import('@/views/error-page/404'),
name: 'Page404', name: 'Page404',
meta: { title: 'page404', noCache: true } meta: { title: '404', noCache: true }
} }
] ]
}, },
......
...@@ -16,7 +16,7 @@ const componentsRouter = { ...@@ -16,7 +16,7 @@ const componentsRouter = {
path: 'tinymce', path: 'tinymce',
component: () => import('@/views/components-demo/tinymce'), component: () => import('@/views/components-demo/tinymce'),
name: 'TinymceDemo', name: 'TinymceDemo',
meta: { title: 'tinymce' } meta: { title: '富文本' }
}, },
// { // {
// path: 'markdown', // path: 'markdown',
...@@ -118,13 +118,13 @@ const componentsRouter = { ...@@ -118,13 +118,13 @@ const componentsRouter = {
path: 'dnd-list', path: 'dnd-list',
component: () => import('@/views/components-demo/dnd-list'), component: () => import('@/views/components-demo/dnd-list'),
name: 'DndListDemo', name: 'DndListDemo',
meta: { title: 'dndList' } meta: { title: '列表拖拽' }
}, },
{ {
path: 'drag-kanban', path: 'drag-kanban',
component: () => import('@/views/components-demo/drag-kanban'), component: () => import('@/views/components-demo/drag-kanban'),
name: 'DragKanbanDemo', name: 'DragKanbanDemo',
meta: { title: 'dragKanban' } meta: { title: '可拖拽看板' }
} }
] ]
} }
......
...@@ -16,25 +16,25 @@ const tableRouter = { ...@@ -16,25 +16,25 @@ const tableRouter = {
path: 'dynamic-table', path: 'dynamic-table',
component: () => import('@/views/table/dynamic-table/index'), component: () => import('@/views/table/dynamic-table/index'),
name: 'DynamicTable', name: 'DynamicTable',
meta: { title: 'dynamicTable' } meta: { title: '动态Table' }
}, },
{ {
path: 'drag-table', path: 'drag-table',
component: () => import('@/views/table/drag-table'), component: () => import('@/views/table/drag-table'),
name: 'DragTable', name: 'DragTable',
meta: { title: 'dragTable' } meta: { title: '拖拽Table' }
}, },
{ {
path: 'inline-edit-table', path: 'inline-edit-table',
component: () => import('@/views/table/inline-edit-table'), component: () => import('@/views/table/inline-edit-table'),
name: 'InlineEditTable', name: 'InlineEditTable',
meta: { title: 'inlineEditTable' } meta: { title: 'Table内编辑' }
}, },
{ {
path: 'complex-table', path: 'complex-table',
component: () => import('@/views/table/complex-table'), component: () => import('@/views/table/complex-table'),
name: 'ComplexTable', name: 'ComplexTable',
meta: { title: 'complexTable' } meta: { title: '综合Table' }
} }
] ]
} }
......
import defaultSettings from '@/settings' import defaultSettings from '@/settings'
import i18n from '@/lang'
const title = defaultSettings.title || 'Vue Element Admin' const title = defaultSettings.title || 'Vue Element Admin'
......
<template> <template>
<div class="components-container"> <div class="components-container">
<aside> <aside>
{{ $t('components.tinymceTips') }} 富文本介绍见
<a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/component/rich-editor.html"> {{ $t('components.documentation') }}</a> <a target="_blank" class="link-type" href="https://github.com/tinymce/tinymce">文档</a>
</aside> </aside>
<div> <div>
<tinymce v-model="content" :height="300" /> <tinymce v-model="content" :height="300" />
......
<template> <template>
<div class="dashboard-container"> <div class="dashboard-container">
<component :is="currentRole" /> 首页
<!-- <component :is="currentRole" />-->
</div> </div>
</template> </template>
......
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<div class="errPage-container"> <div class="errPage-container">
<ErrorA /> <ErrorA />
<ErrorB /> <ErrorB />
<!-- $t is vue-i18n global function to translate lang --> <h3>{{ $t('errorLog.tips')}}</h3>
<h3>{{ $t('errorLog.tips') }}</h3>
<aside> <aside>
{{ $t('errorLog.description') }} {{ $t('errorLog.description') }}
<a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/guide/advanced/error.html"> <a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/guide/advanced/error.html">
......
<template> <template>
<div style="display:inline-block;"> <div style="display:inline-block;">
<!-- $t is vue-i18n global function to translate lang -->
<label class="radio-label" style="padding-left:0;">Filename: </label> <label class="radio-label" style="padding-left:0;">Filename: </label>
<el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:350px;" prefix-icon="el-icon-document" /> <el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:350px;" prefix-icon="el-icon-document" />
</div> </div>
......
<template> <template>
<!-- $t is vue-i18n global function to translate lang -->
<div class="app-container"> <div class="app-container">
<div> <div>
<FilenameOption v-model="filename" /> <FilenameOption v-model="filename" />
......
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- $t is vue-i18n global function to translate lang -->
<el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:350px;" prefix-icon="el-icon-document" /> <el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:350px;" prefix-icon="el-icon-document" />
<el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="el-icon-document" @click="handleDownload"> <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="el-icon-document" @click="handleDownload">
{{ $t('excel.selectedExport') }} {{ $t('excel.selectedExport') }}
......
<template> F<template>
<div> <div>
<el-card class="box-card" style="margin-top:40px;"> <el-card class="box-card" style="margin-top:40px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
......
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
}, },
i18n(routes) { i18n(routes) {
const app = routes.map(route => { const app = routes.map(route => {
// route.title = i18n.t(`route.${route.title}`) route.title = `route.${route.title}`
if (route.children) { if (route.children) {
route.children = this.i18n(route.children) route.children = this.i18n(route.children)
} }
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- $t is vue-i18n global function to translate lang (lang in @/lang) -->
<div class="show-d"> <div class="show-d">
<el-tag style="margin-right:12px;">{{ $t('table.dragTips1') }} :</el-tag> {{ oldList }} <el-tag style="margin-right:12px;">{{ $t('table.dragTips1') }} :</el-tag> {{ oldList }}
</div> </div>
......
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- $t is vue-i18n global function to translate lang -->
<el-input v-model="filename" :placeholder="$t('zip.placeholder')" style="width:300px;" prefix-icon="el-icon-document" /> <el-input v-model="filename" :placeholder="$t('zip.placeholder')" style="width:300px;" prefix-icon="el-icon-document" />
<el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="el-icon-document" @click="handleDownload"> <el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="el-icon-document" @click="handleDownload">
{{ $t('zip.export') }} Zip {{ $t('zip.export') }} Zip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment