diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>
diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue
index a271668..2b9212b 100644
--- a/src/views/alarm/securityAlarm/list.vue
+++ b/src/views/alarm/securityAlarm/list.vue
@@ -1,8 +1,7 @@
 <!-- 安全隐患报警管理 -->
 <script lang="ts" setup name="IdentifyResultPage">
 import dayjs from 'dayjs'
-// import { getResultList, getResultPic } from '@/api/page/result'
-// import { getDeviceAll } from '@/api/page/device'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
 import img from '@/assets/image/loading.gif'
 // 获取页面高度
 const pageHeight = ref(window.innerHeight - 260)
@@ -16,107 +15,56 @@
 const list = ref<any[]>([])
 //  查询条件
 const listQuery = ref({
-  area: '', // 所属区域
-  equipmentName: '', // 相机
+  areaName: '', // 所属区域
+  deviceName: '', // 相机
   deptId: '', // 所属单位
-  frameStartTime: '', // 开始时间
-  frameEndTime: '', // 结束时间
+  deptName: '', // 所属单位名称
+  alarmTimeStart: '', // 开始时间
+  alarmTimeEnd: '', // 结束时间
   offset: 1,
   limit: 20,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.frameStartTime = ''
-  listQuery.value.frameEndTime = ''
+  listQuery.value.alarmTimeStart = ''
+  listQuery.value.alarmTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.frameStartTime = `${newVal[0]} 00:00:00`
-      listQuery.value.frameEndTime = `${newVal[1]} 23:59:59`
+      listQuery.value.alarmTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.alarmTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
+  search()
 })
 // 获取数据
 const fetchData = () => {
   loadingTable.value = false
-  list.value = [{
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  }]
-  // getResultList(listQuery.value).then((res) => {
-  //   total.value = res.data.total
-  //   list.value = res.data.items.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       time: dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'),
-  //       url: `${publicPath}/image/loading.gif`,
-  //     }
-  //   })
-  //   list.value.forEach((element: any) => {
-  //     getResultPic({ frame_id: element.id }).then((res) => {
-  //       const reader = new FileReader()
-  //       reader.onload = (e: any) => {
-  //         element.url = e.target.result
-  //       }
-  //       reader.readAsDataURL(res.data)
-  //     }).catch(() => {
-  //       element.url = ''
-  //     })
-  //   })
-  //   const seat = list.value.length % 4
-  //   // 占位符 重要用来补充不足4的部分(布局需要)
-  //   if (seat !== 0) {
-  //     for (let i = 0; i < 4 - seat; i++) {
-  //       console.log(i, 4 - (list.value.length % 4))
-  //       list.value.push({
-  //         id: '',
-  //       })
-  //     }
-  //   }
-  //   // const
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getSecurityAlarmList(listQuery.value).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + 'picture/alarm/' + item.filePath + '?token=' + window.localStorage.getItem('token'),
+      }
+    })
+    console.log(list.value)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置
 const reset = () => {
   datetimerange.value = []
   listQuery.value = {
-    area: '', // 所属区域
-    equipmentName: '', // 相机
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
     deptId: '', // 所属单位
-    frameStartTime: '', // 开始时间
-    frameEndTime: '', // 结束时间
+    deptName: '', // 所属单位名称
+    alarmTimeStart: '', // 开始时间
+    alarmTimeEnd: '', // 结束时间
     offset: 1,
     limit: 20,
   }
@@ -134,7 +82,7 @@
 }
 
 // 搜索
-const search = () => {
+function search() {
   fetchData()
 }
 
@@ -154,37 +102,41 @@
   <app-container>
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.areaName" placeholder="所属区域" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/>
+        <!-- <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/> -->
+        <el-input v-model="listQuery.deptName" placeholder="所属单位" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="相机" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="相机" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间" @change="search"
+          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间"
         />
       </search-item>
     </search-area>
-    <div v-loading="loadingTable" class="main-area">
+    <div v-loading="loadingTable" class="main-areaName">
       <el-row v-if="list.length" :gutter="20" :style="{ height: `${pageHeight}px` }">
         <el-col v-for="(item, index) in list" :key="index" :span="6" style="margin-bottom: 10px;">
           <el-card :body-style="{ padding: '10px' }">
             <el-image :src="item.url" :preview-src-list="[item.url]" class="image" />
             <div style="padding: 14px;">
-              <span>口罩识别</span>
+              <span style="font-weight: 600;">{{ item.recognitionTypeName || item.sceneName }}</span>
+              <div style="margin-top: 6px;font-size: 14px;">{{ item.deviceName }}</div>
               <div class="bottom clearfix">
-                <time class="time">{{ item.time }}</time>
+                <div class="time" style="margin-bottom: 6px;">{{ item.areaName }}</div>
+                <div class="time" style="margin-bottom: 6px;">{{ item.deptName }}</div>
+                <div class="time">{{ item.alarmTime }}</div>
                 <!-- <el-button type="text" class="button">查看详情</el-button> -->
               </div>
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <el-empty v-else description="暂无数据" :size="200" />
+      <el-empty v-else description="暂无数据" :size="200" :style="{ height: `${pageHeight}px` }" />
     </div>
     <!-- 分页 -->
     <div style="width: 100%;margin: 10px auto;height: 32px;">
@@ -247,7 +199,7 @@
   padding: 10px;
 }
 
-.main-area {
+.main-areaName {
   box-sizing: border-box;
   // background-color: #fff;
   border-radius: 10px;

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>
diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue
index a271668..2b9212b 100644
--- a/src/views/alarm/securityAlarm/list.vue
+++ b/src/views/alarm/securityAlarm/list.vue
@@ -1,8 +1,7 @@
 <!-- 安全隐患报警管理 -->
 <script lang="ts" setup name="IdentifyResultPage">
 import dayjs from 'dayjs'
-// import { getResultList, getResultPic } from '@/api/page/result'
-// import { getDeviceAll } from '@/api/page/device'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
 import img from '@/assets/image/loading.gif'
 // 获取页面高度
 const pageHeight = ref(window.innerHeight - 260)
@@ -16,107 +15,56 @@
 const list = ref<any[]>([])
 //  查询条件
 const listQuery = ref({
-  area: '', // 所属区域
-  equipmentName: '', // 相机
+  areaName: '', // 所属区域
+  deviceName: '', // 相机
   deptId: '', // 所属单位
-  frameStartTime: '', // 开始时间
-  frameEndTime: '', // 结束时间
+  deptName: '', // 所属单位名称
+  alarmTimeStart: '', // 开始时间
+  alarmTimeEnd: '', // 结束时间
   offset: 1,
   limit: 20,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.frameStartTime = ''
-  listQuery.value.frameEndTime = ''
+  listQuery.value.alarmTimeStart = ''
+  listQuery.value.alarmTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.frameStartTime = `${newVal[0]} 00:00:00`
-      listQuery.value.frameEndTime = `${newVal[1]} 23:59:59`
+      listQuery.value.alarmTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.alarmTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
+  search()
 })
 // 获取数据
 const fetchData = () => {
   loadingTable.value = false
-  list.value = [{
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  }]
-  // getResultList(listQuery.value).then((res) => {
-  //   total.value = res.data.total
-  //   list.value = res.data.items.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       time: dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'),
-  //       url: `${publicPath}/image/loading.gif`,
-  //     }
-  //   })
-  //   list.value.forEach((element: any) => {
-  //     getResultPic({ frame_id: element.id }).then((res) => {
-  //       const reader = new FileReader()
-  //       reader.onload = (e: any) => {
-  //         element.url = e.target.result
-  //       }
-  //       reader.readAsDataURL(res.data)
-  //     }).catch(() => {
-  //       element.url = ''
-  //     })
-  //   })
-  //   const seat = list.value.length % 4
-  //   // 占位符 重要用来补充不足4的部分(布局需要)
-  //   if (seat !== 0) {
-  //     for (let i = 0; i < 4 - seat; i++) {
-  //       console.log(i, 4 - (list.value.length % 4))
-  //       list.value.push({
-  //         id: '',
-  //       })
-  //     }
-  //   }
-  //   // const
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getSecurityAlarmList(listQuery.value).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + 'picture/alarm/' + item.filePath + '?token=' + window.localStorage.getItem('token'),
+      }
+    })
+    console.log(list.value)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置
 const reset = () => {
   datetimerange.value = []
   listQuery.value = {
-    area: '', // 所属区域
-    equipmentName: '', // 相机
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
     deptId: '', // 所属单位
-    frameStartTime: '', // 开始时间
-    frameEndTime: '', // 结束时间
+    deptName: '', // 所属单位名称
+    alarmTimeStart: '', // 开始时间
+    alarmTimeEnd: '', // 结束时间
     offset: 1,
     limit: 20,
   }
@@ -134,7 +82,7 @@
 }
 
 // 搜索
-const search = () => {
+function search() {
   fetchData()
 }
 
@@ -154,37 +102,41 @@
   <app-container>
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.areaName" placeholder="所属区域" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/>
+        <!-- <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/> -->
+        <el-input v-model="listQuery.deptName" placeholder="所属单位" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="相机" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="相机" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间" @change="search"
+          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间"
         />
       </search-item>
     </search-area>
-    <div v-loading="loadingTable" class="main-area">
+    <div v-loading="loadingTable" class="main-areaName">
       <el-row v-if="list.length" :gutter="20" :style="{ height: `${pageHeight}px` }">
         <el-col v-for="(item, index) in list" :key="index" :span="6" style="margin-bottom: 10px;">
           <el-card :body-style="{ padding: '10px' }">
             <el-image :src="item.url" :preview-src-list="[item.url]" class="image" />
             <div style="padding: 14px;">
-              <span>口罩识别</span>
+              <span style="font-weight: 600;">{{ item.recognitionTypeName || item.sceneName }}</span>
+              <div style="margin-top: 6px;font-size: 14px;">{{ item.deviceName }}</div>
               <div class="bottom clearfix">
-                <time class="time">{{ item.time }}</time>
+                <div class="time" style="margin-bottom: 6px;">{{ item.areaName }}</div>
+                <div class="time" style="margin-bottom: 6px;">{{ item.deptName }}</div>
+                <div class="time">{{ item.alarmTime }}</div>
                 <!-- <el-button type="text" class="button">查看详情</el-button> -->
               </div>
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <el-empty v-else description="暂无数据" :size="200" />
+      <el-empty v-else description="暂无数据" :size="200" :style="{ height: `${pageHeight}px` }" />
     </div>
     <!-- 分页 -->
     <div style="width: 100%;margin: 10px auto;height: 32px;">
@@ -247,7 +199,7 @@
   padding: 10px;
 }
 
-.main-area {
+.main-areaName {
   box-sizing: border-box;
   // background-color: #fff;
   border-radius: 10px;
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index aaa1686..3d9eab9 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -103,6 +103,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>
diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue
index a271668..2b9212b 100644
--- a/src/views/alarm/securityAlarm/list.vue
+++ b/src/views/alarm/securityAlarm/list.vue
@@ -1,8 +1,7 @@
 <!-- 安全隐患报警管理 -->
 <script lang="ts" setup name="IdentifyResultPage">
 import dayjs from 'dayjs'
-// import { getResultList, getResultPic } from '@/api/page/result'
-// import { getDeviceAll } from '@/api/page/device'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
 import img from '@/assets/image/loading.gif'
 // 获取页面高度
 const pageHeight = ref(window.innerHeight - 260)
@@ -16,107 +15,56 @@
 const list = ref<any[]>([])
 //  查询条件
 const listQuery = ref({
-  area: '', // 所属区域
-  equipmentName: '', // 相机
+  areaName: '', // 所属区域
+  deviceName: '', // 相机
   deptId: '', // 所属单位
-  frameStartTime: '', // 开始时间
-  frameEndTime: '', // 结束时间
+  deptName: '', // 所属单位名称
+  alarmTimeStart: '', // 开始时间
+  alarmTimeEnd: '', // 结束时间
   offset: 1,
   limit: 20,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.frameStartTime = ''
-  listQuery.value.frameEndTime = ''
+  listQuery.value.alarmTimeStart = ''
+  listQuery.value.alarmTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.frameStartTime = `${newVal[0]} 00:00:00`
-      listQuery.value.frameEndTime = `${newVal[1]} 23:59:59`
+      listQuery.value.alarmTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.alarmTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
+  search()
 })
 // 获取数据
 const fetchData = () => {
   loadingTable.value = false
-  list.value = [{
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  }]
-  // getResultList(listQuery.value).then((res) => {
-  //   total.value = res.data.total
-  //   list.value = res.data.items.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       time: dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'),
-  //       url: `${publicPath}/image/loading.gif`,
-  //     }
-  //   })
-  //   list.value.forEach((element: any) => {
-  //     getResultPic({ frame_id: element.id }).then((res) => {
-  //       const reader = new FileReader()
-  //       reader.onload = (e: any) => {
-  //         element.url = e.target.result
-  //       }
-  //       reader.readAsDataURL(res.data)
-  //     }).catch(() => {
-  //       element.url = ''
-  //     })
-  //   })
-  //   const seat = list.value.length % 4
-  //   // 占位符 重要用来补充不足4的部分(布局需要)
-  //   if (seat !== 0) {
-  //     for (let i = 0; i < 4 - seat; i++) {
-  //       console.log(i, 4 - (list.value.length % 4))
-  //       list.value.push({
-  //         id: '',
-  //       })
-  //     }
-  //   }
-  //   // const
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getSecurityAlarmList(listQuery.value).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + 'picture/alarm/' + item.filePath + '?token=' + window.localStorage.getItem('token'),
+      }
+    })
+    console.log(list.value)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置
 const reset = () => {
   datetimerange.value = []
   listQuery.value = {
-    area: '', // 所属区域
-    equipmentName: '', // 相机
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
     deptId: '', // 所属单位
-    frameStartTime: '', // 开始时间
-    frameEndTime: '', // 结束时间
+    deptName: '', // 所属单位名称
+    alarmTimeStart: '', // 开始时间
+    alarmTimeEnd: '', // 结束时间
     offset: 1,
     limit: 20,
   }
@@ -134,7 +82,7 @@
 }
 
 // 搜索
-const search = () => {
+function search() {
   fetchData()
 }
 
@@ -154,37 +102,41 @@
   <app-container>
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.areaName" placeholder="所属区域" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/>
+        <!-- <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/> -->
+        <el-input v-model="listQuery.deptName" placeholder="所属单位" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="相机" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="相机" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间" @change="search"
+          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间"
         />
       </search-item>
     </search-area>
-    <div v-loading="loadingTable" class="main-area">
+    <div v-loading="loadingTable" class="main-areaName">
       <el-row v-if="list.length" :gutter="20" :style="{ height: `${pageHeight}px` }">
         <el-col v-for="(item, index) in list" :key="index" :span="6" style="margin-bottom: 10px;">
           <el-card :body-style="{ padding: '10px' }">
             <el-image :src="item.url" :preview-src-list="[item.url]" class="image" />
             <div style="padding: 14px;">
-              <span>口罩识别</span>
+              <span style="font-weight: 600;">{{ item.recognitionTypeName || item.sceneName }}</span>
+              <div style="margin-top: 6px;font-size: 14px;">{{ item.deviceName }}</div>
               <div class="bottom clearfix">
-                <time class="time">{{ item.time }}</time>
+                <div class="time" style="margin-bottom: 6px;">{{ item.areaName }}</div>
+                <div class="time" style="margin-bottom: 6px;">{{ item.deptName }}</div>
+                <div class="time">{{ item.alarmTime }}</div>
                 <!-- <el-button type="text" class="button">查看详情</el-button> -->
               </div>
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <el-empty v-else description="暂无数据" :size="200" />
+      <el-empty v-else description="暂无数据" :size="200" :style="{ height: `${pageHeight}px` }" />
     </div>
     <!-- 分页 -->
     <div style="width: 100%;margin: 10px auto;height: 32px;">
@@ -247,7 +199,7 @@
   padding: 10px;
 }
 
-.main-area {
+.main-areaName {
   box-sizing: border-box;
   // background-color: #fff;
   border-radius: 10px;
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index aaa1686..3d9eab9 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -103,6 +103,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/monitor/playback/index-media.vue b/src/views/monitor/playback/index-media.vue
index 3a1fab8..ed5c1f0 100644
--- a/src/views/monitor/playback/index-media.vue
+++ b/src/views/monitor/playback/index-media.vue
@@ -275,7 +275,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -473,6 +473,7 @@
 </style>
 
 <style lang="scss">
+.playback {
   .el-tree-node__content {
     padding-left: 0 !important;
   }
@@ -484,4 +485,5 @@
     display: inline-block;
     min-width: 100%;
   }
+}
 </style>

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>
diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue
index a271668..2b9212b 100644
--- a/src/views/alarm/securityAlarm/list.vue
+++ b/src/views/alarm/securityAlarm/list.vue
@@ -1,8 +1,7 @@
 <!-- 安全隐患报警管理 -->
 <script lang="ts" setup name="IdentifyResultPage">
 import dayjs from 'dayjs'
-// import { getResultList, getResultPic } from '@/api/page/result'
-// import { getDeviceAll } from '@/api/page/device'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
 import img from '@/assets/image/loading.gif'
 // 获取页面高度
 const pageHeight = ref(window.innerHeight - 260)
@@ -16,107 +15,56 @@
 const list = ref<any[]>([])
 //  查询条件
 const listQuery = ref({
-  area: '', // 所属区域
-  equipmentName: '', // 相机
+  areaName: '', // 所属区域
+  deviceName: '', // 相机
   deptId: '', // 所属单位
-  frameStartTime: '', // 开始时间
-  frameEndTime: '', // 结束时间
+  deptName: '', // 所属单位名称
+  alarmTimeStart: '', // 开始时间
+  alarmTimeEnd: '', // 结束时间
   offset: 1,
   limit: 20,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.frameStartTime = ''
-  listQuery.value.frameEndTime = ''
+  listQuery.value.alarmTimeStart = ''
+  listQuery.value.alarmTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.frameStartTime = `${newVal[0]} 00:00:00`
-      listQuery.value.frameEndTime = `${newVal[1]} 23:59:59`
+      listQuery.value.alarmTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.alarmTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
+  search()
 })
 // 获取数据
 const fetchData = () => {
   loadingTable.value = false
-  list.value = [{
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  }]
-  // getResultList(listQuery.value).then((res) => {
-  //   total.value = res.data.total
-  //   list.value = res.data.items.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       time: dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'),
-  //       url: `${publicPath}/image/loading.gif`,
-  //     }
-  //   })
-  //   list.value.forEach((element: any) => {
-  //     getResultPic({ frame_id: element.id }).then((res) => {
-  //       const reader = new FileReader()
-  //       reader.onload = (e: any) => {
-  //         element.url = e.target.result
-  //       }
-  //       reader.readAsDataURL(res.data)
-  //     }).catch(() => {
-  //       element.url = ''
-  //     })
-  //   })
-  //   const seat = list.value.length % 4
-  //   // 占位符 重要用来补充不足4的部分(布局需要)
-  //   if (seat !== 0) {
-  //     for (let i = 0; i < 4 - seat; i++) {
-  //       console.log(i, 4 - (list.value.length % 4))
-  //       list.value.push({
-  //         id: '',
-  //       })
-  //     }
-  //   }
-  //   // const
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getSecurityAlarmList(listQuery.value).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + 'picture/alarm/' + item.filePath + '?token=' + window.localStorage.getItem('token'),
+      }
+    })
+    console.log(list.value)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置
 const reset = () => {
   datetimerange.value = []
   listQuery.value = {
-    area: '', // 所属区域
-    equipmentName: '', // 相机
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
     deptId: '', // 所属单位
-    frameStartTime: '', // 开始时间
-    frameEndTime: '', // 结束时间
+    deptName: '', // 所属单位名称
+    alarmTimeStart: '', // 开始时间
+    alarmTimeEnd: '', // 结束时间
     offset: 1,
     limit: 20,
   }
@@ -134,7 +82,7 @@
 }
 
 // 搜索
-const search = () => {
+function search() {
   fetchData()
 }
 
@@ -154,37 +102,41 @@
   <app-container>
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.areaName" placeholder="所属区域" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/>
+        <!-- <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/> -->
+        <el-input v-model="listQuery.deptName" placeholder="所属单位" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="相机" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="相机" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间" @change="search"
+          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间"
         />
       </search-item>
     </search-area>
-    <div v-loading="loadingTable" class="main-area">
+    <div v-loading="loadingTable" class="main-areaName">
       <el-row v-if="list.length" :gutter="20" :style="{ height: `${pageHeight}px` }">
         <el-col v-for="(item, index) in list" :key="index" :span="6" style="margin-bottom: 10px;">
           <el-card :body-style="{ padding: '10px' }">
             <el-image :src="item.url" :preview-src-list="[item.url]" class="image" />
             <div style="padding: 14px;">
-              <span>口罩识别</span>
+              <span style="font-weight: 600;">{{ item.recognitionTypeName || item.sceneName }}</span>
+              <div style="margin-top: 6px;font-size: 14px;">{{ item.deviceName }}</div>
               <div class="bottom clearfix">
-                <time class="time">{{ item.time }}</time>
+                <div class="time" style="margin-bottom: 6px;">{{ item.areaName }}</div>
+                <div class="time" style="margin-bottom: 6px;">{{ item.deptName }}</div>
+                <div class="time">{{ item.alarmTime }}</div>
                 <!-- <el-button type="text" class="button">查看详情</el-button> -->
               </div>
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <el-empty v-else description="暂无数据" :size="200" />
+      <el-empty v-else description="暂无数据" :size="200" :style="{ height: `${pageHeight}px` }" />
     </div>
     <!-- 分页 -->
     <div style="width: 100%;margin: 10px auto;height: 32px;">
@@ -247,7 +199,7 @@
   padding: 10px;
 }
 
-.main-area {
+.main-areaName {
   box-sizing: border-box;
   // background-color: #fff;
   border-radius: 10px;
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index aaa1686..3d9eab9 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -103,6 +103,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/monitor/playback/index-media.vue b/src/views/monitor/playback/index-media.vue
index 3a1fab8..ed5c1f0 100644
--- a/src/views/monitor/playback/index-media.vue
+++ b/src/views/monitor/playback/index-media.vue
@@ -275,7 +275,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -473,6 +473,7 @@
 </style>
 
 <style lang="scss">
+.playback {
   .el-tree-node__content {
     padding-left: 0 !important;
   }
@@ -484,4 +485,5 @@
     display: inline-block;
     min-width: 100%;
   }
+}
 </style>
diff --git a/src/views/monitor/playback/index.vue b/src/views/monitor/playback/index.vue
index 3ac0d8c..b82ddbd 100644
--- a/src/views/monitor/playback/index.vue
+++ b/src/views/monitor/playback/index.vue
@@ -311,10 +311,10 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
-      <el-card class="left">
-        <div style="display: flex;margin: 5px 0;margin-left: -20px;width: 280px">
+      <el-card class="left"  :body-style="{ padding: '10px' }">
+        <div style="display: flex;margin: 5px 0;margin-left: -10px;width: 280px">
           <span class="title">日期：</span>
           <el-date-picker
             v-model="day"
@@ -326,7 +326,7 @@
             placeholder="回放日期"
           />
         </div>
-        <div style="display: flex;margin-bottom: 5px;margin-left: -20px;width: 280px">
+        <div style="display: flex;margin-bottom: 5px;margin-left: -10px;width: 280px">
           <span class="title">时间：</span>
           <el-time-picker
             v-model="startTime"
@@ -349,7 +349,7 @@
           />
         </div>
 
-        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -20px;width: 275px" />
+        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -10px;width: 275px" />
         <el-tree
           ref="treeRef"
           class="filter-tree"
@@ -363,12 +363,12 @@
         >
           <template #default="{ node, data }">
             <span style="display: flex;align-items: center;">
-              <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
                 <svg-icon name="icon-online" />
               </el-icon>
               <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
                 <svg-icon name="icon-offline" />
-              </el-icon>
+              </el-icon> -->
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -450,10 +450,15 @@
   background-color: #111111;
 }
 .left {
+  // width: 300px;
+  // height: 100%;
+  // padding: 10px;
+  // overflow-y: scroll;
+  box-sizing: border-box;
   width: 300px;
   height: 100%;
-  padding: 10px;
   overflow-y: scroll;
+  overflow-x: scroll;
 }
 .right {
   width: calc(100% - 310px);
@@ -475,3 +480,19 @@
   background: #000;
 }
 </style>
+
+<style lang="scss">
+.playback {
+  .el-tree-node__content {
+    padding-left: 0 !important;
+  }
+  .el-tree {
+    width: 100%;
+  }
+
+  .el-tree > .el-tree-node {
+    display: inline-block;
+    min-width: 100%;
+  }
+}
+</style>

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>
diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue
index a271668..2b9212b 100644
--- a/src/views/alarm/securityAlarm/list.vue
+++ b/src/views/alarm/securityAlarm/list.vue
@@ -1,8 +1,7 @@
 <!-- 安全隐患报警管理 -->
 <script lang="ts" setup name="IdentifyResultPage">
 import dayjs from 'dayjs'
-// import { getResultList, getResultPic } from '@/api/page/result'
-// import { getDeviceAll } from '@/api/page/device'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
 import img from '@/assets/image/loading.gif'
 // 获取页面高度
 const pageHeight = ref(window.innerHeight - 260)
@@ -16,107 +15,56 @@
 const list = ref<any[]>([])
 //  查询条件
 const listQuery = ref({
-  area: '', // 所属区域
-  equipmentName: '', // 相机
+  areaName: '', // 所属区域
+  deviceName: '', // 相机
   deptId: '', // 所属单位
-  frameStartTime: '', // 开始时间
-  frameEndTime: '', // 结束时间
+  deptName: '', // 所属单位名称
+  alarmTimeStart: '', // 开始时间
+  alarmTimeEnd: '', // 结束时间
   offset: 1,
   limit: 20,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.frameStartTime = ''
-  listQuery.value.frameEndTime = ''
+  listQuery.value.alarmTimeStart = ''
+  listQuery.value.alarmTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.frameStartTime = `${newVal[0]} 00:00:00`
-      listQuery.value.frameEndTime = `${newVal[1]} 23:59:59`
+      listQuery.value.alarmTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.alarmTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
+  search()
 })
 // 获取数据
 const fetchData = () => {
   loadingTable.value = false
-  list.value = [{
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  }]
-  // getResultList(listQuery.value).then((res) => {
-  //   total.value = res.data.total
-  //   list.value = res.data.items.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       time: dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'),
-  //       url: `${publicPath}/image/loading.gif`,
-  //     }
-  //   })
-  //   list.value.forEach((element: any) => {
-  //     getResultPic({ frame_id: element.id }).then((res) => {
-  //       const reader = new FileReader()
-  //       reader.onload = (e: any) => {
-  //         element.url = e.target.result
-  //       }
-  //       reader.readAsDataURL(res.data)
-  //     }).catch(() => {
-  //       element.url = ''
-  //     })
-  //   })
-  //   const seat = list.value.length % 4
-  //   // 占位符 重要用来补充不足4的部分(布局需要)
-  //   if (seat !== 0) {
-  //     for (let i = 0; i < 4 - seat; i++) {
-  //       console.log(i, 4 - (list.value.length % 4))
-  //       list.value.push({
-  //         id: '',
-  //       })
-  //     }
-  //   }
-  //   // const
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getSecurityAlarmList(listQuery.value).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + 'picture/alarm/' + item.filePath + '?token=' + window.localStorage.getItem('token'),
+      }
+    })
+    console.log(list.value)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置
 const reset = () => {
   datetimerange.value = []
   listQuery.value = {
-    area: '', // 所属区域
-    equipmentName: '', // 相机
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
     deptId: '', // 所属单位
-    frameStartTime: '', // 开始时间
-    frameEndTime: '', // 结束时间
+    deptName: '', // 所属单位名称
+    alarmTimeStart: '', // 开始时间
+    alarmTimeEnd: '', // 结束时间
     offset: 1,
     limit: 20,
   }
@@ -134,7 +82,7 @@
 }
 
 // 搜索
-const search = () => {
+function search() {
   fetchData()
 }
 
@@ -154,37 +102,41 @@
   <app-container>
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.areaName" placeholder="所属区域" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/>
+        <!-- <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/> -->
+        <el-input v-model="listQuery.deptName" placeholder="所属单位" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="相机" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="相机" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间" @change="search"
+          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间"
         />
       </search-item>
     </search-area>
-    <div v-loading="loadingTable" class="main-area">
+    <div v-loading="loadingTable" class="main-areaName">
       <el-row v-if="list.length" :gutter="20" :style="{ height: `${pageHeight}px` }">
         <el-col v-for="(item, index) in list" :key="index" :span="6" style="margin-bottom: 10px;">
           <el-card :body-style="{ padding: '10px' }">
             <el-image :src="item.url" :preview-src-list="[item.url]" class="image" />
             <div style="padding: 14px;">
-              <span>口罩识别</span>
+              <span style="font-weight: 600;">{{ item.recognitionTypeName || item.sceneName }}</span>
+              <div style="margin-top: 6px;font-size: 14px;">{{ item.deviceName }}</div>
               <div class="bottom clearfix">
-                <time class="time">{{ item.time }}</time>
+                <div class="time" style="margin-bottom: 6px;">{{ item.areaName }}</div>
+                <div class="time" style="margin-bottom: 6px;">{{ item.deptName }}</div>
+                <div class="time">{{ item.alarmTime }}</div>
                 <!-- <el-button type="text" class="button">查看详情</el-button> -->
               </div>
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <el-empty v-else description="暂无数据" :size="200" />
+      <el-empty v-else description="暂无数据" :size="200" :style="{ height: `${pageHeight}px` }" />
     </div>
     <!-- 分页 -->
     <div style="width: 100%;margin: 10px auto;height: 32px;">
@@ -247,7 +199,7 @@
   padding: 10px;
 }
 
-.main-area {
+.main-areaName {
   box-sizing: border-box;
   // background-color: #fff;
   border-radius: 10px;
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index aaa1686..3d9eab9 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -103,6 +103,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/monitor/playback/index-media.vue b/src/views/monitor/playback/index-media.vue
index 3a1fab8..ed5c1f0 100644
--- a/src/views/monitor/playback/index-media.vue
+++ b/src/views/monitor/playback/index-media.vue
@@ -275,7 +275,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -473,6 +473,7 @@
 </style>
 
 <style lang="scss">
+.playback {
   .el-tree-node__content {
     padding-left: 0 !important;
   }
@@ -484,4 +485,5 @@
     display: inline-block;
     min-width: 100%;
   }
+}
 </style>
diff --git a/src/views/monitor/playback/index.vue b/src/views/monitor/playback/index.vue
index 3ac0d8c..b82ddbd 100644
--- a/src/views/monitor/playback/index.vue
+++ b/src/views/monitor/playback/index.vue
@@ -311,10 +311,10 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
-      <el-card class="left">
-        <div style="display: flex;margin: 5px 0;margin-left: -20px;width: 280px">
+      <el-card class="left"  :body-style="{ padding: '10px' }">
+        <div style="display: flex;margin: 5px 0;margin-left: -10px;width: 280px">
           <span class="title">日期：</span>
           <el-date-picker
             v-model="day"
@@ -326,7 +326,7 @@
             placeholder="回放日期"
           />
         </div>
-        <div style="display: flex;margin-bottom: 5px;margin-left: -20px;width: 280px">
+        <div style="display: flex;margin-bottom: 5px;margin-left: -10px;width: 280px">
           <span class="title">时间：</span>
           <el-time-picker
             v-model="startTime"
@@ -349,7 +349,7 @@
           />
         </div>
 
-        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -20px;width: 275px" />
+        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -10px;width: 275px" />
         <el-tree
           ref="treeRef"
           class="filter-tree"
@@ -363,12 +363,12 @@
         >
           <template #default="{ node, data }">
             <span style="display: flex;align-items: center;">
-              <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
                 <svg-icon name="icon-online" />
               </el-icon>
               <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
                 <svg-icon name="icon-offline" />
-              </el-icon>
+              </el-icon> -->
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -450,10 +450,15 @@
   background-color: #111111;
 }
 .left {
+  // width: 300px;
+  // height: 100%;
+  // padding: 10px;
+  // overflow-y: scroll;
+  box-sizing: border-box;
   width: 300px;
   height: 100%;
-  padding: 10px;
   overflow-y: scroll;
+  overflow-x: scroll;
 }
 .right {
   width: calc(100% - 310px);
@@ -475,3 +480,19 @@
   background: #000;
 }
 </style>
+
+<style lang="scss">
+.playback {
+  .el-tree-node__content {
+    padding-left: 0 !important;
+  }
+  .el-tree {
+    width: 100%;
+  }
+
+  .el-tree > .el-tree-node {
+    display: inline-block;
+    min-width: 100%;
+  }
+}
+</style>
diff --git a/src/views/monitor/realTime/index-media-single.vue b/src/views/monitor/realTime/index-media-single.vue
index 228f94f..583843d 100644
--- a/src/views/monitor/realTime/index-media-single.vue
+++ b/src/views/monitor/realTime/index-media-single.vue
@@ -148,7 +148,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="realTime">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -305,15 +305,17 @@
 </style>
 
 <style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
+.realTime {
+  .el-tree-node__content {
+    padding-left: 0 !important;
+  }
+  .el-tree {
+    width: 100%;
+  }
 
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
+  .el-tree > .el-tree-node {
+    display: inline-block;
+    min-width: 100%;
+  }
 }
 </style>

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>
diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue
index a271668..2b9212b 100644
--- a/src/views/alarm/securityAlarm/list.vue
+++ b/src/views/alarm/securityAlarm/list.vue
@@ -1,8 +1,7 @@
 <!-- 安全隐患报警管理 -->
 <script lang="ts" setup name="IdentifyResultPage">
 import dayjs from 'dayjs'
-// import { getResultList, getResultPic } from '@/api/page/result'
-// import { getDeviceAll } from '@/api/page/device'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
 import img from '@/assets/image/loading.gif'
 // 获取页面高度
 const pageHeight = ref(window.innerHeight - 260)
@@ -16,107 +15,56 @@
 const list = ref<any[]>([])
 //  查询条件
 const listQuery = ref({
-  area: '', // 所属区域
-  equipmentName: '', // 相机
+  areaName: '', // 所属区域
+  deviceName: '', // 相机
   deptId: '', // 所属单位
-  frameStartTime: '', // 开始时间
-  frameEndTime: '', // 结束时间
+  deptName: '', // 所属单位名称
+  alarmTimeStart: '', // 开始时间
+  alarmTimeEnd: '', // 结束时间
   offset: 1,
   limit: 20,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.frameStartTime = ''
-  listQuery.value.frameEndTime = ''
+  listQuery.value.alarmTimeStart = ''
+  listQuery.value.alarmTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.frameStartTime = `${newVal[0]} 00:00:00`
-      listQuery.value.frameEndTime = `${newVal[1]} 23:59:59`
+      listQuery.value.alarmTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.alarmTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
+  search()
 })
 // 获取数据
 const fetchData = () => {
   loadingTable.value = false
-  list.value = [{
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  }]
-  // getResultList(listQuery.value).then((res) => {
-  //   total.value = res.data.total
-  //   list.value = res.data.items.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       time: dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'),
-  //       url: `${publicPath}/image/loading.gif`,
-  //     }
-  //   })
-  //   list.value.forEach((element: any) => {
-  //     getResultPic({ frame_id: element.id }).then((res) => {
-  //       const reader = new FileReader()
-  //       reader.onload = (e: any) => {
-  //         element.url = e.target.result
-  //       }
-  //       reader.readAsDataURL(res.data)
-  //     }).catch(() => {
-  //       element.url = ''
-  //     })
-  //   })
-  //   const seat = list.value.length % 4
-  //   // 占位符 重要用来补充不足4的部分(布局需要)
-  //   if (seat !== 0) {
-  //     for (let i = 0; i < 4 - seat; i++) {
-  //       console.log(i, 4 - (list.value.length % 4))
-  //       list.value.push({
-  //         id: '',
-  //       })
-  //     }
-  //   }
-  //   // const
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getSecurityAlarmList(listQuery.value).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + 'picture/alarm/' + item.filePath + '?token=' + window.localStorage.getItem('token'),
+      }
+    })
+    console.log(list.value)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置
 const reset = () => {
   datetimerange.value = []
   listQuery.value = {
-    area: '', // 所属区域
-    equipmentName: '', // 相机
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
     deptId: '', // 所属单位
-    frameStartTime: '', // 开始时间
-    frameEndTime: '', // 结束时间
+    deptName: '', // 所属单位名称
+    alarmTimeStart: '', // 开始时间
+    alarmTimeEnd: '', // 结束时间
     offset: 1,
     limit: 20,
   }
@@ -134,7 +82,7 @@
 }
 
 // 搜索
-const search = () => {
+function search() {
   fetchData()
 }
 
@@ -154,37 +102,41 @@
   <app-container>
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.areaName" placeholder="所属区域" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/>
+        <!-- <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/> -->
+        <el-input v-model="listQuery.deptName" placeholder="所属单位" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="相机" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="相机" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间" @change="search"
+          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间"
         />
       </search-item>
     </search-area>
-    <div v-loading="loadingTable" class="main-area">
+    <div v-loading="loadingTable" class="main-areaName">
       <el-row v-if="list.length" :gutter="20" :style="{ height: `${pageHeight}px` }">
         <el-col v-for="(item, index) in list" :key="index" :span="6" style="margin-bottom: 10px;">
           <el-card :body-style="{ padding: '10px' }">
             <el-image :src="item.url" :preview-src-list="[item.url]" class="image" />
             <div style="padding: 14px;">
-              <span>口罩识别</span>
+              <span style="font-weight: 600;">{{ item.recognitionTypeName || item.sceneName }}</span>
+              <div style="margin-top: 6px;font-size: 14px;">{{ item.deviceName }}</div>
               <div class="bottom clearfix">
-                <time class="time">{{ item.time }}</time>
+                <div class="time" style="margin-bottom: 6px;">{{ item.areaName }}</div>
+                <div class="time" style="margin-bottom: 6px;">{{ item.deptName }}</div>
+                <div class="time">{{ item.alarmTime }}</div>
                 <!-- <el-button type="text" class="button">查看详情</el-button> -->
               </div>
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <el-empty v-else description="暂无数据" :size="200" />
+      <el-empty v-else description="暂无数据" :size="200" :style="{ height: `${pageHeight}px` }" />
     </div>
     <!-- 分页 -->
     <div style="width: 100%;margin: 10px auto;height: 32px;">
@@ -247,7 +199,7 @@
   padding: 10px;
 }
 
-.main-area {
+.main-areaName {
   box-sizing: border-box;
   // background-color: #fff;
   border-radius: 10px;
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index aaa1686..3d9eab9 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -103,6 +103,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/monitor/playback/index-media.vue b/src/views/monitor/playback/index-media.vue
index 3a1fab8..ed5c1f0 100644
--- a/src/views/monitor/playback/index-media.vue
+++ b/src/views/monitor/playback/index-media.vue
@@ -275,7 +275,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -473,6 +473,7 @@
 </style>
 
 <style lang="scss">
+.playback {
   .el-tree-node__content {
     padding-left: 0 !important;
   }
@@ -484,4 +485,5 @@
     display: inline-block;
     min-width: 100%;
   }
+}
 </style>
diff --git a/src/views/monitor/playback/index.vue b/src/views/monitor/playback/index.vue
index 3ac0d8c..b82ddbd 100644
--- a/src/views/monitor/playback/index.vue
+++ b/src/views/monitor/playback/index.vue
@@ -311,10 +311,10 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
-      <el-card class="left">
-        <div style="display: flex;margin: 5px 0;margin-left: -20px;width: 280px">
+      <el-card class="left"  :body-style="{ padding: '10px' }">
+        <div style="display: flex;margin: 5px 0;margin-left: -10px;width: 280px">
           <span class="title">日期：</span>
           <el-date-picker
             v-model="day"
@@ -326,7 +326,7 @@
             placeholder="回放日期"
           />
         </div>
-        <div style="display: flex;margin-bottom: 5px;margin-left: -20px;width: 280px">
+        <div style="display: flex;margin-bottom: 5px;margin-left: -10px;width: 280px">
           <span class="title">时间：</span>
           <el-time-picker
             v-model="startTime"
@@ -349,7 +349,7 @@
           />
         </div>
 
-        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -20px;width: 275px" />
+        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -10px;width: 275px" />
         <el-tree
           ref="treeRef"
           class="filter-tree"
@@ -363,12 +363,12 @@
         >
           <template #default="{ node, data }">
             <span style="display: flex;align-items: center;">
-              <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
                 <svg-icon name="icon-online" />
               </el-icon>
               <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
                 <svg-icon name="icon-offline" />
-              </el-icon>
+              </el-icon> -->
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -450,10 +450,15 @@
   background-color: #111111;
 }
 .left {
+  // width: 300px;
+  // height: 100%;
+  // padding: 10px;
+  // overflow-y: scroll;
+  box-sizing: border-box;
   width: 300px;
   height: 100%;
-  padding: 10px;
   overflow-y: scroll;
+  overflow-x: scroll;
 }
 .right {
   width: calc(100% - 310px);
@@ -475,3 +480,19 @@
   background: #000;
 }
 </style>
+
+<style lang="scss">
+.playback {
+  .el-tree-node__content {
+    padding-left: 0 !important;
+  }
+  .el-tree {
+    width: 100%;
+  }
+
+  .el-tree > .el-tree-node {
+    display: inline-block;
+    min-width: 100%;
+  }
+}
+</style>
diff --git a/src/views/monitor/realTime/index-media-single.vue b/src/views/monitor/realTime/index-media-single.vue
index 228f94f..583843d 100644
--- a/src/views/monitor/realTime/index-media-single.vue
+++ b/src/views/monitor/realTime/index-media-single.vue
@@ -148,7 +148,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="realTime">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -305,15 +305,17 @@
 </style>
 
 <style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
+.realTime {
+  .el-tree-node__content {
+    padding-left: 0 !important;
+  }
+  .el-tree {
+    width: 100%;
+  }
 
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
+  .el-tree > .el-tree-node {
+    display: inline-block;
+    min-width: 100%;
+  }
 }
 </style>
diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue
index 074dc92..2feec02 100644
--- a/src/views/monitor/realTime/index-new-gm-plugin.vue
+++ b/src/views/monitor/realTime/index-new-gm-plugin.vue
@@ -19,6 +19,7 @@
 console.log('baseurl', baseurl.value)
 const { proxy } = getCurrentInstance() as any
 const mediaToken = ref('') // 流媒体token
+const currentData = ref() // 当前播放视频的设备信息
 const width = ref(0)
 const height = ref(0)
 const loading = ref(false)
@@ -88,6 +89,7 @@
       src.value[0] = `${url}?token=${window.localStorage.getItem('token')}`
       currentCameras[0] = data
       title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
       // 记录正在播的流的国标号
       currentStreamId.value = createStreamResponseId
 
@@ -142,14 +144,14 @@
 function page(index: any) {
   console.log('跳转控制页')
 
-  // if (src.value[index] !== '') {
+  if (src.value[index] !== '') {
     router.push({
       path: '/realTime/control',
       query: {
         id: currentCameras[index].id,
       },
     })
-  // }
+  }
 }
 
 const unwatch = watch(filterText, (newVal) => {
@@ -200,9 +202,9 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="realTime">
     <div style="display: flex;height: 100%">
-      <el-card class="left">
+      <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
           v-model="filterText"
           placeholder="设备名称过滤"
@@ -227,12 +229,12 @@
                 <svg-icon name="icon-loading" />
               </el-icon>
               <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
                 <svg-icon name="icon-online" />
               </el-icon>
               <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
                 <svg-icon name="icon-offline" />
-              </el-icon>
+              </el-icon> -->
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -279,6 +281,18 @@
         />
         <div class="title">
           {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
         </div>
         <div v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
           z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">视频加载中，请稍等...</div>
@@ -315,11 +329,11 @@
   padding-left: 6px;
 }
 .left {
+  box-sizing: border-box;
   width: 300px;
   height: 100%;
-  padding: 10px;
   overflow-y: scroll;
-
+  overflow-x: scroll;
 }
 
 .video-container {
@@ -352,3 +366,19 @@
   animation: rotate 2s linear infinite;
 }
 </style>
+
+<style lang="scss">
+  .realTime {
+    .el-tree-node__content {
+      padding-left: 0 !important;
+    }
+    .el-tree {
+      width: 100%;
+    }
+
+    .el-tree > .el-tree-node {
+      display: inline-block;
+      min-width: 100%;
+    }
+  }
+</style>

diff --git a/public/config/config.json b/public/config/config.json
index 29161c3..12a6978 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title": "安全生产智慧监管系统",
   "baseUrl": "http://192.168.83.42:6909/safe-server/",
-  "mediaBaseUrl": "http:/192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
diff --git a/src/api/alarm/securityAlarm/securityAlarmList.ts b/src/api/alarm/securityAlarm/securityAlarmList.ts
new file mode 100644
index 0000000..793b9c1
--- /dev/null
+++ b/src/api/alarm/securityAlarm/securityAlarmList.ts
@@ -0,0 +1,13 @@
+/**
+ * 安全隐患报警管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getSecurityAlarmList(data: any) {
+  return request({
+    url: 'record/listPage',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 92165e1..5b18391 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -162,7 +162,7 @@
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%;" class="dept-select">
     <el-tree-select
       v-if="multiData"
       v-model="value"
diff --git a/src/router/modules/alarm.ts b/src/router/modules/alarm.ts
index 2db5801..f8109ab 100644
--- a/src/router/modules/alarm.ts
+++ b/src/router/modules/alarm.ts
@@ -71,7 +71,7 @@
       {
         path: 'videoPreviewList',
         name: 'PolicyConfigVideoPreviewList',
-        component: () => import('@/views/alarm/policyConfig/videoPreview/list.vue'),
+        component: () => import('@/views/alarm/policyConfig/videoPreview/index-media-single.vue'),
         meta: {
           title: '视频预览',
           icon: 'ep:key',
diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue
index 4f1232f..0d491c1 100644
--- a/src/views/alarm/dangerAssessment/assessment/list.vue
+++ b/src/views/alarm/dangerAssessment/assessment/list.vue
@@ -193,7 +193,7 @@
         <el-image :src="sbzs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            安全隐患总数
+            重大危险源
           </div>
           <div class="num">
             {{ list.devTotal }}<span class="unit">个</span>
@@ -204,7 +204,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            易燃易爆类
+            危险点
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -215,7 +215,7 @@
         <el-image :src="sbzxs" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            机械类
+            危险化学品场所
           </div>
           <div class="num">
             {{ list.onlineNum }}<span class="unit">个</span>
@@ -226,7 +226,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            有毒有害气体类
+            危险作业
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -237,7 +237,7 @@
         <el-image :src="sblxl" class="base-map-image" mode="fill" />
         <div class="item-text">
           <div style="color: #0f67e7;">
-            其他
+            危险工序
           </div>
           <div class="num">
             {{ list.onlineRate }}<span class="unit">个</span>
@@ -247,7 +247,7 @@
     </div>
     <div class="device-bench">
       <el-row :gutter="10">
-        <el-col :span="8">
+        <el-col :span="12">
           <bench-col
             v-loading="areaPieLoading" icon="icon-pie" title="区域安全隐患分析" :height="blockHeight"
           >
@@ -256,7 +256,7 @@
               unit="台"
               :data="areaPieData"
               :radius="['0%', '70%']"
-              :width="`${blockWidth / 3 - 10}px`"
+              :width="`${blockWidth / 2 - 10}px`"
               :height="`${blockHeight - 30}px`"
               :right="32"
               :legend="{
@@ -275,7 +275,7 @@
             />
           </bench-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <bench-col v-loading="safeCatogeryLoading" icon="icon-bar" title="安全隐患类别分析" :height="blockHeight">
             <bar-chart-horizontal
               style="margin-top: -20px;"
@@ -298,25 +298,7 @@
               }"
             />
           </bench-col>
-        </el-col>
-        <el-col :span="8">
-          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
-            <bar-chart-vertical
-              style="margin-top: -20px;"
-              unit="台"
-              :x-axis-data="lastMonthAlarmXData"
-              :width="`${blockWidth / 3 - 10}px`"
-              :height="`${blockHeight - 30}px`"
-              :data="lastMonthAlarmData"
-              :max="lastMonthAlarmYDataMax"
-              :barConer="0"
-            />
-          </bench-col>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="device-bench" style="margin-top: 10px;">
-      <el-row :gutter="10">
+        </el-col> -->
         <el-col :span="12">
           <bench-col v-loading="safeCatogeryByDeptLoading" icon="icon-bar" title="单位安全隐患分类" :height="blockHeight">
             <bar-chart-vertical
@@ -350,6 +332,25 @@
             />
           </bench-col>
         </el-col>
+      </el-row>
+    </div>
+    <div class="device-bench" style="margin-top: 10px;">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <bench-col v-loading="lastMonthAlarmLoading" icon="icon-bar" title="单位近一个月报警分析" :height="blockHeight">
+            <bar-chart-vertical
+              style="margin-top: -20px;"
+              unit="台"
+              :x-axis-data="lastMonthAlarmXData"
+              :width="`${blockWidth / 2 - 10}px`"
+              :height="`${blockHeight - 30}px`"
+              :data="lastMonthAlarmData"
+              :max="lastMonthAlarmYDataMax"
+              :barConer="0"
+            />
+          </bench-col>
+        </el-col>
+
         <el-col :span="12">
           <bench-col v-loading="alarmLineLoading" icon="icon-line" title="单位报警时间曲线" :height="blockHeight">
             <line-chart
@@ -472,7 +473,6 @@
   border-radius: 8px;
 }
 
-
 .num {
   text-shadow: 0 0 5px #0f67e7;
   color: #0f67e7;
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8ce1a7b..bf5fcd5 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑危险点 -->
+<!-- 新增、编辑重大危险源（pending） -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -20,14 +20,15 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险点名称
-  address: '', // 详细地址
-  content: '', // 作业活动概述
+  riskName: '', // 危险源名称
+  csjb: '', // 场所级别
+  wxhxpmc: '', // 危险化学品名称
   nature: '', // 危险性质
-  grade: '', // 等级
-  assignPost: '', // 定岗
-  staffQuota: 1, // 定员
+  cl: '', // 存量
+  ljl: '', // 临界量
+  fjzs: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
+  grade: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3a0e5b6..39241e1 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -123,10 +123,8 @@
 
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
   if (event.target.files[0].name.endsWith('.xlsx')) {
     if (event.target.files?.length !== 0) {
-      // 创建formdata对象
       const fd = new FormData()
       fd.append('file', event.target.files[0])
       batchImport(fd).then((res: any) => {
@@ -138,6 +136,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/alarm/policyConfig/videoPreview/index-media-single.vue b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
new file mode 100644
index 0000000..4333b4d
--- /dev/null
+++ b/src/views/alarm/policyConfig/videoPreview/index-media-single.vue
@@ -0,0 +1,432 @@
+<script lang="ts" setup name="ResourceList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
+import { getMediaStream, getMediaToken } from '@/api/monitor/media'
+import { videoTree } from '@/api/monitor/broadcast'
+const router = useRouter()
+const baseurl = ref(window.location.href.split('/#')[0])
+const treeRef = ref(null) as any
+const filterText = ref('')
+const data = ref([])
+// const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
+
+const defaultProps = ref({
+  children: 'children',
+  label: 'name',
+  isDisabled: 'disabled',
+})
+
+const { proxy } = getCurrentInstance() as any
+const mediaToken = ref('') // 流媒体token
+const width = ref(0)
+const height = ref(0)
+const loading = ref(false)
+const src = ref([''])
+const title = ref('')
+const leafLoading = ref(false)
+const currentLeafId = ref('')
+const currentData = ref() // 当前播放视频的设备信息
+const alarmResultList = ref([]) as any // 报警结果列表
+const alarmCount = ref(0) // 当日报警数
+const resize = () => {
+  const divPlugin = document.getElementById('home') as any
+  console.log(divPlugin)
+  // width.value = divPlugin.clientWidth / 2 - 20
+  // height.value = divPlugin.clientHeight / 2 - 5
+  width.value = divPlugin.clientWidth
+  height.value = divPlugin.clientHeight - 5
+}
+
+function filterNode(value: any, data: { name: string | any[] }) {
+  if (value === '' || value === null) {
+    return true
+  }
+  if ('name' in data) {
+    return data.name.includes(value)
+  }
+}
+
+let treeClickCount = 0
+let currentIndex = 0
+const currentCameras = [{}, {}, {}, {}] as any
+
+function handleNodeClick(data: any, node: any, self: any) {
+  if (data.device.deviceStatusName === '离线') {
+    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
+    return false
+  }
+
+  const now = new Date().getTime()
+  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
+    if (data.children.length !== 0) { // 点击父亲
+      return
+    }
+    if (data.device.id === currentLeafId.value) {
+      return
+    }
+
+    currentIndex = 0
+    // ElMessage.warning('正在加载流，请稍等！')
+    leafLoading.value = true
+    currentLeafId.value = data.device.id
+    // 获取视频流接口
+    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
+      currentCameras[currentIndex] = data
+      title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
+      currentIndex++
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  treeClickCount = now
+}
+
+// 拉取流
+async function fetchMediaStream(deviceId: string, channelId: string) {
+  loading.value = true
+  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
+  loading.value = false
+  if (res && res.data) {
+    return res.data.fmp4
+  }
+  else {
+    ElMessage.warning('设备未注册')
+  }
+}
+
+function page(index: any) {
+  if (src.value[index] !== '') {
+    router.push({
+      path: '/realTime/control',
+      query: {
+        id: currentCameras[index].id,
+      },
+    })
+  }
+}
+
+// 获取当日报警数数据
+const fetchAlarmData = () => {
+  const params = {
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
+    deptId: '', // 所属单位
+    deptName: '', // 所属单位名称
+    // alarmTimeStart: `${dayjs().format('YYYY-MM-DD')} 00:00:00`, // 开始时间
+    // alarmTimeEnd: `${dayjs().format('YYYY-MM-DD')} 23:59:59`, // 结束时间
+    offset: 1,
+    limit: 20,
+  }
+  getSecurityAlarmList(params).then((res) => {
+    alarmResultList.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + item.filePath,
+      }
+    })
+    alarmCount.value = alarmResultList.value.length
+  }).catch(() => {
+  })
+}
+
+const unwatch = watch(filterText, (newVal) => {
+  treeRef.value.filter(newVal)
+})
+
+onBeforeUnmount(() => {
+  unwatch()
+  window.removeEventListener('resize', resize)
+})
+
+function solveData(data: any) {
+  data.forEach((item: any) => {
+    if (item.device) {
+      item.name = `${item.name} (${item.device.deviceStatusName})`
+      console.log('修改后的name', item.name)
+    }
+    if (item.children && item.children.length) {
+      solveData(item.children)
+    }
+  })
+  return data
+}
+
+onMounted(() => {
+  videoTree().then((response) => {
+    if (response.code === 200) {
+      data.value = response.data
+      // data.value = solveData(data.value)
+    }
+  })
+  // 获取流媒体token
+  getMediaToken().then((res: any) => {
+    mediaToken.value = res.data
+  })
+  setTimeout(() => {
+    resize()
+    window.addEventListener('resize', resize)
+  }, 200)
+
+  fetchAlarmData() // 获取当日报警数
+})
+</script>
+
+<template>
+  <app-container style="height: calc(100vh - 110px)">
+    <div style="display: flex;height: 100%">
+      <el-card class="left" :body-style="{ padding: '10px' }">
+        <el-input
+          v-model="filterText"
+          placeholder="设备名称过滤"
+          style="margin-bottom: 10px;"
+          clearable
+        />
+        <el-tree
+          ref="treeRef"
+          class="filter-tree"
+          style="width: 100%;height: 100%"
+          :data="data"
+          node-key="id"
+          :filter-node-method="filterNode"
+          :default-expand-all="true"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        >
+          <template #default="{ node, data }">
+            <span style="display: flex;align-items: center;">
+              <!-- && leafLoading -->
+              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
+                <svg-icon name="icon-loading" />
+              </el-icon>
+              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+                <svg-icon name="icon-online" />
+              </el-icon> -->
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
+                <svg-icon name="icon-offline" />
+              </el-icon> -->
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="node.label"
+                placement="right"
+              >
+                <template #content>
+                  <span>{{ node.label }}</span>
+                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
+                </template>
+                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
+                <span v-else>{{ node.label }}</span>
+              </el-tooltip>
+              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
+                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
+              </el-icon>
+              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
+                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
+                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
+              </el-icon>
+              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
+            </span>
+          </template>
+        </el-tree>
+      </el-card>
+      <div id="home" class="right">
+        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
+        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
+        <iframe
+          id="myframe"
+          :src="`${baseurl}/player/player.html?playUrl=http://192.168.83.100:8080/live/101.live.flv`"
+          frameborder="0"
+          :style="{ width: `${width}px`, height: `${height - 28}px` }"
+        />
+        <div class="title">
+          {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
+        </div>
+        <div
+          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
+          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
+          视频加载中，请稍等...
+        </div>
+      </div>
+
+      <div class="alarm-result" v-if="alarmResultList.length">
+        <div class="alarm-title">报警结果</div>
+        <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
+        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+            <div style="padding: 14px;">
+              <div>
+                <span class="alarm-data-title">识别类型：</span>
+                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+              </div>
+              <div>
+                <span class="alarm-data-title">相机名称：</span>
+                <span class="alarm-data-text">{{ item.deviceName }}</span>
+              </div>
+              <div class="bottom clearfix">
+                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+              <!-- <el-button type="text" class="button">查看详情</el-button> -->
+              </div>
+              <div class="alarm-index">{{ index + 1 }}</div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.right {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1;
+  margin-left: 10px;
+  padding-top: 30px;
+  background: #111;
+  border-radius:  15px 15px  0 0 ;
+}
+
+.title {
+  position: absolute;
+  z-index: 1000;
+  font-size: 16px;
+  letter-spacing: 1px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #71b5ff, #4384ff);
+  color: white;
+  font-weight: bold;
+  line-height: 30px;
+  width: 100%;
+  height: 30px;
+  top: 0px;
+  border-radius:  15px 15px  0 0 ;
+  padding-left: 6px;
+}
+.left {
+  box-sizing: border-box;
+  width: 300px;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+.video-container {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 5px;
+}
+video {
+  position: relative;
+  object-fit: fill;
+  overflow: hidden;
+  background: #000;
+}
+
+/* 定义一个名为rotate的动画 */
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 应用动画到具体的元素上 */
+.loading-rotate {
+  animation: rotate 2s linear infinite;
+}
+
+// 报警结果
+.alarm-result {
+  width: 300px;
+  background-color: #fff;
+  margin-left: 10px;
+  border-radius: 3px;
+  padding: 10px;
+  overflow: auto;
+  .alarm-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+  .main-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+    color: #606266;
+    .count {
+    font-size: 15px;
+      color: red;
+      font-weight: 600;
+    }
+  }
+}
+
+.alarm-data-title {
+  font-size: 13px;
+}
+
+.alarm-data-text {
+  font-size: 13px;
+  font-weight: 600;
+}
+.alarm-data-title-time {
+  // color: #999;
+}
+.alarm-data-text-time {
+  // color: #999;
+}
+.alarm-index {
+  position: absolute;
+  right: 2px;
+  bottom: 0px;
+  color: #999;
+  font-size: 11px;
+  font-weight: 600;
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+  padding-left: 0 !important;
+}
+.el-tree {
+  width: 100%;
+}
+
+.el-tree > .el-tree-node {
+  display: inline-block;
+  min-width: 100%;
+}
+</style>
diff --git a/src/views/alarm/policyConfig/videoPreview/list.vue b/src/views/alarm/policyConfig/videoPreview/list.vue
deleted file mode 100644
index 158f021..0000000
--- a/src/views/alarm/policyConfig/videoPreview/list.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts" setup name="ResourceList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getMediaStream, getMediaToken } from '@/api/monitor/media'
-import { videoTree } from '@/api/monitor/broadcast'
-const router = useRouter()
-
-const treeRef = ref(null) as any
-const filterText = ref('')
-const data = ref([])
-
-const defaultProps = ref({
-  children: 'children',
-  label: 'name',
-  isDisabled: 'disabled',
-})
-
-const { proxy } = getCurrentInstance() as any
-const mediaToken = ref('') // 流媒体token
-const width = ref(0)
-const height = ref(0)
-const loading = ref(false)
-const src = ref([''])
-const title = ref('')
-const leafLoading = ref(false)
-const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
-const  alarmResultList = ref([]) // 报警结果列表
-const resize = () => {
-  const divPlugin = document.getElementById('home') as any
-  console.log(divPlugin)
-  // width.value = divPlugin.clientWidth / 2 - 20
-  // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
-}
-
-function filterNode(value: any, data: { name: string | any[] }) {
-  if (value === '' || value === null) {
-    return true
-  }
-  if ('name' in data) {
-    return data.name.includes(value)
-  }
-}
-
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
-
-function handleNodeClick(data: any, node: any, self: any) {
-  if (data.device.deviceStatusName === '离线') {
-    ElMessage.warning(`设备 ${data.device.monitorName} 离线`)
-    return false
-  }
-
-  const now = new Date().getTime()
-  if (now - treeClickCount < 300) { // 双击事件的判断，300毫秒内重复点击
-    if (data.children.length !== 0) { // 点击父亲
-      return
-    }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
-    leafLoading.value = true
-    currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
-  }
-  treeClickCount = now
-}
-
-// 拉取流
-async function fetchMediaStream(deviceId: string, channelId: string) {
-  loading.value = true
-  const res = await getMediaStream(deviceId, channelId, mediaToken.value)
-  loading.value = false
-  if (res && res.data) {
-    return res.data.fmp4
-  }
-  else {
-    ElMessage.warning('设备未注册')
-  }
-}
-
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
-const unwatch = watch(filterText, (newVal) => {
-  treeRef.value.filter(newVal)
-})
-
-onBeforeUnmount(() => {
-  unwatch()
-  window.removeEventListener('resize', resize)
-})
-
-function solveData(data: any) {
-  data.forEach((item: any) => {
-    if (item.device) {
-      item.name = `${item.name} (${item.device.deviceStatusName})`
-      console.log('修改后的name', item.name)
-    }
-    if (item.children && item.children.length) {
-      solveData(item.children)
-    }
-  })
-  return data
-}
-
-onMounted(() => {
-  videoTree().then((response) => {
-    if (response.code === 200) {
-      data.value = response.data
-      // data.value = solveData(data.value)
-    }
-  })
-  // 获取流媒体token
-  getMediaToken().then((res: any) => {
-    mediaToken.value = res.data
-  })
-  setTimeout(() => {
-    resize()
-    window.addEventListener('resize', resize)
-  }, 200)
-
-  alarmResultList.value = [{
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12',
-    url: '/left.jpg',
-  }]
-})
-</script>
-
-<template>
-  <app-container style="height: calc(100vh - 110px)">
-    <div style="display: flex;height: 100%">
-      <el-card class="left" :body-style="{ padding: '10px' }">
-        <el-input
-          v-model="filterText"
-          placeholder="设备名称过滤"
-          style="margin-bottom: 10px;"
-          clearable
-        />
-        <el-tree
-          ref="treeRef"
-          class="filter-tree"
-          style="width: 100%;height: 100%"
-          :data="data"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :default-expand-all="true"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        >
-          <template #default="{ node, data }">
-            <span style="display: flex;align-items: center;">
-              <!-- && leafLoading -->
-              <el-icon class="loading-rotate" style="margin-right: 5px" v-if="data && data.device && data.device.id === currentLeafId && leafLoading">
-                <svg-icon name="icon-loading" />
-              </el-icon>
-              <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
-                <svg-icon name="icon-online" />
-              </el-icon> -->
-              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
-                <svg-icon name="icon-offline" />
-              </el-icon> -->
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                :content="node.label"
-                placement="right"
-              >
-                <template #content>
-                  <span>{{ node.label }}</span>
-                  <span v-if="data && data.device && data.device.deviceTypeName">({{ data.device.deviceTypeName }})</span>
-                </template>
-                <span v-if="data && data.device && data.device.deviceTypeName" :style="{ 'color': data.device.deviceStatusName === '在线' ? '#0e932e' : '#606266', 'font-weight': data.device.deviceStatusName === '在线' ? 600 : 500 }">{{ node.label }}</span>
-                <span v-else>{{ node.label }}</span>
-              </el-tooltip>
-              <el-icon v-if="data && data.device && data.device.deviceType === '0'" style="margin-left: 5px">
-                <svg-icon name="icon-qiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'"/>
-              </el-icon>
-              <el-icon v-if="data && data.device && (data.device.deviceType === '1' || data.device.deviceType === '2')" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '3'" style="margin-left: 5px;">
-                <svg-icon name="icon-ball" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <el-icon v-if="data && data.device && data.device.deviceType === '4'" style="margin-left: 5px;">
-                <svg-icon name="icon-ytqiang" :color="data.device.deviceStatusName === '在线' ? '#0e932e' : '#979797'" />
-              </el-icon>
-              <!-- <span v-if="data.device.deviceTypeName">{{ node.label.slice(node.label.indexOf('(')) }}</span> -->
-            </span>
-          </template>
-        </el-tree>
-      </el-card>
-      <div id="home" class="right">
-        <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff"/>
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
-          v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
-          z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
-          视频加载中，请稍等...
-        </div>
-      </div>
-
-      <div class="alarm-result" v-if="alarmResultList.length">
-        <div class="alarm-title">报警结果</div>
-        <div class="main-title">当日报警数: <span class="count">5</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>识别类型：吸烟</div>
-              <div>相机名称：摄像头一</div>
-              <div class="bottom clearfix">
-                <time class="time">记录时间：{{ item.time }}</time>
-                <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-            </div>
-          </el-card>
-        </div>
-      </div>
-    </div>
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-.right {
-  position: relative;
-  box-sizing: border-box;
-  flex: 1;
-  margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
-  border-radius:  15px 15px  0 0 ;
-}
-
-.title {
-  position: absolute;
-  z-index: 1000;
-  font-size: 16px;
-  letter-spacing: 1px;
-  cursor: pointer;
-  background: linear-gradient(180deg, #71b5ff, #4384ff);
-  color: white;
-  font-weight: bold;
-  line-height: 30px;
-  width: 100%;
-  height: 30px;
-  top: 0px;
-  border-radius:  15px 15px  0 0 ;
-  padding-left: 6px;
-}
-.left {
-  box-sizing: border-box;
-  width: 300px;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-.video-container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 5px;
-}
-video {
-  position: relative;
-  object-fit: fill;
-  overflow: hidden;
-  background: #000;
-}
-
-/* 定义一个名为rotate的动画 */
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* 应用动画到具体的元素上 */
-.loading-rotate {
-  animation: rotate 2s linear infinite;
-}
-
-// 报警结果
-.alarm-result {
-  width: 300px;
-  background-color: #fff;
-  margin-left: 10px;
-  border-radius: 3px;
-  padding: 10px;
-  overflow: auto;
-  .alarm-title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 10px;
-  }
-  .main-title {
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 10px;
-    color: #606266;
-    .count {
-    font-size: 15px;
-      color: red;
-      font-weight: 600;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
-
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>
diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue
index a271668..2b9212b 100644
--- a/src/views/alarm/securityAlarm/list.vue
+++ b/src/views/alarm/securityAlarm/list.vue
@@ -1,8 +1,7 @@
 <!-- 安全隐患报警管理 -->
 <script lang="ts" setup name="IdentifyResultPage">
 import dayjs from 'dayjs'
-// import { getResultList, getResultPic } from '@/api/page/result'
-// import { getDeviceAll } from '@/api/page/device'
+import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList'
 import img from '@/assets/image/loading.gif'
 // 获取页面高度
 const pageHeight = ref(window.innerHeight - 260)
@@ -16,107 +15,56 @@
 const list = ref<any[]>([])
 //  查询条件
 const listQuery = ref({
-  area: '', // 所属区域
-  equipmentName: '', // 相机
+  areaName: '', // 所属区域
+  deviceName: '', // 相机
   deptId: '', // 所属单位
-  frameStartTime: '', // 开始时间
-  frameEndTime: '', // 结束时间
+  deptName: '', // 所属单位名称
+  alarmTimeStart: '', // 开始时间
+  alarmTimeEnd: '', // 结束时间
   offset: 1,
   limit: 20,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.frameStartTime = ''
-  listQuery.value.frameEndTime = ''
+  listQuery.value.alarmTimeStart = ''
+  listQuery.value.alarmTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.frameStartTime = `${newVal[0]} 00:00:00`
-      listQuery.value.frameEndTime = `${newVal[1]} 23:59:59`
+      listQuery.value.alarmTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.alarmTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
+  search()
 })
 // 获取数据
 const fetchData = () => {
   loadingTable.value = false
-  list.value = [{
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  },
-  {
-    time: '2021-12-12 12:10:30',
-    url: '/left.jpg',
-  }]
-  // getResultList(listQuery.value).then((res) => {
-  //   total.value = res.data.total
-  //   list.value = res.data.items.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       time: dayjs(item.time).format('YYYY-MM-DD HH:mm:ss'),
-  //       url: `${publicPath}/image/loading.gif`,
-  //     }
-  //   })
-  //   list.value.forEach((element: any) => {
-  //     getResultPic({ frame_id: element.id }).then((res) => {
-  //       const reader = new FileReader()
-  //       reader.onload = (e: any) => {
-  //         element.url = e.target.result
-  //       }
-  //       reader.readAsDataURL(res.data)
-  //     }).catch(() => {
-  //       element.url = ''
-  //     })
-  //   })
-  //   const seat = list.value.length % 4
-  //   // 占位符 重要用来补充不足4的部分(布局需要)
-  //   if (seat !== 0) {
-  //     for (let i = 0; i < 4 - seat; i++) {
-  //       console.log(i, 4 - (list.value.length % 4))
-  //       list.value.push({
-  //         id: '',
-  //       })
-  //     }
-  //   }
-  //   // const
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getSecurityAlarmList(listQuery.value).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows.map((item: { filePath: string }) => {
+      return {
+        ...item,
+        url: window.localStorage.getItem('baseURL') + 'picture/alarm/' + item.filePath + '?token=' + window.localStorage.getItem('token'),
+      }
+    })
+    console.log(list.value)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置
 const reset = () => {
   datetimerange.value = []
   listQuery.value = {
-    area: '', // 所属区域
-    equipmentName: '', // 相机
+    areaName: '', // 所属区域
+    deviceName: '', // 相机
     deptId: '', // 所属单位
-    frameStartTime: '', // 开始时间
-    frameEndTime: '', // 结束时间
+    deptName: '', // 所属单位名称
+    alarmTimeStart: '', // 开始时间
+    alarmTimeEnd: '', // 结束时间
     offset: 1,
     limit: 20,
   }
@@ -134,7 +82,7 @@
 }
 
 // 搜索
-const search = () => {
+function search() {
   fetchData()
 }
 
@@ -154,37 +102,41 @@
   <app-container>
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.areaName" placeholder="所属区域" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/>
+        <!-- <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search"/> -->
+        <el-input v-model="listQuery.deptName" placeholder="所属单位" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="相机" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="相机" clearable style="width: 200px;" @change="search"/>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间" @change="search"
+          range-separator="至" start-placeholder="起始时间" end-placeholder="终止时间"
         />
       </search-item>
     </search-area>
-    <div v-loading="loadingTable" class="main-area">
+    <div v-loading="loadingTable" class="main-areaName">
       <el-row v-if="list.length" :gutter="20" :style="{ height: `${pageHeight}px` }">
         <el-col v-for="(item, index) in list" :key="index" :span="6" style="margin-bottom: 10px;">
           <el-card :body-style="{ padding: '10px' }">
             <el-image :src="item.url" :preview-src-list="[item.url]" class="image" />
             <div style="padding: 14px;">
-              <span>口罩识别</span>
+              <span style="font-weight: 600;">{{ item.recognitionTypeName || item.sceneName }}</span>
+              <div style="margin-top: 6px;font-size: 14px;">{{ item.deviceName }}</div>
               <div class="bottom clearfix">
-                <time class="time">{{ item.time }}</time>
+                <div class="time" style="margin-bottom: 6px;">{{ item.areaName }}</div>
+                <div class="time" style="margin-bottom: 6px;">{{ item.deptName }}</div>
+                <div class="time">{{ item.alarmTime }}</div>
                 <!-- <el-button type="text" class="button">查看详情</el-button> -->
               </div>
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <el-empty v-else description="暂无数据" :size="200" />
+      <el-empty v-else description="暂无数据" :size="200" :style="{ height: `${pageHeight}px` }" />
     </div>
     <!-- 分页 -->
     <div style="width: 100%;margin: 10px auto;height: 32px;">
@@ -247,7 +199,7 @@
   padding: 10px;
 }
 
-.main-area {
+.main-areaName {
   box-sizing: border-box;
   // background-color: #fff;
   border-radius: 10px;
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index aaa1686..3d9eab9 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -103,6 +103,9 @@
         else {
           ElMessage.error(res.message)
         }
+      }).catch(() => {
+        console.log('上传失败')
+        event.target.value = null
       })
     }
   }
diff --git a/src/views/monitor/playback/index-media.vue b/src/views/monitor/playback/index-media.vue
index 3a1fab8..ed5c1f0 100644
--- a/src/views/monitor/playback/index-media.vue
+++ b/src/views/monitor/playback/index-media.vue
@@ -275,7 +275,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -473,6 +473,7 @@
 </style>
 
 <style lang="scss">
+.playback {
   .el-tree-node__content {
     padding-left: 0 !important;
   }
@@ -484,4 +485,5 @@
     display: inline-block;
     min-width: 100%;
   }
+}
 </style>
diff --git a/src/views/monitor/playback/index.vue b/src/views/monitor/playback/index.vue
index 3ac0d8c..b82ddbd 100644
--- a/src/views/monitor/playback/index.vue
+++ b/src/views/monitor/playback/index.vue
@@ -311,10 +311,10 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="playback">
     <div style="display: flex;height: 100%">
-      <el-card class="left">
-        <div style="display: flex;margin: 5px 0;margin-left: -20px;width: 280px">
+      <el-card class="left"  :body-style="{ padding: '10px' }">
+        <div style="display: flex;margin: 5px 0;margin-left: -10px;width: 280px">
           <span class="title">日期：</span>
           <el-date-picker
             v-model="day"
@@ -326,7 +326,7 @@
             placeholder="回放日期"
           />
         </div>
-        <div style="display: flex;margin-bottom: 5px;margin-left: -20px;width: 280px">
+        <div style="display: flex;margin-bottom: 5px;margin-left: -10px;width: 280px">
           <span class="title">时间：</span>
           <el-time-picker
             v-model="startTime"
@@ -349,7 +349,7 @@
           />
         </div>
 
-        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -20px;width: 275px" />
+        <el-input v-model="filterText" placeholder="设备名称过滤" clearable style="margin-bottom: 5px;margin-left: -10px;width: 275px" />
         <el-tree
           ref="treeRef"
           class="filter-tree"
@@ -363,12 +363,12 @@
         >
           <template #default="{ node, data }">
             <span style="display: flex;align-items: center;">
-              <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
                 <svg-icon name="icon-online" />
               </el-icon>
               <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
                 <svg-icon name="icon-offline" />
-              </el-icon>
+              </el-icon> -->
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -450,10 +450,15 @@
   background-color: #111111;
 }
 .left {
+  // width: 300px;
+  // height: 100%;
+  // padding: 10px;
+  // overflow-y: scroll;
+  box-sizing: border-box;
   width: 300px;
   height: 100%;
-  padding: 10px;
   overflow-y: scroll;
+  overflow-x: scroll;
 }
 .right {
   width: calc(100% - 310px);
@@ -475,3 +480,19 @@
   background: #000;
 }
 </style>
+
+<style lang="scss">
+.playback {
+  .el-tree-node__content {
+    padding-left: 0 !important;
+  }
+  .el-tree {
+    width: 100%;
+  }
+
+  .el-tree > .el-tree-node {
+    display: inline-block;
+    min-width: 100%;
+  }
+}
+</style>
diff --git a/src/views/monitor/realTime/index-media-single.vue b/src/views/monitor/realTime/index-media-single.vue
index 228f94f..583843d 100644
--- a/src/views/monitor/realTime/index-media-single.vue
+++ b/src/views/monitor/realTime/index-media-single.vue
@@ -148,7 +148,7 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="realTime">
     <div style="display: flex;height: 100%">
       <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
@@ -305,15 +305,17 @@
 </style>
 
 <style lang="scss">
-.el-tree-node__content {
-  padding-left: 0 !important;
-}
-.el-tree {
-  width: 100%;
-}
+.realTime {
+  .el-tree-node__content {
+    padding-left: 0 !important;
+  }
+  .el-tree {
+    width: 100%;
+  }
 
-.el-tree > .el-tree-node {
-  display: inline-block;
-  min-width: 100%;
+  .el-tree > .el-tree-node {
+    display: inline-block;
+    min-width: 100%;
+  }
 }
 </style>
diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue
index 074dc92..2feec02 100644
--- a/src/views/monitor/realTime/index-new-gm-plugin.vue
+++ b/src/views/monitor/realTime/index-new-gm-plugin.vue
@@ -19,6 +19,7 @@
 console.log('baseurl', baseurl.value)
 const { proxy } = getCurrentInstance() as any
 const mediaToken = ref('') // 流媒体token
+const currentData = ref() // 当前播放视频的设备信息
 const width = ref(0)
 const height = ref(0)
 const loading = ref(false)
@@ -88,6 +89,7 @@
       src.value[0] = `${url}?token=${window.localStorage.getItem('token')}`
       currentCameras[0] = data
       title.value = data.device.monitorName.replace('-', ' - ')
+      currentData.value = data.device
       // 记录正在播的流的国标号
       currentStreamId.value = createStreamResponseId
 
@@ -142,14 +144,14 @@
 function page(index: any) {
   console.log('跳转控制页')
 
-  // if (src.value[index] !== '') {
+  if (src.value[index] !== '') {
     router.push({
       path: '/realTime/control',
       query: {
         id: currentCameras[index].id,
       },
     })
-  // }
+  }
 }
 
 const unwatch = watch(filterText, (newVal) => {
@@ -200,9 +202,9 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 110px)">
+  <app-container style="height: calc(100vh - 110px)" class="realTime">
     <div style="display: flex;height: 100%">
-      <el-card class="left">
+      <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
           v-model="filterText"
           placeholder="设备名称过滤"
@@ -227,12 +229,12 @@
                 <svg-icon name="icon-loading" />
               </el-icon>
               <!-- <el-image style="margin-right: 5px;width: 20px;height: 20px;" src="/loading.gif" v-if="data.device.id === currentLeafId"></el-image> -->
-              <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
                 <svg-icon name="icon-online" />
               </el-icon>
               <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
                 <svg-icon name="icon-offline" />
-              </el-icon>
+              </el-icon> -->
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -279,6 +281,18 @@
         />
         <div class="title">
           {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
         </div>
         <div v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
           z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">视频加载中，请稍等...</div>
@@ -315,11 +329,11 @@
   padding-left: 6px;
 }
 .left {
+  box-sizing: border-box;
   width: 300px;
   height: 100%;
-  padding: 10px;
   overflow-y: scroll;
-
+  overflow-x: scroll;
 }
 
 .video-container {
@@ -352,3 +366,19 @@
   animation: rotate 2s linear infinite;
 }
 </style>
+
+<style lang="scss">
+  .realTime {
+    .el-tree-node__content {
+      padding-left: 0 !important;
+    }
+    .el-tree {
+      width: 100%;
+    }
+
+    .el-tree > .el-tree-node {
+      display: inline-block;
+      min-width: 100%;
+    }
+  }
+</style>
diff --git a/src/views/monitor/realTime/index-noPlugin-single.vue b/src/views/monitor/realTime/index-noPlugin-single.vue
index 6186937..87cc448 100644
--- a/src/views/monitor/realTime/index-noPlugin-single.vue
+++ b/src/views/monitor/realTime/index-noPlugin-single.vue
@@ -32,6 +32,7 @@
 let treeClickCount = 0
 let currentIndex = 0
 const currentCameras: any = [{}]
+const currentData = ref() // 当前播放视频的设备信息
 
 const resize = debounce(() => {
   currentCameras.forEach((data: any, index: number) => {
@@ -119,6 +120,7 @@
     // proxy.showLoading()
     currentCameras[currentIndex] = data
     title.value = data.device.monitorName.replace('-', ' - ')
+    currentData.value = data.device
     initVideo(currentCameras[currentIndex], currentIndex)
     log('场景监控', `${data.device.monitorName}`)
     currentIndex++
@@ -214,9 +216,9 @@
 </script>
 
 <template>
-  <app-container style="height: calc(100vh - 125px);box-sizing: border-box;">
+  <app-container style="height: calc(100vh - 125px);box-sizing: border-box;" class="realTime">
     <div style="display: flex;height: 100%;">
-      <el-card class="left">
+      <el-card class="left" :body-style="{ padding: '10px' }">
         <el-input
           v-model="filterText"
           placeholder="设备名称过滤"
@@ -239,12 +241,12 @@
               <!-- <el-icon class="loading-rotate" v-if="data && data.device && data.device.id === currentLeafId && leafLoading" style="margin-right: 5px">
                 <svg-icon name="icon-loading" />
               </el-icon> -->
-              <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
+              <!-- <el-icon v-if="data && data.device && data.device.deviceStatusName === '在线'" style="margin-right: 5px">
                 <svg-icon name="icon-online" />
               </el-icon>
               <el-icon v-if="data && data.device && data.device.deviceStatusName === '离线'" style="margin-right: 5px">
                 <svg-icon name="icon-offline" />
-              </el-icon>
+              </el-icon> -->
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -281,6 +283,18 @@
         <canvas v-if="!ishk[0]" id="dhCanvas0" class="dhCanvas" :style="`width:${width}px;height:${height - 30}px;`" style="top: 40px" @dblclick="cbDoubleClickWnd(0, null, null)" />
         <div class="video-desc title1" @dblclick="cbDoubleClickWnd(0, null, null)">
           {{ title }}
+          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+            <svg-icon name="icon-qiang" color="#fff"/>
+          </el-icon>
+          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+            <svg-icon name="icon-ball" color="#fff" />
+          </el-icon>
+          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+            <svg-icon name="icon-ytqiang" color="#fff" />
+          </el-icon>
         </div>
       </div>
     </div>
@@ -329,10 +343,15 @@
 }
 
 .left {
+  // width: 300px;
+  // height: 100%;
+  // padding: 10px;
+  // overflow-y: scroll;
+  box-sizing: border-box;
   width: 300px;
   height: 100%;
-  padding: 10px;
   overflow-y: scroll;
+  overflow-x: scroll;
 }
 
 .right {
@@ -361,3 +380,19 @@
   background: #000;
 }
 </style>
+
+<style lang="scss">
+  .realTime {
+    .el-tree-node__content {
+      padding-left: 0 !important;
+    }
+    .el-tree {
+      width: 100%;
+    }
+
+    .el-tree > .el-tree-node {
+      display: inline-block;
+      min-width: 100%;
+    }
+  }
+</style>