统计

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.ts

@@ -101,7 +101,8 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
       let dictionaryList = data || [];
-      dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      let flag = dictionaryList.some((item) => item.value === 'dateOther');
+      !flag && dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
       this.dictionaryList = dictionaryList;
       this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px');
       if (num !== undefined) {

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html

@@ -46,7 +46,7 @@
     </thead>
     <tbody>
       <tr *ngFor="let data of listOfData">
-        <td class="width150">{{ data.name }}<ng-container *ngIf="data.code">({{ data.code }})</ng-container></td>
+        <td class="width150">{{ data.name }}</td>
         <td>{{ data.totalCount }}</td>
         <td>{{ data.totalGrade }}</td>
         <ng-container *ngFor="let dictionary of dictionaryList">
@@ -58,7 +58,7 @@
     <ng-template #footerTpl>
       <table class="footTable">
         <tr *ngFor="let data of listOfDataEnd">
-          <td class="width150">{{ data.code }}</td>
+          <td class="width150">{{ data.name }}</td>
           <td>{{ data.totalCount }}</td>
           <td>{{ data.totalGrade }}</td>
           <ng-container *ngFor="let dictionary of dictionaryList">

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.ts

@@ -111,7 +111,8 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
       let dictionaryList = data || [];
-      dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      let flag = dictionaryList.some((item) => item.value === 'dateOther');
+      !flag && dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
       this.dictionaryList = dictionaryList;
       this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px').map((v, i) => { return i == 0 ? '150px' : '100px' });;
       if (num !== undefined) {

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html

@@ -46,7 +46,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.name }}<ng-container *ngIf="data.code">({{ data.code }})</ng-container></td>
+      <td>{{ data.name }}</td>
       <td>{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -60,7 +60,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.code }}</td>
+        <td style="width: 12%">{{ data.name }}</td>
         <td style="width: 11%">{{ data.totalCount }}</td>
         <td style="width: 11%">{{ data.totalGrade }}</td>
         <td style="width: 11%">{{ data.response_time_num }}</td>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html

@@ -46,7 +46,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.name }}<ng-container *ngIf="data.code">({{ data.code }})</ng-container></td>
+      <td>{{ data.name }}</td>
       <td>{{ data.totalCount }}</td>
       <td>{{ data.evaCount }}</td>
       <td>{{ data.eva1 }}</td>
@@ -60,7 +60,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.code }}</td>
+        <td style="width: 12%">{{ data.name }}</td>
         <td style="width: 11%">{{ data.totalCount }}</td>
         <td style="width: 11%">{{ data.evaCount }}</td>
         <td style="width: 11%">{{ data.eva1 }}</td>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html

@@ -42,7 +42,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.name }}<ng-container *ngIf="data.code">({{ data.code }})</ng-container></td>
+      <td>{{ data.name }}</td>
       <td>{{ data.service }}</td>
       <td>{{ data.nurse }}</td>
       <td>{{ data.system }}</td>
@@ -52,7 +52,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 20%">{{ data.code }}</td>
+        <td style="width: 20%">{{ data.name }}</td>
         <td style="width: 20%">{{ data.service }}</td>
         <td style="width: 20%">{{ data.nurse }}</td>
         <td style="width: 20%">{{ data.system }}</td>

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.html

@@ -46,7 +46,7 @@
     </thead>
     <tbody>
       <tr *ngFor="let data of listOfData">
-        <td class="width150">{{ data.name }}<ng-container *ngIf="data.account">({{ data.account }})</ng-container></td>
+        <td class="width150">{{ data.name }}</td>
         <td>{{ data.totalCount }}</td>
         <td>{{ data.totalGrade }}</td>
         <ng-container *ngFor="let dictionary of dictionaryList">
@@ -58,7 +58,7 @@
     <ng-template #footerTpl>
       <table class="footTable">
         <tr *ngFor="let data of listOfDataEnd">
-          <td class="width150">{{ data.account }}</td>
+          <td class="width150">{{ data.name }}</td>
           <td>{{ data.totalCount }}</td>
           <td>{{ data.totalGrade }}</td>
           <ng-container *ngFor="let dictionary of dictionaryList">

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.ts

@@ -111,7 +111,8 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
       let dictionaryList = data || [];
-      dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      let flag = dictionaryList.some((item) => item.value === 'dateOther');
+      !flag && dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
       this.dictionaryList = dictionaryList;
       this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px').map((v, i) => { return i == 0 ? '150px' : '100px' });
       if (num !== undefined) {
@@ -191,7 +192,7 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "userTransOrder", postData)
+      .postExportCustom("itsm/exportMergeTitle", "userTransOrder", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.html

@@ -44,7 +44,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.name }}<ng-container *ngIf="data.account">({{ data.account }})</ng-container></td>
+      <td>{{ data.name }}</td>
       <td>{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -58,7 +58,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.account }}</td>
+        <td style="width: 12%">{{ data.name }}</td>
         <td style="width: 11%">{{ data.totalCount }}</td>
         <td style="width: 11%">{{ data.totalGrade }}</td>
         <td style="width: 11%">{{ data.response_time_num }}</td>