Commit 20cfda02 authored by wangqinghua's avatar wangqinghua

bug 修复

parent 1d08e6a6
...@@ -65,7 +65,7 @@ export class JhiMainComponent implements OnInit { ...@@ -65,7 +65,7 @@ export class JhiMainComponent implements OnInit {
} }
private getPageTitle(routeSnapshot: ActivatedRouteSnapshot) { private getPageTitle(routeSnapshot: ActivatedRouteSnapshot) {
let title: string = (routeSnapshot.data && routeSnapshot.data['pageTitle']) ? routeSnapshot.data['pageTitle'] : '智能监控'; let title: string = (routeSnapshot.data && routeSnapshot.data['pageTitle']) ? routeSnapshot.data['pageTitle'] : '智能运维监管平台';
if (routeSnapshot.firstChild) { if (routeSnapshot.firstChild) {
title = this.getPageTitle(routeSnapshot.firstChild) || title; title = this.getPageTitle(routeSnapshot.firstChild) || title;
} }
......
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<td class="round-tag tag-form"> <td class="round-tag tag-form">
{{data.officeName | stringSlice:8:8}} {{data.officeName | stringSlice:8:8}}
</td> </td>
<td>{{data.officePrincipal}}</td> <td>{{data.officePrincipal | stringSlice:8:8}}</td>
<td> <td>
{{data.yearly}} {{data.yearly}}
</td> </td>
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
<tbody> <tbody>
<tr *ngFor="let data of nzTable7.data"> <tr *ngFor="let data of nzTable7.data">
<td>{{data.name | stringSlice:8:8}}</td> <td>{{data.name | stringSlice:8:8}}</td>
<td>{{data.principal}}</td> <td>{{data.principal | stringSlice:8:8}}</td>
<td> <td>
<span *ngIf="data.type == 0">中心驻场</span> <span *ngIf="data.type == 0">中心驻场</span>
<span *ngIf="data.type == 1">中心运维</span> <span *ngIf="data.type == 1">中心运维</span>
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
<span *ngIf="data.type == 1">非驻场团队</span> <span *ngIf="data.type == 1">非驻场团队</span>
</td> </td>
<td>{{data.companyName | stringSlice:8:8}}</td> <td>{{data.companyName | stringSlice:8:8}}</td>
<td>{{data.principal}}</td> <td>{{data.principal | stringSlice:8:8}}</td>
</tr> </tr>
</tbody> </tbody>
</nz-table> </nz-table>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<tr *ngFor="let data of nzTable9.data"> <tr *ngFor="let data of nzTable9.data">
<td>{{data.projectName | stringSlice:8:8}}</td> <td>{{data.projectName | stringSlice:8:8}}</td>
<td>{{data.timeStr | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{data.timeStr | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.people}}</td> <td>{{data.people | stringSlice:8:8}}</td>
<td>{{data.costdescribe}}</td> <td>{{data.costdescribe}}</td>
<td>{{data.total}}</td> <td>{{data.total}}</td>
</tr> </tr>
......
...@@ -134,7 +134,7 @@ export class MyFollowComponent implements OnInit { ...@@ -134,7 +134,7 @@ export class MyFollowComponent implements OnInit {
this.loading.planLoading = true; this.loading.planLoading = true;
const obj = { const obj = {
pageNum: 1, pageNum: 1,
pageCount: 1000, pageCount: 100,
}; };
this.workSer.findPlanList(obj).subscribe( this.workSer.findPlanList(obj).subscribe(
(res) => { (res) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment