Browse Source

页面连数据

sunyize 2 years ago
parent
commit
afd20ea82c

+ 310 - 431
src/components/layouts/stock/Warning.vue

@@ -43,7 +43,39 @@
             </a-row>
           </a-form>
         </a-col>
-        <a-col :span="6" 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>
+                <arrow-up-outlined/>
+              </template>
+            </a-statistic>
+          </a-card>
+        </a-col>
+        <a-col :span="4" style="padding-top: 10px">
+          <a-card>
+            <a-statistic
+              title="未处理客户数量"
+              :value="noHandle"
+              :precision="0"
+              suffix="个"
+              :value-style="{ color: '#fa073f' }"
+              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="未完善客户数量"
@@ -59,7 +91,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="6" style="padding-top: 10px">
+        <a-col :span="4" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="待整改客户数量"
@@ -75,7 +107,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="6" style="padding-top: 10px">
+        <a-col :span="4" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="待稽核客户数量"
@@ -91,7 +123,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="6" style="padding-top: 10px">
+        <a-col :span="4" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="稽核通过客户数量"
@@ -114,7 +146,7 @@
         </a-col>
 
         <a-col :span="12" style="top: 10px">
-          <a-card title="码号维度预警图标" :bordered="false">
+          <a-card title="机构维度预警图标" :bordered="false">
             <div id="statusRefusePieNo" ref="statusRefusePieNo" style="width:100%;height:500px"></div>
           </a-card>
         </a-col>
@@ -305,6 +337,15 @@
                 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                 class="j-table-force-nowrap"
                 @change="handleTableChange">
+                <template v-slot:checkState="status">
+                  <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
+                </template>
+                <template v-slot:checkType="text">
+                  <a-badge  :text="text | checkType "/>
+                </template>
+                <template v-slot:rowIndex="text,records,index">
+                  {{ (ipagination.current - 1) * ipagination.pageSize + Number(index)+1 }}
+                </template>
               </a-table>
             </div>
             <!-- table区域 end -->
@@ -336,315 +377,33 @@ export default {
   data() {
     return {
       dataSource:[
-        {
-          "id": "1712649352008179713",
-          "dataId": "1712660980103651330",
-          "dataLogId": "1712661582091132929",
-          "taskId": "1712648713974849538",
-          "customerNo": "200001817629",
-          "customerName": null,
-          "smsNumber": null,
-          "userNo": "行短稽核任务1",
-          "networkAccessTime": "2010-10-11",
-          "networkAccessTimeEnd": "2012-10-11",
-          "userState": "在用",
-          "staffInfo": "张文超(104009353459)(B03619)",
-          "staffUsername": "zhangwenchao",
-          "staffName": "待处理",
-          "field": "码号证书到期",
-          "staffNameStart": "2023-10-10 19:23:17",
-
-          "staffNameEnd": "2023-10-12 20:33:17",
-          "staffNameTime": "50小时",
-          "staffNo": "1000",
-          "staffDeptLevel2": "北区电信局(2800000000)",
-          "staffDeptLevel2Name": "北区电信局",
-          "staffDeptLevel2No": "孙可",
-          "staffDeptLevel3": "其他(校园中心)(103013215530)",
-          "staffDeptLevel3Name": "其他(校园中心)",
-          "staffDeptLevel3No": "103013215530",
-          "userOpenState": null,
-          "smsNumberPrefix": null,
-          "smsNumberUsage": null,
-          "accountManager": null,
-          "accountManagerPhone": null,
-          "customerContacts": '行短稽核任务',
-          "customerContactsPhone": null,
-          "contractExpireTime": null,
-          "smsNumberCertificateExpireTime": null,
-          "recordNoticeExpireTime": null,
-          "valueAddedLicenceExpireTime": null,
-          "businessLicenceExpireTime": null,
-          "contractOpenCustomerSame": null,
-          "groupPriceApproval": null,
-          "dataComplete": null,
-          "rectifyReformOver": null,
-          "checkState": 500,
-          "description": null,
-          "delFlag": 0,
-          "createBy": "admin",
-          "createTime": "2023-10-13 10:00:00",
-          "updateBy": null,
-          "updateTime": null,
-          "sysOrgCode": "A03A02",
-          "submitSpecialDate": null,
-          "shutdownLabel": null,
-          "shutdownLabelDate": null,
-          "reopenTime": null,
-          "materialLabel": null,
-          "nameFindCompliance": null,
-          "type": null,
-          "checkState_dictText": "待稽核"
-        },
-        {
-          "id": "1712649353086115842",
-          "dataId": null,
-          "dataLogId": null,
-          "taskId": "1712648713974849538",
-          "customerNo": "200002340549",
-          "customerName": null,
-          "smsNumber": null,
-          "userNo": "行短稽核任务1",
-          "networkAccessTime": "2012-02-14",
-          "networkAccessTimeEnd": "2012-10-11",
-          "userState": "在用",
-          "staffInfo": "毛捷(1004320610)(A00776)",
-          "staffUsername": "A00776",
-          "staffName": "已处理",
-          "field": "合同到期时间到期",
-          "staffNameStart": "2023-10-10 19:23:17",
-          "staffNameEnd": "2023-10-12 15:16:17",
-          "staffNameTime": "44小时",
-          "staffNo": "2000",
-          "staffDeptLevel2": "北区电信局(2800000000)",
-          "staffDeptLevel2Name": "北区电信局",
-          "staffDeptLevel2No": "赵六",
-          "staffDeptLevel3": "北区电信局(2800000000)",
-          "staffDeptLevel3Name": "北区电信局",
-          "staffDeptLevel3No": "2800000000",
-          "userOpenState": null,
-          "smsNumberPrefix": null,
-          "smsNumberUsage": null,
-          "accountManager": null,
-          "accountManagerPhone": null,
-          "customerContacts": '行短稽核任务',
-          "customerContactsPhone": null,
-          "contractExpireTime": null,
-          "smsNumberCertificateExpireTime": null,
-          "recordNoticeExpireTime": null,
-          "valueAddedLicenceExpireTime": null,
-          "businessLicenceExpireTime": null,
-          "contractOpenCustomerSame": null,
-          "groupPriceApproval": null,
-          "dataComplete": null,
-          "rectifyReformOver": null,
-          "checkState": 500,
-          "description": null,
-          "delFlag": 0,
-          "createBy": "admin",
-          "createTime": "2023-10-13 10:00:00",
-          "updateBy": null,
-          "updateTime": null,
-          "sysOrgCode": "A03A02",
-          "submitSpecialDate": null,
-          "shutdownLabel": null,
-          "shutdownLabelDate": null,
-          "reopenTime": null,
-          "materialLabel": null,
-          "nameFindCompliance": null,
-          "type": null,
-          "checkState_dictText": "未处理"
-        },
-        {
-          "id": "1712649343284027393",
-          "dataId": null,
-          "dataLogId": null,
-          "taskId": "17126487139748495f38",
-          "customerNo": "104003061446",
-          "customerName": null,
-          "smsNumber": null,
-          "userNo": "中继线稽核任务1",
-          "networkAccessTime": "2013-08-05",
-          "networkAccessTimeEnd": "2012-10-11",
-          "userState": "在用",
-          "staffInfo": "张文超(104009353459)(B03619)",
-          "staffUsername": "zhangwenchao",
-          "staffName": "已处理",
-          "field": "资料不完整",
-          "staffNameStart": "2023-10-10 19:23:17",
-          "staffNameEnd": "2023-10-12 13:33:00",
-          "staffNameTime": "43小时",
-          "staffNo": "1500",
-          "staffDeptLevel2": "北区电信局(2800000000)",
-          "staffDeptLevel2Name": "北区电信局",
-          "staffDeptLevel2No": "王武",
-          "staffDeptLevel3": "其他(校园中心)(103013215530)",
-          "staffDeptLevel3Name": "其他(校园中心)",
-          "staffDeptLevel3No": "103013215530",
-          "userOpenState": null,
-          "smsNumberPrefix": null,
-          "smsNumberUsage": null,
-          "accountManager": null,
-          "accountManagerPhone": null,
-          "customerContacts": '中继线稽核',
-          "customerContactsPhone": null,
-          "contractExpireTime": null,
-          "smsNumberCertificateExpireTime": null,
-          "recordNoticeExpireTime": null,
-          "valueAddedLicenceExpireTime": null,
-          "businessLicenceExpireTime": null,
-          "contractOpenCustomerSame": null,
-          "groupPriceApproval": null,
-          "dataComplete": null,
-          "rectifyReformOver": null,
-          "checkState": 500,
-          "description": null,
-          "delFlag": 0,
-          "createBy": "admin",
-          "createTime": "2023-10-13 09:59:58",
-          "updateBy": null,
-          "updateTime": null,
-          "sysOrgCode": "A03A02",
-          "submitSpecialDate": null,
-          "shutdownLabel": null,
-          "shutdownLabelDate": null,
-          "reopenTime": null,
-          "materialLabel": null,
-          "nameFindCompliance": null,
-          "type": null,
-          "checkState_dictText": "未处理"
-        },
-        {
-          "id": "1712649344286466049",
-          "dataId": null,
-          "dataLogId": null,
-          "taskId": "1712648713974849538",
-          "customerNo": "104003061446",
-          "customerName": null,
-          "smsNumber": null,
-          "userNo": "特审复开任务1",
-          "networkAccessTime": "2013-04-03",
-          "networkAccessTimeEnd": "2012-10-11",
-          "userState": "在用",
-          "staffInfo": "张文超(104009353459)(B03619)",
-          "staffUsername": "zhangwenchao",
-          "staffName": "已处理",
-          "field": "未完成整改",
-          "staffNameStart": "2023-10-10 19:23:17",
-          "staffNameEnd": "2023-10-11 20:33:15",
-          "staffNameTime": "25小时",
-          "staffNo": "2500",
-          "staffDeptLevel2": "北区电信局(2800000000)",
-          "staffDeptLevel2Name": "北区电信局",
-          "staffDeptLevel2No": "李四",
-          "staffDeptLevel3": "其他(校园中心)(103013215530)",
-          "staffDeptLevel3Name": "其他(校园中心)",
-          "staffDeptLevel3No": "103013215530",
-          "userOpenState": null,
-          "smsNumberPrefix": null,
-          "smsNumberUsage": null,
-          "accountManager": null,
-          "accountManagerPhone": null,
-          "customerContacts": '特审复开稽核',
-          "customerContactsPhone": null,
-          "contractExpireTime": null,
-          "smsNumberCertificateExpireTime": null,
-          "recordNoticeExpireTime": null,
-          "valueAddedLicenceExpireTime": null,
-          "businessLicenceExpireTime": null,
-          "contractOpenCustomerSame": null,
-          "groupPriceApproval": null,
-          "dataComplete": null,
-          "rectifyReformOver": null,
-          "checkState": 300,
-          "description": null,
-          "delFlag": 0,
-          "createBy": "admin",
-          "createTime": "2023-10-13 09:59:58",
-          "updateBy": null,
-          "updateTime": null,
-          "sysOrgCode": "A03A02",
-          "submitSpecialDate": null,
-          "shutdownLabel": null,
-          "shutdownLabelDate": null,
-          "reopenTime": null,
-          "materialLabel": null,
-          "nameFindCompliance": null,
-          "type": null,
-          "checkState_dictText": "未处理"
-        },
-        {
-          "id": "1712649345687363585",
-          "dataId": null,
-          "dataLogId": null,
-          "taskId": "1712648713974849538",
-          "customerNo": "104004941911",
-          "customerName": null,
-          "smsNumber": null,
-          "userNo": "特审复开任务1",
-          "networkAccessTime": "2012-06-01",
-          "networkAccessTimeEnd": "2012-10-11",
-          "userState": "在用",
-          "staffInfo": "张文超(104009353459)(B03619)",
-          "staffUsername": "zhangwenchao",
-          "staffName": "处理中",
-          "field": "服务号码(全)",
-          "staffNameStart": "2023-10-10 19:23:17",
-          "staffNameEnd": "2023-10-12 19:33:17",
-          "staffNameTime": "10小时",
-          "staffNo": "3000",
-          "staffDeptLevel2": "北区电信局(2800000000)",
-          "staffDeptLevel2Name": "北区电信局",
-          "staffDeptLevel2No": "张三",
-          "staffDeptLevel3": "其他(校园中心)(103013215530)",
-          "staffDeptLevel3Name": "其他(校园中心)",
-          "staffDeptLevel3No": "103013215530",
-          "userOpenState": null,
-          "smsNumberPrefix": null,
-          "smsNumberUsage": null,
-          "accountManager": null,
-          "accountManagerPhone": null,
-          "customerContacts": '特审复开稽核',
-          "customerContactsPhone": null,
-          "contractExpireTime": null,
-          "smsNumberCertificateExpireTime": null,
-          "recordNoticeExpireTime": null,
-          "valueAddedLicenceExpireTime": null,
-          "businessLicenceExpireTime": null,
-          "contractOpenCustomerSame": null,
-          "groupPriceApproval": null,
-          "dataComplete": null,
-          "rectifyReformOver": null,
-          "checkState": 500,
-          "description": null,
-          "delFlag": 0,
-          "createBy": "admin",
-          "createTime": "2023-10-13 09:59:58",
-          "updateBy": null,
-          "updateTime": null,
-          "sysOrgCode": "A03A02",
-          "submitSpecialDate": null,
-          "shutdownLabel": null,
-          "shutdownLabelDate": null,
-          "reopenTime": null,
-          "materialLabel": null,
-          "nameFindCompliance": null,
-          "type": null,
-          "checkState_dictText": "未处理"
-        }
       ],
       columns: [
-
         {
-          title:'稽核类型',
+          title: '#',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
           align:"center",
-          sorter: true,
-          dataIndex: 'customerContacts'
+          scopedSlots: { customRender: 'rowIndex' }
         },
         {
-          title:'任务名称',
+          title:'稽核类型',
           align:"center",
-          dataIndex: 'userNo'
+          sorter: true,
+          dataIndex: 'type',
+          customRender: function (text) {
+            //客户信息所属类型:1:行短稽核 2:物联网业务稽核 3.复开审批 4.中继线稽核
+            if (text == '1') {
+              return "行短稽核";
+            } else if (text == "2") {
+              return "物联网业务稽核";
+            }  else if (text == "3") {
+              return "复开审批";
+            }  else if (text == "4") {
+              return "中继线稽核";
+            }
+          }
         },
         {
           title:'客户编号',
@@ -652,43 +411,51 @@ export default {
           sorter: true,
           dataIndex: 'customerNo'
         },
-
         {
-          title:'任务开始时间',
+          title:'用户编号',
+          align:"center",
+          dataIndex: 'userNo'
+        },
+        {
+          title:'入网时间',
           align:"center",
           sorter: true,
           dataIndex: 'networkAccessTime'
-        }, {
-          title:'任务结束时间',
+        },
+        {
+          title:'员工姓名',
+          align:"center",
+          dataIndex: 'staffName'
+        },
+        {
+          title:'员工编号',
           align:"center",
           sorter: true,
-          dataIndex: 'networkAccessTimeEnd'
+          dataIndex: 'staffNo'
         },
         {
-          title: '当前处理人',
+          title: '员工二级部门',
           align: "center",
-          dataIndex: 'staffDeptLevel2No'
+          dataIndex: 'staffDeptLevel2Name'
         },
         {
-          title:'整改时间',
-          align:"center",
-          dataIndex: 'staffNameStart'
-        } , {
-          title:'预警字段',
-          align:"center",
-          dataIndex: 'field'
-        } ,
-        {
-          title:'当前状态',
-          align:"center",
-          dataIndex: 'staffName'
+          title: '员工三级部门',
+          align: "center",
+          dataIndex: 'staffDeptLevel3Name'
         },
         {
-          title: '员工所在部门',
+          title: '创建时间',
           align: "center",
-          dataIndex: 'staffDeptLevel2Name'
+          dataIndex: 'createTime'
+        },
+        {
+          //0:未处理;1:未完善;2:待稽核;4:待整改;5:稽核通过;)
+          title:'预警稽核进度',
+          align:"center",
+          sorter: true,
+          dataIndex: 'warningState',
+          scopedSlots: { customRender: 'checkState' }
         }
-
       ],
       /* table选中keys*/
       selectedRowKeys: [],
@@ -706,8 +473,15 @@ export default {
       autoSearch: true,
       description: '稽核工作日志管理页面',
       taskDate: '',
+      warningListTask:null,
+      warningCountFiled:null,
+      getWarningCountOrg:null,
       taskType:'',
       url: {
+        lists: "/smsCheck/customerInfo/warningList",
+        "getWarningCountOrg":"/smsCheck/customerInfo/status/getWarningCountOrg",
+        "getWarningCount":"/smsCheck/customerInfo/status/getWarningCount",
+        "getTaksCount":"/smsCheck/customerInfo/status/getTaksCount",
         "statusRefuse": "/smsCheck/customerInfo/status/refuse",
         "taskList": "/smsCheck/task/list",
         "dateList": "/smsCheck/task/year/list",
@@ -732,6 +506,8 @@ export default {
       $abnormalCheckHistogram: "",
       $abnormalCreateTimeTrend: "",
       toImproveUser: 0,
+      allCount:0,
+      noHandle:0,
       latestDate: '180',
       toBeAudited: 0,
       tobeRectified: 0,
@@ -748,6 +524,7 @@ export default {
   created() {
     const waterMarkText = '智慧运营系统';
     this.canvas = document.createElement('canvas');
+    this.selectList()
     const ctx = this.canvas.getContext('2d');
     this.canvas.width = this.canvas.height = 100;
     ctx.textAlign = 'center';
@@ -766,13 +543,48 @@ export default {
     //稽核概况统计
     this.statusRefuse();
     //稽核历史异常分析
-    this.checkStateCount(this.url.checkStateCount);
+   // this.checkStateCount(this.url.checkStateCount);
     this.abnormalCreateTime();
 
 
   },
   computed: {},
-
+  filters: {
+
+    statusTypeFilter(type) {
+      const statusTypeMap = {
+        '0': 'error',
+        '1': 'purple',
+        '2': 'warning',
+        '3': 'warning',
+        '4': 'processing',
+        '5': 'success'
+      }
+      return statusTypeMap[type]
+    },
+    checkType(text) {
+      const statusMap = {
+        '0': '未处理',
+        '1': '未完善',
+        '2': '待稽核',
+        '3': '待稽核',
+        '4': '待整改',
+        '5': '通过'
+      }
+      return statusMap[text]
+    },
+    statusFilter(status) {
+      const statusMap = {
+        '0': '未处理',
+        '1': '未完善',
+        '2': '待稽核',
+        '3': '待稽核',
+        '4': '待整改',
+        '5': '通过'
+      }
+      return statusMap[status]
+    }
+  },
   methods: {
 
     changeReportDate(a, event){
@@ -789,12 +601,8 @@ export default {
     },
 
     handleChange(value,model){
-      this.taskDate = model
-      // model 当前value
+      this.taskDate = [this.getDate(this.taskDate[0]), this.getDate(this.taskDate[1])]
       this.statusRefuse(this.taskId);
-      this.checkStateCount(this.url.checkStateCount, this.taskId);
-      this.abnormalCreateTime(this.taskId);
-
     },
     // handleChange2(value,model){
     //   this.taskDate = model
@@ -1151,7 +959,26 @@ export default {
       )
 
     },
-
+    getWarningCountOrg1(){
+      let taskDate = this.taskDate;
+      let queryParam = {
+        "taskType":this.taskType,
+        "startDate": taskDate[0],
+        "endDate": taskDate[1],
+      }
+      getAction(this.url.getWarningCountOrg, queryParam).then((res) => {
+        if (res.success) {
+          debugger
+          if (!res.result){
+            this.getWarningCountOrg = []
+          }else {
+            this.getWarningCountOrg = res.result ;
+          }
+        }else{
+          this.$message.warning(res.message)
+        }
+      })
+    },
     //任务列表数据
     taskList() {
       let queryParam = {
@@ -1169,7 +996,40 @@ export default {
 
     },
 
-
+    getDate:function (n) {
+      let day = moment(n)
+        .format("YYYY-MM-DD");
+      return day;
+    },
+    selectList() {
+      this.loading = true;
+      let params = {
+        // customerNo: this.queryParam.customerNo,
+        // userNo: this.queryParam.userNo,
+        // checkState:this.currentCheckState,
+        // staffNo: this.queryParam.staffNo,
+        // type: this.queryParam.type
+      }
+      getAction(this.url.lists, params).then((res) => {
+        if (res.success) {
+          if (!res.result){
+            this.dataSource = []
+          }else {
+            this.dataSource = res.result.records ;
+          }
+          if(res.result && res.result.total) {
+            this.ipagination.total = res.result.total;
+          }else{
+            this.ipagination.total = 0;
+          }
+          //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
+        }else{
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     //查询各类型稽核进度
     statusRefuse(taskId) {
       let taskDate = this.taskDate;
@@ -1180,73 +1040,118 @@ export default {
         "taskId": taskId
       }
       if (taskDate.length = 2) {
-        getAction(this.url["statusRefuse"], queryParam).then(res => {
-          if (res.success) {
-            let builderJson = {};
-            let columnDate = {};
-            let pieDate = {};
-            let all = 0;
-            let resultList = res.resultList;
-            for (var i in resultList) {
-              let resultListElement = resultList[i];
-              let status = this.statusMap[resultListElement.checkState];
-              if (status != undefined && status != null) {
-                all = all + resultListElement.count
-                columnDate[status] = resultListElement.count
+            getAction(this.url["statusRefuse"], queryParam).then(res => {
+              if (res.success) {
+                let builderJson = {};
+                let columnDate = {};
+                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;
+                }
+                //稽核状态(0:未处理;1:未完善;2:待稽核;4:待整改;5:稽核通过;)
+                for (var i in resultList) {
+                  if (resultList[i].checkState == 0) {
+                    this.noHandle = resultList[i].count;
+                  }
+                  if (resultList[i].checkState == 1) {
+                    this.toImproveUser = resultList[i].count;
+                  }
+                  if (resultList[i].checkState == 2) {
+                    this.toBeAudited = resultList[i].count;
+                  }
+                  if (resultList[i].checkState == 4) {
+                    this.tobeRectified = resultList[i].count;
+                  }
+                  if (resultList[i].checkState == 5) {
+                    this.auditPassed = resultList[i].count;
+                  }
+                  let resultListElement = resultList[i];
+                  let status = this.statusMap[resultListElement.checkState];
+                  if (status != undefined && status != null) {
+                    all = all + resultListElement.count
+                    columnDate[status] = resultListElement.count
+                  }
+                  this.allCount = this.noHandle + this.toImproveUser + this.toBeAudited + this.tobeRectified + this.auditPassed
+                }
+                this.getTaksCount(builderJson);
+                this.getWarningCountOrg1(builderJson);
               }
-            }
-            builderJson = {
-              "all": all,
-              "charts": columnDate,
-              "ie": 9743
-            }
-            this.statusRefusePie(builderJson)
-            this.statusRefusePieNo(builderJson)
+            })
+          }
+    },
+
+    getTaksCount(data){
+      let taskDate = this.taskDate;
+      let queryParam = {
+        "taskType":this.taskType,
+        "startDate": taskDate[0],
+        "endDate": taskDate[1],
+      }
+      getAction(this.url.getTaksCount, queryParam).then((res) => {
+        if (res.success) {
+
+          if (!res.result){
+            this.warningListTask = []
+          }else {
+            this.warningListTask = res.result ;
+            this.getWarningCount(data);
+
+
           }
-        })
+
+        }else{
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    getWarningCount(data){
+      let taskDate = this.taskDate;
+      let queryParam = {
+        "taskType":this.taskType,
+        "startDate": taskDate[0],
+        "endDate": taskDate[1],
       }
+      getAction(this.url.getWarningCount, queryParam).then((res) => {
+        if (res.success) {
+
+          if (!res.result){
+            this.warningCountFiled = []
+          }else {
+            this.warningCountFiled = res.result ;
+            this.statusRefusePie(data)
+            this.statusRefusePieNo(data)
+
+          }
+
+        }else{
+          this.$message.warning(res.message)
+        }
+      })
     },
     statusRefusePie(builderJson) {
+      let allCount=this.warningListTask.all;
+      delete this.warningListTask.all
+
+      let allWarningCount=this.warningCountFiled.all;
+       delete this.warningCountFiled.all
       var myChart = echarts.init(document.getElementById('statusRefusePie'));
 
       builderJson = {
-        all: 10887,
-        charts: {
-          本年一月任务: 1593,
-          本年二月任务:  2060,
-          本年三月任务: 1537,
-          本年四月任务: 1908,
-          本年五月任务: 2107,
-          本年六月任务: 1692,
-          本年七月任务: 1568,
-        },
-        components: {
-          证件到期时间到期: 2984,
-          营业执照有效期到期: 2739,
-          合同到期时间: 2744,
-          码号证书有效期到期: 2466,
-          资料不完整: 3034,
-          未完成整改: 1945
-        },
+        all: allCount,
+        charts: this.warningListTask,
+        components: this.warningCountFiled,
         ie: 9743
       };
-      var downloadJson = {
-        本年一月任务: 1593,
-        本年二月任务:  2060,
-        本年三月任务: 1537,
-        本年四月任务: 1908,
-        本年五月任务: 2107,
-        本年六月任务: 1692,
-        本年七月任务: 1568,
-      };
-      var themeJson = {
-        证件到期时间到期: 2984,
-        营业执照有效期到期: 2739,
-        合同到期时间: 2744,
-        码号证书有效期到期: 2466,
-        资料不完整: 3034,
-        未完成整改: 1945
-      };
+
+      var downloadJson = this.warningListTask;
+      var themeJson = this.warningCountFiled;
       var waterMarkText = '北区稽核';
       var canvas = document.createElement('canvas');
       var ctx = canvas.getContext('2d');
@@ -1430,46 +1335,20 @@ export default {
       myChart.setOption(option);
     },
     statusRefusePieNo(builderJson) {
-      var myChart = echarts.init(document.getElementById('statusRefusePieNo'));
+
+      let allCount=this.getWarningCountOrg.all;
+      delete this.getWarningCountOrg.all
+
+       var myChart = echarts.init(document.getElementById('statusRefusePieNo'));
 
       builderJson = {
-        all: 50,
-        charts: {
-          '110-111': 13,
-          '311-112':  20,
-          '145-113': 37,
-          '198-114': 18,
-          '109-115': 7,
-          '382-116': 12,
-          '33-117': 18,
-        },
-        components: {
-          证件到期时间到期: 24,
-          营业执照有效期到期: 29,
-          合同到期时间: 24,
-          码号证书有效期到期: 26,
-          资料不完整: 34,
-          未完成整改: 15
-        },
+        all: allCount,
+        charts: this.getWarningCountOrg,
+        components: this.warningCountFiled,
         ie: 10
       };
-      var downloadJson = {
-        '110-111': 13,
-        '311-112':  20,
-        '145-113': 37,
-        '198-114': 18,
-        '109-115': 7,
-        '382-116': 12,
-        '33-117': 18,
-      };
-      var themeJson = {
-        证件到期时间到期: 24,
-        营业执照有效期到期: 29,
-        合同到期时间: 24,
-        码号证书有效期到期: 26,
-        资料不完整: 34,
-        未完成整改: 15
-      };
+      var downloadJson = this.getWarningCountOrg;
+      var themeJson =  this.warningCountFiled;
       var waterMarkText = '北区稽核';
       var canvas = document.createElement('canvas');
       var ctx = canvas.getContext('2d');

+ 80 - 36
src/components/layouts/stock/WorkTable.vue

@@ -201,6 +201,12 @@
                  :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                  class="j-table-force-nowrap"
                  @change="handleTableChange">
+
+                 <template slot="tooltipSlot" slot-scope="text, record, index">
+                   <a-tooltip placement="topLeft" :title="text">
+                     <div style="width:150px; overflow:hidden;">{{text}}</div>
+                   </a-tooltip>
+                 </template>
                </a-table>
              </div>
              <!-- table区域 end -->
@@ -236,6 +242,7 @@ export default {
       taskType:'',
       url: {
         "statusRefuse": "/smsCheck/customerInfo/status/refuse",
+        "getBillList": "/smsCheck/customerInfo/status/getBillList",
         "taskList": "/smsCheck/task/list",
         "dateList": "/smsCheck/task/year/list",
         //基本信息 规范信息  附件资料 异常稽核统计
@@ -563,61 +570,79 @@ export default {
           title:'稽核类型',
           align:"center",
           sorter: true,
-          dataIndex: 'customerContacts'
+          dataIndex: 'type',
+          customRender: function (text) {
+            //客户信息所属类型:1:行短稽核 2:物联网业务稽核 3.复开审批 4.中继线稽核
+            if (text == '1') {
+              return "行短稽核";
+            } else if (text == "2") {
+              return "物联网业务稽核";
+            }  else if (text == "3") {
+              return "复开审批";
+            }  else if (text == "4") {
+              return "中继线稽核";
+            }
+          }
         },
         {
           title:'任务名称',
           align:"center",
-          dataIndex: 'userNo'
+          dataIndex: 'task_name'
         },
         {
           title:'客户编号',
           align:"center",
           sorter: true,
-          dataIndex: 'customerNo'
+          dataIndex: 'customer_no'
+        },
+        {
+          title:'用户编号',
+          align:"center",
+          sorter: true,
+          dataIndex: 'user_no',
+          scopedSlots: { customRender: 'tooltipSlot' }
         },
 
         {
           title:'任务开始时间',
           align:"center",
           sorter: true,
-          dataIndex: 'networkAccessTime'
+          dataIndex: 'task_start_time'
         }, {
           title:'任务结束时间',
           align:"center",
           sorter: true,
-          dataIndex: 'networkAccessTimeEnd'
+          dataIndex: 'task_end_time'
         },
         {
           title: '当前处理人',
           align: "center",
-          dataIndex: 'staffDeptLevel2No'
+          dataIndex: 'staff_no'
         },
         {
-          title:'整改时间',
-          align:"center",
-          dataIndex: 'staffNameStart'
-        } , {
-          title:'整改字段',
-          align:"center",
-          dataIndex: 'field'
-        } ,
-        {
-          title:'整改次数',
+          title:'提交次数',
           align:"center",
-          dataIndex: 'number'
+          dataIndex: 'c'
         } ,
         {
-          title:'当前状态',
-          align:"center",
-          dataIndex: 'staffName'
-        },
-        {
-          title: '员工所在部门',
+          title: '当前状态',
           align: "center",
-          dataIndex: 'staffDeptLevel2Name'
+          dataIndex: 'check_state',
+          customRender: function(text) {
+            //客户信息所属类型:1:行短稽核 2:物联网业务稽核 3.复开审批 4.中继线稽核
+            if (text == '0') {
+              return "未处理";
+            } else if (text == "1") {
+              return "未完善";
+            } else if (text == "2") {
+              return "待稽核";
+            } else if (text == "4") {
+              return "待整改";
+            } else if (text == "5") {
+              return "稽核通过";
+            }
+          }
         }
-
       ],
       /* table选中keys*/
       selectedRowKeys: [],
@@ -674,7 +699,7 @@ export default {
     //稽核历史异常分析
     this.checkStateCount(this.url.checkStateCount);
     this.abnormalCreateTime();
-
+    this.getBillList();
 
   },
   computed: {},
@@ -682,12 +707,6 @@ export default {
   methods: {
 
     changeReportDate(a, event){
-      //当前 value this.latestDatec
-      //console.log(this.latestDate)
-      if (this.taskType ==='3'){
-        this.onTreeNodeSelect('all')
-      }
-
       this.taskDate = [this.getRecentDay(parseInt(this.latestDate)), this.getRecentDay(0)]
       this.statusRefuse(this.taskId);
       this.checkStateCount(this.url.checkStateCount, this.taskId);
@@ -695,11 +714,10 @@ export default {
     },
 
     handleChange(value,model){
-      this.taskDate = model
-      // model 当前value
+
+      this.taskDate = [this.getDate(this.taskDate[0]), this.getDate(this.taskDate[1])]
+
       this.statusRefuse(this.taskId);
-      this.checkStateCount(this.url.checkStateCount, this.taskId);
-      this.abnormalCreateTime(this.taskId);
 
     },
     // handleChange2(value,model){
@@ -710,6 +728,27 @@ export default {
     //   this.abnormalCreateTime(this.taskId);
     //
     // },
+
+    getBillList(){
+      getAction(this.url.getBillList).then((res) => {
+        if (res.success) {
+          if (!res.result) {
+            this.dataSource = []
+          } else {
+            this.dataSource = res.result.records;
+          }
+          if (res.result && res.result.total) {
+            this.ipagination.total = res.result.total;
+          } else {
+            this.ipagination.total = 0;
+          }
+          //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+
     abnormalCreateTime(infoId) {
       let taskDate = this.taskDate;
       let queryParam = {
@@ -1075,6 +1114,11 @@ export default {
 
     },
 
+    getDate:function (n) {
+      let day = moment(n)
+        .format("YYYY-MM-DD");
+      return day;
+    },
 
     //查询各类型稽核进度
     statusRefuse(taskId) {

+ 213 - 79
src/components/layouts/stock/ZgTable.vue

@@ -43,7 +43,39 @@
             </a-row>
           </a-form>
         </a-col>
-        <a-col :span="6" 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>
+                <arrow-up-outlined/>
+              </template>
+            </a-statistic>
+          </a-card>
+        </a-col>
+        <a-col :span="4" style="padding-top: 10px">
+          <a-card>
+            <a-statistic
+              title="未处理客户数量"
+              :value="noHandle"
+              :precision="0"
+              suffix="个"
+              :value-style="{ color: '#fa073f' }"
+              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="未完善客户数量"
@@ -59,7 +91,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="6" style="padding-top: 10px">
+        <a-col :span="4" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="待整改客户数量"
@@ -75,7 +107,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="6" style="padding-top: 10px">
+        <a-col :span="4" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="待稽核客户数量"
@@ -91,7 +123,7 @@
             </a-statistic>
           </a-card>
         </a-col>
-        <a-col :span="6" style="padding-top: 10px">
+        <a-col :span="4" style="padding-top: 10px">
           <a-card>
             <a-statistic
               title="稽核通过客户数量"
@@ -201,6 +233,11 @@
                 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                 class="j-table-force-nowrap"
                 @change="handleTableChange">
+                <template slot="tooltipSlot" slot-scope="text, record, index">
+                  <a-tooltip placement="topLeft" :title="text">
+                    <div style="width:150px; overflow:hidden;">{{text}}</div>
+                  </a-tooltip>
+                </template>
               </a-table>
             </div>
             <!-- table区域 end -->
@@ -535,55 +572,78 @@ export default {
           title:'稽核类型',
           align:"center",
           sorter: true,
-          dataIndex: 'customerContacts'
+          dataIndex: 'type',
+          customRender: function (text) {
+            //客户信息所属类型:1:行短稽核 2:物联网业务稽核 3.复开审批 4.中继线稽核
+            if (text == '1') {
+              return "行短稽核";
+            } else if (text == "2") {
+              return "物联网业务稽核";
+            }  else if (text == "3") {
+              return "复开审批";
+            }  else if (text == "4") {
+              return "中继线稽核";
+            }
+          }
         },
         {
           title:'任务名称',
           align:"center",
-          dataIndex: 'userNo'
+          dataIndex: 'task_name'
         },
         {
           title:'客户编号',
           align:"center",
           sorter: true,
-          dataIndex: 'customerNo'
+          dataIndex: 'customer_no'
+        },
+        {
+          title:'用户编号',
+          align:"center",
+          sorter: true,
+          dataIndex: 'user_no'
         },
-
         {
           title:'任务开始时间',
           align:"center",
           sorter: true,
-          dataIndex: 'networkAccessTime'
+          dataIndex: 'task_start_time'
         }, {
           title:'任务结束时间',
           align:"center",
           sorter: true,
-          dataIndex: 'networkAccessTimeEnd'
+          dataIndex: 'task_end_time'
         },
         {
           title: '当前处理人',
           align: "center",
-          dataIndex: 'staffDeptLevel2No'
-        },
-        {
-          title:'整改时间',
-          align:"center",
-          dataIndex: 'staffNameStart'
-        } , {
+          dataIndex: 'staff_no'
+        }, {
           title:'整改字段',
           align:"center",
-          dataIndex: 'field'
+          dataIndex: 'filed',
+          scopedSlots: { customRender: 'tooltipSlot' }
         } ,
         {
           title:'当前状态',
           align:"center",
-          dataIndex: 'staffName'
+          dataIndex: 'check_state',
+          customRender: function (text) {
+            //客户信息所属类型:1:行短稽核 2:物联网业务稽核 3.复开审批 4.中继线稽核
+            if (text == '0') {
+              return "未处理";
+            } else if (text == "1") {
+              return "未完善";
+            } else if (text == "2") {
+              return "待稽核";
+            } else if (text == "4") {
+              return "待整改";
+            } else if (text == "5") {
+              return "稽核通过";
+            }
+          }
         },
-        {
-          title: '员工所在部门',
-          align: "center",
-          dataIndex: 'staffDeptLevel2Name'
-        }
+
 
       ],
       /* table选中keys*/
@@ -602,9 +662,14 @@ export default {
       autoSearch: true,
       description: '稽核工作日志管理页面',
       taskDate: '',
+      zLmapDate:null,
+      jBmapDate:{},
       taskType:'',
       url: {
+        lists: "/smsCheck/customerInfo/status/getHistory",
         "statusRefuse": "/smsCheck/customerInfo/status/refuse",
+        "getTableView":"/smsCheck/customerInfo/status/getTableView",
+        "getTableViewJb":"/smsCheck/customerInfo/status/getTableViewJb",
         "taskList": "/smsCheck/task/list",
         "dateList": "/smsCheck/task/year/list",
         //基本信息 规范信息  附件资料 异常稽核统计
@@ -627,6 +692,8 @@ export default {
       $abnormalCheckPie: "",
       $abnormalCheckHistogram: "",
       $abnormalCreateTimeTrend: "",
+      allCount:0,
+      noHandle:0,
       toImproveUser: 0,
       latestDate: '180',
       toBeAudited: 0,
@@ -653,6 +720,7 @@ export default {
     ctx.translate(50, 50);
     ctx.rotate(-Math.PI / 4);
     ctx.fillText(waterMarkText, 0, 0);
+    this.selectList()
 
     //初始化日期 默认最近180天
     this.taskDate = [this.getRecentDay(parseInt(this.latestDate)), this.getRecentDay(0)]
@@ -670,26 +738,17 @@ export default {
   computed: {},
 
   methods: {
-
     changeReportDate(a, event){
-      //当前 value this.latestDatec
-      //console.log(this.latestDate)
-      if (this.taskType ==='3'){
-        this.onTreeNodeSelect('all')
-      }
-
       this.taskDate = [this.getRecentDay(parseInt(this.latestDate)), this.getRecentDay(0)]
       this.statusRefuse(this.taskId);
-      this.checkStateCount(this.url.checkStateCount, this.taskId);
-      this.abnormalCreateTime(this.taskId);
     },
 
     handleChange(value,model){
-      this.taskDate = model
-      // model 当前value
+
+      this.taskDate = [this.getDate(this.taskDate[0]), this.getDate(this.taskDate[1])]
+       
       this.statusRefuse(this.taskId);
-      this.checkStateCount(this.url.checkStateCount, this.taskId);
-      this.abnormalCreateTime(this.taskId);
+
 
     },
     // handleChange2(value,model){
@@ -731,7 +790,82 @@ export default {
       })
 
     },
+    getTableViewJb(data){
+      let taskDate = this.taskDate;
+      let queryParam = {
+        "taskType":this.taskType,
+        "startDate": taskDate[0],
+        "endDate": taskDate[1],
+      }
+      getAction(this.url.getTableViewJb, queryParam).then((res) => {
+        if (res.success) {
 
+          if (!res.result){
+            this.jBmapDate = []
+          }else {
+            this.jBmapDate = res.result ;
+            this.statusRefusePie(data)
+          }
+
+        }else{
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    getTableView(data){
+      let taskDate = this.taskDate;
+      let queryParam = {
+        "taskType":this.taskType,
+        "startDate": taskDate[0],
+        "endDate": taskDate[1],
+      }
+      getAction(this.url.getTableView, queryParam).then((res) => {
+        if (res.success) {
+
+          if (!res.result){
+            this.zLmapDate = []
+          }else {
+            this.zLmapDate = res.result ;
+            this.getTableViewJb(data)
+
+          }
+
+        }else{
+          this.$message.warning(res.message)
+        }
+      })
+    },
+
+    selectList() {
+      this.loading = true;
+      let params = {
+        customerNo: this.queryParam.customerNo,
+        userNo: this.queryParam.userNo,
+        checkState:this.currentCheckState,
+        staffNo: this.queryParam.staffNo,
+        type: this.queryParam.type
+      }
+      getAction(this.url.lists, params).then((res) => {
+        if (res.success) {
+           
+          if (!res.result){
+            this.dataSource = []
+          }else {
+            this.dataSource = res.result.records ;
+          }
+          if(res.result && res.result.total) {
+            this.ipagination.total = res.result.total;
+          }else{
+            this.ipagination.total = 0;
+          }
+          //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
+        }else{
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     abnormalCreateTimetrend(dateList, valueList) {
       let option = {
         title: {
@@ -1083,65 +1217,59 @@ 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;
+            }
+            //稽核状态(0:未处理;1:未完善;2:待稽核;4:待整改;5:稽核通过;)
             for (var i in resultList) {
+              if (resultList[i].checkState==0){
+                this.noHandle=resultList[i].count;
+              }
+              if (resultList[i].checkState==1){
+                this.toImproveUser=resultList[i].count;
+              }
+              if (resultList[i].checkState==2){
+                this.toBeAudited=resultList[i].count;
+              }
+              if (resultList[i].checkState==4){
+                this.tobeRectified=resultList[i].count;
+              }
+              if (resultList[i].checkState==5){
+                this.auditPassed=resultList[i].count;
+              }
               let resultListElement = resultList[i];
               let status = this.statusMap[resultListElement.checkState];
               if (status != undefined && status != null) {
                 all = all + resultListElement.count
                 columnDate[status] = resultListElement.count
               }
+              this.allCount =this.noHandle+this.toImproveUser+this.toBeAudited+this.tobeRectified+this.auditPassed
             }
-            builderJson = {
-              "all": all,
-              "charts": columnDate,
-              "ie": 9743
-            }
-            this.statusRefusePie(builderJson)
+            this.getTableView(builderJson)
+
+
           }
         })
       }
     },
     statusRefusePie(builderJson) {
+      let allCount=this.zLmapDate.all;
+      delete this.zLmapDate.all
+      delete this.jBmapDate.all
       var myChart = echarts.init(document.getElementById('statusRefusePie'));
-
       builderJson = {
-        all: 10887,
-        charts: {
-          诺书上传资料备注: 1593,
-          短信模板上传资料备注: 2060,
-          入网签报上传资料备注: 1537,
-          经办人证件资料上传资料备注: 1908,
-          间资料上传资料备注: 2107,
-          测试卡申请单稽核结果备注: 1692,
-          基本信息稽核结果备注: 1568,
-        },
-        components: {
-          更新日期: 2984,
-          备案通知到期时间: 2739,
-          合同到期时间: 2744,
-          营业执照到期时间: 2466,
-          用户发展员工: 3034,
-          码号: 1945
-        },
+        all: allCount,
+        charts:  this.zLmapDate ,
+        components:  this.jBmapDate ,
         ie: 9743
       };
-      var downloadJson = {
-        诺书上传资料备注: 1593,
-        短信模板上传资料备注: 2060,
-        入网签报上传资料备注: 1537,
-        经办人证件资料上传资料备注: 1908,
-        间资料上传资料备注: 2107,
-        测试卡申请单稽核结果备注: 1692,
-        基本信息稽核结果备注: 1568,
-      };
-      var themeJson = {
-        更新日期: 2984,
-        备案通知到期时间: 2739,
-        合同到期时间: 2744,
-        营业执照到期时间: 2466,
-        用户发展员工: 3034,
-        码号: 1945
-      };
+      var downloadJson =  this.zLmapDate;
+      var themeJson =   this.jBmapDate ;
       var waterMarkText = 'ECHARTS';
       var canvas = document.createElement('canvas');
       var ctx = canvas.getContext('2d');
@@ -1325,6 +1453,12 @@ export default {
       myChart.setOption(option);
     },
 
+    getDate:function (n) {
+      let day = moment(n)
+        .format("YYYY-MM-DD");
+      return day;
+    },
+
     getRecentDay: function (n) {
       let day = moment(new Date())
         .subtract(n, "days")