Skip to content

S
shld-databoard-ui
Commit abfc53f5 authored by 王礼鸿 Baimax Wang's avatar 王礼鸿 Baimax Wang
Browse files
Options

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

parents 90b0a229 6e73cfc1
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 136 deletions
src/module/api/fetch.js
View file @ abfc53f5
......@@ -44,9 +44,6 @@ export default async (url = '', data = {}, type = 'GET', method = 'fetch') => {
try {
const response = await fetch(url, requestConfig);
const responseJson = await response.json();
if(response.status === 403){
parent.window.location = "/";
}
return responseJson
} catch (error) {
throw new Error(error)
......
src/module/databoard/databoard/js/lostAddCustomer.js
View file @ abfc53f5
......@@ -36,7 +36,7 @@ export const adapterLostAdd = function (data) {
let lostAddDataCol = new Array();
lostAddDataCol[0] = adapterLostAddCol("订单量(万吨) ", conver_amont(data.unit_weight), "red")
lostAddDataCol[1] = adapterLostAddCol("订单件数", data.qty, "#eaa749")
lostAddDataCol[2] = adapterLostAddCol("营销额(万元)", conver_amont(data.sell_settle_amount), "#49eb29")
lostAddDataCol[2] = adapterLostAddCol("营业额(万元)", conver_amont(data.sell_settle_amount), "#49eb29")
lostAddData['column'] = lostAddDataCol;
return lostAddData;
}
......
src/module/databoard/databoard/lost-add-customer.vue
View file @ abfc53f5
......@@ -3,11 +3,13 @@
<div class="content">
<display-board class="content_card" :title="lostCustomerTitle" title_size="large">
<winners-list style="height: 100%;overflow: auto;" id="ar_company_list"
:columns-style="{'title':{'width':'45%'}}"
:rows="lostCustomer"
/>
</display-board>
<display-board class="content_card" :title="addCustomerTitle" title_size="large">
<winners-list style="height: 100%;overflow: auto;" id="ar_company_list"
:columns-style="{'title':{'width':'45%'}}"
:rows="addCustomer"
/>
</display-board>
......@@ -50,9 +52,7 @@ export default {
},
async mounted() {
this.lostCustomer = await getAllDatas(this.today, 2)
console.log(this.lostCustomer)
this.addCustomer = await getAllDatas(this.today, 1)
console.log(this.addCustomer)
},
}
</script>
......
src/module/databoard/databoard/turnover-detail.vue
View file @ abfc53f5
<template>
<div class="turnover-detail">
<div class="card-board">
<contrast-card v-for="(data,key) in currentData.head" style="height: 100%;width: 20%;"
<contrast-card v-for="(data,key) in currentData.head" style="height: 100%;width: 23%;"
:class="{'selectCard': currentCard === key}"
@click.native="selectLegend(key)">
<title-content-mark style="color: #369afa;float: left;width: 40%;font-size: 18px"
<title-content-mark style="color: #369afa;float: left;width: 30%;font-size: 18px"
:title-style="{'font-weight': 'bold','line-height': '30px'}" :mark-style="{'bottom': '12%'}" :title="key" :content="data.amount" mark="万元" isBold/>
<div
style="width: 60%; height: 100%; float:left; padding: 2% 2% 0 8%; line-height: 60px; display: flex; align-items: center;font-size: 16px;">
style="width: 70%; height: 100%; float:left; padding: 2% 2% 0 8%; line-height: 60px; display: flex; align-items: center;font-size: 16px;">
<table-column style="float: left;width: 25%;" :data="data.hb" name="title"/>
<table-column style="float: left;width: 40%;" :data="data.hb" name="amount"/>
<table-column style="float: left;width: 35%;" :data="data.hb" name="rate"
......
src/module/databoard/databoard/turnoverDetail.js
View file @ abfc53f5
......@@ -136,64 +136,33 @@ export const adapterSumDataDay = function (type, data) {
turnOver.title = '营业额'
turnOver.amount = conver_amont(data.cur_sell_settle_amount);
//昨日环比
if (data.pre_sell_settle_amount) {
let yesterday = new Object()
yesterday.title = '昨日'
yesterday.amount = conver_amont(data.pre_sell_settle_amount);
yesterday.rate = calc_hb_str(data.cur_sell_settle_amount, data.pre_sell_settle_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('昨日', conver_amont(data.pre_sell_settle_amount), calc_hb_str(data.cur_sell_settle_amount, data.pre_sell_settle_amount))
hb.push(yesterday)
//昨日环比
if (data.pre_month_sell_settle_amount) {
let premonth = new Object()
premonth.title = '上月'
premonth.amount = conver_amont(data.pre_month_sell_settle_amount);
premonth.rate = calc_tb_str(data.cur_sell_settle_amount, data.pre_month_sell_settle_amount);
turnOver[hb].push(premonth)
}
let premonth = initRate('上月', conver_amont(data.pre_month_sell_settle_amount), calc_tb_str(data.cur_sell_settle_amount, data.pre_month_sell_settle_amount))
hb.push(premonth)
}
if (type == 'cb') {
turnOver.title = '成本'
turnOver.amount = conver_amont(data.cur_buy_settle_amount);
//昨日环比
if (data.pre_buy_settle_amount) {
let yesterday = new Object()
yesterday.title = '昨日'
yesterday.amount = conver_amont(data.pre_buy_settle_amount);
yesterday.rate = calc_hb_str(data.cur_buy_settle_amount, data.pre_buy_settle_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('昨日', conver_amont(data.pre_buy_settle_amount), calc_hb_str(data.cur_buy_settle_amount, data.pre_buy_settle_amount))
hb.push(yesterday)
//昨日环比
if (data.pre_month_buy_settle_amount) {
let premonth = new Object()
premonth.title = '上月'
premonth.amount = conver_amont(data.pre_month_buy_settle_amount);
premonth.rate = calc_tb_str(data.cur_buy_settle_amount, data.pre_month_buy_settle_amount);
turnOver[hb].push(premonth)
}
let premonth = initRate('上月', conver_amont(data.pre_month_buy_settle_amount), calc_tb_str(data.cur_buy_settle_amount, data.pre_month_buy_settle_amount))
hb.push(premonth)
}
if (type == 'ml') {
turnOver.title = '毛利'
turnOver.amount = conver_amont(data.cur_gross_profit_amount);
//昨日环比
if (data.pre_gross_profit_amount) {
let yesterday = new Object()
yesterday.title = '昨日'
yesterday.amount = conver_amont(data.pre_gross_profit_amount);
yesterday.rate = calc_hb_str(data.cur_gross_profit_amount, data.pre_gross_profit_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('昨日', conver_amont(data.pre_gross_profit_amount), calc_hb_str(data.cur_gross_profit_amount, data.pre_gross_profit_amount))
hb.push(yesterday)
//昨日环比
if (data.pre_month_gross_profit_amount) {
let premonth = new Object()
premonth.title = '上月'
premonth.amount = conver_amont(data.pre_month_gross_profit_amount);
premonth.rate = calc_tb_str(data.cur_gross_profit_amount, data.pre_month_gross_profit_amount);
turnOver[hb].push(premonth)
}
let premonth = initRate('上月', conver_amont(data.pre_month_gross_profit_amount), calc_tb_str(data.cur_gross_profit_amount, data.pre_month_gross_profit_amount))
hb.push(premonth)
}
turnOver['hb'] = hb
return turnOver;
}
......@@ -206,21 +175,23 @@ export const initSumDataDay = function () {
turnOver.title = '营业额'
turnOver.amount = "0.0"
let hb = new Array()
let yesterday = new Object()
yesterday.title = '昨日'
yesterday.amount = "0.0"
yesterday.rate = "0.0"
let yesterday = initRate('昨日')
hb.push(yesterday)
yesterday = new Object()
yesterday.title = '上月'
yesterday.amount = "0.0"
yesterday.rate = "0.0"
yesterday = initRate('上月')
hb.push(yesterday)
turnOver.hb = hb
return turnOver;
}
export const initRate = function (title, amount, rate) {
let rateVo = new Object()
rateVo.title = title
rateVo.amount = amount ? amount : "0.0"
rateVo.rate = rate ? rate : "0%"
return rateVo;
}
/**
* 月维度汇总
* @param type
......@@ -231,67 +202,35 @@ export const adapterSumDataMonth = function (type, data) {
let hb = new Array()
if (type == 'yye') {
turnOver.title = '营业额'
turnOver.amount = conver_amont(data.cur_month_buy_settle_amount);
turnOver.amount = conver_amont(data.cur_month_sell_settle_amount);
//昨日环比
if (data.pre_month_sell_settle_amount) {
let yesterday = new Object()
yesterday.title = '上月'
yesterday.amount = conver_amont(data.pre_month_sell_settle_amount);
yesterday.rate = calc_hb_str(data.cur_month_buy_settle_amount, data.pre_month_sell_settle_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('上月', conver_amont(data.pre_month_sell_settle_amount), calc_hb_str(data.cur_month_sell_settle_amount, data.pre_month_sell_settle_amount))
hb.push(yesterday)
//昨日环比
if (data.pre_year_sell_settle_amount) {
let premonth = new Object()
premonth.title = '去年'
premonth.amount = conver_amont(data.pre_year_sell_settle_amount);
premonth.rate = calc_tb_str(data.cur_sell_settle_amount, data.pre_year_sell_settle_amount);
turnOver[hb].push(premonth)
}
let premonth = initRate('去年', conver_amont(data.pre_year_sell_settle_amount), calc_tb_str(data.cur_month_sell_settle_amount, data.pre_year_sell_settle_amount))
hb.push(premonth)
}
if (type == 'cb') {
turnOver.title = '成本'
turnOver.amount = conver_amont(data.cur_month_buy_settle_amount);
//上月环比
if (data.pre_month_buy_settle_amount) {
let yesterday = new Object()
yesterday.title = '上月'
yesterday.amount = conver_amont(data.pre_month_buy_settle_amount);
yesterday.rate = calc_hb_str(data.cur_month_buy_settle_amount, data.pre_month_buy_settle_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('上月', conver_amont(data.pre_month_buy_settle_amount), calc_hb_str(data.cur_month_buy_settle_amount, data.pre_month_buy_settle_amount))
hb.push(yesterday)
//去年环比
if (data.pre_year_buy_settle_amount) {
let premonth = new Object()
premonth.title = '去年'
premonth.amount = conver_amont(data.pre_year_buy_settle_amount);
premonth.rate = calc_tb_str(data.cur_month_buy_settle_amount, data.pre_year_buy_settle_amount);
turnOver[hb].push(premonth)
}
let premonth = initRate('去年', conver_amont(data.pre_year_buy_settle_amount), calc_tb_str(data.cur_month_buy_settle_amount, data.pre_year_buy_settle_amount))
hb.push(premonth)
}
if (type == 'ml') {
turnOver.title = '毛利'
turnOver.amount = conver_amont(data.cur_month_gross_profit_amount);
//昨日环比
if (data.pre_month_gross_profit_amount) {
let yesterday = new Object()
yesterday.title = '上月'
yesterday.amount = conver_amont(data.pre_month_gross_profit_amount);
yesterday.rate = calc_hb_str(data.cur_month_gross_profit_amount, data.pre_month_gross_profit_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('上月', conver_amont(data.pre_month_gross_profit_amount), calc_hb_str(data.cur_month_gross_profit_amount, data.pre_month_gross_profit_amount))
hb.push(yesterday)
//昨日环比
if (data.pre_year_gross_profit_amount) {
let premonth = new Object()
premonth.title = '去年'
premonth.amount = conver_amont(data.pre_year_gross_profit_amount);
premonth.rate = calc_tb_str(data.cur_month_gross_profit_amount, data.pre_year_gross_profit_amount);
turnOver[hb].push(premonth)
}
let premonth = initRate('去年', conver_amont(data.pre_year_gross_profit_amount), calc_tb_str(data.cur_month_gross_profit_amount, data.pre_year_gross_profit_amount))
hb.push(premonth)
}
turnOver['hb'] = hb
return turnOver;
}
......@@ -307,41 +246,24 @@ export const adapterSumDataYear = function (type, data) {
turnOver.title = '营业额'
turnOver.amount = conver_amont(data.cur_year_sell_settle_amount);
//昨日环比
if (data.pre_year_sell_settle_amount) {
let yesterday = new Object()
yesterday.title = '去年'
yesterday.amount = conver_amont(data.pre_year_sell_settle_amount);
yesterday.rate = calc_hb_str(data.cur_year_sell_settle_amount, data.pre_year_sell_settle_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('去年', conver_amont(data.pre_year_sell_settle_amount), calc_hb_str(data.cur_year_sell_settle_amount, data.pre_year_sell_settle_amount))
hb.push(yesterday)
}
if (type == 'cb') {
turnOver.title = '成本'
turnOver.amount = conver_amont(data.cur_year_buy_settle_amount);
//上月环比
if (data.pre_year_buy_settle_amount) {
let yesterday = new Object()
yesterday.title = '去年'
yesterday.amount = conver_amont(data.pre_year_buy_settle_amount);
yesterday.rate = calc_hb_str(data.cur_year_buy_settle_amount, data.pre_year_buy_settle_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('去年', conver_amont(data.pre_year_buy_settle_amount), calc_hb_str(data.cur_year_buy_settle_amount, data.pre_year_buy_settle_amount))
hb.push(yesterday)
}
if (type == 'ml') {
turnOver.title = '毛利'
turnOver.amount = conver_amont(data.cur_year_gross_profit_amount);
//昨日环比
if (data.pre_year_gross_profit_amount) {
let yesterday = new Object()
yesterday.title = '去年'
yesterday.amount = conver_amont(data.pre_year_gross_profit_amount);
yesterday.rate = calc_hb_str(data.cur_year_gross_profit_amount, data.pre_year_gross_profit_amount);
turnOver[hb].push(yesterday)
}
let yesterday = initRate('去年', conver_amont(data.pre_year_gross_profit_amount), calc_hb_str(data.cur_year_gross_profit_amount, data.pre_year_gross_profit_amount))
hb.push(yesterday)
}
turnOver['hb'] = hb
return turnOver;
}
......
src/module/databoard/index.vue
View file @ abfc53f5
<template>
<div class="main" @click="log()">
<div class="main">
<div class="middle">
<display-board class="trade_left" title="营业情况">
<div
......
src/module/index/index.vue
View file @ abfc53f5
......@@ -45,7 +45,7 @@ export default {
},
setCurrentDateTime(){
let now = new Date();
this.currentDate = now.getFullYear() + "-" + now.getMonth() + "-" + now.getDate();
this.currentDate = now.getFullYear() + "-" + (now.getMonth()+1) + "-" + now.getDate();
this.currentTime = now.getHours() + ":" + now.getMinutes() + ":" + now.getSeconds();
this.currentWeek = this.week[now.getDay()];
},
......
src/module/utils/numUtil.js
View file @ abfc53f5
//环比值=（当日营业额-昨日营业额）/昨日营业额*100%计算
export const calc_hb_str = function (cur, pre) {
if (cur == 0 || pre == 0){
if (cur == 0 || pre == 0) {
return '0.00%'
}
return conver_num_rate(formater((cur - pre) / pre * 100));
......@@ -8,12 +8,15 @@ export const calc_hb_str = function (cur, pre) {
//同比值=（当日营业额上个月同一日营业额）/上个月同一日营业额*100%计算
export const calc_tb_str = function (cur, pre) {
if (cur == 0 || pre == 0) {
return '0.00%'
}
return conver_num_rate(formater(cur / pre * 100));
};
//计算占比
export const calc_zb_str = function (item, total) {
if (item == 0 || total == 0){
if (item == 0 || total == 0) {
return '0.00%'
}
return formater(item / total * 100) + '%';
......@@ -22,7 +25,7 @@ export const calc_zb_str = function (item, total) {
//conver amont
export const conver_amont = function (amont) {
return formater(amont / 10000);
return amont ? formater(amont / 10000) : "0.0";
};
//Positive and negative
......
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