Commit d4158234 authored by 张恒's avatar 张恒

Merge remote-tracking branch 'origin/ld_databoard_fix' into ld_databoard_fix

parents f29ffa65 aafa21a7
...@@ -44,6 +44,9 @@ export default async (url = '', data = {}, type = 'GET', method = 'fetch') => { ...@@ -44,6 +44,9 @@ export default async (url = '', data = {}, type = 'GET', method = 'fetch') => {
try { try {
const response = await fetch(url, requestConfig); const response = await fetch(url, requestConfig);
const responseJson = await response.json(); const responseJson = await response.json();
if(response.status === 403){
parent.window.location = "/";
}
return responseJson return responseJson
} catch (error) { } catch (error) {
throw new Error(error) throw new Error(error)
......
...@@ -20,6 +20,7 @@ import data from "./mockData/lost_add_customer.json"; ...@@ -20,6 +20,7 @@ import data from "./mockData/lost_add_customer.json";
import DisplayBoard from "../components/container/display-board.vue"; import DisplayBoard from "../components/container/display-board.vue";
import WinnersList from "../components/card/winners-list.vue"; import WinnersList from "../components/card/winners-list.vue";
import {getAllDatas} from "./js/lostAddCustomer" import {getAllDatas} from "./js/lostAddCustomer"
import moment from 'moment'
export default { export default {
name: "LostAddCustomer", name: "LostAddCustomer",
......
...@@ -584,7 +584,7 @@ export default { ...@@ -584,7 +584,7 @@ export default {
return conver_amont(param) + "万元"; return conver_amont(param) + "万元";
}, },
pieDataFormatter(param) { pieDataFormatter(param) {
return param.name + '\r\n' + this.pieDataValueFormatter(param.value) + "万元"; return param.name + '\r\n' + this.pieDataValueFormatter(param.value);
}, },
getLoseAndAdd() { getLoseAndAdd() {
getOrderLoseAddCustomer(this.today).then(res => { getOrderLoseAddCustomer(this.today).then(res => {
...@@ -615,7 +615,6 @@ export default { ...@@ -615,7 +615,6 @@ export default {
}, },
watch:{ watch:{
countDown(n,o){ countDown(n,o){
console.log(n)
if (n === 1){ if (n === 1){
this.refreshData(); this.refreshData();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment