fix(*): 修改aibox 告警

manifest.json

@@ -1,5 +1,5 @@
 {
-  "name": "蛟龙云",
+  "name": "云",
   "short_name": "WebApp",
   "description": "构建万物互联",
   "start_url": "/",

src/api/cvs/aibox.ts

@@ -69,6 +69,13 @@ export const getSys = (clientId: string) => {
   })
 }
 
+export const getWarnOssUrl = () => {
+  return request<String>({
+    url: '/file/warnOssUrl',
+    method: 'GET'
+  })
+}
+
 export const refreshSys = (clientId: string) => {
   return request<string>({
     url: `/aiBox/sys/refresh/${clientId}`,

src/controller/cvs/aiboxController.ts

@@ -1,4 +1,22 @@
-import { addAiBoxForward, aiboxLevelUp, delAiBoxForward, dimensionAiBox, getAiBoxEvent, getAiBoxForward, getAiBoxList, getAiBoxPage, getStream, getSys, getTaskByClientId, reboot, refreshStream, refreshSys, refreshTask, updateAiBoxForward } from '@/api/cvs/aibox'
+import {
+  addAiBoxForward,
+  aiboxLevelUp,
+  delAiBoxForward,
+  dimensionAiBox,
+  getAiBoxEvent,
+  getAiBoxForward,
+  getAiBoxList,
+  getAiBoxPage,
+  getStream,
+  getSys,
+  getTaskByClientId,
+  getWarnOssUrl,
+  reboot,
+  refreshStream,
+  refreshSys,
+  refreshTask,
+  updateAiBoxForward
+} from '@/api/cvs/aibox'
 import { updateForward } from '@/api/iot/rule'
 import { message } from 'ant-design-vue'
 
@@ -79,6 +97,13 @@ export class AiboxController {
     }
   }
 
+  static async warnOssUrl () {
+    const { code, data } = await getWarnOssUrl()
+    if (code === 200) {
+      return data
+    }
+  }
+
   static async refreshSys (clientId: string) {
     await refreshSys(clientId)
   }

src/pages/cvs/edge/manage.vue

@@ -64,12 +64,12 @@
     <a-descriptions-item label="摄像头名称">{{eventState?.Data.CameraDescribe}}</a-descriptions-item>
     <a-descriptions-item label="任务名称">{{eventState?.Data.TaskName}}</a-descriptions-item>
     <a-descriptions-item :span="2" label="记录类型">{{eventState?.Data.RecordType}}</a-descriptions-item>
-    <a-descriptions-item label="进入数量">{{eventState?.Data.warnIN}}</a-descriptions-item>
-    <a-descriptions-item label="离开数量">{{eventState?.Data.warnOUT}}</a-descriptions-item>
+    <a-descriptions-item label="进入数量">{{eventState?.Data.WarnIN}}</a-descriptions-item>
+    <a-descriptions-item label="离开数量">{{eventState?.Data.WarnOUT}}</a-descriptions-item>
     <a-descriptions-item label="触发时间">{{eventState?.Data.TriggerTime}}</a-descriptions-item>
     <a-descriptions-item label="保存时间">{{dayjs(eventState?.saveTs).format('YYYY/MM/DD HH:MM:ss')}}</a-descriptions-item>
-    <a-descriptions-item label="告警图片"><a-image style="width: 100px;" :src="eventState?.Data.WarnPic" ></a-image></a-descriptions-item>
-    <a-descriptions-item label="bkg图片"><a-image style="width: 100px;" :src="eventState?.Data.BkgPic" ></a-image></a-descriptions-item>
+    <a-descriptions-item label="告警图片"><a-image style="width: 100px;" :src="warnOssUrl+eventState?.Data.imgAddr" ></a-image></a-descriptions-item>
+    <a-descriptions-item label="告警视频"><video controls style="width: 100px;" :src="warnOssUrl+eventState?.Data.videoAddr" ></video></a-descriptions-item>
   </a-descriptions>
 </modal-pro>
 
@@ -78,7 +78,7 @@
 import { AiboxController, SpaceController } from '@/controller'
 import { SelectTsx, InputTsx } from '@/components/MicroComponents'
 import dayjs from 'dayjs'
-import { ref, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
 const columns = [
   {
@@ -123,6 +123,8 @@ const serviceParams = ref({
 
 const eventState = ref<CVS.AiBox.Event>()
 
+const warnOssUrl = ref<String>('')
+
 watch(
   () => times.value,
   () => {
@@ -140,6 +142,14 @@ const search = () => {
   tableProDom.value.reload()
 }
 
+onMounted(() => {
+  initWarnOssUrl()
+})
+
+const initWarnOssUrl = async () => {
+  warnOssUrl.value = await AiboxController.warnOssUrl()
+}
+
 </script>
 <style lang='less' scoped >
 </style>

src/type/cvs.d.ts

@@ -184,14 +184,14 @@ declare namespace CVS {
       'EventName': string,
       'Data': {
         'CameraID': string,
-        'CameraName': string,
+        'CameraDescribe': string,
         'TaskName': string,
         'TriggerTime': string,
-        'BkgPic': string,
-        'WarnPic': string,
+        'imgAddr': string,
+        'videoAddr': string,
         'RecordType': string,
-        'EnterSum': string,
-        'ExitSum': string
+        'WarnIN': string,
+        'WarnOUT': string
       }
     }