fix(*): abc

README.md

@@ -79,7 +79,7 @@ npm run build:package  该指令全是将目前已有的模块分别打包
 
 ### master
 
-​	蛟龙云项目分支
+​	云项目分支
 
 ### cli
 
@@ -87,7 +87,7 @@ npm run build:package  该指令全是将目前已有的模块分别打包
 
 ## 模块说明
 
-### cvs蛟龙云视
+### cvs云视
 
 参考地址： https://console.bce.baidu.com/
 

config/proxy.ts

@@ -13,7 +13,7 @@ module.exports = {
     },
     '/cvss': {
       // target: 'http://120.223.238.91:6666',
-      target: 'http://124.222.113.37:8080',
+      target: 'http://172.28.0.3:18082',
       changeOrigin: true,
       pathRewrite: { '^/cvss': '' }
     },

src/pages/cvs/edge/manage.vue

@@ -10,15 +10,16 @@
   <template #search >
     <a-space>
 
-      <SelectTsx
-        :request="async () => (await SpaceController.devicePage({page: 1, pageSize: 10, deviceName: ''})).data"
-        :keys="{
-          name: 'deviceName',
-          value: 'deviceId',
-          key: 'deviceId'
-        }"
-        v-model:value="serviceParams.devId"
-      />
+<!--      <SelectTsx-->
+<!--        :request="async () => (await SpaceController.devicePage({page: 1, pageSize: 10, deviceName: ''})).data"-->
+<!--        :keys="{-->
+<!--          name: 'deviceName',-->
+<!--          value: 'deviceId',-->
+<!--          key: 'deviceId'-->
+<!--        }"-->
+<!--        v-model:value="serviceParams.devId"-->
+<!--      />-->
+      <InputTsx :styles="{minWidth: '120px'}"  v-model:value="serviceParams.devId" placeholder="请输入AIBox设备ID类型" />
       <InputTsx :styles="{minWidth: '120px'}"  v-model:value="serviceParams.eventType" placeholder="请输入事件类型" />
       <!-- <SelectTsx
         style="width: 100px"
@@ -36,11 +37,8 @@
 
   </template>
     <template #render="{column, record}" >
-      <template v-if="column.key === 'EventType'" >
-        {{ AiboxController.eventTypeMap.get(record.EventType)}}
-      </template>
       <template v-if="column.key === 'saveTs'" >
-          {{dayjs(record.saveTs).format('YYYY/MM/DD HH:MM:ss')}}
+          {{dayjs(record.saveTs).format('YYYY/MM/DD HH:mm:ss')}}
       </template>
       <template v-if="column.key === 'action'" >
         <a @click="openDetailModal(record)" >查看详情</a>
@@ -58,18 +56,17 @@
 
 >
   <a-descriptions :column="2">
-    <a-descriptions-item label="事件类型">{{AiboxController.eventTypeMap.get(eventState!.EventType)}}</a-descriptions-item>
+    <a-descriptions-item label="事件类型">{{eventState!.EventType}}</a-descriptions-item>
     <a-descriptions-item label="设备ID" >{{eventState?.DevID}}</a-descriptions-item>
     <a-descriptions-item :span="2" label="摄像头ID">{{eventState?.Data.CameraID}}</a-descriptions-item>
     <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.WarnClass}}</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="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-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>
 
@@ -115,7 +112,7 @@ const tableProDom = ref()
 const times = ref()
 
 const serviceParams = ref({
-  devId: null,
+  devId: '',
   eventType: '',
   start: '',
   end: ''

src/router/index.ts

@@ -267,7 +267,7 @@ const datacenter = {
 }
 
 const view = {
-  path: 'http://cloudview.jiaolongcloud.com/',
+  path: 'http://172.28.0.3:28080/#/project/items',
   name: '可视化',
   meta: {
     title: '可视化'
@@ -429,7 +429,7 @@ const cvs = {
   ]
 }
 
-const _routes = [iot, cvs, datacenter, view, user] as any
+const _routes = [iot, cvs, view] as any
 
 if (_routes[0].link) {
   window.open(_routes[0].path)

src/store/modules/user/index.ts

@@ -12,7 +12,7 @@ const initState: USER.Tenant.Detail = {
   token: '',
   email: '',
   account: '',
-  label: '蛟龙云'
+  label: '用户'
 }
 
 export const useUserStore = defineStore('userStore', () => {

src/type/cvs.d.ts

@@ -187,11 +187,12 @@ declare namespace CVS {
         'CameraDescribe': string,
         'TaskName': string,
         'TriggerTime': string,
-        'imgAddr': string,
-        'videoAddr': string,
+        'ImgAddr': string,
+        'VideoAddr': string,
         'RecordType': string,
         'WarnIN': string,
-        'WarnOUT': string
+        'WarnOUT': string,
+        'WarnClass':string
       }
     }