From 63fce2b793451ee340b7a0f6e0d6ce6c2d470dd0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 21 七月 2022 17:10:22 +0800
Subject: [PATCH] 1.优化代码，2.完成工序缺陷页面3.模板下载功能

---
 src/components/ImportPicker/index.vue |   57 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/components/ImportPicker/index.vue b/src/components/ImportPicker/index.vue
index d4f3bb9..c85c1b3 100644
--- a/src/components/ImportPicker/index.vue
+++ b/src/components/ImportPicker/index.vue
@@ -47,7 +47,7 @@
           <el-button class="but_style" icon="el-icon-upload2" size="small">{{ button_name }}</el-button>
         </el-upload>
         璇风偣鍑�
-        <el-button type="text" icon="el-icon-download" @click="clickDown(code)">涓嬭浇鏁版嵁妯＄増</el-button>
+        <el-button type="text" style="font-size: 14px;cursor: pointer" icon="el-icon-download" @click="clickDown(code)">涓嬭浇鏁版嵁妯＄増</el-button>
         , 骞舵寜鐓фā鐗堢紪杈戝鍏ユ暟鎹�
       </div>
       <p v-if="div1">{{ file_name }}</p>
@@ -112,7 +112,7 @@
         <p>瀵煎叆澶辫触锛屽け璐ョ殑鍘熷洜鏄瘂{ error_message }}锛�</p>
       </div>
     </div>
-    <span slot="footer" class="dialog-footer">
+    <span slot="footer" class="dialog-footer" style="display: flex;">
       <el-button v-if="button_text !=&quot;瀹屾垚&quot;" @click="colos()">鍙� 娑�</el-button>
       <el-button
         type="primary"
@@ -124,7 +124,8 @@
   </el-dialog>
 </template>
 <script>
-import all from '@/api/all'
+
+import { DownLoadExcel, ExcelModelCheck } from '@/api/Excel'
 
 export default {
   props: {
@@ -231,22 +232,33 @@
       }
     },
     ExcelImportSubmit(data) {
-      all.ExcelImportSubmit(data).then((res) => {
-        if (res.statusCode === '200') {
-          this.div3 = true
-          this.num += 2
-          this.button_text = '瀹屾垚'
-          this.disState = false
-        } else {
-          this.num += 1
-          this.div3_sb = true
-          this.disState = true
-          this.error_message = res.message
-        }
-      })
+      // all.ExcelImportSubmit(data).then((res) => {
+      //   if (res.statusCode === '200') {
+      //     this.div3 = true
+      //     this.num += 2
+      //     this.button_text = '瀹屾垚'
+      //     this.disState = false
+      //   } else {
+      //     this.num += 1
+      //     this.div3_sb = true
+      //     this.disState = true
+      //     this.error_message = res.message
+      //   }
+      // })
     },
     ExcelCheckData(data) {
-      all.ExcelCheckData(data).then((res) => {
+      // all.ExcelCheckData(data).then((res) => {
+      //   this.div2_state = res.StuCode
+      //   setTimeout(() => {
+      //     this.cg4 = true
+      //   }, 2000)
+      //   this.error_list = res.list
+      //   this.total_num = res.Count
+      //   if (res.StuCode === '200') {
+      //     this.disState = false
+      //   }
+      // })
+      ExcelModelCheck(data).then(res => {
         this.div2_state = res.StuCode
         setTimeout(() => {
           this.cg4 = true
@@ -334,8 +346,15 @@
       const data = {
         FileCode: code
       }
-      all.DownLoadExcel(data).then((res) => {
-        window.location.href = res
+      // all.DownLoadExcel(data).then((res) => {
+      //   window.location.href = res
+      // })
+      DownLoadExcel(data).then(res => {
+        console.log(res.data)
+        console.log(process.env.VUE_APP_BASE_API)
+        console.log(process.env.VUE_APP_BASE_API_FILE)
+        console.log(window.location.origin + res.data)
+        window.location.href = process.env.VUE_APP_BASE_API_FILE + res.data
       })
     }
   }

--
Gitblit v1.9.3