From c204590a3123f37660e109cc20e5458e4ed95d62 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 19 May 2022 11:08:12 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../condition-monitoring.component.html       | 92 +++++++++----------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/src/app/system-management/condition-monitoring/condition-monitoring.component.html b/src/app/system-management/condition-monitoring/condition-monitoring.component.html
index 276056f..b68937a 100644
--- a/src/app/system-management/condition-monitoring/condition-monitoring.component.html
+++ b/src/app/system-management/condition-monitoring/condition-monitoring.component.html
@@ -73,16 +73,15 @@
         <th>ip地址</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>
+        <th>镜像更新状态结束时间</th> -->
         <th>监控程序更新状态</th>
-        <th>监控程序更新状态开始时间</th>
-        <th>监控程序更新状态结束时间</th>
+        <!-- <th>监控程序更新状态开始时间</th>
+        <th>监控程序更新状态结束时间</th> -->
       </tr>
     </thead>
     <tbody>
@@ -100,51 +99,50 @@
           </ng-template>
 
         </td>
-        <!-- <td>
-          <span *ngIf="data.linuxServiceState == 'Dead'">未启动</span>
-          <span *ngIf="data.linuxServiceState == 'Waiting'">启动中</span>
-          <span *ngIf="data.linuxServiceState == 'Running'">运行中</span>
-          <span *ngIf="data.linuxServiceState == 'Failed'">失败</span>
-        </td> -->
         <td>
-          <span *ngIf="data.appUpdatingState == 'Never'">未更新</span>
-          <span *ngIf="data.appUpdatingState == 'Updating'">更新中</span>
-          <span *ngIf="data.appUpdatingState == 'Updated'">已更新</span>
-        </td>
-        <td>
-          <span>{{data.appUpdatingStartedTime ? (data.appUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") :
-            '/'}}</span>
-        </td>
-        <td>
-          <span>{{data.appUpdatingFinishedTime ? (data.appUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") :
-            '/'}}</span>
-        </td>
-        <td>
-          <span *ngIf="data.imageUpdatingState == 'Never'">未更新</span>
-          <span *ngIf="data.imageUpdatingState == 'Updating'">更新中</span>
-          <span *ngIf="data.imageUpdatingState == 'Updated'">已更新</span>
-        </td>
-        <td>
-          <span>{{data.imageUpdatingStartedTime ? (data.imageUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") :
-            '/'}}</span>
-        </td>
-        <td>
-          <span>{{data.imageUpdatingFinishedTime ? (data.imageUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") :
-            '/'}}</span>
-        </td>
-        <td>
-          <span *ngIf="data.monitorUpdatingState == 'Never'">未更新</span>
-          <span *ngIf="data.monitorUpdatingState == 'Updating'">更新中</span>
-          <span *ngIf="data.monitorUpdatingState == 'Updated'">已更新</span>
-          <span *ngIf="data.monitorUpdatingState == 'UpdatingTimeout'">更新超时</span>
+          <p>
+            <span *ngIf="data.appUpdatingState == 'Never'">未更新</span>
+            <span *ngIf="data.appUpdatingState == 'Updating'">更新中</span>
+            <span *ngIf="data.appUpdatingState == 'Updated'">已更新</span>
+          </p>
+          <p>
+            开始时间:{{data.appUpdatingStartedTime ? (data.appUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") :'/'}}
+
+          </p>
+          <p>
+            结束时间:{{data.appUpdatingFinishedTime ? (data.appUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") :'/'}}
+          </p>
         </td>
         <td>
-          <span>{{data.monitorUpdatingStartedTime ? (data.monitorUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") :
-            '/'}}</span>
+          <p>
+            <span *ngIf="data.imageUpdatingState == 'Never'">未更新</span>
+            <span *ngIf="data.imageUpdatingState == 'Updating'">更新中</span>
+            <span *ngIf="data.imageUpdatingState == 'Updated'">已更新</span>
+          </p>
+          <p>
+            {{data.imageUpdatingStartedTime ? (data.imageUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") :
+            '/'}}
+          </p>
+          <p>
+            {{data.imageUpdatingFinishedTime ? (data.imageUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") :
+            '/'}}
+          </p>
         </td>
         <td>
-          <span>{{data.monitorUpdatingFinishedTime ? (data.monitorUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") :
-            '/'}}</span>
+          <p>
+            <span *ngIf="data.monitorUpdatingState == 'Never'">未更新</span>
+            <span *ngIf="data.monitorUpdatingState == 'Updating'">更新中</span>
+            <span *ngIf="data.monitorUpdatingState == 'Updated'">已更新</span>
+            <span *ngIf="data.monitorUpdatingState == 'UpdatingTimeout'">更新超时</span>
+          </p>
+          <p>
+            {{data.monitorUpdatingStartedTime ? (data.monitorUpdatingStartedTime | date:"yyyy-MM-dd HH:mm:ss") :
+            '/'}}
+          </p>
+          <p>
+            {{data.monitorUpdatingFinishedTime ? (data.monitorUpdatingFinishedTime | date:"yyyy-MM-dd HH:mm:ss") :
+            '/'}}
+          </p>
         </td>
       </tr>
     </tbody>