[完善]完善完整度计算

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,

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];