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 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 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 {

--
Gitblit v1.9.3