Merge remote-tracking branch 'origin/master'

src/api/portal/APICONFIG/APICONFIG.js

@@ -61,9 +61,21 @@ export function exportAPICONFIG(id) {
 
 
 }//导入
-export function uploadAPICONFIG() {
+export function uploadAPICONFIG(file) {
   return request({
     url: '/APICONFIG/upload/',
-    method: 'post'
+    method: 'post',
+    data:file
   })
+  
 }
+
+
+// // 导入
+// export function upload(data) {
+//   return request({
+//     url: '/common/upload/',
+//     method: 'post',
+//     data:data
+//   })
+// }

src/views/APICONFIG/index.vue

@@ -92,13 +92,23 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
-          @click="handleupload"
+          icon="el-icon-upload"
+          @click="openUpload = true"
           v-hasPermi="['business:APICONFIG:export']"
           >导入</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          plain
+          size="mini"
+          icon="el-icon-download"
+          @click="handleDownload()"
+          :disabled="radio === '' ? true : false"
+          >导出</el-button
+        >
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -109,8 +119,19 @@
       v-loading="loading"
       :data="APICONFIGList"
       @selection-change="handleSelectionChange"
+      @row-click="showRow"
     >
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table-column label="选择" width="70" center>
+        <template scope="scope">
+          <el-radio
+            class="radio"
+            v-model="radio"
+            :label="scope.$index"
+            @change.native="getCurrentRow(scope.row)"
+            >{{ "" }}</el-radio
+          >
+        </template>
+      </el-table-column>
       <el-table-column label="接口编号" align="center" prop="apiCode">
         <template slot-scope="scope">
           {{ scope.row.apiCode }}
@@ -282,6 +303,46 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+    <!-- 上传文件对话框 -->
+    <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="linkUrl">
+          <el-upload
+            class="upload-demo"
+            ref="upload"
+            action="#"
+            :http-request="httprequest"
+            :before-upload="uploadFile"
+            :file-list="fileList"
+            :auto-upload="false"
+            :limit="1"
+          >
+            <el-button slot="trigger" size="small" type="primary"
+              >选取文件</el-button
+            >
+          </el-upload>
+         
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitUpload">导 入</el-button>
+        <el-button @click="cancel">取 消</el-button>
+        <!-- <el-button @click="cancel">取 消</el-button> -->
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -294,12 +355,23 @@ import {
   updateAPICONFIG,
   exportAPICONFIG, //导出
   uploadAPICONFIG, //导入
+  upload,
 } from "@/api/portal/APICONFIG/APICONFIG.js";
 
+import { saveAs } from "file-saver";
+import { getToken } from "@/utils/auth";
+import axios from "axios";
+//我好困
+
 export default {
   name: "APICONFIG",
   data() {
     return {
+      fileList:[],
+      uploadForm:{
+        fileName:''
+      },
+      openUpload: false,
       //是否启用(1=启用,0=不启用)
       statusList: [
         { label: "启用", value: "1" },
@@ -330,6 +402,7 @@ export default {
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
+      rowData: {},
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -368,6 +441,7 @@ export default {
         linkStatus: null,
         remark: null,
       },
+      radio:'',
       // 表单参数
       form: {},
       // 表单校验
@@ -430,6 +504,19 @@ export default {
     this.getList();
   },
   methods: {
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    //导入
+    uploadFile(file) {
+      let formData = new FormData();
+      formData.append("file", file);
+      formData.append("type", this.uploadForm.type);
+      uploadAPICONFIG(formData)
+      this.cancel()
+      this.openUpload = false
+    },
+    httprequest() {},
     /** 查询数据接口api配置列表 */
     getList() {
       this.loading = true;
@@ -442,8 +529,12 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openUpload = false;
       this.reset();
     },
+    getCurrentRow(val) {
+      console.log(val);
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -461,6 +552,7 @@ export default {
         linkStatus: null,
         remark: null,
       };
+      this.fileList = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -519,7 +611,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除数据接口api配置编号为"' + ids + '"的数据项？')
+        .confirm('确定删除吗?')
         .then(function () {
           return delAPICONFIG(ids);
         })
@@ -529,15 +621,43 @@ export default {
         })
         .catch(() => {});
     },
-    /** 导入按钮操作 */
+    /** 点击导入按钮操作 */
     handleupload() {
-      uploadAPICONFIG
+      uploadAPICONFIG(this.uploadForm.fileName)
+      this.cancel()
+      this.openUpload = false
     },
     /** 导出按钮操作 */
-    handleExport(id) {
-      exportAPICONFIG(id).then(res=>{
+    // handleExport(id) {
+    //   exportAPICONFIG(id).then(res=>{
         
-      })
+    //   })
+    // },
+      /** 导出按钮操作 */
+      showRow(row) {
+      //赋值给radio
+      this.radio = this.APICONFIGList.indexOf(row);
+      this.rowData = row;
+    },
+    handleDownload() {
+      let row = this.rowData;
+      axios({
+        url: process.env.VUE_APP_BASE_API + "/APICONFIG/export/",
+        method: "post",
+        responseType: "blob",
+        data:row,
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+      }).then((res) => {
+        // const temp = res.headers["content-disposition"]
+        //   .split(";")[1]
+        //   .split("filename=")[1];
+        // const fileName = decodeURIComponent(temp);
+        const blob = new Blob([res.data]);
+        saveAs(blob, row.apiName+'.xlsx');
+        this.getList();
+      });
     },
     
   },

src/views/GATHER/index.vue

@@ -618,7 +618,9 @@ export default {
       let formData = new FormData();
       formData.append("file", file);
       formData.append("type", this.uploadForm.type);
-      upload(formData).then((res) => {});
+      upload(formData)
+      this.cancel()
+      this.openUpload = false
     },
     //下载模板
     handleDownload() {