首页统计修改

front-vue/src/api/service/report/credit.js

@@ -27,7 +27,7 @@ export function getEffectBalance(query) {
   })
 }
 
-// 企业已放款额度
+// 企业已融资（已放款）额度
 export function getLoanBalance(query) {
   return request({
     url: '/sc-service/report/credit/getLoanBalance',
@@ -36,6 +36,24 @@ export function getLoanBalance(query) {
   })
 }
 
+// 企业已失效（到期失效）额度
+export function getLoseEffectBalance(query) {
+  return request({
+    url: '/sc-service/report/credit/getLoseEffectBalance',
+    method: 'get',
+    params: query
+  })
+}
+
+// 企业已还款（到期失效）额度
+export function getReturnBalance(query) {
+  return request({
+    url: '/sc-service/report/credit/getReturnBalance',
+    method: 'get',
+    params: query
+  })
+}
+
 // 企业即将到期额度（30天）
 export function getExpiredBalance(query) {
   return request({

front-vue/src/views/home.vue

@@ -13,63 +13,60 @@
                             <div class="zap-card__title">入驻企业总数</div>
                             <div class="zap-card__wrap zap-card__blue">
                                 <span class="zap-card__num">{{companyNum}}</span>
-                                <span class="zap-card__unit">个</span>
+                                <span class="zap-card__unit">家</span>
                             </div>
                         </div>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">已融资/供应商入驻数量</div>
-                            <div class="zap-card__wrap zap-card__gold">
-                                <span class="zap-card__num">{{financeSupplierNum}}</span>
-                                <span class="zap-card__unit">万</span>
-                                <span class="zap-card__slash">/</span>
-                                <span class="zap-card__num">{{supplierNum}}</span>
-                                <span class="zap-card__unit">个</span>
+                            <div class="zap-card__title">入驻核心企业数</div>
+                            <div class="zap-card__wrap zap-card__pink">
+                                <span class="zap-card__num">{{coreNum}}</span>
+                                <span class="zap-card__unit">家</span>
                             </div>
                         </div>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">入驻核心企业数</div>
-                            <div class="zap-card__wrap zap-card__pink">
-                                <span class="zap-card__num">{{coreNum}}</span>
-                                <span class="zap-card__unit">个</span>
+                            <div class="zap-card__title">入驻供应商</div>
+                            <div class="zap-card__wrap zap-card__gold">
+                                <span class="zap-card__num">{{supplierNum}}</span>
+                                <span class="zap-card__unit">家</span>
                             </div>
                         </div>
                     </el-col>
                     <!-- 第二行 -->
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">总融资金额</div>
-                            <div class="zap-card__wrap zap-card__blue">
-                                <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
-                                <span class="zap-card__unit">万</span>
+                            <div class="zap-card__title">平台总授信额度</div>
+                            <div class="zap-card__wrap zap-card__gold">
+                                <span class="zap-card__num">{{handleInput(creditLineAll)}}</span>
+                                <span class="zap-card__unit">元</span>
                             </div>
                         </div>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">融资中金额</div>
-                            <div class="zap-card__wrap zap-card__gold">
-                                <span class="zap-card__num">{{handleInput(availableBalance)}}</span>
-                                <span class="zap-card__unit">万</span>
+                            <div class="zap-card__title">平台可用授信额度</div>
+                            <div class="zap-card__wrap zap-card__pink">
+                                <span class="zap-card__num">{{handleInput(getsubNum())}}</span>
+                                <span class="zap-card__unit">元</span>
                             </div>
                         </div>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">已放款金额</div>
+                            <div class="zap-card__title">平台放款金额</div>
                             <div class="zap-card__wrap zap-card__pink">
-                                <span class="zap-card__num">{{handleInput(loanBalance)}}</span>
-                                <span class="zap-card__unit">个</span>
+                                <span class="zap-card__num">{{handleInput(getAllLoanBalance())}}</span>
+                                <span class="zap-card__unit">元</span>
                             </div>
                         </div>
                     </el-col>
                     <!-- 第三行 -->
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">发起融资业务数</div>
+                            <div class="zap-card__title">发起融资业务</div>
                             <div class="zap-card__wrap zap-card__blue">
                                 <span class="zap-card__num">{{financeNum}}</span>
                                 <span class="zap-card__unit">笔</span>
@@ -78,19 +75,19 @@
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">核心企业总授信额度</div>
+                            <div class="zap-card__title">平台开立融信</div>
                             <div class="zap-card__wrap zap-card__gold">
-                                <span class="zap-card__num">{{handleInput(creditLineAll)}}</span>
-                                <span class="zap-card__unit">万</span>
+                                <span class="zap-card__num">{{handleInput(getFinancedNumAll())}}</span>
+                                <span class="zap-card__unit">元</span>
                             </div>
                         </div>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="8" :lg="8">
                         <div class="zap-card">
-                            <div class="zap-card__title">剩余可用授信</div>
+                            <div class="zap-card__title">未融资额度</div>
                             <div class="zap-card__wrap zap-card__pink">
-                                <span class="zap-card__num">{{handleInput(getsubNum())}}</span>
-                                <span class="zap-card__unit">万</span>
+                                <span class="zap-card__num">{{handleInput(getNotUseAmt())}}</span>
+                                <span class="zap-card__unit">元</span>
                             </div>
                         </div>
                     </el-col>
@@ -169,7 +166,13 @@
                 <el-row class="zap-home-chart zap-home-chart--space">
                     <el-col>
                         <div class="zap-home-chart__title">
-                            平台用户统计（天） 
+                            <div class="zap-home-chart__wrap">
+                                平台用户统计
+                                <el-select class="zap-home-chart__select" v-model="dateType" @change="getCompanyReport">
+                                    <el-option v-for="(item,index) in dateTypeList" :key="index" :label="item.label" :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </div>
                             <div class="zap-home-chart__legend">
                                 <span class="zap-home-chart__circle zap-home-chart__circle--blue"></span>
                                 <span class="zap-home-chart__text">供应商</span>
@@ -446,7 +449,7 @@
                     <span style="color: #666ee8; font-weight: bold;">已融资额度</span>
                 </div>
                 <div class="text item" style="height:100px">
-                    <span style="color: #666ee8; font-weight: bold;">{{handleInput(getFinancedNum())}}</span>
+                    <span style="color: #666ee8; font-weight: bold;">{{handleInput(loanBalance)}}</span>
                 </div>
             </el-card>
             <el-card class="box-card" style="width:22.4%;margin:0.6%;float:left;">
@@ -523,25 +526,25 @@
                 <!-- 第一行 -->
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
                     <div class="zap-card">
-                        <div class="zap-card__title">持有融信额度</div>
+                        <div class="zap-card__title">总授信额度</div>
                         <div class="zap-card__wrap zap-card__blue">
-                            <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
+                            <span class="zap-card__num">{{handleInput(creditLineAll)}}</span>
                         </div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
                     <div class="zap-card">
-                        <div class="zap-card__title">融资中额度</div>
+                        <div class="zap-card__title">已用额度</div>
                         <div class="zap-card__wrap zap-card__gold">
-                            <span class="zap-card__num">{{handleInput(availableBalance)}}</span>
+                            <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
                         </div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
                     <div class="zap-card">
-                        <div class="zap-card__title">已融资额度</div>
+                        <div class="zap-card__title">可用额度</div>
                         <div class="zap-card__wrap zap-card__pink">
-                            <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
+                            <span class="zap-card__num">{{handleInput(getsubNum())}}</span>
                         </div>
                     </div>
                 </el-col>
@@ -563,7 +566,7 @@
 </template>
 <script>
 import * as echarts from 'echarts';
-import { getCreditLineAll, getAvailableBalance, getEffectBalance, getLoanBalance, getFinanceAmount, getFinanceAmountAll, getExpiredBalance, getCoreCreditLine, getCreditLineList, getCreditLineNumList, financeRecordMonth } from '@/api/service/report/credit'
+import { getCreditLineAll, getAvailableBalance, getEffectBalance, getLoanBalance, getLoseEffectBalance, getReturnBalance, getFinanceAmount, getFinanceAmountAll, getExpiredBalance, getCoreCreditLine, getCreditLineList, getCreditLineNumList, financeRecordMonth } from '@/api/service/report/credit'
 import { getCompanyNum, getFinanceSupplier, getFinanceNum, getCompanyReport } from '@/api/service/report/company'
 import { getOwnCompany } from "@/api/common/company";
 import { accAdd, accSub } from "@/utils/calculation";
@@ -596,6 +599,8 @@ export default {
             effectBalanceForward: 0,
             financeNum: 0,
             expiredBalance: 0,
+            loseEffectBalance: 0,
+            returnBalance: 0,
             financeAmountList: [],
             companyDataList:[],
             dateType: "00",
@@ -830,6 +835,10 @@ export default {
                     this.getLoanBalance()
                     //已生效金额
                     this.getEffectBalance()
+                    //已失效金额
+                    this.getLoseEffectBalance()
+                    //已还款金额
+                    this.getReturnBalance()
                     //融资业务数量
                     this.getFinanceNum()
                     //授信总额度
@@ -980,6 +989,18 @@ export default {
                 this.loanBalanceForward = res.data.allAmount
             })
         },
+        //已失效金额
+        getLoseEffectBalance(){
+            getLoseEffectBalance().then(response => {
+                this.loseEffectBalance = response.data.allAmount
+            })
+        },
+        //已还款金额
+        getReturnBalance(){
+            getReturnBalance().then(response => {
+                this.returnBalance = response.data.allAmount
+            })
+        },
         //融资业务数量
         getFinanceNum(){
             getFinanceNum().then(response => {
@@ -1000,11 +1021,23 @@ export default {
                 this.creditLineAllForward = res.data.allAmount
             })
         },
-        //已融资金额
+        //平台放款金额
+        getAllLoanBalance(){
+            return accAdd(this.loanBalance, this.returnBalance, 2)
+        },
+        //未融资金额
+        getNotUseAmt(){
+            return accAdd(this.effectBalance, this.loseEffectBalance, 2)
+        },
+        //平台开立融信
+        getFinancedNumAll(){
+            return accAdd(accAdd(accAdd(accAdd(this.effectBalance, this.availableBalance, 2), this.loanBalance, 2), this.loseEffectBalance, 2) ,this.returnBalance ,2)
+        },
+        //开立金额
         getFinancedNum(){
             return accAdd(accAdd(this.effectBalance, this.availableBalance, 2), this.loanBalance, 2)
         },
-        //已融资金额 -- 正向保理
+        //开立金额 -- 正向保理
         getFinancedNumForward(){
             return accAdd(accAdd(this.effectBalanceForward, this.availableBalanceForward, 2), this.loanBalanceForward, 2)
         },
@@ -1020,7 +1053,7 @@ export default {
         getFinanceAmount(){
             getFinanceAmount().then(response => {
                 this.financeAmountList = response.data;
-                this.initChartPie(response.data, '平台资金统计', ["#f9b51d", "#30d894", "#ff6d8a", "#4280f2"], '{name|{b}}\n{unit|{c} 万}')
+                this.initChartPie(response.data, '平台资金统计', ["#f9b51d", "#30d894", "#ff6d8a", "#4280f2"], '{name|{b}}\n{unit|{c} 元}')
             })
         },
         //平台用户统计 -- 柱状图
@@ -1035,7 +1068,7 @@ export default {
         },
         iniEcharBar (id, series, dateList) {
             // 时间选择是周的时候进行转换 YYYY-MM-D 2 MM.D
-            if (this.financeDateType === '00') {
+            if (this.dateType === '00') {
                 dateList = dateList.map(item => {
                     let arr = item.split('-').slice(1)
                     return arr.join('.')
@@ -1151,6 +1184,12 @@ export default {
             myChart.setOption(option)
         },
         iniEchartBarCore (series, dateList) {
+            if (this.financeDateType === '00') {
+                dateList = dateList.map(item => {
+                    let arr = item.split('-').slice(1)
+                    return arr.join('.')
+                })
+            }
             var barCore = document.getElementById('echarBarCore');
             var myChart = echarts.init(barCore);
             let _series = series.map(item => {
@@ -1232,12 +1271,14 @@ export default {
         getWorkList(){
             listNotice(this.queryParamsWork).then((response) => {
                 this.workList = response.rows
+                this.workTotal = response.total
             });
         },
         //查询消息
         getNoticeList(){
             listNotice(this.queryParamsNotice).then((response) => {
                 this.noticeList = response.rows
+                this.noticeTotal = response.total 
             });
         },
         //即将到期额度（30天）
@@ -1361,7 +1402,7 @@ export default {
         getCreditLine(){
             getCoreCreditLine().then(response => {
                 this.dataList = response.data;
-                this.initChartPie(response.data, '融信授权额度', ['#ff6d8a', '#4280f2'], '{percent|{d}%}\n{percentUnit|{c} 万}')
+                this.initChartPie(response.data, '融信授权额度', ['#ff6d8a', '#4280f2'], '{percent|{d}%}\n{percentUnit|{c} 元}')
             })
         },
         //融信授权额度 -- 列表