zhangwenya 10 ay önce
ebeveyn
işleme
44c18ed6c4
53 değiştirilmiş dosya ile 105 ekleme ve 90 silme
  1. 1 1
      src/main/angular/src/app/core/components/agent-search-input/agent-search-input-container.component.ts
  2. 1 1
      src/main/angular/src/app/core/components/agent-statistic-chart/agent-statistic-chart-container.component.ts
  3. 1 1
      src/main/angular/src/app/core/components/application-inspector-usage-guide/application-inspector-usage-guide-container.component.html
  4. 1 1
      src/main/angular/src/app/core/components/application-inspector-usage-guide/application-inspector-usage-guide-container.component.ts
  5. 1 1
      src/main/angular/src/app/core/components/application-list/application-list-for-header-container.component.html
  6. 5 5
      src/main/angular/src/app/core/components/application-list/application-list-for-header-container.component.ts
  7. 3 3
      src/main/angular/src/app/core/components/inbound-outbound-range-selector/inbound-outbound-range-selector.component.html
  8. 2 2
      src/main/angular/src/app/core/components/info-per-server/info-per-server-container.component.html
  9. 2 2
      src/main/angular/src/app/core/components/info-per-server/info-per-server-for-filtered-map-container.component.html
  10. 2 2
      src/main/angular/src/app/core/components/inspector-chart/agent-data-source-chart-container.component.ts
  11. 2 2
      src/main/angular/src/app/core/components/inspector-chart/application-data-source-chart-container.component.ts
  12. 2 2
      src/main/angular/src/app/core/components/inspector-chart/inspector-chart-container.component.ts
  13. 2 2
      src/main/angular/src/app/core/components/inspector-chart/transaction-view-chart-container.component.ts
  14. 1 1
      src/main/angular/src/app/core/components/load-avg-max-chart/load-avg-max-chart-container.component.html
  15. 2 3
      src/main/angular/src/app/core/components/load-avg-max-chart/load-avg-max-chart-container.component.ts
  16. 1 0
      src/main/angular/src/app/core/components/load-avg-max-chart/load-avg-max-chart.component.ts
  17. 1 1
      src/main/angular/src/app/core/components/load-chart/load-chart-container.component.html
  18. 2 2
      src/main/angular/src/app/core/components/load-chart/load-chart-container.component.ts
  19. 1 1
      src/main/angular/src/app/core/components/period-selector/period-selector-container.component.ts
  20. 6 6
      src/main/angular/src/app/core/components/period-selector/period-selector-using-calendar.component.html
  21. 1 1
      src/main/angular/src/app/core/components/period-selector/period-selector-using-reserved-time.component.html
  22. 1 1
      src/main/angular/src/app/core/components/response-avg-max-chart/response-avg-max-chart-container.component.html
  23. 2 2
      src/main/angular/src/app/core/components/response-avg-max-chart/response-avg-max-chart-container.component.ts
  24. 1 1
      src/main/angular/src/app/core/components/response-summary-chart/response-summary-chart-container.component.html
  25. 2 2
      src/main/angular/src/app/core/components/response-summary-chart/response-summary-chart-container.component.ts
  26. 3 3
      src/main/angular/src/app/core/components/scatter-chart/scatter-chart-container.component.ts
  27. 3 3
      src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-filtered-map-info-per-server-container.component.ts
  28. 3 3
      src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-filtered-map-side-bar-container.component.ts
  29. 3 3
      src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-full-screen-mode-container.component.ts
  30. 3 3
      src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-info-per-server-container.component.ts
  31. 1 1
      src/main/angular/src/app/core/components/scatter-chart/scatter-chart-state-view.component.ts
  32. 1 1
      src/main/angular/src/app/core/components/server-and-agent-list/server-and-agent-list-container.component.ts
  33. 2 2
      src/main/angular/src/app/core/components/server-map-search-result-viewer/server-map-search-result-viewer-container.component.ts
  34. 4 4
      src/main/angular/src/app/core/components/server-status/server-status-container.component.html
  35. 1 1
      src/main/angular/src/app/core/components/timeline-command-group/timeline-command-group.component.html
  36. 1 1
      src/main/angular/src/app/core/components/transaction-id-search/transaction-id-search-container.component.html
  37. 1 1
      src/main/angular/src/app/core/components/transaction-search/transaction-search-container.component.ts
  38. 1 1
      src/main/angular/src/app/core/components/transaction-table-grid/transaction-table-grid-container.component.ts
  39. 4 4
      src/main/angular/src/app/core/models/period.ts
  40. 1 1
      src/main/angular/src/app/routes/error-page/error-page.component.css
  41. 1 1
      src/main/angular/src/app/routes/error-page/error-page.component.html
  42. 5 2
      src/main/angular/src/app/routes/error-page/error-page.component.ts
  43. 1 1
      src/main/angular/src/app/shared/components/header-logo/header-logo.component.html
  44. 1 1
      src/main/angular/src/assets/i18n/en.json
  45. BIN
      src/main/angular/src/assets/img/loading.png
  46. BIN
      src/main/angular/src/assets/img/logo.png
  47. BIN
      src/main/angular/src/assets/img/logo_bk.png
  48. BIN
      src/main/angular/src/favicon-16x16.png
  49. BIN
      src/main/angular/src/favicon-32x32.png
  50. BIN
      src/main/angular/src/favicon.ico
  51. 4 3
      src/main/angular/src/index.html
  52. 13 2
      src/main/angular/src/main.css
  53. 2 2
      src/main/angular/src/proxy.conf.js

+ 1 - 1
src/main/angular/src/app/core/components/agent-search-input/agent-search-input-container.component.ts

@@ -33,7 +33,7 @@ export class AgentSearchInputContainerComponent implements OnInit {
     }
 
     private getI18NText(): void {
-        this.translateService.get('COMMON.MIN_LENGTH').subscribe((i18n: string) => {
+        this.translateService.get('请输入...').subscribe((i18n: string) => {
             this.i18nText.MIN_LENGTH_MSG = this.translateReplaceService.replace(i18n, this.SEARCH_MIN_LENGTH);
         });
     }

+ 1 - 1
src/main/angular/src/app/core/components/agent-statistic-chart/agent-statistic-chart-container.component.ts

@@ -25,7 +25,7 @@ export class AgentStatisticChartContainerComponent implements OnInit {
     ) {}
 
     ngOnInit() {
-        this.emptyText$ = this.translateService.get('COMMON.NO_DATA');
+        this.emptyText$ = this.translateService.get('暂无数据');
         this.chartData$ = this.storeHelperService.getAgentList(this.unsubscribe).pipe(
             filter((data: IAgentList) => !!data),
             map((data: IAgentList) => this.makeChartData(data))

+ 1 - 1
src/main/angular/src/app/core/components/application-inspector-usage-guide/application-inspector-usage-guide-container.component.html

@@ -1,4 +1,4 @@
 <section class="l-guide-wrapper">
-    <h4 class="l-guide-title"><span class="fas fa-exclamation-circle"></span>Warning</h4>
+    <h4 class="l-guide-title"><span class="fas fa-exclamation-circle"></span>警告</h4>
     <p class="l-guide-text" [innerHTML]="guideMessage$ | async | jsonTextParser | safeHtml"></p>
 </section>

+ 1 - 1
src/main/angular/src/app/core/components/application-inspector-usage-guide/application-inspector-usage-guide-container.component.ts

@@ -15,6 +15,6 @@ export class ApplicationInspectorUsageGuideContainerComponent implements OnInit
     ) {}
 
     ngOnInit() {
-        this.guideMessage$ = this.translateService.get('INSPECTOR.APPLICATION_INSPECTOR_USAGE_GUIDE_MESSAGE');
+        this.guideMessage$ = this.translateService.get('检查器应用程序检查器使用指南消息');
     }
 }

+ 1 - 1
src/main/angular/src/app/core/components/application-list/application-list-for-header-container.component.html

@@ -40,7 +40,7 @@
                 (outFocused)="onFocused($event)">
             </pp-application-list-for-header>
         </div>
-        <button class="btn btn-blue l-reload-button" (click)="onReload()">Reload <span class="fas fa-sync" [class.fa-spin]="showLoading"></span></button>
+        <button class="btn btn-blue l-reload-button" (click)="onReload()">刷新<span class="fas fa-sync" [class.fa-spin]="showLoading"></span></button>
         <pp-film-for-disable *ngIf="useDisable" [zIndex]="9" [marginWidth]="0"></pp-film-for-disable>    
         <pp-loading [showLoading]="showLoading" [zIndex]="11"></pp-loading>
     </div>

+ 5 - 5
src/main/angular/src/app/core/components/application-list/application-list-for-header-container.component.ts

@@ -178,11 +178,11 @@ export class ApplicationListForHeaderContainerComponent implements OnInit, After
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.INPUT_APP_NAME_PLACE_HOLDER'),
-            this.translateService.get('MAIN.APP_LIST'),
-            this.translateService.get('MAIN.FAVORITE_APP_LIST'),
-            this.translateService.get('COMMON.SELECT_YOUR_APP'),
-            this.translateService.get('COMMON.EMPTY_ON_SEARCH')
+            this.translateService.get('输入应用程序名称'),
+            this.translateService.get('应用程序列表'),
+            this.translateService.get('收藏的应用程序列表'),
+            this.translateService.get('选择你的应用'),
+            this.translateService.get('暂无应用')
         ).subscribe((i18n: string[]) => {
             this.i18nText.INPUT_APPLICATION_NAME = i18n[0];
             this.i18nText.APPLICATION_LIST_TITLE = i18n[1];

+ 3 - 3
src/main/angular/src/app/core/components/inbound-outbound-range-selector/inbound-outbound-range-selector.component.html

@@ -6,7 +6,7 @@
     </button>
     <div class="l-dropdown-menu-wrapper" [hidden]="hideList">
         <dl class="l-inbound-list">
-            <dt class="l-bound-title">Inbound</dt>
+            <dt class="l-bound-title">Inbound1</dt>
             <dd *ngFor="let inbound of inboundList" class="l-bound-list-item" [class.active]="selectedInbound === inbound" (click)="onSelectInbound(inbound)">{{inbound}}</dd>
         </dl>
         <dl class="l-outbound-list">
@@ -14,8 +14,8 @@
             <dd *ngFor="let outbound of outboundList" class="l-bound-list-item" [class.active]="selectedOutbound === outbound" (click)="onSelectOutbound(outbound)">{{outbound}}</dd>
         </dl>
         <div class="l-button-group-wrapper">
-            <button class="btn l-cancel-button" (click)="onCancel()">Cancel</button>
-            <button class="btn l-apply-button" (click)="onApply()">Apply</button>
+            <button class="btn l-cancel-button" (click)="onCancel()">取消</button>
+            <button class="btn l-apply-button" (click)="onApply()">应用</button>
         </div>
     </div>
 </div>

+ 2 - 2
src/main/angular/src/app/core/components/info-per-server/info-per-server-container.component.html

@@ -1,7 +1,7 @@
 <div class="l-sidemenu2" [@chartAnimationTrigger]="chartAnimationTrigger">
     <div class="l-title-group2">
         <div class="l-selected-agent">
-            <label>Selected Agent</label>
+            <label>选择代理</label>
             <span title="{{selectedAgentName ? selectedAgentName : 'N/A'}}">{{selectedAgent}} ({{selectedAgentName ? selectedAgentName : "N/A"}})</span>
         </div>
     </div>
@@ -22,7 +22,7 @@
 <div class="l-sidemenu3" [@listAnimationTrigger]="listAnimationTrigger">
     <div class="l-title-group3">
         <span class="fas fa-file-alt"></span>
-        <span class="l-title">Servers List</span>
+        <span class="l-title">服务器列表</span>
     </div>
     <div class="l-contents-group">
         <ng-container *ngIf="agentHistogramData">

+ 2 - 2
src/main/angular/src/app/core/components/info-per-server/info-per-server-for-filtered-map-container.component.html

@@ -1,7 +1,7 @@
 <div class="l-sidemenu2" [@chartAnimationTrigger]="chartAnimationTrigger">
     <div class="l-title-group2">
         <p class="l-selected-agent">
-            <button>Selected Agent</button>
+            <button>选择代理</button>
             <span [attr.title]="selectedAgent">{{selectedAgent}}</span>
         </p>
     </div>
@@ -22,7 +22,7 @@
 <div class="l-sidemenu3" [@listAnimationTrigger]="listAnimationTrigger">
     <div class="l-title-group3">
         <span class="fas fa-file-alt"></span>
-        <span class="l-title">Servers List</span>
+        <span class="l-title">服务器列表</span>
     </div>
     <div class="l-contents-group">
         <ng-container *ngIf="agentHistogramData">

+ 2 - 2
src/main/angular/src/app/core/components/inspector-chart/agent-data-source-chart-container.component.ts

@@ -78,8 +78,8 @@ export class AgentDataSourceChartContainerComponent implements OnInit, OnDestroy
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;

+ 2 - 2
src/main/angular/src/app/core/components/inspector-chart/application-data-source-chart-container.component.ts

@@ -65,8 +65,8 @@ export class ApplicationDataSourceChartContainerComponent implements OnInit, OnD
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;

+ 2 - 2
src/main/angular/src/app/core/components/inspector-chart/inspector-chart-container.component.ts

@@ -83,8 +83,8 @@ export class InspectorChartContainerComponent implements OnInit, OnDestroy {
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;

+ 2 - 2
src/main/angular/src/app/core/components/inspector-chart/transaction-view-chart-container.component.ts

@@ -69,8 +69,8 @@ export class TransactionViewChartContainerComponent implements OnInit, OnDestroy
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;

+ 1 - 1
src/main/angular/src/app/core/components/load-avg-max-chart/load-avg-max-chart-container.component.html

@@ -1,6 +1,6 @@
 <article class="l-chart-item">
     <div class="l-tool-box">
-        <p class="l-title">Load Avg & Max</p>
+        <p class="l-title">负载平均值和最大值</p>
     </div>
     <div class="l-content-section">
         <pp-loading [showLoading]="showLoading" [zIndex]="10"></pp-loading>

+ 2 - 3
src/main/angular/src/app/core/components/load-avg-max-chart/load-avg-max-chart-container.component.ts

@@ -128,8 +128,8 @@ export class LoadAvgMaxChartContainerComponent implements OnInit, OnDestroy {
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;
@@ -294,7 +294,6 @@ export class LoadAvgMaxChartContainerComponent implements OnInit, OnDestroy {
 
     private makeDataOption(columns: PrimitiveArray[]): Data {
         const keyList = columns.slice(1).map(([key]: PrimitiveArray) => key as string);
-
         return {
             x: 'x',
             columns,

+ 1 - 0
src/main/angular/src/app/core/components/load-avg-max-chart/load-avg-max-chart.component.ts

@@ -39,6 +39,7 @@ export class LoadAvgMaxChartComponent implements OnInit, OnChanges {
             ...this.chartConfig.elseConfig,
             onrendered: () => this.finishLoading(),
         });
+
     }
 
     private updateChart({previousValue, currentValue}: {previousValue: IChartConfig, currentValue: IChartConfig}): void {

+ 1 - 1
src/main/angular/src/app/core/components/load-chart/load-chart-container.component.html

@@ -1,6 +1,6 @@
 <article class="l-chart-item">
     <div class="l-tool-box">
-        <p class="l-title">Load</p>
+        <p class="l-title">负载</p>
         <button class="fas fa-question-circle" (click)="onShowHelp($event)"></button>
     </div>
     <div class="l-content-section">

+ 2 - 2
src/main/angular/src/app/core/components/load-chart/load-chart-container.component.ts

@@ -139,8 +139,8 @@ export class LoadChartContainerComponent implements OnInit, OnDestroy {
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;

+ 1 - 1
src/main/angular/src/app/core/components/period-selector/period-selector-container.component.ts

@@ -90,7 +90,7 @@ export class PeriodSelectorContainerComponent implements OnInit, OnDestroy {
     }
 
     private getI18NText(): void {
-        this.translateService.get('COMMON.MAX_SEARCH_PERIOD').subscribe((i18n: string) => {
+        this.translateService.get('最大搜索周期').subscribe((i18n: string) => {
             this.i18nText.MAX_PERIOD = this.translateReplaceService.replace(i18n, this.maxPeriod / 24 / 60);
         });
     }

+ 6 - 6
src/main/angular/src/app/core/components/period-selector/period-selector-using-calendar.component.html

@@ -17,15 +17,15 @@
                     </div>
                     <ul class="l-set-group">
                         <li>
-                            <span>Time</span>{{getStartTime()}}</li>
+                            <span>时间</span>{{getStartTime()}}</li>
                         <li>
-                            <span>Hour</span>
+                            <span>小时</span>
                             <select (change)="onChangeStartHour($event.target.value)">
                                 <option *ngFor="let oHour of hours" value="{{oHour.value}}" [selected]="oHour.value == startDate.hour()">{{oHour.display}}</option>
                             </select>
                         </li>
                         <li>
-                            <span>Minute</span>
+                            <span>分钟</span>
                             <select (change)="onChangeStartMinute($event.target.value)">
                                 <option *ngFor="let oMinute of minutes" value="{{oMinute.value}}" [selected]="oMinute.value == startDate.minute()">{{oMinute.display}}</option>
                             </select>
@@ -41,15 +41,15 @@
                     </div>
                     <ul class="l-set-group">
                         <li>
-                            <span>Time</span>{{getEndTime()}}</li>
+                            <span>时间</span>{{getEndTime()}}</li>
                         <li>
-                            <span>Hour</span>
+                            <span>小时</span>
                             <select (change)="onChangeEndHour($event.target.value)">
                                 <option *ngFor="let oHour of hours" value="{{oHour.value}}" [selected]="oHour.value == endDate.hour()">{{oHour.display}}</option>
                             </select>
                         </li>
                         <li>
-                            <span>Minute</span>
+                            <span>分钟</span>
                             <select (change)="onChangeEndMinute($event.target.value)">
                                 <option *ngFor="let oMinute of minutes" value="{{oMinute.value}}" [selected]="oMinute.value == endDate.minute()">{{oMinute.display}}</option>
                             </select>

+ 1 - 1
src/main/angular/src/app/core/components/period-selector/period-selector-using-reserved-time.component.html

@@ -1,6 +1,6 @@
 <ul class="l-time-set" (click)="onSelectPeriod($event)" [hidden]="isHidden">
     <li *ngIf="showRealTimeButton">
-        <button [class.active]="isRealTimeMode" [attr.data-period]="'realtime'">REAL TIME</button>
+        <button [class.active]="isRealTimeMode" [attr.data-period]="'realtime'">实时</button>
     </li>
     <li *ngFor="let period of periodList; let i = index">
         <button [class.active]="isSelectedPeriod(period)" [attr.data-period]="period.getValueWithTime()">{{i === 0 ? period.getValueWithAddedWords() : period.getValueWithTime()}}</button>

+ 1 - 1
src/main/angular/src/app/core/components/response-avg-max-chart/response-avg-max-chart-container.component.html

@@ -1,6 +1,6 @@
 <article class="l-chart-item">
     <div class="l-tool-box">
-        <p class="l-title">Response Avg & Max</p>
+        <p class="l-title">响应平均值和最大值</p>
     </div>
     <div class="l-content-section">
         <pp-loading [showLoading]="showLoading" [zIndex]="10"></pp-loading>

+ 2 - 2
src/main/angular/src/app/core/components/response-avg-max-chart/response-avg-max-chart-container.component.ts

@@ -136,8 +136,8 @@ export class ResponseAvgMaxChartContainerComponent implements OnInit, OnDestroy
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;

+ 1 - 1
src/main/angular/src/app/core/components/response-summary-chart/response-summary-chart-container.component.html

@@ -1,6 +1,6 @@
 <article class="l-chart-item">
     <div class="l-tool-box">
-        <p class="l-title">Response Summary</p>
+        <p class="l-title">响应总结</p>
         <button class="fas fa-question-circle" (click)="onShowHelp($event)"></button>
     </div>
     <div class="l-content-section">

+ 2 - 2
src/main/angular/src/app/core/components/response-summary-chart/response-summary-chart-container.component.ts

@@ -145,8 +145,8 @@ export class ResponseSummaryChartContainerComponent implements OnInit, OnDestroy
 
     private initI18nText(): void {
         forkJoin(
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.NO_DATA'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('暂无数据'),
         ).subscribe(([dataFetchFailedText, dataEmptyText]: string[]) => {
            this.dataFetchFailedText = dataFetchFailedText;
            this.dataEmptyText = dataEmptyText;

+ 3 - 3
src/main/angular/src/app/core/components/scatter-chart/scatter-chart-container.component.ts

@@ -80,9 +80,9 @@ export class ScatterChartContainerComponent implements OnInit, OnDestroy {
         this.setScatterY();
 
         forkJoin(
-            this.translateService.get('COMMON.NO_DATA'),
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.POPUP_BLOCK_MESSAGE')
+            this.translateService.get('暂无数据'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('阻止弹出消息')
         ).subscribe((i18n: string[]) => {
             this.i18nText = {
                 NO_DATA: i18n[0],

+ 3 - 3
src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-filtered-map-info-per-server-container.component.ts

@@ -73,9 +73,9 @@ export class ScatterChartForFilteredMapInfoPerServerContainerComponent implement
         this.enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
         this.setScatterY();
         forkJoin(
-            this.translateService.get('COMMON.NO_DATA'),
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.POPUP_BLOCK_MESSAGE')
+            this.translateService.get('暂无数据'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('阻止弹出消息')
         ).subscribe((i18n: string[]) => {
             this.i18nText = {
                 NO_DATA: i18n[0],

+ 3 - 3
src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-filtered-map-side-bar-container.component.ts

@@ -73,9 +73,9 @@ export class ScatterChartForFilteredMapSideBarContainerComponent implements OnIn
         this.enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
         this.setScatterY();
         forkJoin(
-            this.translateService.get('COMMON.NO_DATA'),
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.POPUP_BLOCK_MESSAGE')
+            this.translateService.get('暂无数据'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('阻止弹出消息')
         ).subscribe((i18n: string[]) => {
             this.i18nText = {
                 NO_DATA: i18n[0],

+ 3 - 3
src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-full-screen-mode-container.component.ts

@@ -182,9 +182,9 @@ export class ScatterChartForFullScreenModeContainerComponent implements OnInit,
 
     private getI18NText(): void {
         forkJoin(
-            this.translateService.get('COMMON.NO_DATA'),
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.POPUP_BLOCK_MESSAGE')
+            this.translateService.get('暂无数据'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('阻止弹出消息')
         ).subscribe((i18n: string[]) => {
             this.i18nText = {
                 NO_DATA: i18n[0],

+ 3 - 3
src/main/angular/src/app/core/components/scatter-chart/scatter-chart-for-info-per-server-container.component.ts

@@ -75,9 +75,9 @@ export class ScatterChartForInfoPerServerContainerComponent implements OnInit, A
         this.enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
         this.setScatterY();
         forkJoin(
-            this.translateService.get('COMMON.NO_DATA'),
-            this.translateService.get('COMMON.FAILED_TO_FETCH_DATA'),
-            this.translateService.get('COMMON.POPUP_BLOCK_MESSAGE')
+            this.translateService.get('暂无数据'),
+            this.translateService.get('获取数据失败'),
+            this.translateService.get('阻止弹出消息')
         ).subscribe((i18n: string[]) => {
             this.i18nText = {
                 NO_DATA: i18n[0],

+ 1 - 1
src/main/angular/src/app/core/components/scatter-chart/scatter-chart-state-view.component.ts

@@ -34,7 +34,7 @@ export class ScatterChartStateViewComponent implements OnInit, OnChanges {
         });
     }
     upperFirstChar(str: string): string {
-        return str ? str.substr(0, 1).toUpperCase() + str.substr(1) : '';
+        return str === 'success'?'成功':'失败';//str ? str.substr(0, 1).toUpperCase() + str.substr(1) : '';
     }
     getTypeCount(name: string): number {
         if (this.transactionTypeCount && this.transactionTypeCount[name]) {

+ 1 - 1
src/main/angular/src/app/core/components/server-and-agent-list/server-and-agent-list-container.component.ts

@@ -141,7 +141,7 @@ export class ServerAndAgentListContainerComponent implements OnInit, OnDestroy {
     }
 
     private initI18nText(): void {
-        this.emptyText$ = this.translateService.get('COMMON.EMPTY_ON_SEARCH');
+        this.emptyText$ = this.translateService.get('暂无数据');
     }
 
     onSelectAgent(agentId: string) {

+ 2 - 2
src/main/angular/src/app/core/components/server-map-search-result-viewer/server-map-search-result-viewer-container.component.ts

@@ -49,8 +49,8 @@ export class ServerMapSearchResultViewerContainerComponent implements OnInit, On
 
     private initI18NText() {
         forkJoin(
-            this.translateService.get('COMMON.SEARCH_INPUT'),
-            this.translateService.get('COMMON.EMPTY_ON_SEARCH')
+            this.translateService.get('请输入搜索内容'),
+            this.translateService.get('暂无内容')
         ).subscribe((i18n: string[]) => {
             this.i18nText = {
                 'PLACE_HOLDER': i18n[0],

+ 4 - 4
src/main/angular/src/app/core/components/server-status/server-status-container.component.html

@@ -1,8 +1,8 @@
 <div class="l-status" *ngIf="hasServerList">
-    <button class="pinpoint-btn" [disabled]="enableRealTime" (click)="onClickViewServer()"><span><i class="fas fa-angle-{{spreadAngleIndicator}}" [hidden]="isLoading"></i><i class="fas fa-spinner fa-spin fa-fw" style="top:0px;left:-10px;" [hidden]="!isLoading"></i>VIEW SERVERS</span></button>
-    <button class="pinpoint-btn" (click)="onClickOpenInspector()" *ngIf="isWAS"><span><i class="fas fa-chart-line"></i><span>Inspector</span></span></button>
+    <button class="pinpoint-btn" [disabled]="enableRealTime" (click)="onClickViewServer()"><span><i class="fas fa-angle-{{spreadAngleIndicator}}" [hidden]="isLoading"></i><i class="fas fa-spinner fa-spin fa-fw" style="top:0px;left:-10px;" [hidden]="!isLoading"></i>查看服务器</span></button>
+    <button class="pinpoint-btn" (click)="onClickOpenInspector()" *ngIf="isWAS"><span><i class="fas fa-chart-line"></i><span>检查</span></span></button>
     <ul class="l-status-count">
-        <li>Total <span class="l-total">{{node.instanceCount}}</span></li>
-        <li>Error <span class="l-error">{{node.instanceErrorCount || 0}}</span></li>
+        <li>总数 <span class="l-total">{{node.instanceCount}}</span></li>
+        <li>错误 <span class="l-error">{{node.instanceErrorCount || 0}}</span></li>
     </ul>
 </div>

+ 1 - 1
src/main/angular/src/app/core/components/timeline-command-group/timeline-command-group.component.html

@@ -1,6 +1,6 @@
 <div class="l-command-group">
     <div class="l-current-time">
-        <label (click)="onClickNow()">NOW</label>
+        <label (click)="onClickNow()">现在</label>
         <input type="text" readonly value="{{pointingTime}}">
     </div>
 </div>

+ 1 - 1
src/main/angular/src/app/core/components/transaction-id-search/transaction-id-search-container.component.html

@@ -2,7 +2,7 @@
     <input
         type="text"
         ppSearchInput
-        placeholder="search pTxId"
+        placeholder="请输入pTxid"
         class="l-search-input"
         [useEnter]="searchUseEnter"
         (outSearch)="onSearchId($event)"

+ 1 - 1
src/main/angular/src/app/core/components/transaction-search/transaction-search-container.component.ts

@@ -63,7 +63,7 @@ export class TransactionSearchContainerComponent implements OnInit, OnDestroy {
     private getI18NText(): void {
         forkJoin(
             this.translateService.get('TRANSACTION.HAS_RESULTS'),
-            this.translateService.get('COMMON.EMPTY_ON_SEARCH')
+            this.translateService.get('1COMMON.EMPTY_ON_SEARCH')
         ).subscribe((i18n: string[]) => {
             this.i18nText.HAS_RESULTS = i18n[0];
             this.i18nText.EMPTY_RESULT = i18n[1];

+ 1 - 1
src/main/angular/src/app/core/components/transaction-table-grid/transaction-table-grid-container.component.ts

@@ -111,7 +111,7 @@ export class TransactionTableGridContainerComponent implements OnInit, OnDestroy
     }
 
     private initI18nText(): void {
-        this.translateService.get('COMMON.NO_DATA').subscribe((dataEmptyText: string) => {
+        this.translateService.get('暂无数据').subscribe((dataEmptyText: string) => {
            this.dataEmptyText = dataEmptyText;
         });
     }

+ 4 - 4
src/main/angular/src/app/core/models/period.ts

@@ -1,8 +1,8 @@
 const ONE_HOUR = 60;
 const ONE_DAY = 1440;
-const MINUTE = 'm';
-const HOUR = 'h';
-const DAY = 'd';
+const MINUTE = '分钟';
+const HOUR = '小时';
+const DAY = '';
 
 export class Period {
     private viewValue: string;
@@ -45,7 +45,7 @@ export class Period {
         return this.viewValue;
     }
     getValueWithAddedWords(): string {
-        const prefix = this.prefix ? this.prefix + ' ' : '';
+        const prefix = this.prefix ? "最后" + ' ' : '';
         const postfix = this.postfix ? this.postfix + ' ' : '';
         return prefix + this.getValueWithTime() + postfix;
     }

+ 1 - 1
src/main/angular/src/app/routes/error-page/error-page.component.css

@@ -30,7 +30,7 @@
     flex-direction: row;
 }
 .l-api-check .l-api i {
-    margin: 10px 10px 0px 0px;
+    margin: 0 10px 0px 0px;
 }
 .l-api-check button {
     width: 100px;

+ 1 - 1
src/main/angular/src/app/routes/error-page/error-page.component.html

@@ -6,7 +6,7 @@
     <div class="l-api-check">
         <button *ngIf="hasError()" class="btn btn-sm btn-blue" (click)="onReload()"><i class="fas fa-redo"></i></button>
         <button *ngIf="!hasError()" class="btn btn-sm btn-blue" (click)="onMoveBack()"><i class="fas fa-chevron-left"></i></button>
-    
+
         <div class="l-apis" *ngFor="let stateName of stateList">
             <div class="l-api">
                 <i [ngClass]="getStateClass(stateName)"></i> {{getUrl(stateName)}}

+ 5 - 2
src/main/angular/src/app/routes/error-page/error-page.component.ts

@@ -11,17 +11,20 @@ export class ErrorPageComponent implements OnInit {
     state: any = {
         serverTime: {
             url: 'serverTime.pinpoint',
+            label: '服务时间',
             loading: true,
             success: false,
             message: ''
         },
         configuration: {
             url: 'configuration.pinpoint',
+            label: '系统配置',
             loading: true,
             success: false,
             message: ''
-        }
+        },
     };
+    
     constructor(
         private urlRouteManagerService: UrlRouteManagerService,
         private systemConfigurationDataService: SystemConfigurationDataService,
@@ -70,7 +73,7 @@ export class ErrorPageComponent implements OnInit {
         }
     }
     getUrl(type: string): string {
-        return this.state[type].url;
+        return this.state[type].label;
     }
     onMoveBack(): void {
         this.urlRouteManagerService.back();

+ 1 - 1
src/main/angular/src/app/shared/components/header-logo/header-logo.component.html

@@ -1,5 +1,5 @@
 <h1 class="l-logo">
     <a (click)="onLogoClick()" routerLink="/main" class="l-logo-link">
-        <img [src]="logoPath" alt="PINPOINT LOGO">
+        <img [src]="logoPath" alt="STATE GRID">
     </a>
 </h1>

+ 1 - 1
src/main/angular/src/assets/i18n/en.json

@@ -167,7 +167,7 @@
             }]
         }],
         "RESPONSE_SUMMARY": [{
-            "TITLE": "Response Summary Chart",
+            "TITLE": "回应总结图表",
             "DESC": "",
             "CATEGORY": [{
                 "TITLE": "Legend",

BIN
src/main/angular/src/assets/img/loading.png


BIN
src/main/angular/src/assets/img/logo.png


BIN
src/main/angular/src/assets/img/logo_bk.png


BIN
src/main/angular/src/favicon-16x16.png


BIN
src/main/angular/src/favicon-32x32.png


BIN
src/main/angular/src/favicon.ico


+ 4 - 3
src/main/angular/src/index.html

@@ -18,12 +18,13 @@
 </head>
 <body id="pinpoint">
     <pp-root>
-        <div style="display: flex;height: 100%; width: 100%; justify-content: center;align-items: center;">
-            <div style="background-color: #00d5ff;padding: 20px 20px;border-radius: 280px;opacity: 0;border:1px solid #408dd4;box-shadow:10px 10px 5px 0px rgba(0,0,0,0.75);animation: rootFadeIn 3s;">
+        <div style="display: flex;height: 100vh; width: 100%; justify-content: center;align-items: center;">
+          <img src="./assets/img/loading.png" alt=""/>
+            <!-- <div style="background-color: #00d5ff;padding: 20px 20px;border-radius: 280px;opacity: 0;border:1px solid #408dd4;box-shadow:10px 10px 5px 0px rgba(0,0,0,0.75);animation: rootFadeIn 3s;">
                 <div style="background-color: #408dd4;padding: 200px 200px;border-radius: 220px;">
                     <div style="background-color: #00d5ff;padding: 10px 10px;border-radius: 10px;"></div>
                 </div>
-            </div>
+            </div> -->
         </div>
     </pp-root>
     <script>

+ 13 - 2
src/main/angular/src/main.css

@@ -1,6 +1,6 @@
 body {
   /* primary blue */
-  --blue-50: #e5f2fb;
+  /* --blue-50: #e5f2fb;
   --blue-100: #bfdff7;
   --blue-200: #98ccf2;
   --blue-300: #74b8eb;
@@ -9,7 +9,18 @@ body {
   --blue-600: #3f8cd7;
   --blue-700: #367bc4;
   --blue-800: #306ab2;
-  --blue-900: #244d92;
+  --blue-900: #244d92; */
+  --blue-50: #ddf2ed;
+  --blue-100: #acdfd0;
+  --blue-200: #74cbb1;
+  --blue-300: #3dcfa8;
+  --blue-400: #00a67e;
+  --blue-500: #00956b;
+  --blue-600: #00885f;
+  --blue-700: #007850;
+  --blue-800: #006843;
+  --blue-900: #004c29;
+
   /* emerald green */
   --emerald-green-50: #ddf2ed;
   --emerald-green-100: #acdfd0;

+ 2 - 2
src/main/angular/src/proxy.conf.js

@@ -60,14 +60,14 @@ const PROXY_CONFIG = [
             "/application/webhookSendInfo.pinpoint",
             "/application/alarmRule/includeWebhooks.pinpoint"
         ],
-        target: 'http://localhost:8080',
+        target: 'http://127.0.0.1:8000',
         secure: false
     },
     {
         context: [
             "/agent/activeThread.pinpointws"
         ],
-        target: "http://localhost:8080",
+        target: "http://127.0.0.1:8000",
         secure: false,
         ws: true
     }