diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..e061fff 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -15,11 +15,11 @@
 }
 
 // 图片上传
-export function Uploadimg(fileobj) {
+export function UploadFile(fileobj) {
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'file/upload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param

diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..e061fff 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -15,11 +15,11 @@
 }
 
 // 图片上传
-export function Uploadimg(fileobj) {
+export function UploadFile(fileobj) {
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'file/upload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue
index 9961069..d89a499 100644
--- a/src/components/wangeditor/wangeditor.vue
+++ b/src/components/wangeditor/wangeditor.vue
@@ -33,7 +33,6 @@
           'underline', // 下划线
           'strikeThrough', // 删除线
           'foreColor', // 文字颜色
-          'backColor', // 背景颜色
           'list', // 列表
           'justify', // 对齐方式
           'quote', // 引用
@@ -45,12 +44,12 @@
   data() {
     return {
       editorContent: '',
-      editor: ''
+      editor: null
     }
   },
   watch: {
     content(val) {
-      if(val!==this.getContent()){
+      if (val !== this.getContent()) {
         this.setContent(val)
       }
     }
@@ -62,7 +61,8 @@
     initEditor() {
       var that = this
       that.editor = new E(that.$refs.editorElem) // 创建富文本实例
-      that.editor.customConfig.debug = location.href.indexOf('wangeditor_debug_mode=1') > 0
+      that.editor.customConfig.debug = true
+      debugger
       that.editor.customConfig.onchange = html => {
         that.editorContent = html
         console.log('onchange')
@@ -143,10 +143,10 @@
       that.editor.create()
       that.setContent(that.content)
     },
-    getContent: function() {
+    getContent() {
       return this.editor.txt.html()
     },
-    setContent: function(content) {
+    setContent(content) {
       this.editor.txt.html(content)
     },
     changeContent(content) {

diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..e061fff 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -15,11 +15,11 @@
 }
 
 // 图片上传
-export function Uploadimg(fileobj) {
+export function UploadFile(fileobj) {
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'file/upload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/components/wangeditor/wangeditor.vue b/src/components/wangeditor/wangeditor.vue
index 9961069..d89a499 100644
--- a/src/components/wangeditor/wangeditor.vue
+++ b/src/components/wangeditor/wangeditor.vue
@@ -33,7 +33,6 @@
           'underline', // 下划线
           'strikeThrough', // 删除线
           'foreColor', // 文字颜色
-          'backColor', // 背景颜色
           'list', // 列表
           'justify', // 对齐方式
           'quote', // 引用
@@ -45,12 +44,12 @@
   data() {
     return {
       editorContent: '',
-      editor: ''
+      editor: null
     }
   },
   watch: {
     content(val) {
-      if(val!==this.getContent()){
+      if (val !== this.getContent()) {
         this.setContent(val)
       }
     }
@@ -62,7 +61,8 @@
     initEditor() {
       var that = this
       that.editor = new E(that.$refs.editorElem) // 创建富文本实例
-      that.editor.customConfig.debug = location.href.indexOf('wangeditor_debug_mode=1') > 0
+      that.editor.customConfig.debug = true
+      debugger
       that.editor.customConfig.onchange = html => {
         that.editorContent = html
         console.log('onchange')
@@ -143,10 +143,10 @@
       that.editor.create()
       that.setContent(that.content)
     },
-    getContent: function() {
+    getContent() {
       return this.editor.txt.html()
     },
-    setContent: function(content) {
+    setContent(content) {
       this.editor.txt.html(content)
     },
     changeContent(content) {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index a2f2dfa..b371bc1 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="1000px" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="1000px" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="knowledgeForm" :size="size" label-position="right" label-width="80px">
       <el-row type="flex" justify="center">
         <el-col :span="24">
@@ -29,6 +29,28 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="附件" prop="file">
+            <el-upload
+              :on-remove="handleRemove"
+              :on-exceed="handleExceed"
+              :on-change="handleChange"
+              :file-list="fileList"
+              :on-success="handleSuccess"
+              :limit="3"
+              :http-request="uploadFile"
+              :before-remove="beforeRemove"
+              :before-upload="handleBeforeUpload"
+              action="string"
+              multiple
+            >
+              <el-button :disabled="hideUpload" size="small" type="primary">点击上传</el-button>
+              <span slot="tip" class="el-upload__tip"> 只能上传word, excel, pdf文件，且不超过10M</span>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
@@ -41,6 +63,7 @@
 import { toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 // import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile } from '@/api/common'
 import { getTypeList, addKnowledge, updateKnowledge, knowledgeDetail } from '@/api/knowledge'
 import Tinymce from '../../components/Tinymce/index'
 import Wangeditor from '../../components/wangeditor/wangeditor'
@@ -50,6 +73,8 @@
   components: { Wangeditor, Tinymce, SelectTree },
   data() {
     return {
+      uploadPath: process.env.BASE_API + '/file/upload',
+      staticPath: process.env.BASE_API + '/static/',
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       btnLoading: false, // 保存按钮的加载中状态
@@ -59,7 +84,8 @@
         type: '', // 父级编号
         name: '', // 类别名
         keywords: '', // 关键词
-        info: '' // 内容
+        info: '', // 内容
+        file: '' // 文件
       }, // 表单
       typeProps: {
         parent: 'pid',
@@ -68,6 +94,9 @@
         children: 'children'
       },
       typeTreeList: [], // 类别树列表数据
+      fileList: [], // 上传附件列表
+      upFileList: [], // 上传File列表，上传参数
+      hideUpload: false,
       textMap: {
         update: '编辑',
         create: '新增'
@@ -94,6 +123,7 @@
         this.resetForm()
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
+          // this.$refs['editor'].initEditor()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.fetchKnowledgeDetail(row.kId)
@@ -104,12 +134,28 @@
       // this.$refs.editor.initEditor()
       knowledgeDetail(id).then(response => {
         if (response.data) {
+          debugger
+          // 处理fileList
+          if (response.data.file && response.data.file !== '') {
+            const file_strs = response.data.file.split(';')
+            const fileList = []
+            for (const item of file_strs) {
+              const strs = item.split(':')
+              fileList.push({
+                name: strs[0],
+                url: this.staticPath + strs[1]
+              })
+            }
+            this.fileList = fileList
+          }
+          // 处理表单
           this.knowledgeForm = {
             id: response.data.kId, // id
             type: response.data.kType, // 类型
             name: response.data.kName, // 类别名
             keywords: response.data.keywords, // 关键词
-            info: response.data.kInfo // 内容
+            info: response.data.kInfo, // 内容
+            file: response.data.file // 附件
           }
         }
       })
@@ -132,6 +178,15 @@
     },
     // 保存数据
     saveData: function() {
+      // 处理附件
+      const urls = this.fileList.map(item => {
+        let index = item.url.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        return item.name + ':' + item.url.substring(index)
+      })
+      this.knowledgeForm.file = urls.join(';')
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -141,6 +196,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
+        // 处理附件
         // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
@@ -187,7 +243,83 @@
     },
     cancel: function() {
       this.dialogFormVisible = false
+      this.fileList = []
       this.$emit('watchChild')
+    },
+    // 文件上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      UploadFile(file).then(res => {
+        if (res.code === 200) {
+          // this.fileList = fileList
+          this.fileList.push({ name: file.file.name, url: this.staticPath + res.data })
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      debugger
+      console.log('beforeUpload')
+      const isFile = (file.type.indexOf('word') > -1) || (file.type.indexOf('excel') > -1) || (file.type === 'application/pdf') || (file.type.indexOf('image') > -1)
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 10
+      if (!isFile) {
+        this.$message.error('上传文件只能是word或excel或pdf!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 10MB!')
+        res = false
+      }
+      // for (const i in fileList) {
+      //   if (this.fileList[i].name === file.name) {
+      //     this.$message.error('该文件已上传过，请选择文件图片')
+      //     res = false
+      //   }
+      // }
+      return res
+    },
+    // 移除后操作删除文件
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      debugger
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.fileList.splice(i, 1)
+          this.hideUpload = this.fileList.length >= 3
+          return
+        }
+      }
+    },
+    // 上传文件时触发，如果文件个数超过3个则hideUpload
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 3
+      } else {
+        this.hideUpload = false
+      }
+      this.upFileList = fileList
+    },
+    // 处理闲置
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
+    // 移除前的确认
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    },
+    // 上传成功
+    handleSuccess(response, file, fileList) {
+      console.log('handleSuccess')
+      // const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        debugger
+        this.fileList.push({ name: file.file.name, url: response.data })
+        this.handleChange()
+      } else {
+        this.$message.warning(response.message)
+      }
     }
   }
 }
@@ -201,4 +333,7 @@
   .el-select{
     width: 100%;
   }
+  .el-upload__tip{
+    margin-left:10px;
+  }
 </style>