From 9917ca25f616b99f4249b98990fb9104d5689708 Mon Sep 17 00:00:00 2001
From: sy2084 <yaoxiaoqiong@shiyue.com>
Date: Wed, 31 Jul 2024 10:28:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A5=E8=A1=A8=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/preview/index.ts                        | 11 +----------
 src/components/common/y-table.vue               | 16 +++++++---------
 src/views/page-show-info/page-info/index,.vue   |  6 ++++--
 src/views/view-all-manage/create-view/index.vue |  6 +-----
 src/views/view-all-manage/view-list/index.vue   | 15 +--------------
 5 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/src/api/preview/index.ts b/src/api/preview/index.ts
index f6f3dbc..96bf703 100644
--- a/src/api/preview/index.ts
+++ b/src/api/preview/index.ts
@@ -1,4 +1,4 @@
-import { post } from "@/utils/request";
+import { get, post } from "@/utils/request";
 
 interface PreviewItemParams {
   previewId: string | number;
@@ -20,12 +20,3 @@ export function searchInfo(data: PreviewItemParams) {
   });
 }
 
-export function exportTable(data: PreviewItemParams) {
-  return post({
-    url: '/api/v1/preview/export',
-    data: {
-      preview_id: data.previewId,
-      filter: data.filter,
-    },
-  })
-}
diff --git a/src/components/common/y-table.vue b/src/components/common/y-table.vue
index 1579049..d64a24c 100644
--- a/src/components/common/y-table.vue
+++ b/src/components/common/y-table.vue
@@ -29,7 +29,7 @@
         />
         <a-range-picker v-else-if="item.type === 'time'" class="date-item" v-model:value="filterData[item.name]" @change="toFilt" />
       </div>
-      <div v-if="isExport" class="filter-item"><a-button type="primary" @click="toExport">导出</a-button></div>
+      <div v-if="isExport" class="filter-item"><a :href="`${YCODE_BASEURL}/api/v1/preview/export?preview_id=${previewId}&filter=${JSON.stringify(getFilter())}`" target="_blank"><a-button type="primary">导出</a-button></a></div>
     </div>
     <div class="y-table-content">
       <a-table
@@ -58,7 +58,13 @@ import { reactive, ref } from "vue";
 import { useDebounceFn } from "@vueuse/core";
 import _ from "lodash";
 
+const YCODE_BASEURL = import.meta.env.VITE_YCODE_BASEURL
+
 const props = defineProps({
+  previewId: {
+    type: Number,
+    default: null,
+  },
   filterConfig: {
     type: Array,
     default: () => [],
@@ -115,7 +121,6 @@ const getFilter = () => {
 };
 
 const getData = () => {
-  
   emit("toFilt", {
     filter: getFilter(),
     page: pageState.page,
@@ -131,13 +136,6 @@ const pageChange = () => {
   getData();
 };
 
-const toExport = () => {
-  emit("toExport", {
-    filter: getFilter(),
-    page: pageState.page,
-    perPage: pageState.perPage,
-  });
-}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/page-show-info/page-info/index,.vue b/src/views/page-show-info/page-info/index,.vue
index bc1f1e4..76955ba 100644
--- a/src/views/page-show-info/page-info/index,.vue
+++ b/src/views/page-show-info/page-info/index,.vue
@@ -39,6 +39,7 @@
                 <div class="card-content">
                   <y-table
                     v-if="item.data.type === VIEW_TYPE.TABLE"
+                    :preview-id="item.id"
                     :filter-config="item.data.filter"
                     :data-list="item.data.data"
                     :column-config="item.data.header"
@@ -46,8 +47,8 @@
                     :title="item.data.preview_name"
                     :is-export="item.data.is_export"
                     @toFilt="
-                    (params?:object) => {
-                      handleSingle(ids[index], params);
+                      (params?:object) => {
+                        handleSingle(ids[index], params);
                       }
                     "
                   ></y-table>
@@ -78,6 +79,7 @@
                   <div class="card-content">
                     <y-table
                       v-if="item.data.type === VIEW_TYPE.TABLE"
+                      :preview-id="item.id"
                       :filter-config="item.data.filter"
                       :data-list="item.data.data"
                       :column-config="item.data.header"
diff --git a/src/views/view-all-manage/create-view/index.vue b/src/views/view-all-manage/create-view/index.vue
index f928a8e..ccdabd2 100644
--- a/src/views/view-all-manage/create-view/index.vue
+++ b/src/views/view-all-manage/create-view/index.vue
@@ -89,7 +89,7 @@
               />
               <a-range-picker v-if="item.type === 'time'" class="date-item" v-model:value="previewData.filterData[item.name]" @change="toFilt" />
             </div>
-            <div v-if="previewData.isExport" class="filter-item"><a-button @click="toExport">导出</a-button></div>
+            <div v-if="previewData.isExport" class="filter-item"><a-button type="primary">导出</a-button></div>
           </div>
           <div class="y-table-content">
             <a-table
@@ -355,10 +355,6 @@ const toFilt = () => {
   previewData.page = 1;
   toPreview({});
 };
-
-const toExport = () => {
-  // exportTable()
-}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/view-all-manage/view-list/index.vue b/src/views/view-all-manage/view-list/index.vue
index c724977..138e448 100644
--- a/src/views/view-all-manage/view-list/index.vue
+++ b/src/views/view-all-manage/view-list/index.vue
@@ -73,6 +73,7 @@
       <div class="right-box">
         <y-table
           v-if="selectViewInfo.type === 'table'"
+          :previewId="selectedRowId"
           :filter-config="selectViewInfo.filter"
           :data-list="selectViewInfo.data"
           :column-config="selectViewInfo.header"
@@ -83,10 +84,6 @@
             (params) => {
               toGetViewInfo(params);
             }"
-          @toExport="
-            (params) => {
-              toExport(params)
-            }"
         />
         <y-chart v-else-if="selectViewInfo.type === 'chart'" :chartCfg="selectViewInfo.config" :title="selectViewInfo.preview_name" :filter-config="selectViewInfo.filter" @toFilt="toGetViewInfo" />
         <div class="preview-area" v-else>
@@ -101,7 +98,6 @@
 <script setup>
 import { onMounted, ref, reactive } from "vue";
 import { getProModular, getViewList, getViewInfo, deleteView } from "./service";
-import { exportTable } from "@/api/preview/index";
 import { viewListCols } from "./config";
 import yTable from "@/components/common/y-table.vue";
 import { message } from "ant-design-vue";
@@ -159,15 +155,6 @@ const toGetViewInfo = (params = {}) => {
   });
 };
 
-const toExport = (params = {}) => {
-  exportTable({
-    previewId: selectedRowId.value,
-    ...params,
-  }).then(() => {
-    message.success("导出成功");
-  });
-}
-
 const onProjectChange = (val) => {
   modularSel.value = projectSel.value.find((item) => item.value === val).child;
   modularId.value = null;