浏览代码

fix consume api get excel

yazid138 3 年之前
父节点
当前提交
34d4e849f2
共有 2 个文件被更改,包括 15 次插入20 次删除
  1. 12 17
      actions/graph.js
  2. 3 3
      pages/app/laporan-delegasi/index.js

+ 12 - 17
actions/graph.js

@@ -1,4 +1,5 @@
 import axiosAPI from "../config/axios";
+import { API_URL } from "../env";
 
 export const getGraph = async (token, query = {}) => {
 	try {
@@ -43,24 +44,18 @@ export const getGraph = async (token, query = {}) => {
 	}
 };
 
-export const getExcel = async (token, filename, query = {}) => {
-	try {
-		let url = "/graph/" + filename + ".xlsx";
-		if (query != null) {
-			const { tahun } = query;
-			url += "?";
-			const parseURL = [];
-			if (tahun) {
-				parseURL.push(`tahun=${tahun}`);
-			}
-
-			url += parseURL.join("&");
+export const getExcel = (token, filename, query = {}) => {
+	let url = API_URL + "/graph/" + token + "/" + filename + ".xlsx";
+	if (query != null) {
+		const { tahun } = query;
+		url += "?";
+		const parseURL = [];
+		if (tahun) {
+			parseURL.push(`tahun=${tahun}`);
 		}
 
-		const res = await axiosAPI.get(url, { headers: { Authorization: token } });
-		return res.data;
-	} catch (error) {
-		console.log("error", error);
-		return false;
+		url += parseURL.join("&");
 	}
+
+	return url;
 };

+ 3 - 3
pages/app/laporan-delegasi/index.js

@@ -41,9 +41,9 @@ class Pelaporan extends Component {
 		if (prevState.graph !== this.state.graph) return true;
 	};
 
-	excel = async () => {
-		const data = await getExcel(this.props.token, "Laporan Delegasi", { tahun: this.state.tahun });
-		Router.push(data.data.path);
+	excel = () => {
+		const url = getExcel(this.props.token, "Laporan Delegasi", { tahun: this.state.tahun });
+		Router.push(url);
 	};
 
 	render() {