Home Explore Help
Sign In
guoziyun
/
oms
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix

guoziyun 9 months ago
parent
03bec18fa5
commit
7ac11937dd
4 changed files with 23 additions and 39 deletions
Unified View Show Diff Stats
  1. 1 1
      oms/public/app/index.html
  2. 0 0
      oms/public/app/main-2UCT5JIU.js
  3. 9 16
      omsapp/src/app/pages/message-dashboard.component.html
  4. 13 22
      omsapp/src/app/pages/message-dashboard.component.ts

+ 1 - 1
oms/public/app/index.html
View File 

@@ -9,5 +9,5 @@
 
   <style>body,html{width:100%;height:100%}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}body{margin:0;color:#000000d9;font-size:14px;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-variant:tabular-nums;line-height:1.5715;background-color:#fff;font-feature-settings:"tnum"}html{--antd-wave-shadow-color:#1890ff;--scroll-bar:0}</style><link rel="stylesheet" href="styles-LXBSU6DF.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles-LXBSU6DF.css"></noscript></head>
 
   <style>body,html{width:100%;height:100%}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}body{margin:0;color:#000000d9;font-size:14px;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-variant:tabular-nums;line-height:1.5715;background-color:#fff;font-feature-settings:"tnum"}html{--antd-wave-shadow-color:#1890ff;--scroll-bar:0}</style><link rel="stylesheet" href="styles-LXBSU6DF.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles-LXBSU6DF.css"></noscript></head>
 
   <body>
 
   <body>
 
     <app-root></app-root>
 
     <app-root></app-root>
 
-  <script src="polyfills-B6TNHZQ6.js" type="module"></script><script src="main-FKSCPF2E.js" type="module"></script></body>
 
+  <script src="polyfills-B6TNHZQ6.js" type="module"></script><script src="main-2UCT5JIU.js" type="module"></script></body>
 
 </html>
 
 </html>

File diff suppressed because it is too large
+ 0 - 0
oms/public/app/main-2UCT5JIU.js


+ 9 - 16
omsapp/src/app/pages/message-dashboard.component.html
View File 

@@ -141,13 +141,6 @@
 
               ></span>
 
               ></span>
 
               已送达
 
               已送达
 
             </div>
 
             </div>
 
-            <div>
 
-              <span
 
-                class="legend-color"
 
-                style="background-color: #722ed1"
 
-              ></span>
 
-              已打开
 
-            </div>
 
             <div>
 
             <div>
 
               <span
 
               <span
 
                 class="legend-color"
 
                 class="legend-color"
 
@@ -158,23 +151,23 @@
 
             <div>
 
             <div>
 
               <span
 
               <span
 
                 class="legend-color"
 
                 class="legend-color"
 
-                style="background-color: #f5222d"
 
+                style="background-color: #482880"
 
               ></span>
 
               ></span>
 
-              失败数
 
+              展示用户
 
             </div>
 
             </div>
 
             <div>
 
             <div>
 
               <span
 
               <span
 
                 class="legend-color"
 
                 class="legend-color"
 
-                style="background-color: #482880"
 
+                style="background-color: #722ed1"
 
               ></span>
 
               ></span>
 
-              展示用户
 
+              点击数
 
             </div>
 
             </div>
 
             <div>
 
             <div>
 
               <span
 
               <span
 
                 class="legend-color"
 
                 class="legend-color"
 
                 style="background-color: #0066cc"
 
                 style="background-color: #0066cc"
 
               ></span>
 
               ></span>
 
-              打开用户
 
+              点击用户
 
             </div>
 
             </div>
 
             <div>
 
             <div>
 
               <span class="legend-line" style="border-color: #13c2c2"></span>
 
               <span class="legend-line" style="border-color: #13c2c2"></span>
 
@@ -305,7 +298,7 @@
 
                 </span>
 
                 </span>
 
               </th>
 
               </th>
 
               <th (click)="sortStrategyTable('openedUsers')">
 
               <th (click)="sortStrategyTable('openedUsers')">
 
-                打开用户
 
+                点击用户
 
                 <span *ngIf="strategySortField === 'openedUsers'">
 
                 <span *ngIf="strategySortField === 'openedUsers'">
 
                   <i
 
                   <i
 
                     nz-icon
 
                     nz-icon
 
@@ -621,7 +614,7 @@
 
                 </span>
 
                 </span>
 
               </th>
 
               </th>
 
               <th (click)="sortTemplateTable('openedUsers')">
 
               <th (click)="sortTemplateTable('openedUsers')">
 
-                打开用户
 
+                点击用户
 
                 <span *ngIf="templateSortField === 'openedUsers'">
 
                 <span *ngIf="templateSortField === 'openedUsers'">
 
                   <i
 
                   <i
 
                     nz-icon
 
                     nz-icon
 
@@ -922,7 +915,7 @@
 
                 </span>
 
                 </span>
 
               </th>
 
               </th>
 
               <th (click)="sortCcTable('openedUsers')">
 
               <th (click)="sortCcTable('openedUsers')">
 
-                打开用户
 
+                点击用户
 
                 <span *ngIf="ccSortField === 'openedUsers'">
 
                 <span *ngIf="ccSortField === 'openedUsers'">
 
                   <i
 
                   <i
 
                     nz-icon
 
                     nz-icon
 
@@ -1201,7 +1194,7 @@
 
                 </span>
 
                 </span>
 
               </th>
 
               </th>
 
               <th (click)="sortImageTable('openedUsers')">
 
               <th (click)="sortImageTable('openedUsers')">
 
-                打开用户
 
+                点击用户
 
                 <span *ngIf="imageSortField === 'openedUsers'">
 
                 <span *ngIf="imageSortField === 'openedUsers'">
 
                   <i
 
                   <i
 
                     nz-icon
 
                     nz-icon

+ 13 - 22
omsapp/src/app/pages/message-dashboard.component.ts
View File 

@@ -135,25 +135,19 @@ export class MessageDashboardComponent implements OnInit {
 
         yAxisID: 'y',
 
         yAxisID: 'y',
 
       },
 
       },
 
       {
 
       {
 
-        label: '点击数',
 
-        data: [],
 
-        backgroundColor: '#722ed1',
 
-        yAxisID: 'y',
 
-      },
 
-      {
 
-        label: '失败数',
 
+        label: '展示用户',
 
         data: [],
 
         data: [],
 
-        backgroundColor: '#f5222d',
 
+        backgroundColor: '#482880',
 
         yAxisID: 'y',
 
         yAxisID: 'y',
 
       },
 
       },
 
       {
 
       {
 
-        label: '展示用户',
 
+        label: '点击数',
 
         data: [],
 
         data: [],
 
-        backgroundColor: '#482880',
 
+        backgroundColor: '#722ed1',
 
         yAxisID: 'y',
 
         yAxisID: 'y',
 
       },
 
       },
 
       {
 
       {
 
-        label: '打开用户',
 
+        label: '点击用户',
 
         data: [],
 
         data: [],
 
         backgroundColor: '#0066CC',
 
         backgroundColor: '#0066CC',
 
         yAxisID: 'y',
 
         yAxisID: 'y',
 
@@ -224,7 +218,7 @@ export class MessageDashboardComponent implements OnInit {
 
               label += ': ';
 
               label += ': ';
 
             }
 
             }
 
             // 如果是折线图（转化率），格式化显示两位小数并添加百分号
 
             // 如果是折线图（转化率），格式化显示两位小数并添加百分号
 
-            if (context.datasetIndex >= 8) {
 
+            if (context.datasetIndex >= 7) {
 
               // 假设6-8是折线图数据集
 
               // 假设6-8是折线图数据集
 
               const value = typeof context.raw === 'number' ? context.raw : 0;
 
               const value = typeof context.raw === 'number' ? context.raw : 0;
 
               label += value.toFixed(2) + '%';
 
               label += value.toFixed(2) + '%';
 
@@ -598,42 +592,39 @@ export class MessageDashboardComponent implements OnInit {
 
         },
 
         },
 
         {
 
         {
 
           ...this.combinedChartData.datasets[4],
 
           ...this.combinedChartData.datasets[4],
 
-          data: this.dailyTrends.map((t) => t.opened || 0),
 
+          data: this.dailyTrends.map((t) => t.displayedUsers || 0),
 
         },
 
         },
 
         {
 
         {
 
           ...this.combinedChartData.datasets[5],
 
           ...this.combinedChartData.datasets[5],
 
-          data: this.dailyTrends.map((t) => t.failed || 0),
 
+          data: this.dailyTrends.map((t) => t.opened || 0),
 
         },
 
         },
 
+
 
         {
 
         {
 
           ...this.combinedChartData.datasets[6],
 
           ...this.combinedChartData.datasets[6],
 
-          data: this.dailyTrends.map((t) => t.displayedUsers || 0),
 
-        },
 
-        {
 
-          ...this.combinedChartData.datasets[7],
 
           data: this.dailyTrends.map((t) => t.openedUsers || 0),
 
           data: this.dailyTrends.map((t) => t.openedUsers || 0),
 
         },
 
         },
 
 
 
         // 折线图数据
 
         // 折线图数据
 
         {
 
         {
 
-          ...this.combinedChartData.datasets[8],
 
+          ...this.combinedChartData.datasets[7],
 
           data: this.dailyTrends.map((t) =>
 
           data: this.dailyTrends.map((t) =>
 
             this.preciseRound((t.deliveredRate || 0) * 100, 2)
 
             this.preciseRound((t.deliveredRate || 0) * 100, 2)
 
           ),
 
           ),
 
         },
 
         },
 
         {
 
         {
 
-          ...this.combinedChartData.datasets[9],
 
+          ...this.combinedChartData.datasets[8],
 
           data: this.dailyTrends.map((t) =>
 
           data: this.dailyTrends.map((t) =>
 
             this.preciseRound((t.displayRate || 0) * 100, 2)
 
             this.preciseRound((t.displayRate || 0) * 100, 2)
 
           ),
 
           ),
 
         },
 
         },
 
         {
 
         {
 
-          ...this.combinedChartData.datasets[10],
 
+          ...this.combinedChartData.datasets[9],
 
           data: this.dailyTrends.map((t) =>
 
           data: this.dailyTrends.map((t) =>
 
             this.preciseRound((t.clickThroughRate || 0) * 100, 2)
 
             this.preciseRound((t.clickThroughRate || 0) * 100, 2)
 
           ),
 
           ),
 
         },
 
         },
 
         {
 
         {
 
-          ...this.combinedChartData.datasets[11],
 
+          ...this.combinedChartData.datasets[10],
 
           data: this.dailyTrends.map((t) =>
 
           data: this.dailyTrends.map((t) =>
 
             this.preciseRound((t.actualClickThroughRate || 0) * 100, 2)
 
             this.preciseRound((t.actualClickThroughRate || 0) * 100, 2)
 
           ),
 
           ),

Some files were not shown because too many files changed in this diff