From e7149ea08b6f642ce8bbf3196a7a3217d854e3d8 Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Thu, 15 Sep 2022 15:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E5=91=8A=E8=AD=A6=E5=92=8C=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E9=BB=98=E8=AE=A4=20=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E9=99=8D=E5=BA=8F=20=E6=8E=92=E5=88=97?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/alarm/record/index.vue       | 2 ++
 src/views/iot/alarm/waringRecord/index.vue | 2 ++
 src/views/iot/video/site/index.vue         | 4 ++--
 src/views/tenant/alarm/record.vue          | 2 ++
 src/views/tenant/alarm/warning.vue         | 2 ++
 yarn.lock                                  | 5 +++++
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/iot/alarm/record/index.vue b/src/views/iot/alarm/record/index.vue
index 22c3c2f4..56876997 100644
--- a/src/views/iot/alarm/record/index.vue
+++ b/src/views/iot/alarm/record/index.vue
@@ -235,6 +235,8 @@ export default {
         beginTime: null,
         endTime: null,
         alarmDivide: "ALARM",
+        isAsc: 'desc',
+        orderByColumn: 'alarmTime'
       },
       // 表单参数
       form: {},
diff --git a/src/views/iot/alarm/waringRecord/index.vue b/src/views/iot/alarm/waringRecord/index.vue
index 9e5ede31..38abf2d2 100644
--- a/src/views/iot/alarm/waringRecord/index.vue
+++ b/src/views/iot/alarm/waringRecord/index.vue
@@ -211,6 +211,8 @@ export default {
         beginTime: null,
         endTime: null,
         alarmDivide: "WARNING",
+        isAsc: 'desc',
+        orderByColumn: 'alarmTime'
       },
       // 表单参数
       form: {},
diff --git a/src/views/iot/video/site/index.vue b/src/views/iot/video/site/index.vue
index 43d3d962..2556a11a 100644
--- a/src/views/iot/video/site/index.vue
+++ b/src/views/iot/video/site/index.vue
@@ -85,7 +85,7 @@
           <span :title="scope.row.siteAddress" class="lay-table-textarea">{{ scope.row.siteAddress || '--'}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="站点状态" align="center" width="100" prop="siteStatus">
+      <!-- <el-table-column label="站点状态" align="center" width="100" prop="siteStatus">
         <template slot-scope="scope">
           <div class="list-row">
             <span class="notice-item" :class="noticeState(scope.row.siteStatus)"></span>
@@ -95,7 +95,7 @@
             ></span>
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="接入协议" align="left" width="100" prop="videoProtocol" />
       <el-table-column label="站点通道" align="left" width="200" prop="devId" />
       <el-table-column label="设备编码" align="left" width="150" prop="devCode" />
diff --git a/src/views/tenant/alarm/record.vue b/src/views/tenant/alarm/record.vue
index 12277026..7ef878d8 100644
--- a/src/views/tenant/alarm/record.vue
+++ b/src/views/tenant/alarm/record.vue
@@ -238,6 +238,8 @@ export default {
         beginTime: null,
         endTime: null,
         alarmDivide: "ALARM",
+        isAsc: 'desc',
+        orderByColumn: 'alarmTime'
       },
       // 表单参数
       form: {},
diff --git a/src/views/tenant/alarm/warning.vue b/src/views/tenant/alarm/warning.vue
index d5ce18aa..37576dd6 100644
--- a/src/views/tenant/alarm/warning.vue
+++ b/src/views/tenant/alarm/warning.vue
@@ -236,6 +236,8 @@ export default {
         beginTime: null,
         endTime: null,
         alarmDivide: "WARNING",
+        isAsc: 'desc',
+        orderByColumn: 'alarmTime'
       },
       // 表单参数
       form: {},
diff --git a/yarn.lock b/yarn.lock
index aeb3fc80..f2cf8cd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -903,6 +903,11 @@
     cssnano-preset-default "^4.0.0"
     postcss "^7.0.0"
 
+"@liveqing/liveplayer@^2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@liveqing/liveplayer/-/liveplayer-2.7.0.tgz#06b7c4093cc299b6f9cff060e9ef4835ff6f8f70"
+  integrity sha512-SWveQRqhhfJzkcpmHZxL6eLn+xLQuub888/JiBtUDHgt1eVwYYsorDiGcAKciNcyD70PuMfQ3+QrLoLbWE2vWA==
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"