报表通过率

src/components/layouts/stock/Warning.vue

@@ -48,7 +48,8 @@
             </a-row>
           </a-form>
         </a-col>
-        <a-col :span="3" style="padding-top: 10px">
+
+        <a-col :span="4" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="客户总数"
@@ -64,10 +65,10 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="3" style="padding-top: 10px">
+        <a-col :span="5" style="padding-top: 10px">
           <a-card>
             <a-statistic
-              title="未处理客户数量"
+              title="未处理"
               :value="noHandle"
               :precision="0"
               suffix="个"
@@ -80,10 +81,10 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="3" style="padding-top: 10px">
+        <a-col :span="5" style="padding-top: 10px">
           <a-card>
             <a-statistic
-              title="未完善客户数量"
+              title="未完善"
               :value="toImproveUser"
               :precision="0"
               suffix="个"
@@ -96,10 +97,10 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="3" style="padding-top: 10px">
+        <a-col :span="5" style="padding-top: 10px">
           <a-card>
             <a-statistic
-              title="待整改客户数量"
+              title="待整改"
               :value="tobeRectified"
               :precision="0"
               suffix="个"
@@ -112,10 +113,10 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="3" style="padding-top: 10px">
+        <a-col :span="5" style="padding-top: 10px">
           <a-card>
             <a-statistic
-              title="待稽核客户数量"
+              title="待稽核"
               :value="toBeAudited"
               :precision="0"
               suffix="个"
@@ -128,54 +129,75 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="3" style="padding-top: 10px">
-          <a-card>
-            <a-statistic
-              title="稽核通过客户数"
-              :value="auditPassed"
-              :precision="0"
-              suffix="个"
-              :value-style="{ color: '#3f8600' }"
-              style="margin-right: 50px"
-            >
-              <template #prefix>
 
-              </template>
-            </a-statistic>
-          </a-card>
-        </a-col>
-        <a-col :span="3" style="padding-top: 10px">
-          <a-card>
-            <a-statistic
-              title="稽核整改率"
-              :value="zgl"
-              :precision="0"
-              suffix=""
-              :value-style="{ color: '#3f8600' }"
-              style="margin-right: 50px"
-            >
-              <template #prefix>
-                <arrow-up-outlined/>
-              </template>
-            </a-statistic>
-          </a-card>
-        </a-col>
-        <a-col :span="3" style="padding-top: 10px">
-          <a-card>
-            <a-statistic
-              title="稽核通过率"
-              :value="tgl"
-              :precision="0"
-              suffix=""
-              :value-style="{ color: '#3f8600' }"
-              style="margin-right: 50px"
-            >
-              <template #prefix>
-                <arrow-up-outlined/>
-              </template>
-            </a-statistic>
-          </a-card>
-        </a-col>
+
+
+          <a-col :span="4" style="padding-top: 10px">
+            <a-card>
+              <a-statistic
+                title="稽核通过客户数"
+                :value="auditPassed"
+                :precision="0"
+                suffix="个"
+                :value-style="{ color: 'rgba(42,57,157,0.84)' }"
+                style="margin-right: 50px"
+              >
+                <template #prefix>
+
+                </template>
+              </a-statistic>
+            </a-card>
+          </a-col>
+          <a-col :span="5" style="padding-top: 10px">
+            <a-card>
+              <a-statistic
+                title="稽核通过率"
+                :value="tgl"
+                :precision="0"
+                suffix=""
+                :value-style="{ color: '#3f8600' }"
+                style="margin-right: 50px"
+              >
+                <template #prefix>
+                  <arrow-up-outlined/>
+                </template>
+              </a-statistic>
+            </a-card>
+          </a-col>
+          <a-col :span="5" style="padding-top: 10px">
+            <a-card>
+              <a-statistic
+                title="一次稽核通过率"
+                :value="yctgl"
+                :precision="0"
+                suffix=""
+                :value-style="{ color: '#21b43f' }"
+                style="margin-right: 50px"
+              >
+                <template #prefix>
+                  <arrow-up-outlined/>
+                </template>
+              </a-statistic>
+            </a-card>
+          </a-col>
+          <a-col :span="5" style="padding-top: 10px">
+            <a-card>
+              <a-statistic
+                title="整改完成率"
+                :value="zgl"
+                :precision="0"
+                suffix=""
+                :value-style="{ color: '#860074' }"
+                style="margin-right: 50px"
+              >
+                <template #prefix>
+                  <arrow-up-outlined/>
+                </template>
+              </a-statistic>
+            </a-card>
+          </a-col>
+
+
         <a-col :span="24" style="top: 10px">
           <a-card title="任务维度预警图标" :bordered="false">
             <div id="statusRefusePie" ref="statusRefusePie" style="width:100%;height:500px"></div>
@@ -550,8 +572,12 @@ export default {
       toBeAudited: 0,
       tobeRectified: 0,
       auditPassed: 0,
+      //1、稽核通过率：稽核通过客户数量（包括一次稽核通过、多次稽核通过）/客户总数*100%  前段计算
+      //2、一次稽核通过率：一次稽核通过客户数量/客户总数*100%
+      //3、整改完成率：整改通过的客户数量（多次稽核通过的）/全部需要整改的客户数量（一次稽核不通过的）*100%
       zgl:0,
       tgl:0,
+      yctgl:0,
       treeData: [],
       expandedKeys: ['2022', '2022-10'],
       selectedKeys: {},
@@ -1120,6 +1146,9 @@ export default {
                   this.toBeAudited = 0;
                   this.tobeRectified = 0;
                   this.auditPassed = 0;
+                  this.tgl='0%';
+                  this.zgl='0%';
+                  this.yctgl='0%';
                 }
                 //稽核状态（0：未处理；1：未完善；2：待稽核；4：待整改；5：稽核通过；）
                 for (var i in resultList) {
@@ -1438,11 +1467,16 @@ export default {
           }
         ]
       };
-      if (res.result.his+res.result.sum>0 && res.result.his<=res.result.his+res.result.sum){
-        this.zgl =Math.round(res.result.his / (res.result.his+res.result.sum) * 10000) / 100 + "%";
+      if (res.result.zgSum>0 && res.result.his<=res.result.zgSum){
+        this.zgl =Math.round(res.result.his / res.result.zgSum  * 10000) / 100 + "%";
       }else {
         this.zgl='0%'
       }
+      if (res.result.sum>0 && res.result.his<=res.result.sum+this.allCount && this.allCount>0){
+        this.yctgl = Math.round(res.result.sum /  this.allCount   * 10000) / 100 + "%";
+      }else {
+        this.yctgl='0%'
+      }
 
       myChart.setOption(option);
     },

src/components/layouts/stock/WorkTable.vue

@@ -48,7 +48,23 @@
              </a-row>
            </a-form>
          </a-col>
-        <a-col :span="4" style="padding-top: 10px">
+         <a-col :span="4" style="padding-top: 10px">
+           <a-card>
+             <a-statistic
+               title="客户总数"
+               :value="allCount"
+               :precision="0"
+               suffix="个"
+               :value-style="{ color: '#fa073f' }"
+               style="margin-right: 50px"
+             >
+               <template #prefix>
+
+               </template>
+             </a-statistic>
+           </a-card>
+         </a-col>
+        <a-col :span="5" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="未处理客户数量"
@@ -64,7 +80,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-         <a-col :span="4" style="padding-top: 10px">
+         <a-col :span="5" style="padding-top: 10px">
            <a-card>
              <a-statistic
                title="未完善客户数量"
@@ -80,7 +96,7 @@
              </a-statistic>
            </a-card>
          </a-col>
-        <a-col :span="3" style="padding-top: 10px">
+        <a-col :span="5" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="待整改客户数量"
@@ -96,7 +112,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="3" style="padding-top: 10px">
+        <a-col :span="5" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="待稽核客户数量"
@@ -128,11 +144,12 @@
             </a-statistic>
           </a-card>
         </a-col>
-         <a-col :span="3" style="padding-top: 10px">
+
+         <a-col :span="5" style="padding-top: 10px">
            <a-card>
              <a-statistic
-               title="稽核整改率"
-               :value="zgl"
+               title="稽核通过率"
+               :value="tgl"
                :precision="0"
                suffix=""
                :value-style="{ color: '#3f8600' }"
@@ -144,14 +161,30 @@
              </a-statistic>
            </a-card>
          </a-col>
-         <a-col :span="3" style="padding-top: 10px">
+         <a-col :span="5" style="padding-top: 10px">
            <a-card>
              <a-statistic
-               title="稽核通过率"
-               :value="tgl"
+               title="一次稽核通过率"
+               :value="yctgl"
                :precision="0"
                suffix=""
-               :value-style="{ color: '#3f8600' }"
+               :value-style="{ color: '#21b43f' }"
+               style="margin-right: 50px"
+             >
+               <template #prefix>
+                 <arrow-up-outlined/>
+               </template>
+             </a-statistic>
+           </a-card>
+         </a-col>
+         <a-col :span="5" style="padding-top: 10px">
+           <a-card>
+             <a-statistic
+               title="整改完成率"
+               :value="zgl"
+               :precision="0"
+               suffix=""
+               :value-style="{ color: '#860074' }"
                style="margin-right: 50px"
              >
                <template #prefix>
@@ -188,7 +221,7 @@
                        </a-form-item>
                      </a-col>
                      <a-col :xl="5" :lg="7" :md="8" :sm="24">
-                       <a-form-item label="稽核次数">
+                       <a-form-item label="整改次数">
                          <a-input-number style='width: 200px' id="inputNumber" v-model="queryParam.count" :min="1" :max="100"  />
 
                        </a-form-item>
@@ -691,7 +724,7 @@ export default {
           dataIndex: 'staff_no'
         },
         {
-          title:'稽核次数',
+          title:'整改次数',
           align:"center",
           dataIndex: 'c'
         } ,
@@ -734,6 +767,7 @@ export default {
       $abnormalCheckHistogram: "",
       $abnormalCreateTimeTrend: "",
       toImproveUser: 0,
+      allCount:0,
       wanshan: 0,
       latestDate: '180',
       toBeAudited: 0,
@@ -741,6 +775,7 @@ export default {
       auditPassed: 0,
       zgl:0,
       tgl:0,
+      yctgl:0,
       treeData: [],
       expandedKeys: ['2022', '2022-10'],
       selectedKeys: {},
@@ -1052,11 +1087,16 @@ export default {
           }
         ]
       };
-      if (res.result.his+res.result.sum>0 && res.result.his<=res.result.his+res.result.sum){
-        this.zgl =Math.round(res.result.his / (res.result.his+res.result.sum) * 10000) / 100 + "%";
+      if (res.result.zgSum>0 && res.result.his<=res.result.zgSum){
+        this.zgl =Math.round(res.result.his / res.result.zgSum  * 10000) / 100 + "%";
       }else {
         this.zgl='0%'
       }
+      if (res.result.sum>0   && this.allCount>0){
+        this.yctgl = Math.round(res.result.sum /  this.allCount   * 10000) / 100 + "%";
+      }else {
+        this.yctgl='0%'
+      }
       myChart.setOption(option);
     },
     checkStatePie(data) {
@@ -1273,6 +1313,17 @@ export default {
             let pieDate = {};
             let all = 0;
             let resultList = res.resultList;
+            if (resultList.length == 0) {
+              this.allCount = 0;
+              this.noHandle = 0;
+              this.toImproveUser = 0;
+              this.toBeAudited = 0;
+              this.tobeRectified = 0;
+              this.auditPassed = 0;
+              this.tgl='0%';
+              this.zgl='0%';
+              this.yctgl='0%';
+            }
             for (var i in resultList) {
               let resultListElement = resultList[i];
               let status = this.statusMap[resultListElement.checkState];
@@ -1304,15 +1355,24 @@ export default {
       if (builderJson.charts["待整改"] == null || builderJson.charts["待整改"] == undefined) {
         builderJson.charts["待整改"] = 0;
       }
-
+      if (builderJson.charts["未处理"] == null || builderJson.charts["未处理"] == undefined) {
+        builderJson.charts["未处理"] = 0;
+      }
       this.toImproveUser = builderJson.charts["未处理"];
       this.wanshan = builderJson.charts["未完善"];
 
       this.toBeAudited = builderJson.charts["待稽核"];
       this.tobeRectified = builderJson.charts["待整改"];
       this.auditPassed = builderJson.charts["稽核通过"];
-      //this.zgl=  (parseInt(percentage) / 100) * total;
-      this.tgl= Math.round(this.auditPassed / (this.toImproveUser+this.wanshan+this.toBeAudited+this.tobeRectified+this.auditPassed) * 10000) / 100 + "%";
+      debugger
+      this.allCount =this.toImproveUser+this.wanshan+this.toBeAudited+this.tobeRectified+this.auditPassed;
+        //this.zgl=  (parseInt(percentage) / 100) * total;
+      if ( this.allCount>0){
+        this.tgl= Math.round(this.auditPassed /   this.allCount * 10000) / 100 + "%";
+      }else {
+        this.tgl='0%'
+      }
+
       let option = {
         backgroundColor: {
           type: 'pattern',

src/views/warningList/ShortCheck.vue

@@ -343,7 +343,7 @@
       </div>
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 10%;width: 100%;" label="稽核结果备注：" v-bind="labelCol1Note">
+        <a-form-model-item style="left: 5%;width: 100%;" label="稽核结果备注：" v-bind="labelCol1Note">
           <a-textarea style="height: 77px"
                       v-model="shotInfoModel.codeNumberDateResultRemark"