From 15141c1c89f10ee69f911769d00a9d67bdabe7b4 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 02 Dec 2021 17:14:41 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys
---
src/views/securityUnitOperation/economicAnalysis.vue | 28 +++++++++++-----------------
src/views/securityUnitOperation/operationAnalysis.vue | 24 ++++++++++++------------
2 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/src/views/securityUnitOperation/economicAnalysis.vue b/src/views/securityUnitOperation/economicAnalysis.vue
index e6a7c36..eb0ace7 100644
--- a/src/views/securityUnitOperation/economicAnalysis.vue
+++ b/src/views/securityUnitOperation/economicAnalysis.vue
@@ -506,27 +506,21 @@
selectTo(params).then(res => {
if (res.data.code === 200) {
let data = res.data.data[0];
- this.socialSecurity.num = data.thismouth;
- this.socialSecurity.addNum = data.thismouth - data.lastmonth;
- this.socialSecurity.money = data.thisamount;
- this.socialSecurity.addMoney = data.thisamount - data.lastamount;
- this.socialSecurity.paiQ = data.userpcthismouth;
- this.socialSecurity.addPaiQ =
- data.userpcthismouth - data.userpclastmouth;
+ this.socialSecurity.num = data.znum;
+ this.socialSecurity.addNum = data.thismouth;
+ this.socialSecurity.money = data.tamountnum.toFixed(0);
+ this.socialSecurity.addMoney = data.thisamount.toFixed(0);
+ this.socialSecurity.paiQ = data.userpcnum;
+ this.socialSecurity.addPaiQ = data.userpcthismouth;
this.socialSecurity.sheBPerson =
- data.userthismouth && (data.thismouth / data.userthismouth) * 100
- ? ((data.thismouth / data.userthismouth) * 100).toFixed(2) + "%"
+ data.usernum && (data.znum / data.usernum) * 100
+ ? ((data.znum / data.usernum) * 100).toFixed(2) + "%"
: 0;
this.socialSecurity.addSheBPerson =
- data.userthismouth &&
- data.userlastmouth &&
- (data.thismouth / data.userthismouth) * 100 &&
- (data.lastmonth / data.userlastmouth) * 100 &&
- (data.thismouth / data.userthismouth) * 100 -
- (data.lastmonth / data.userlastmouth) * 100
+ data.thismouth && data.lastmonth && data.thismouth - data.lastmonth
? (
- (data.thismouth / data.userthismouth) * 100 -
- (data.lastmonth / data.userlastmouth) * 100
+ ((data.thismouth - data.lastmonth) / data.lastmonth) *
+ 100
).toFixed(2) + "%"
: 0;
} else {
diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index 3d83130..e2c432a 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -505,20 +505,20 @@
if (res.data.code === 200) {
let data = res.data.data[0];
this.card = {
- baoanTotal: data.baoan.thisnum,
- addbaoanTotal: data.baoan.thisnum - data.baoan.lastnum,
- zcBaoan: data.zcbaoan.thisnum,
- addzcBaoan: data.zcbaoan.thisnum - data.zcbaoan.lastnum,
- czBaoan: data.czbaoan.thisnum,
- addczBaoan: data.czbaoan.thisnum - data.czbaoan.lastnum,
+ baoanTotal: data.baoan.num,
+ addbaoanTotal: data.baoan.thisnum,
+ zcBaoan: data.zcbaoan.num,
+ addzcBaoan: data.zcbaoan.thisnum,
+ czBaoan: data.czbaoan.num,
+ addczBaoan: data.czbaoan.thisnum,
gkBaoan: 0,
addgkBaoan: 0,
- kh: data.kh.thisnum,
- addkh: data.kh.thisnum - data.kh.lastnum,
- sheb: data.sheb.thisnum,
- addsheb: data.sheb.thisnum - data.sheb.lastnum,
- baoanPq: data.paiq.thisnum,
- addbaoanPq: data.paiq.thisnum - data.paiq.lastnum,
+ kh: data.kh.num,
+ addkh: data.kh.thisnum,
+ sheb: data.sheb.num,
+ addsheb: data.sheb.thisnum,
+ baoanPq: data.paiq.num,
+ addbaoanPq: data.paiq.thisnum,
};
}
});
--
Gitblit v1.9.3