Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/sync/SysUploadData.vue

src/views/sync/SysUploadData.vue

@@ -38,9 +38,6 @@
                 <el-table-column label="任务ID" prop="taskId" width="180" show-overflow-tooltip></el-table-column>
 
                 <el-table-column label="任务类型" prop="type" width="140" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.type}}</span>
-                    </template>
                 </el-table-column>
                 <!-- <el-table-column
                     label="状态"
@@ -67,6 +64,7 @@
                 <el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
                 <el-table-column label="文件路径" prop="cacheFilePath" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" fixed="right" width="160">
+
                     <template slot-scope="scope">
                         <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了'
                             class="mr10" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？"
@@ -344,7 +342,7 @@
             },
 
             downFile(rows) {
-                uploadInfoByStatus({
+                infoByStatus({
                     'id': rows.id
                 }).then(res => {
                     let blob = new Blob([res])