update

package.json

@@ -37,7 +37,7 @@
     "simple-drawing-board": "^2.0.1",
     "vue": "2.5.17",
     "vue-count-to": "1.0.13",
-    "vue-router": "^3.1.2",
+    "vue-router": "^3.1.3",
     "vuex": "3.0.1",
     "wangeditor": ">=3.0.0",
     "xlsx": "^0.11.16"

src/api/localStorage.js

@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/localStorage',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/localStorage/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/localStorage',
+    method: 'put',
+    data
+  })
+}

src/router/index.js

@@ -58,7 +58,7 @@ export const loadMenus = (next, to) => {
     asyncRouter.push({ path: '*', redirect: '/404', hidden: true })
     store.dispatch('GenerateRoutes', asyncRouter).then(() => { // 存储路由
       router.addRoutes(asyncRouter) // 动态添加可访问路由表
-      next({ ...to, replace: true })// hack方法 确保addRoutes已完成
+      next({ ...to, replace: true })
     })
   })
 }

src/store/getters.js

@@ -11,6 +11,8 @@ const getters = {
   addRouters: state => state.permission.addRouters,
   socketApi: state => state.api.socketApi,
   imagesUploadApi: state => state.api.imagesUploadApi,
+  baseApi: state => state.api.baseApi,
+  fileUploadApi: state => state.api.fileUploadApi,
   updateAvatarApi: state => state.api.updateAvatarApi,
   qiNiuUploadApi: state => state.api.qiNiuUploadApi,
   sqlApi: state => state.api.sqlApi,

src/store/modules/api.js

@@ -12,7 +12,11 @@ const api = {
     // Sql 监控
     sqlApi: baseUrl + '/druid',
     // swagger
-    swaggerApi: baseUrl + '/swagger-ui.html'
+    swaggerApi: baseUrl + '/swagger-ui.html',
+    // 文件上传
+    fileUploadApi: baseUrl + '/api/localStorage',
+    // baseUrl，
+    baseApi: baseUrl
   }
 }
 

src/styles/index.scss

@@ -164,3 +164,10 @@ a:hover {
   z-index: 99;
   width: 100%;
 }
+.eladmin-upload {
+  border: 1px dashed #c0ccda;
+  border-radius: 5px;
+  height: 45px;
+  line-height: 45px;
+  width: 368px;
+}

src/views/tools/qiniu/config.vue

@@ -1,100 +0,0 @@
-<template>
-  <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="130px">
-    <el-form-item label="Access Key" prop="accessKey">
-      <el-input v-model="form.accessKey" style="width: 35%"/>
-      <span style="color: #C0C0C0;margin-left: 10px;">accessKey，在安全中心，秘钥管理中查看</span>
-    </el-form-item>
-    <el-form-item label="Secret Key" prop="secretKey">
-      <el-input v-model="form.secretKey" type="password" style="width: 35%;"/>
-      <span style="color: #C0C0C0;margin-left: 10px;">secretKey，在安全中心，秘钥管理中查看</span>
-    </el-form-item>
-    <el-form-item label="空间名称" prop="bucket">
-      <el-input v-model="form.bucket" style="width: 35%;"/>
-      <span style="color: #C0C0C0;margin-left: 10px;">存储空间名称作为唯一的 Bucket 识别符</span>
-    </el-form-item>
-    <el-form-item label="外链域名" prop="host">
-      <el-input v-model="form.host" style="width: 35%;"/>
-      <span style="color: #C0C0C0;margin-left: 10px;">外链域名，可自定义，需在七牛云绑定</span>
-    </el-form-item>
-    <el-form-item label="存储区域" prop="port">
-      <el-select v-model="form.zone" placeholder="请选择存储区域">
-        <el-option
-          v-for="item in zones"
-          :key="item"
-          :label="item"
-          :value="item"/>
-      </el-select>
-      <span style="color: #C0C0C0;margin-left: 10px;">北美区域尚未支持自定义数据处理服务，一旦创建区域无法修改，请谨慎选择</span>
-    </el-form-item>
-    <el-form-item label="空间类型" prop="host">
-      <el-radio v-model="form.type" label="公开">公开</el-radio>
-      <el-radio v-model="form.type" label="私有" >私有</el-radio>
-      <span style="color: #C0C0C0;margin-left: 10px;">公开和私有仅对 Bucket 的读文件生效，修改、删除、写入等对 Bucket 的操作均需要拥有者的授权才能进行操作</span>
-    </el-form-item>
-    <el-button :loading="loading" style="margin-left:5%;" size="medium" type="primary" @click="doSubmit">保存配置</el-button>
-  </el-form>
-</template>
-
-<script>
-import { get, update } from '@/api/qiniu'
-export default {
-  name: 'Config',
-  data() {
-    return {
-      zones: ['华东', '华北', '华南', '北美', '东南亚'],
-      loading: false, form: { accessKey: '', secretKey: '', bucket: '', host: '', zone: '', type: '' },
-      rules: {
-        accessKey: [
-          { required: true, message: '请输入accessKey', trigger: 'blur' }
-        ],
-        secretKey: [
-          { required: true, message: '请输入secretKey', trigger: 'blur' }
-        ],
-        bucket: [
-          { required: true, message: '请输入空间名称', trigger: 'blur' }
-        ],
-        host: [
-          { required: true, message: '请输入外链域名', trigger: 'blur' }
-        ],
-        type: [
-          { required: true, message: '空间类型不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods: {
-    init() {
-      get().then(res => {
-        this.form = res
-      })
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          update(this.form).then(res => {
-            this.$notify({
-              title: '修改成功',
-              type: 'success',
-              duration: 2500
-            })
-            this.loading = false
-          }).catch(err => {
-            this.loading = false
-            console.log(err.response.data.message)
-          })
-        } else {
-          return false
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/tools/qiniu/index.vue

@@ -1,41 +0,0 @@
-<template>
-  <el-tabs v-model="activeName" style="padding-left: 5px;">
-    <el-tab-pane label="存储配置" name="first">
-      <Config/>
-    </el-tab-pane>
-    <el-tab-pane label="文件列表" name="second">
-      <List/>
-    </el-tab-pane>
-    <el-tab-pane label="使用说明" name="third">
-      <div>
-        <blockquote class="my-blockquote">注意</blockquote>
-        <pre class="my-code">
-1、配置时外链域名需带上协议，也就是必须http/https开头
-2、如果七牛云中存在数据，使用同步按钮即可将数据同步到数据库
-3、本次集成了七牛云的常用操作，如：上传，下载，删除，同步，支持私有空间上传下载</pre>
-        <blockquote class="my-blockquote">更多帮助</blockquote>
-        <pre class="my-code">更多帮助请查看系统源码，或者七牛云java开发文档
-七牛云官网：<a style="color: #00a2d4" href="https://sso.qiniu.com/" target="_blank">https://sso.qiniu.com/</a>
-七牛云java开发文档：<a style="color: #00a2d4" href="https://developer.qiniu.com/kodo/sdk/1239/java#3" target="_blank">https://developer.qiniu.com/kodo/sdk/1239/java#3</a></pre>
-      </div>
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script>
-import Config from './config'
-import List from './list'
-import '@/styles/description.scss'
-export default {
-  name: 'Qiniu',
-  components: { Config, List },
-  data() {
-    return {
-      activeName: 'second'
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>

src/views/tools/storage/index.vue

@@ -0,0 +1,28 @@
+<template>
+  <el-tabs v-model="activeName" style="padding-left: 8px;">
+    <el-tab-pane label="本地存储" name="first">
+      <Local/>
+    </el-tab-pane>
+    <el-tab-pane label="七牛云存储" name="second">
+      <QiNiu/>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import QiNiu from './qiniu/list'
+import Local from './local/index'
+import '@/styles/description.scss'
+export default {
+  name: 'Storage',
+  components: { QiNiu, Local },
+  data() {
+    return {
+      activeName: 'first'
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/views/tools/storage/local/form.vue

@@ -0,0 +1,122 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '上传文件' : '编辑文件'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="文件名" >
+        <el-input v-model="form.name" style="width: 370px;"/>
+      </el-form-item>
+      <!--   上传文件   -->
+      <el-form-item v-if="isAdd" label="上传">
+        <el-upload
+          ref="upload"
+          :limit="1"
+          :before-upload="beforeUpload"
+          :auto-upload="false"
+          :headers="headers"
+          :on-success="handleSuccess"
+          :on-error="handleError"
+          :action="fileUploadApi + '?name=' + form.name">
+          <div class="eladmin-upload"><i class="el-icon-upload"/> 点击上传</div>
+          <div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过100M</div>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { getToken } from '@/utils/auth'
+import { edit } from '@/api/localStorage'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      headers: { 'Authorization': 'Bearer ' + getToken() },
+      form: {
+        id: '',
+        name: ''
+      },
+      rules: {
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'fileUploadApi'
+    ])
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.$refs.upload.submit()
+      } else this.doEdit()
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        name: ''
+      }
+    },
+    beforeUpload(file) {
+      let isLt2M = true
+      isLt2M = file.size / 1024 / 1024 < 100
+      if (!isLt2M) {
+        this.$message.error('上传文件大小不能超过 100MB!')
+      }
+      this.loading = false
+      return isLt2M
+    },
+    handleSuccess(response, file, fileList) {
+      this.dialog = false
+      this.resetForm()
+      this.$refs.upload.clearFiles()
+      this.$parent.init()
+    },
+    // 监听上传失败
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 2500
+      })
+      this.loading = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/tools/storage/local/index.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="app-container" style="padding: 8px;">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload"
+          @click="add">文件上传</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column :show-overflow-tooltip="true" prop="name" label="文件名">
+        <template slot-scope="scope">
+          <el-link :href="baseApi + '/file/' + scope.row.type + '/' + scope.row.realName" target="_blank" type="primary">{{ scope.row.name }}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column prop="suffix" label="后缀"/>
+      <el-table-column prop="type" label="类型"/>
+      <el-table-column prop="size" label="大小"/>
+      <el-table-column prop="operate" label="操作人"/>
+      <el-table-column prop="createTime" label="创建日期">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="修改日期">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_EDIT','LOCALSTORAGE_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-popover
+            v-permission="['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_DELETE']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180">
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"/>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/localStorage'
+import { parseTime } from '@/utils/index'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '文件名' },
+        { key: 'suffix', display_name: '后缀' },
+        { key: 'type', display_name: '类型' },
+        { key: 'operate', display_name: '操作人' }
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseApi'
+    ])
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/localStorage'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const value = query.value
+      if (value) { this.params['blurry'] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        name: data.name
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/tools/storage/qiniu/form.vue

@@ -0,0 +1,98 @@
+<template>
+  <!--上传图片-->
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" title="七牛云配置" append-to-body width="580px">
+    <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="110px">
+      <el-form-item label="Access Key" prop="accessKey">
+        <el-input v-model="form.accessKey" style="width: 95%" placeholder="accessKey，在安全中心，秘钥管理中查看"/>
+      </el-form-item>
+      <el-form-item label="Secret Key" prop="secretKey">
+        <el-input v-model="form.secretKey" type="password" style="width: 95%;" placeholder="secretKey，在安全中心，秘钥管理中查看"/>
+      </el-form-item>
+      <el-form-item label="空间名称" prop="bucket">
+        <el-input v-model="form.bucket" style="width: 95%;" placeholder="存储空间名称作为唯一的 Bucket 识别符"/>
+      </el-form-item>
+      <el-form-item label="外链域名" prop="host">
+        <el-input v-model="form.host" style="width: 95%;" placeholder = "外链域名，可自定义，需在七牛云绑定"/>
+      </el-form-item>
+      <el-form-item label="存储区域" prop="port">
+        <el-select v-model="form.zone" placeholder="请选择存储区域">
+          <el-option
+            v-for="item in zones"
+            :key="item"
+            :label="item"
+            :value="item"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="空间类型" prop="host">
+        <el-radio v-model="form.type" label="公开">公开</el-radio>
+        <el-radio v-model="form.type" label="私有" >私有</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="dialog = false">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { get, update } from '@/api/qiniu'
+export default {
+  data() {
+    return {
+      zones: ['华东', '华北', '华南', '北美', '东南亚'], dialog: false,
+      loading: false, form: { accessKey: '', secretKey: '', bucket: '', host: '', zone: '', type: '' },
+      rules: {
+        accessKey: [
+          { required: true, message: '请输入accessKey', trigger: 'blur' }
+        ],
+        secretKey: [
+          { required: true, message: '请输入secretKey', trigger: 'blur' }
+        ],
+        bucket: [
+          { required: true, message: '请输入空间名称', trigger: 'blur' }
+        ],
+        host: [
+          { required: true, message: '请输入外链域名', trigger: 'blur' }
+        ],
+        type: [
+          { required: true, message: '空间类型不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init() {
+      get().then(res => {
+        this.form = res
+      })
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          update(this.form).then(res => {
+            this.$notify({
+              title: '修改成功',
+              type: 'success',
+              duration: 2500
+            })
+            this.$parent.init()
+            this.loading = false
+            this.dialog = false
+          }).catch(err => {
+            this.loading = false
+            console.log(err.response.data.message)
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/tools/storage/qiniu/list.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="app-container" style="padding: 8px;">
+    <!--表单组件-->
+    <eForm ref="form"/>
     <!-- 工具栏 -->
     <div class="head-container">
       <!-- 搜索 -->
@@ -11,10 +13,18 @@
       </div>
       <!-- 同步 -->
       <el-button :icon="icon" class="filter-item" size="mini" type="warning" @click="synchronize">同步数据</el-button>
+      <!-- 配置 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-delete"
+          @click="doConfig">七牛配置</el-button>
+      </div>
       <!-- 多选删除 -->
       <div style="display: inline-block;margin: 0px 2px;">
         <el-button
-          v-permission="['ADMIN','PICTURE_ALL','PICTURE_DELETE']"
           :loading="delAllLoading"
           :disabled="data.length === 0 || $refs.table.selection.length === 0"
           class="filter-item"
@@ -23,7 +33,77 @@
           icon="el-icon-delete"
           @click="open">删除</el-button>
       </div>
+      <!-- 文件上传 -->
+      <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
+        <el-upload
+          :before-remove="handleBeforeRemove"
+          :on-success="handleSuccess"
+          :on-error="handleError"
+          :file-list="fileList"
+          :headers="headers"
+          :action="qiNiuUploadApi"
+          class="upload-demo"
+          multiple>
+          <el-button size="small" type="primary">点击上传</el-button>
+          <div slot="tip" style="display: block;" class="el-upload__tip">请勿上传违法文件，且文件不超过15M</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="doSubmit">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table v-loading="loading" ref="table" :data="data" size="small" style="width: 100%;">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column :show-overflow-tooltip="true" label="文件名">
+          <template slot-scope="scope">
+            <span>{{ scope.row.key }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" label="文件类型">
+          <template slot-scope="scope">
+            <span>{{ getExtensionName(scope.row.key) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="bucket" label="空间名称"/>
+        <el-table-column prop="size" label="文件大小"/>
+        <el-table-column prop="type" label="空间类型"/>
+        <el-table-column width="180px" prop="updateTime" label="创建日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.updateTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="130px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              :loading="downloadLoading"
+              size="mini"
+              type="primary"
+              icon="el-icon-download"
+              @click="download(scope.row.id)"/>
+            <el-popover
+              :ref="scope.row.id"
+              placement="top"
+              width="180">
+              <p>确定删除本条数据吗？</p>
+              <div style="text-align: right; margin: 0">
+                <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+                <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+              </div>
+              <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            </el-popover>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-pagination
+        :total="total"
+        :current-page="page + 1"
+        style="margin-top: 8px;"
+        layout="total, prev, pager, next, sizes"
+        @size-change="sizeChange"
+        @current-change="pageChange"/>
     </div>
+<<<<<<< HEAD:src/views/tools/qiniu/list.vue
     <!-- 文件上传 -->
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
       <el-upload
@@ -96,15 +176,19 @@
       @current-change="pageChange"/>
   </div>
 </template>
+=======
+</div></template>
+>>>>>>> master:src/views/tools/storage/qiniu/list.vue
 
 <script>
-import checkPermission from '@/utils/permission' // 权限判断函数
 import initData from '@/mixins/initData'
 import { del, download, sync, delAll } from '@/api/qiniu'
 import { parseTime } from '@/utils/index'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
+import eForm from './form'
 export default {
+  components: { eForm },
   mixins: [initData],
   data() {
     return {
@@ -137,7 +221,6 @@ export default {
   },
   methods: {
     parseTime,
-    checkPermission,
     beforeInit() {
       this.url = 'api/qiNiuContent'
       const sort = 'id,desc'
@@ -147,6 +230,11 @@ export default {
       if (value) { this.params['key'] = value }
       return true
     },
+    doConfig() {
+      const _this = this.$refs.form
+      _this.init()
+      _this.dialog = true
+    },
     subDelete(id) {
       this.delLoading = true
       del(id).then(res => {