From d41b76a9ac83c3f785b5907fe27f979ccce037dd Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Sat, 7 Sep 2019 22:03:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=AC=E5=9C=B0=EF=BC=8C=E5=85=B6=E4=BB=96=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/localStorage.js | 8 +++ src/assets/avatar/avatar.png | Bin 0 -> 4097 bytes src/layout/components/Navbar.vue | 8 ++- src/main.js | 7 ++- src/views/features/401.vue | 1 - src/views/system/user/center.vue | 8 ++- src/views/tools/storage/index.vue | 17 ++++-- src/views/tools/storage/local/form.vue | 2 +- src/views/tools/storage/local/index.vue | 54 ++++++++++++++++-- .../storage/qiniu/{list.vue => index.vue} | 17 +----- 10 files changed, 89 insertions(+), 33 deletions(-) create mode 100644 src/assets/avatar/avatar.png rename src/views/tools/storage/qiniu/{list.vue => index.vue} (95%) 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 0000000000000000000000000000000000000000..e16488e4534d25626ac002e04ce9c64cd834ade2 GIT binary patch literal 4097 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
- +
@@ -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) }} - +