数据采集：新增一个导入按钮

src/api/portal/GATHER/GATHER.js

@@ -92,7 +92,7 @@ export function download(id) {
 }
 
 
-// 导入
+// 导入(历史数据)
 export function upload(data) {
   return request({
     url: '/gather/upload/',
@@ -100,3 +100,12 @@ export function upload(data) {
     data:data
   })
 }
+
+// 导入
+export function uploadnew(data) {
+  return request({
+    url: '/gather/uploadnew',
+    method: 'post',
+    data:data
+  })
+}

src/views/GATHER/index.vue

@@ -35,7 +35,10 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="success" @click="openUpload = true">导入</el-button>
+        <el-button type="success" @click="onOpenDialog('old')">历史数据导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" v-hasPermi="['gather:GATHER:upload']" @click="onOpenDialog('new')">导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button @click="handleDownload()" :title="radio === '' ? '请先选择下面对应的单位模板' : ''" :disabled="radio === '' ? true : false">下载导入模板</el-button>
@@ -139,7 +142,7 @@
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 上传文件对话框 -->
+    <!-- 上传文件对话框  历史数据导入 -->
     <el-dialog center title="导入" :visible.sync="openUpload" width="50%" append-to-body>
       <el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="120px">
         <el-form-item label="数据类型" prop="type">
@@ -163,6 +166,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
     <!-- 录入数据采集对话框 -->
     <el-dialog center :title="title" :visible.sync="open" width="50%" append-to-body>
       <el-tabs v-if="this.form.type == 0" v-model="activeName" type="border-card" @tab-click="handleClick">
@@ -258,7 +262,7 @@
 </template>
 
 <script>
-import { listGATHER, getGATHER, delGATHER, addGATHER, updateGATHER, getInfoByColl, approve, report, download, upload } from '@/api/portal/GATHER/GATHER.js';
+import { listGATHER, getGATHER, delGATHER, addGATHER, updateGATHER, getInfoByColl, approve, report, download, upload, uploadnew } from '@/api/portal/GATHER/GATHER.js';
 import importFile from "./importFile.vue";
 import { saveAs } from 'file-saver';
 import { getToken } from '@/utils/auth';
@@ -351,7 +355,8 @@ export default {
       rowData: {},
       fileList: [],
       uploadForm: {},
-      openUpload: false
+      openUpload: false,
+      uploadFileType: 'old', // old、new
     };
   },
   created() {
@@ -455,17 +460,35 @@ export default {
       this.radio = this.GATHERList.indexOf(row);
       this.rowData = row;
     },
+    /**
+     * 打开上传弹窗
+     * @params string type  old/new
+     */
+    onOpenDialog(type) {
+      this.uploadFileType = type;
+      this.openUpload = true;
+    },
     //导入
     uploadFile(file) {
       let formData = new FormData();
       formData.append('file', file);
       formData.append('type', this.uploadForm.type);
-      upload(formData).then(res => {
-        this.$modal.msgSuccess('上传采集附件成功!');
-        this.getList();
-        this.cancel();
-        this.openUpload = false;
-      });
+      if(this.uploadFileType === 'old') {
+        upload(formData).then(res => {
+          this.$modal.msgSuccess('上传采集附件成功!');
+          this.getList();
+          this.cancel();
+          this.openUpload = false;
+        });
+      } else {
+        uploadnew(formData).then(res => {
+          this.$modal.msgSuccess('上传采集附件成功!');
+          this.getList();
+          this.cancel();
+          this.openUpload = false;
+        });
+      }
+      
     },
     //下载模板
     handleDownload() {