Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc into develop

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/date-quality-control-statistics/date-quality-control-statistics.component.html

@@ -38,7 +38,7 @@
       <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
       <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
       <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均送达时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
       <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
       <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
       <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
@@ -51,7 +51,7 @@
       <td>{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
       <td>{{ data.response_time_num }}</td>
-      <td>{{ data.arrive_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
       <td>{{ data.total_time }}</td>
       <td>{{ data.five_count }}</td>
@@ -65,7 +65,7 @@
         <td style="width: 11%">{{ data.totalCount }}</td>
         <td style="width: 11%">{{ data.totalGrade }}</td>
         <td style="width: 11%">{{ data.response_time_num }}</td>
-        <td style="width: 11%">{{ data.arrive_time_num }}</td>
+        <td style="width: 11%">{{ data.execution_time_num }}</td>
         <td style="width: 11%">{{ data.aveper }}</td>
         <td style="width: 11%">{{ data.total_time }}</td>
         <td style="width: 11%">{{ data.five_count }}</td>

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

@@ -37,7 +37,7 @@
       <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
       <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
       <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均送达时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
       <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
       <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
       <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
@@ -46,11 +46,11 @@
   </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>
-      <td>{{ data.arrive_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
       <td>{{ data.total_time }}</td>
       <td>{{ data.five_count }}</td>
@@ -60,11 +60,11 @@
   <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>
-        <td style="width: 11%">{{ data.arrive_time_num }}</td>
+        <td style="width: 11%">{{ data.execution_time_num }}</td>
         <td style="width: 11%">{{ data.aveper }}</td>
         <td style="width: 11%">{{ data.total_time }}</td>
         <td style="width: 11%">{{ data.five_count }}</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

@@ -35,7 +35,7 @@
       <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
       <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
       <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均送达时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
       <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
       <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
       <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
@@ -44,11 +44,11 @@
   </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>
-      <td>{{ data.arrive_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
       <td>{{ data.total_time }}</td>
       <td>{{ data.five_count }}</td>
@@ -58,11 +58,11 @@
   <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>
-        <td style="width: 11%">{{ data.arrive_time_num }}</td>
+        <td style="width: 11%">{{ data.execution_time_num }}</td>
         <td style="width: 11%">{{ data.aveper }}</td>
         <td style="width: 11%">{{ data.total_time }}</td>
         <td style="width: 11%">{{ data.five_count }}</td>

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.component.ts

@@ -172,12 +172,13 @@ export class SynthesizeStatisticsComponent implements OnInit {
 					      type: 'shadow'
 					    }
 					  },
-					  grid: {
-					    left: '3%',
-					    right: '4%',
-					    bottom: '3%',
-					    containLabel: true
-					  },
+						grid: {
+							top: '10%',
+							left: '3%',  // grid布局设置适当调整避免X轴文字只能部分显示
+							right: '3%', // grid布局设置适当调整避免X轴文字只能部分显示
+							bottom: '6%',
+							containLabel: true
+						},
 					  xAxis: [
 					    {
 					      type: 'category',
@@ -185,7 +186,14 @@ export class SynthesizeStatisticsComponent implements OnInit {
 					      axisTick: {
 									show:false,
 					        alignWithLabel: true
-					      }
+					      },
+								axisLabel: {
+									show: true, // 是否显示刻度标签，默认显示
+									interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+									rotate: 0, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+									inside: false, // 刻度标签是否朝内，默认朝外
+									margin: 6, // 刻度标签与轴线之间的距离
+								}
 					    }
 					  ],
 					  yAxis: [
@@ -242,12 +250,13 @@ export class SynthesizeStatisticsComponent implements OnInit {
 		    	      type: 'shadow'
 		    	    }
 		    	  },
-		    	  grid: {
-		    	    left: '3%',
-		    	    right: '4%',
-		    	    bottom: '3%',
-		    	    containLabel: true
-		    	  },
+						grid: {
+							top: '10%',
+							left: '3%',  // grid布局设置适当调整避免X轴文字只能部分显示
+							right: '3%', // grid布局设置适当调整避免X轴文字只能部分显示
+							bottom: '6%',
+							containLabel: true
+						},
 		    	  xAxis: [
 		    	    {
 		    	      type: 'category',
@@ -255,7 +264,14 @@ export class SynthesizeStatisticsComponent implements OnInit {
 		    	      axisTick: {
 		    	  			show:false,
 		    	        alignWithLabel: true
-		    	      }
+		    	      },
+								axisLabel: {
+									show: true, // 是否显示刻度标签，默认显示
+									interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+									rotate: 0, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+									inside: false, // 刻度标签是否朝内，默认朝外
+									margin: 6, // 刻度标签与轴线之间的距离
+								}
 		    	    }
 		    	  ],
 		    	  yAxis: [