From 2ffd0c216a291f7b3531edb27f3f8f13faf79893 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 14 Jun 2023 15:00:28 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E5=BA=A6=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/home/basic-info/unit/unit.component.ts |  3 +--
 src/app/service/method.service.ts              | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/app/home/basic-info/unit/unit.component.ts b/src/app/home/basic-info/unit/unit.component.ts
index abe937b..a776e20 100644
--- a/src/app/home/basic-info/unit/unit.component.ts
+++ b/src/app/home/basic-info/unit/unit.component.ts
@@ -155,9 +155,8 @@ export class UnitComponent implements OnInit {
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
           await new Promise((resolve, reject) => {
-
-
             let integrity = this.methodService.getAddIntegrity(instance.validateForm.value)
+            // return
             let body = {
               companyName: instance.validateForm.value.unitname,
               legalPersonName: instance.validateForm.value.person,
diff --git a/src/app/service/method.service.ts b/src/app/service/method.service.ts
index ea048f7..c917282 100644
--- a/src/app/service/method.service.ts
+++ b/src/app/service/method.service.ts
@@ -119,18 +119,18 @@ export class MethodService {
     let tabledata = JSON.parse(data.data)
     // console.log('表格数据', tabledata)
     let molecule = 0
-    let denominator = 56 + 4 + tabledata.key.length * 5//完整度分母
+    let denominator = 52 + 4 + tabledata.key.length * 5//完整度分母
     //统计最上方12个输入框 
-    data.usci ? molecule += 1 : null
+    // data.usci ? molecule += 1 : null
     data.organizationId ? molecule += 1 : null
     data.relatedOrganizationId ? molecule += 1 : null
     data.buildingTypeId ? molecule += 1 : null
     data.companyLevel ? molecule += 1 : null
-    data.useNature ? molecule += 1 : null
+    // data.useNature ? molecule += 1 : null
     data.legalPersonName ? molecule += 1 : null
     data.legalPersonPhone ? molecule += 1 : null
-    data.directorName ? molecule += 1 : null
-    data.directorPhone ? molecule += 1 : null
+    // data.directorName ? molecule += 1 : null
+    // data.directorPhone ? molecule += 1 : null
     data.securityAdministratorName ? molecule += 1 : null
     data.securityAdministratorPhone ? molecule += 1 : null
     //统计表格中单位基本情况15个输入框 
@@ -171,8 +171,8 @@ export class MethodService {
       });
     });
 
-    // console.log('分子', molecule)
-    // console.log('分母', denominator)
+    console.log('分子', molecule)
+    console.log('分母', denominator)
 
     let integrity = molecule / denominator
     integrity = Math.floor(integrity * 100) / 100
@@ -184,9 +184,9 @@ export class MethodService {
    * 新增单位时完整度计算
    */
   getAddIntegrity(data) {
-    // console.log('完整度原始数据', data)
+    console.log('完整度原始数据', data)
     let molecule = 4
-    let denominator = 70 //完整度分母
+    let denominator = 66 //完整度分母
     for (const key in data) {
       if (Object.prototype.hasOwnProperty.call(data, key)) {
         const element = data[key];