diff --git a/src/module/api/apiList.js b/src/module/api/apiList.js index d6d55b12267ca2fc9f227c0862e9624e2f1c5858..00e23bf5139a9347e6545c8078cbe03618e81afc 100644 --- a/src/module/api/apiList.js +++ b/src/module/api/apiList.js @@ -119,3 +119,11 @@ export const getOrderAddCustomerDetail = (cur_day, type) => fetch('/api/query/*/ } }, 'POST'); +//褰撴棩璁㈠崟閲忥紝褰撴椂瀹屾垚閲� 浣欓噺 +export const getOrderBusinessConditionData = (cur_day, type) => fetch('/api/query/*/action/get_order_business_condition_data', { + aux: { + cur_day: cur_day + } +}, 'POST'); + + diff --git a/src/module/databoard/databoard/lost-add-customer.vue b/src/module/databoard/databoard/lost-add-customer.vue index 00688dc7149387b6f1f59cf5007ae704f2ed4522..550a8ff7b0b4c470cf7c156adde6dab239abb0ea 100644 --- a/src/module/databoard/databoard/lost-add-customer.vue +++ b/src/module/databoard/databoard/lost-add-customer.vue @@ -2,12 +2,12 @@ <div class="page"> <div class="content"> <display-board class="content_card" :title="lostCustomerTitle" title_size="large"> - <winners-list style="height: 100%" id="ar_company_list" + <winners-list style="height: 100%;overflow: auto;" id="ar_company_list" :rows="lostCustomer" /> </display-board> <display-board class="content_card" :title="addCustomerTitle" title_size="large"> - <winners-list style="height: 100%" id="ar_company_list" + <winners-list style="height: 100%;overflow: auto;" id="ar_company_list" :rows="addCustomer" /> </display-board> diff --git a/src/module/databoard/index.vue b/src/module/databoard/index.vue index 92b05eaa15fcb20c1591d7c0205abffb78d0364e..f0c7cf32024f5dccbfeddf592cdb717ec291f0e4 100644 --- a/src/module/databoard/index.vue +++ b/src/module/databoard/index.vue @@ -4,7 +4,8 @@ <display-board class="trade_left" title="钀ヤ笟鎯呭喌"> <div style="height: 100%; display: flex; flex-direction: column; justify-content: space-around; padding: 0 1rem 0 1rem;"> - <contrast-card v-for="data in yyqk" style="height: 28%;" @click.native="routerTo('/turnover-detail',paths[data.title])"> + <contrast-card v-for="data in yyqk" style="height: 28%;" + @click.native="routerTo('/turnover-detail',paths[data.title])"> <title-content-mark style="width: 40%;color: #369afa;float: left;" :title="data.title" :content="data.amount" :mark="data.unit"/> <div @@ -21,7 +22,8 @@ <display-board class="trade_middle" corner_size="large"> <div style="height: 36%;display: flex;justify-content: space-evenly;padding-top: 1.5rem"> <simple-card v-for="data in arSummary" style="width: 30%;height: 100%"> - <title-content-mark style="color: #5eeef4;" :title="data.title" :content="data.value" :mark="'涓囧厓'" isCenter isBold/> + <title-content-mark style="color: #5eeef4;" :title="data.title" :content="data.value" :mark="'涓囧厓'" + isCenter isBold/> </simple-card> </div> <ar-summary-bar ref="arSummaryBar" style="width: 100%; height: 64%;"></ar-summary-bar> @@ -87,28 +89,28 @@ <showcase style="width: 18%;" title="褰撴棩璁㈠崟閲�"> <title-content-mark style="float:left;width: 100%;height: 50%;color: #5eeef4;padding: 0 15%;font-size: 16px;" - content-style="font-size: 16px;" mark-style="font-size: 10px;" :content="mockData.drddl.weight" + content-style="font-size: 16px;" mark-style="font-size: 10px;" :content="drddl.weight" mark="涓囧惃"/> <title-content-mark style="float:left;width: 100%;height: 50%;color: #5eeef4;padding: 0 15%;" content-style="font-size: 16px;" mark-style="font-size: 10px;" - :content="mockData.drddl.amount" mark="涓囧厓"/> + :content="drddl.amount" mark="涓囧厓"/> </showcase> <showcase style="width: 18%;" title="褰撴棩瀹屾垚閲�"> <title-content-mark style="float:left;width: 100%;height: 50%;color: #5eeef4;padding: 0 15%;font-size: 16px;" - content-style="font-size: 16px;" mark-style="font-size: 10px;" :content="mockData.drwcl.weight" + content-style="font-size: 16px;" mark-style="font-size: 10px;" :content="drwcl.weight" mark="涓囧惃"/> <title-content-mark style="float:left;width: 100%;height: 50%;color: #5eeef4;padding: 0 15%;" content-style="font-size: 16px;" mark-style="font-size: 10px;" - :content="mockData.drwcl.amount" mark="涓囧厓"/> + :content="drwcl.amount" mark="涓囧厓"/> </showcase> <showcase style="width: 18%;" title="浣欓噺"> <title-content-mark style="float:left;width: 100%;height: 50%;color: #5eeef4;padding: 0 15%;font-size: 16px;" - content-style="font-size: 16px;" mark-style="font-size: 10px;" :content="mockData.yl.weight" mark="涓囧惃"/> + content-style="font-size: 16px;" mark-style="font-size: 10px;" :content="yl.weight" mark="涓囧惃"/> <title-content-mark style="float:left;width: 100%;height: 50%;color: #5eeef4;padding: 0 15%;" content-style="font-size: 16px;" mark-style="font-size: 10px;" - :content="mockData.yl.amount" mark="涓囧厓"/> + :content="yl.amount" mark="涓囧厓"/> </showcase> <showcase style="width: 18%;" title="娴佸け瀹㈡埛" @click.native="routerTo('/lost-add-customer')"> <title-content-mark @@ -131,9 +133,14 @@ </div> </div> <display-board class="trade_right" title="褰撴棩璁㈠崟閲忓崰姣�"> - <div style="height: 100%; display: flex; flex-direction: column; justify-content: space-around; padding: 0 1rem 0 1rem;"> - <ring-pie-chart ref="transportTypeChart" style="width: 100%;height: 50%;z-index: 999" name="杩愯緭绫诲瀷鍗犳瘮" :data="transportTypeOrderFinishPie" @click.native="routerTo('/order-proportion')" :value-formatter="pieDataValueFormatter" :formatter="pieDataFormatter"/> - <ring-pie-chart ref="customerChart" style="width: 100%;height: 50%;" name="鍏徃鍗犳瘮" :data="customerOrderFinishPie" @click.native="routerTo('/order-proportion')" :value-formatter="pieDataValueFormatter" :formatter="pieDataFormatter"/> + <div + style="height: 100%; display: flex; flex-direction: column; justify-content: space-around; padding: 0 1rem 0 1rem;"> + <ring-pie-chart ref="transportTypeChart" style="width: 100%;height: 50%;z-index: 999" name="杩愯緭绫诲瀷鍗犳瘮" + :data="transportTypeOrderFinishPie" @click.native="routerTo('/order-proportion')" + :value-formatter="pieDataValueFormatter" :formatter="pieDataFormatter"/> + <ring-pie-chart ref="customerChart" style="width: 100%;height: 50%;" name="鍏徃鍗犳瘮" + :data="customerOrderFinishPie" @click.native="routerTo('/order-proportion')" + :value-formatter="pieDataValueFormatter" :formatter="pieDataFormatter"/> </div> </display-board> </div> @@ -149,9 +156,15 @@ import WinnersList from "./components/card/winners-list.vue"; import TitleContentMark from "./components/layout/title-content-mark.vue"; import TableColumn from "./components/table/table-column.vue"; import RingPieChart from "./components/chart/ring-pie-chart.vue"; -import {arSummaryBar, arCompanyList, getBusinessConditionDatas, customerOrderFinishPie,getOrderLoseAddCustomer} from "../api/apiList" +import { + arSummaryBar, + arCompanyList, + getBusinessConditionDatas, + getOrderLoseAddCustomer, + getOrderBusinessConditionData +} from "../api/apiList" import {calc_hb_str, calc_tb_str, conver_amont, conver_num_retain} from "../utils/numUtil"; -import {getTransportTypeOrderFinishPie,getCustomerOrderFinishPie} from "./databoard/js/indexPieData"; +import {getTransportTypeOrderFinishPie, getCustomerOrderFinishPie} from "./databoard/js/indexPieData"; export default { components: { @@ -235,6 +248,18 @@ export default { weight: "2,000", amount: "20,000", }, + drddl: { + weight: "2,000", + amount: "20,000", + }, + drwcl: { + weight: "2,000", + amount: "20,000", + }, + yl: { + weight: "2,000", + amount: "20,000", + }, mockData: { zqk: { yszk: { @@ -414,15 +439,15 @@ export default { "鎴愭湰": "cb", "姣涘埄": "ml", }, - dataset:{}, - transportTypeOrderFinishPie:[], - customerOrderFinishPie:[], - arCompanyList:[], + dataset: {}, + transportTypeOrderFinishPie: [], + customerOrderFinishPie: [], + arCompanyList: [], charts: {} } }, methods: { - log(){ + log() { }, cellStyleFunction(data) { let res = {color: '#33ff66'}; @@ -436,7 +461,7 @@ export default { this.charts[chartsKey].resize(); } }, - routerTo(path,code) { + routerTo(path, code) { this.$router.push({path: path, query: {code: code}}); }, //钀ヤ笟鎯呭喌 @@ -496,14 +521,14 @@ export default { console.log(err); }); }, - refreshData(){ - getTransportTypeOrderFinishPie(res => this.transportTypeOrderFinishPie = res,this.today); - getCustomerOrderFinishPie(res => this.customerOrderFinishPie = res,this.today); + refreshData() { + getTransportTypeOrderFinishPie(res => this.transportTypeOrderFinishPie = res, this.today); + getCustomerOrderFinishPie(res => this.customerOrderFinishPie = res, this.today); }, - pieDataValueFormatter(param){ + pieDataValueFormatter(param) { return conver_amont(param) + "涓囧厓"; }, - pieDataFormatter (param) { + pieDataFormatter(param) { return param.name + '\r\n' + this.pieDataValueFormatter(param.value) + "涓囧厓"; }, getLoseAndAdd() { @@ -514,6 +539,17 @@ export default { this.xzkh.amount = conver_amont(data.add_sell_settle_amount_sum); this.xzkh.weight = conver_amont(data.add_weight_sum); }) + }, + getOrderBusinessCondition() { + getOrderBusinessConditionData(this.today).then(res => { + let data = res.data + this.drddl.amount = conver_amont(data.cur_sell_settle_amount); + this.drddl.weight = conver_amont(data.cur_unit_weight); + this.drwcl.amount = conver_amont(data.cur_finish_sell_settle_amount); + this.drwcl.weight = conver_amont(data.cur_finish_unit_weight); + this.yl.amount = conver_amont(data.cur_unfinish_sell_settle_amount); + this.yl.weight = conver_amont(data.cur_unfinish_unit_weight); + }) } }, mounted() { @@ -524,6 +560,7 @@ export default { this.getArSummaryBar(); this.getArCompanyList(); this.getLoseAndAdd(); + this.getOrderBusinessCondition(); this.refreshData(); }, beforeDestroy() {