Главная Обзор Помощь
Вход
guoziyun
/
oms
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

fix

guoziyun 9 месяцев назад
Родитель
c4ddd72a99
Сommit
ff1606fbbd
4 измененных файлов с 79 добавлено и 20 удалено
Единый вид Показать статистику Diff
  1. 1 1
      oms/public/app/index.html
  2. 0 0
      oms/public/app/main-SEMN5WYS.js
  3. 26 13
      omsapp/src/app/pages/message-record-detail.component.ts
  4. 52 6
      omsapp/src/app/pages/message-record.component.ts

+ 1 - 1
oms/public/app/index.html
Просмотреть файл 

@@ -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-Z77RP2VA.js" type="module"></script></body>
 
+  <script src="polyfills-B6TNHZQ6.js" type="module"></script><script src="main-SEMN5WYS.js" type="module"></script></body>
 
 </html>
 
 </html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
oms/public/app/main-SEMN5WYS.js


+ 26 - 13
omsapp/src/app/pages/message-record-detail.component.ts
Просмотреть файл 

@@ -1,5 +1,4 @@
 
-// message-record-detail.component.ts
 
-import { Component, Inject, Input } from '@angular/core';
 
+import { Component } from '@angular/core';
 
 import { CommonModule, DatePipe, JsonPipe } from '@angular/common';
 
 import { CommonModule, DatePipe, JsonPipe } from '@angular/common';
 
 
 
 // NG-ZORRO 组件
 
 // NG-ZORRO 组件
 
@@ -27,15 +26,20 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
 
       <nz-descriptions-item nzTitle="用户ID">{{
 
       <nz-descriptions-item nzTitle="用户ID">{{
 
         record.uid
 
         record.uid
 
       }}</nz-descriptions-item>
 
       }}</nz-descriptions-item>
 
-      <nz-descriptions-item nzTitle="活动">{{
 
-        record.activityName || ''
 
-      }}</nz-descriptions-item>
 
-      <nz-descriptions-item nzTitle="策略">{{
 
-        record.strategyName || ''
 
-      }}</nz-descriptions-item>
 
-      <nz-descriptions-item nzTitle="模板">{{
 
-        record.templateName || ''
 
-      }}</nz-descriptions-item>
 
+
 
+      <!-- 合并活动、策略、模板为一列 -->
 
+      <nz-descriptions-item nzTitle="消息来源">
 
+        <div class="source-item">
 
+          @if(record.activityName) {
 
+          <div><strong>活动:</strong> {{ record.activityName }}</div>
 
+          } @if(record.strategyName) {
 
+          <div><strong>策略:</strong> {{ record.strategyName }}</div>
 
+          } @if(record.templateName) {
 
+          <div><strong>模板:</strong> {{ record.templateName }}</div>
 
+          }
 
+        </div>
 
+      </nz-descriptions-item>
 
+
 
       <nz-descriptions-item nzTitle="标题">{{
 
       <nz-descriptions-item nzTitle="标题">{{
 
         record.title
 
         record.title
 
       }}</nz-descriptions-item>
 
       }}</nz-descriptions-item>
 
@@ -51,7 +55,7 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
 
         record.image || ''
 
         record.image || ''
 
       }}</nz-descriptions-item>
 
       }}</nz-descriptions-item>
 
       <nz-descriptions-item nzTitle="大图模式">
 
       <nz-descriptions-item nzTitle="大图模式">
 
-        <nz-switch ([ngModel)="(record.bigger)" [nzDisabled]="true"></nz-switch>
 
+        {{ record.bigger }}
 
       </nz-descriptions-item>
 
       </nz-descriptions-item>
 
       <nz-descriptions-item nzTitle="客户端行为">{{
 
       <nz-descriptions-item nzTitle="客户端行为">{{
 
         record.action || ''
 
         record.action || ''
 
@@ -100,6 +104,16 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
 
         white-space: pre-wrap;
 
         white-space: pre-wrap;
 
         word-wrap: break-word;
 
         word-wrap: break-word;
 
       }
 
       }
 
+
 
+      .source-item {
 
+        display: flex;
 
+        flex-direction: column;
 
+        gap: 4px;
 
+      }
 
+
 
+      .source-item div {
 
+        line-height: 1.5;
 
+      }
 
     `,
 
     `,
 
   ],
 
   ],
 
 })
 
 })
 
@@ -107,7 +121,6 @@ export class MessageRecordDetailComponent {
 
   record: IMessageRecord;
 
   record: IMessageRecord;
 
 
 
   constructor(private modalRef: NzModalRef) {
 
   constructor(private modalRef: NzModalRef) {
 
-    // 从模态框引用中获取数据
 
     this.record = this.modalRef.getConfig().nzData?.record;
 
     this.record = this.modalRef.getConfig().nzData?.record;
 
   }
 
   }

+ 52 - 6
omsapp/src/app/pages/message-record.component.ts
Просмотреть файл 

@@ -196,9 +196,7 @@ import { UserDetailModalComponent } from './user-detail-modal.component';
 
             <tr>
 
             <tr>
 
               <th>用户ID</th>
 
               <th>用户ID</th>
 
               <th>消息</th>
 
               <th>消息</th>
 
-              <th>活动</th>
 
-              <th>策略</th>
 
-              <th>模板</th>
 
+              <th>来源</th>
 
               <th>状态</th>
 
               <th>状态</th>
 
               <th>计划发送时间</th>
 
               <th>计划发送时间</th>
 
               <th>实际发送时间</th>
 
               <th>实际发送时间</th>
 
@@ -221,9 +219,24 @@ import { UserDetailModalComponent } from './user-detail-modal.component';
 
                   {{ record.content }}
 
                   {{ record.content }}
 
                 </div>
 
                 </div>
 
               </td>
 
               </td>
 
-              <td>{{ record.activityName || '-' }}</td>
 
-              <td>{{ record.strategyName || '-' }}</td>
 
-              <td>{{ record.templateName || '-' }}</td>
 
+              <td class="source-cell">
 
+                @if(record.activityName) {
 
+                <div class="source-item">
 
+                  <span class="source-label">活动:</span>
 
+                  <span class="source-value">{{ record.activityName }}</span>
 
+                </div>
 
+                } @if(record.strategyName) {
 
+                <div class="source-item">
 
+                  <span class="source-label">策略:</span>
 
+                  <span class="source-value">{{ record.strategyName }}</span>
 
+                </div>
 
+                } @if(record.templateName) {
 
+                <div class="source-item">
 
+                  <span class="source-label">模板:</span>
 
+                  <span class="source-value">{{ record.templateName }}</span>
 
+                </div>
 
+                }
 
+              </td>
 
 
 
               <td>
 
               <td>
 
                 <nz-tag [nzColor]="getStatusColor(record.status)">
 
                 <nz-tag [nzColor]="getStatusColor(record.status)">
 
@@ -336,6 +349,39 @@ import { UserDetailModalComponent } from './user-detail-modal.component';
 
         line-height: 1.4;
 
         line-height: 1.4;
 
         color: #666;
 
         color: #666;
 
       }
 
       }
 
+      /* 来源单元格样式 */
 
+      .source-cell {
 
+        min-width: 200px;
 
+        max-width: 300px;
 
+      }
 
+
 
+      .source-item {
 
+        display: flex;
 
+        margin-bottom: 4px;
 
+        line-height: 1.5;
 
+      }
 
+
 
+      .source-label {
 
+        font-weight: 500;
 
+        color: #666;
 
+        min-width: 40px;
 
+        margin-right: 8px;
 
+      }
 
+
 
+      .source-value {
 
+        flex: 1;
 
+        overflow: hidden;
 
+        text-overflow: ellipsis;
 
+        white-space: nowrap;
 
+      }
 
+
 
+      /* 响应式调整 */
 
+      @media (max-width: 1200px) {
 
+        .source-cell {
 
+          min-width: 150px;
 
+          max-width: 200px;
 
+        }
 
+      }
 
     `,
 
     `,
 
   ],
 
   ],
 
 })
 
 })

Некоторые файлы не были показаны из-за большого количества измененных файлов