From 4c88cc065fc1863538a5322715a61258ac2f63d5 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Sat, 13 Aug 2022 17:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E7=AE=A1=E7=90=86)=EF=BC=9A=E5=BE=85=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/jlw/safeManage/leftTop.vue   | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/projectAdmin/jlw/safeManage/leftTop.vue b/src/views/projectAdmin/jlw/safeManage/leftTop.vue
index e90a551f..58ce901b 100644
--- a/src/views/projectAdmin/jlw/safeManage/leftTop.vue
+++ b/src/views/projectAdmin/jlw/safeManage/leftTop.vue
@@ -12,12 +12,15 @@
         </div>
       </div>
       <div class="tbody">
-        <div class="row" v-for="i in 5" :key="i">
-          <div class="td">2022.03.05 15:23:22</div>
-          <div class="td">边临防护</div>
-          <div class="td">2022-03-05 15:23:22</div>
-          <div class="td">光怪陆离</div>
-        </div>
+        <vue-scroll>
+          <div class="row" v-for="(alarm, index) in alarmList" :key="index">
+            <div class="td">{{ alarm.checkPoints }}</div>
+            <div class="td">{{ alarm.checkContent }}</div>
+            <div class="td">{{ alarm.checkTime }}</div>
+            <div class="td">{{ alarm.rectifyPeopleAme }}</div>
+          </div>
+          <div v-if="!alarmList.length">无数据</div>
+        </vue-scroll>
       </div>
     </div>
   </Card>
@@ -26,6 +29,7 @@
 <script>
 import Card from '../components/Card.vue'
 import JProgressChart from '../jChart/bar/JProgressChart.vue'
+import { getNewestSecurityManageDataList2Api } from '@/assets/js/api/dataBoard'
 export default {
   components: { Card, JProgressChart },
   props: {
@@ -34,8 +38,15 @@ export default {
       default: ''
     }
   },
+  mounted() {
+    getNewestSecurityManageDataList2Api({ projectSn: this.projectSn }).then(res => {
+      this.alarmList = res.result || []
+    })
+  },
   data() {
     return {
+      projectSn: this.$store.state.projectSn,
+      alarmList: []
       // yData: [
       //   '未分类',
       //   '临边防护',
@@ -67,6 +78,9 @@ export default {
       color: #6ee4f0;
       border-bottom: 1px solid #fff;
     }
+    &.tbody {
+      height: calc(100% - 42px);
+    }
     .row {
       width: 100%;
       display: flex;
@@ -74,9 +88,13 @@ export default {
         height: 30px;
         line-height: 30px;
         &:nth-child(1) {
-          width: 40%;
+          width: 160px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
         &:nth-child(2) {
+          padding-left: 10px;
           flex: 1;
         }
         &:nth-child(3) {