diff --git a/src/views/modules/common/upload.vue b/src/views/modules/common/upload.vue
index afb8e34..d166181 100644
--- a/src/views/modules/common/upload.vue
+++ b/src/views/modules/common/upload.vue
@@ -21,12 +21,13 @@
         url: '',
         num: 0,
         successNum: 0,
-        fileList: []
+        fileList: [],
+        folder: '系统文件'
       }
     },
     methods: {
       init (id) {
-        this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}`)
+        this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}&folder=`+this.folder)
         console.log(this.url)
         this.visible = true
       },
@@ -40,12 +41,9 @@
       },
       // 上传成功
       successHandle (response, file, fileList) {
-
         this.fileList =   fileList.map(item => {
-
           return item.response.ossEntity
         })
-        console.log(this.fileList)
         this.successNum++
         if (response && response.code === 0) {
           this.childClick()
diff --git a/src/views/modules/factory/tblbasedata.vue b/src/views/modules/factory/tblbasedata.vue
index a6877c3..b435a3e 100644
--- a/src/views/modules/factory/tblbasedata.vue
+++ b/src/views/modules/factory/tblbasedata.vue
@@ -9,7 +9,7 @@
     <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
     </el-button>
     <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
-    <el-button @click="addOrUpdateHandle(0)" type="primary">{{ buttons.add}}</el-button>
+    <el-button  @click="addOrUpdateHandle(0)" type="primary">{{ buttons.add}}</el-button>
     <el-form v-show="searchShow" :inline="true" :model="queryData" @keyup.enter.native="getDataList()">
       <el-form-item label="工厂编辑">
         <el-input filterable v-model="queryData.key" clearable>
diff --git a/src/views/modules/oss/oss-upload.vue b/src/views/modules/oss/oss-upload.vue
index caabd3e..0a9004c 100644
--- a/src/views/modules/oss/oss-upload.vue
+++ b/src/views/modules/oss/oss-upload.vue
@@ -27,12 +27,13 @@
         url: '',
         num: 0,
         successNum: 0,
-        fileList: []
+        fileList: [],
+        folder: '系统文件'
       }
     },
     methods: {
       init (id) {
-        this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}`)
+        this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}&folder=`+this.folder)
         console.log(this.url)
         this.visible = true
       },
diff --git a/src/views/modules/oss/oss.vue b/src/views/modules/oss/oss.vue
index f83180d..11ee1cc 100644
--- a/src/views/modules/oss/oss.vue
+++ b/src/views/modules/oss/oss.vue
@@ -35,6 +35,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small"  @click="deleteHandle(scope.row.id)">删除</a>
+          <a @click="downloadFile(scope.row.fileName, scope.row.url)" >下载</a>
         </template>
       </el-table-column>
     </el-table>
@@ -79,6 +80,18 @@
       this.getDataList()
     },
     methods: {
+      downloadFile(fileName, data) {
+        if (!data) {
+          return;
+        }
+        let url = window.URL.createObjectURL(new Blob([data]));
+        let link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = url;
+        link.setAttribute('download', fileName);
+        document.body.appendChild(link);
+        link.click();
+      },
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
diff --git a/src/views/modules/sys/language/common.vue b/src/views/modules/sys/language/common.vue
index 7b5a7da..4672388 100644
--- a/src/views/modules/sys/language/common.vue
+++ b/src/views/modules/sys/language/common.vue
@@ -467,9 +467,6 @@ import column from "../../common/column";
       // 打印方式
       printReport(){
         this.decimalUtil.sub(100,50)
-        alert( this.$store.state.user.site)
-        alert( this.decimalUtil.sub(100,50))
-        //
         // const LODOP = getLodop()
         // if (LODOP) {
         //   var strBodyStyle = '<style>'