diff --git a/QMPlusServer/controller/api/fileUploadAndDownload.go b/QMPlusServer/controller/api/fileUploadAndDownload.go
index cbe6c6c1..387578e9 100644
--- a/QMPlusServer/controller/api/fileUploadAndDownload.go
+++ b/QMPlusServer/controller/api/fileUploadAndDownload.go
@@ -62,7 +62,7 @@ func DeleteFile(c *gin.Context) {
 		if err != nil {
 			servers.ReportFormat(c, false, fmt.Sprintf("删除失败，%v", err), gin.H{})
 		} else {
-			err = file.DeleteFile()
+			err = f.DeleteFile()
 			if err != nil {
 				servers.ReportFormat(c, false, fmt.Sprintf("删除失败，%v", err), gin.H{})
 			} else {
diff --git a/QMPlusServer/docs/docs.go b/QMPlusServer/docs/docs.go
index 78ec4520..7ebe2058 100644
--- a/QMPlusServer/docs/docs.go
+++ b/QMPlusServer/docs/docs.go
@@ -1,6 +1,6 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag at
-// 2019-11-20 16:37:42.2606856 +0800 CST m=+0.064825001
+// 2019-11-20 16:59:15.3568689 +0800 CST m=+0.056920101
 
 package docs
 
@@ -1290,6 +1290,9 @@ var doc = `{
         "dbModel.FileUploadAndDownload": {
             "type": "object",
             "properties": {
+                "key": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },
diff --git a/QMPlusServer/docs/swagger.json b/QMPlusServer/docs/swagger.json
index bfcd8a53..9578352d 100644
--- a/QMPlusServer/docs/swagger.json
+++ b/QMPlusServer/docs/swagger.json
@@ -1273,6 +1273,9 @@
         "dbModel.FileUploadAndDownload": {
             "type": "object",
             "properties": {
+                "key": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },
diff --git a/QMPlusServer/docs/swagger.yaml b/QMPlusServer/docs/swagger.yaml
index e1df82bd..f03a4fd1 100644
--- a/QMPlusServer/docs/swagger.yaml
+++ b/QMPlusServer/docs/swagger.yaml
@@ -114,6 +114,8 @@ definitions:
     type: object
   dbModel.FileUploadAndDownload:
     properties:
+      key:
+        type: string
       name:
         type: string
       tag:
diff --git a/QMPlusVuePage/src/api/fileUploadAndDownload.js b/QMPlusVuePage/src/api/fileUploadAndDownload.js
index 9352b66b..bd77cf31 100644
--- a/QMPlusVuePage/src/api/fileUploadAndDownload.js
+++ b/QMPlusVuePage/src/api/fileUploadAndDownload.js
@@ -13,4 +13,19 @@ export const getFileList = (data) => {
         method: "post",
         data
     })
+}
+
+// @Tags FileUploadAndDownload
+// @Summary 删除文件
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Param data body dbModel.FileUploadAndDownload true "传入文件里面id即可"
+// @Success 200 {string} json "{"success":true,"data":{},"msg":"返回成功"}"
+// @Router /fileUploadAndDownload/deleteFile [post]
+export const deleteFile = (data) => {
+    return service({
+        url: "/fileUploadAndDownload/deleteFile",
+        method: "post",
+        data
+    })
 }
\ No newline at end of file
diff --git a/QMPlusVuePage/src/view/example/upload/upload.vue b/QMPlusVuePage/src/view/example/upload/upload.vue
index 013b3ead..cd62fdde 100644
--- a/QMPlusVuePage/src/view/example/upload/upload.vue
+++ b/QMPlusVuePage/src/view/example/upload/upload.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-upload
-      :headers="{'x-token':token}"
-      :show-file-list="false"
       :before-upload="checkFile"
+      :headers="{'x-token':token}"
       :on-error="uploadError"
       :on-success="uploadSuccess"
+      :show-file-list="false"
       action="/api/fileUploadAndDownload/upload"
     >
       <el-button size="small" type="primary">点击上传</el-button>
@@ -17,7 +17,13 @@
           <img :alt="scope.row.alt" :src="scope.row.url" height="80" width="80" />
         </template>
       </el-table-column>
-      <el-table-column label="日期" prop="UpdatedAt" width="180"></el-table-column>
+      <el-table-column label="日期" prop="UpdatedAt" width="180">
+        <template slot-scope="scope">
+          <div>
+            {{scope.row.UpdatedAt|formatDate}}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="文件名" prop="name" width="180"></el-table-column>
       <el-table-column label="链接" prop="url"></el-table-column>
       <el-table-column label="标签" prop="tag" width="100">
@@ -31,6 +37,7 @@
       <el-table-column label="操作" width="100">
         <template slot-scope="scope">
           <el-button @click="downloadFile(scope.row)" size="small" type="text">下载</el-button>
+          <el-button @click="deleteFile(scope.row)" size="small" type="text">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,8 +57,9 @@
 <script>
 import { mapGetters } from 'vuex'
 import infoList from '@/components/mixins/infoList'
-import { getFileList } from '@/api/fileUploadAndDownload'
+import { getFileList, deleteFile } from '@/api/fileUploadAndDownload'
 import { downloadImage } from '@/utils/downloadImg'
+import { formatTimeToStr } from '@/utils/data'
 export default {
   name: 'Upload',
   mixins: [infoList],
@@ -78,12 +86,45 @@ export default {
   computed: {
     ...mapGetters('user', ['userInfo', 'token'])
   },
+  filters: {
+    formatDate: function(time) {
+      if (time != null && time != '') {
+        var date = new Date(time)
+        return formatTimeToStr(date, 'yyyy-MM-dd hh:mm:ss')
+      } else {
+        return ''
+      }
+    }
+  },
   methods: {
+    async deleteFile(row) {
+      this.$confirm('此操作将永久删除所有角色下该菜单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteFile(row)
+          if (res.success) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+            this.getTableData()
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+    },
     checkFile(file) {
       const isJPG = file.type === 'image/jpeg'
       const isPng = file.type === 'image/png'
       const isLt2M = file.size / 1024 / 1024 < 2
-      if (!isJPG&&!isPng) {
+      if (!isJPG && !isPng) {
         this.$message.error('上传头像图片只能是 JPG或png 格式!')
       }
       if (!isLt2M) {
@@ -96,7 +137,7 @@ export default {
         type: 'success',
         message: '上传成功'
       })
-      if(res.success){
+      if (res.success) {
         this.getTableData()
       }
     },