diff --git a/src/api/localStorage.js b/src/api/localStorage.js index 02293f0..b2e1bdb 100644 --- a/src/api/localStorage.js +++ b/src/api/localStorage.js @@ -15,6 +15,14 @@ export function del(id) { }) } +export function delAll(ids) { + return request({ + url: 'api/localStorage/', + method: 'delete', + data: ids + }) +} + export function edit(data) { return request({ url: 'api/localStorage', diff --git a/src/assets/avatar/avatar.png b/src/assets/avatar/avatar.png new file mode 100644 index 0000000..e16488e Binary files /dev/null and b/src/assets/avatar/avatar.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ee088a0..db0ed5b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -11,7 +11,7 @@
- +
@@ -46,7 +46,7 @@ import { mapGetters } from 'vuex' import Breadcrumb from '@/components/Breadcrumb' import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' - +import Avatar from '@/assets/avatar/avatar.png' export default { components: { Breadcrumb, @@ -55,6 +55,7 @@ export default { }, data() { return { + Avatar: Avatar, dialogVisible: false } }, @@ -62,7 +63,8 @@ export default { ...mapGetters([ 'sidebar', 'user', - 'device' + 'device', + 'baseApi' ]), show: { get() { diff --git a/src/main.js b/src/main.js index 0440705..56a0acc 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,6 @@ import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n import mavonEditor from 'mavon-editor' import 'mavon-editor/dist/css/index.css' - import '@/styles/index.scss' // global css import App from './App' @@ -16,6 +15,7 @@ import store from './store' import '@/icons' // icon import './router/index' // permission control +import Router from 'vue-router' Vue.use(mavonEditor) Vue.use(permission) @@ -23,6 +23,11 @@ Vue.use(ElementUI, { locale }) Vue.config.productionTip = false require('babel-polyfill') +const routerPush = Router.prototype.push +Router.prototype.push = function push(location) { + return routerPush.call(this, location).catch(error => error) +} + new Vue({ el: '#app', router, diff --git a/src/views/features/401.vue b/src/views/features/401.vue index 4559180..14b6996 100644 --- a/src/views/features/401.vue +++ b/src/views/features/401.vue @@ -27,7 +27,6 @@ diff --git a/src/views/tools/storage/local/form.vue b/src/views/tools/storage/local/form.vue index c2a09c0..1e65c23 100644 --- a/src/views/tools/storage/local/form.vue +++ b/src/views/tools/storage/local/form.vue @@ -15,7 +15,7 @@ :on-success="handleSuccess" :on-error="handleError" :action="fileUploadApi + '?name=' + form.name"> -
点击上传
+
添加文件
可上传任意格式文件,且不超过100M
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue index cea40c9..ad354b5 100644 --- a/src/views/tools/storage/local/index.vue +++ b/src/views/tools/storage/local/index.vue @@ -15,18 +15,30 @@ icon="el-icon-upload" @click="add">文件上传 + +
+ 删除 +
- + + - - + + @@ -72,7 +84,7 @@ import { mapGetters } from 'vuex' import checkPermission from '@/utils/permission' import initData from '@/mixins/initData' -import { del } from '@/api/localStorage' +import { del, delAll } from '@/api/localStorage' import { parseTime } from '@/utils/index' import eForm from './form' export default { @@ -80,7 +92,7 @@ export default { mixins: [initData], data() { return { - delLoading: false, + delLoading: false, delAllLoading: false, queryTypeOptions: [ { key: 'name', display_name: '文件名' }, { key: 'suffix', display_name: '后缀' }, @@ -141,6 +153,36 @@ export default { name: data.name } _this.dialog = true + }, + doDelete() { + this.delAllLoading = true + const data = this.$refs.table.selection + const ids = [] + for (let i = 0; i < data.length; i++) { + ids.push(data[i].id) + } + delAll(ids).then(res => { + this.delAllLoading = false + this.dleChangePage(ids.length) + this.init() + this.$notify({ + title: '删除成功', + type: 'success', + duration: 2500 + }) + }).catch(err => { + this.delAllLoading = false + console.log(err.response.data.message) + }) + }, + open() { + this.$confirm('你确定删除选中的数据吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.doDelete() + }) } } } diff --git a/src/views/tools/storage/qiniu/list.vue b/src/views/tools/storage/qiniu/index.vue similarity index 95% rename from src/views/tools/storage/qiniu/list.vue rename to src/views/tools/storage/qiniu/index.vue index 8587d39..4b5f92b 100644 --- a/src/views/tools/storage/qiniu/list.vue +++ b/src/views/tools/storage/qiniu/index.vue @@ -19,7 +19,7 @@ class="filter-item" size="mini" type="success" - icon="el-icon-delete" + icon="el-icon-s-tools" @click="doConfig">七牛配置 @@ -56,7 +56,7 @@ @@ -72,14 +72,8 @@ {{ parseTime(scope.row.updateTime) }} - +