Merge branch 'master' of http://49.232.154.205:10100/DeXun/rtsp-video-analysis-system

rtsp-vue/src/api/video/alarm.js

@@ -9,12 +9,20 @@ export function listAlarm(query) {
   })
 }
 
+// 查询报警记录详细
+export function getAlarm(alarmId) {
+  return request({
+    url: '/video/alarm/' + alarmId,
+    method: 'get'
+  })
+}
+
 // 处理报警记录
 export function handleAlarm(data) {
   return request({
     url: '/video/alarm/handle',
-    method: 'post',
-    params: data
+    method: 'put',
+    data: data
   })
 }
 
@@ -22,7 +30,16 @@ export function handleAlarm(data) {
 export function batchHandleAlarm(data) {
   return request({
     url: '/video/alarm/batchHandle',
+    method: 'put',
+    data: data
+  })
+}
+
+// 导出报警记录
+export function exportAlarm(query) {
+  return request({
+    url: '/video/alarm/export',
     method: 'post',
-    params: data
+    params: query
   })
 }

rtsp-vue/src/views/video/alarm/index.vue

@@ -79,7 +79,7 @@
           v-hasPermi="['video:alarm:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="alarmList" @selection-change="handleSelectionChange">
@@ -112,6 +112,17 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="报警视频" align="center" prop="videoPath">
+        <template #default="scope">
+          <el-button
+            v-if="scope.row.videoPath"
+            link
+            type="primary"
+            icon="VideoPlay"
+            @click="handleView(scope.row)"
+          >播放</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="报警时间" align="center" prop="alarmTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -132,26 +143,26 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button 
-            link 
-            type="success" 
-            icon="Check" 
-            @click="handleProcess(scope.row, '1')" 
-            v-hasPermi="['video:alarm:handle']"
+          <el-button
             v-if="scope.row.handleStatus === '0'"
+            link
+            type="primary"
+            icon="Check"
+            @click="handleProcess(scope.row, '1')"
+            v-hasPermi="['video:alarm:handle']"
           >处理</el-button>
-          <el-button 
-            link 
-            type="info" 
-            icon="Close" 
-            @click="handleProcess(scope.row, '2')" 
-            v-hasPermi="['video:alarm:handle']"
+          <el-button
             v-if="scope.row.handleStatus === '0'"
+            link
+            type="info"
+            icon="Close"
+            @click="handleProcess(scope.row, '2')"
+            v-hasPermi="['video:alarm:handle']"
           >忽略</el-button>
-          <el-button 
-            link 
-            type="primary" 
-            icon="View" 
+          <el-button
+            link
+            type="primary"
+            icon="View"
             @click="handleView(scope.row)"
           >查看</el-button>
         </template>
@@ -159,21 +170,17 @@
     </el-table>
     
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
+      :page="queryParams.pageNum"
+      :limit="queryParams.pageSize"
       @pagination="getList"
     />
 
     <!-- 处理报警对话框 -->
     <el-dialog :title="processTitle" v-model="processOpen" width="500px" append-to-body>
       <el-form ref="processRef" :model="processForm" label-width="80px">
-        <el-form-item label="处理状态">
-          <el-tag v-if="processForm.handleStatus === '1'" type="success">已处理</el-tag>
-          <el-tag v-else-if="processForm.handleStatus === '2'" type="info">已忽略</el-tag>
-        </el-form-item>
-        <el-form-item label="处理备注">
+        <el-form-item label="处理备注" prop="handleRemark">
           <el-input
             v-model="processForm.handleRemark"
             type="textarea"
@@ -190,7 +197,7 @@
       </template>
     </el-dialog>
 
-    <!-- 查看报警详情对话框 -->
+    <!-- 查看详情对话框 -->
     <el-dialog title="报警详情" v-model="viewOpen" width="800px" append-to-body>
       <el-descriptions :column="2" border>
         <el-descriptions-item label="报警ID">{{ viewForm.alarmId }}</el-descriptions-item>
@@ -203,16 +210,20 @@
           <el-tag v-else-if="viewForm.alarmLevel === '3'" type="danger">高</el-tag>
         </el-descriptions-item>
         <el-descriptions-item label="置信度">{{ (viewForm.confidence * 100).toFixed(1) }}%</el-descriptions-item>
-        <el-descriptions-item label="报警时间" :span="2">{{ parseTime(viewForm.alarmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</el-descriptions-item>
+        <el-descriptions-item label="报警时间" :span="2">
+          {{ parseTime(viewForm.alarmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+        </el-descriptions-item>
         <el-descriptions-item label="报警描述" :span="2">{{ viewForm.alarmDesc }}</el-descriptions-item>
         <el-descriptions-item label="处理状态">
           <el-tag v-if="viewForm.handleStatus === '0'" type="danger">未处理</el-tag>
           <el-tag v-else-if="viewForm.handleStatus === '1'" type="success">已处理</el-tag>
           <el-tag v-else-if="viewForm.handleStatus === '2'" type="info">已忽略</el-tag>
         </el-descriptions-item>
-        <el-descriptions-item label="处理人">{{ viewForm.handleBy || '无' }}</el-descriptions-item>
-        <el-descriptions-item label="处理时间" :span="2">{{ parseTime(viewForm.handleTime, '{y}-{m}-{d} {h}:{i}:{s}') || '无' }}</el-descriptions-item>
-        <el-descriptions-item label="处理备注" :span="2">{{ viewForm.handleRemark || '无' }}</el-descriptions-item>
+        <el-descriptions-item label="处理人">{{ viewForm.handleBy || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="处理时间" :span="2">
+          {{ viewForm.handleTime ? parseTime(viewForm.handleTime, '{y}-{m}-{d} {h}:{i}:{s}') : '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="处理备注" :span="2">{{ viewForm.handleRemark || '-' }}</el-descriptions-item>
       </el-descriptions>
       
       <div v-if="viewForm.imagePath" style="margin-top: 20px;">
@@ -224,6 +235,15 @@
           fit="contain"
         />
       </div>
+      <div v-if="viewForm.videoPath" style="margin-top: 20px;">
+        <h4>报警视频：</h4>
+        <video
+          :src="viewForm.videoPath"
+          style="width: 100%; max-height: 420px; background: #000"
+          controls
+          preload="metadata"
+        />
+      </div>
     </el-dialog>
   </div>
 </template>