Merge branch 'dev-ft' into 'main'

feat:新增视频管理 See merge request huang/yun-teng-iot-front!200

Merge branch 'dev-ft' into 'main'
feat:新增视频管理 See merge request huang/yun-teng-iot-front!200
xp.Huang
2 parents a45057ba 732fcbab
Showing 6 changed files with 86 additions and 65 deletions
src/api/camera/cameraManager.ts
src/api/camera/model/cameraModel.ts
src/api/device/model/deviceModel.ts
src/views/camera/manage/ContactDrawer.vue
src/views/camera/manage/config.data.ts
src/views/camera/manage/index.vue
--- a/src/api/camera/cameraManager.ts
View file @fe2fd1c
+++ b/src/api/camera/cameraManager.ts
View file @fe2fd1c
 import { defHttp } from '/@/utils/http/axios';
-import { DeviceModel, DeviceQueryParam } from '/@/api/device/model/deviceModel';
-import { ChildDeviceParams } from './model/cameraModel';
+import { CameraModel, CameraQueryParam } from './model/cameraModel';
 enum CameraManagerApi {
-  CAMERA_POST_URL = '/yt/video',
-  CAMERA_GET_URL = '/yt/video',
-  CAMERA_DELETE_URL = '/yt/video',
-  CAMERA_GET_DETAIL_URL = '/yt/video',
+  CAMERA_POST_URL = '/video',
+  CAMERA_GET_URL = '/video',
+  CAMERA_DELETE_URL = '/video',
+  CAMERA_GET_DETAIL_URL = '/video',
 }
-export const cameraPage = (params: DeviceQueryParam) => {
-  return defHttp.get<DeviceModel>({
+export const cameraPage = (params: CameraQueryParam) => {
+  return defHttp.get<CameraQueryParam>({
     url: CameraManagerApi.CAMERA_GET_URL,
     params,
   });
@@ -31,7 +30,7 @@ export const deleteCameraManage = (ids: string[]) => {
 // 创建或编辑视频
 export const createOrEditCameraManage = (data) => {
-  return defHttp.post({
+  return defHttp.post<CameraModel>({
     url: CameraManagerApi.CAMERA_POST_URL,
     data,
   });
--- a/src/api/camera/model/cameraModel.ts
View file @fe2fd1c
+++ b/src/api/camera/model/cameraModel.ts
View file @fe2fd1c
 import { BasicPageParams } from '/@/api/model/baseModel';
-export enum DeviceState {
-  INACTIVE = 'INACTIVE',
-  ONLINE = 'ONLINE',
-  OFFLINE = 'OFFLINE',
-}
-export enum DeviceTypeEnum {
-  GATEWAY = 'GATEWAY',
-  DIRECT_CONNECTION = 'DIRECT_CONNECTION',
-  SENSOR = 'SENSOR',
-}
-export type DeviceProfileQueryParam = BasicPageParams & DeviceProfileParam & DeviceId;
-export type DeviceQueryParam = BasicPageParams & DeviceParam;
-export type DeviceParam = {
-  name?: string;
-  deviceProfileId?: string;
-};
-export type DeviceProfileParam = {
-  name?: string;
-};
-export type DeviceId = {
-  id?: string;
-};
+export type CameraQueryParam = BasicPageParams & CameraParam;
-export interface DeviceModel {
-  id: string;
+export type CameraParam = {
+  status: true;
   name: string;
-  deviceInfo: any;
-  activeTime: string;
-  deviceState: DeviceState;
-  alarmStatus: number;
-  profileId: string;
-  label: string;
-  lastConnectTime: string;
-  deviceType: DeviceTypeEnum;
-}
+  organizationId: string;
+  orderFiled: string;
+  orderType: string;
+};
-export interface DeviceProfileModel {
-  id: string;
+export interface CameraModel {
+  avatar?: string;
+  brand: string;
+  createTime?: '2022-04-19T11:33:13.113Z';
+  creator?: string;
+  defaultConfig?: string;
+  description?: string;
+  deviceInfo?: string;
+  deviceType?: string;
+  enabled?: true;
+  icon?: string;
+  id?: string;
   name: string;
-  transportType: string;
-  createTime: string;
-  description: string;
+  organizationId: string;
+  organizationName?: string;
+  roleIds?: ['string'];
+  sn: string;
+  status?: false;
+  tenantExpireTime?: '2022-04-19T11:33:13.113Z';
+  tenantId?: string;
+  tenantProfileId?: string;
+  tenantStatus?: 'DISABLED';
+  updateTime?: '2022-04-19T11:33:13.113Z';
+  updater?: string;
+  videoUrl: string;
 }
-
-export type ChildDeviceParams = BasicPageParams & {
-  formId: string;
-};
--- a/src/api/device/model/deviceModel.ts
View file @fe2fd1c
+++ b/src/api/device/model/deviceModel.ts
View file @fe2fd1c
 import { BasicPageParams } from '/@/api/model/baseModel';
+export enum DeviceState {
+  INACTIVE = 'INACTIVE',
+  ONLINE = 'ONLINE',
+  OFFLINE = 'OFFLINE',
+}
+export enum DeviceTypeEnum {
+  GATEWAY = 'GATEWAY',
+  DIRECT_CONNECTION = 'DIRECT_CONNECTION',
+  SENSOR = 'SENSOR',
+}
 export type DeviceProfileQueryParam = BasicPageParams & DeviceProfileParam & DeviceId;
 export type DeviceQueryParam = BasicPageParams & DeviceParam;
 export type DeviceParam = {
@@ -13,11 +23,24 @@ export type DeviceId = {
 };
 export interface DeviceModel {
-  status: true;
+  id: string;
+  name: string;
+  deviceInfo: any;
+  activeTime: string;
+  deviceState: DeviceState;
+  alarmStatus: number;
+  profileId: string;
+  label: string;
+  lastConnectTime: string;
+  deviceType: DeviceTypeEnum;
+}
+
+export interface DeviceProfileModel {
+  id: string;
   name: string;
-  organizationId: string;
-  orderFiled: string;
-  orderType: string;
+  transportType: string;
+  createTime: string;
+  description: string;
 }
 export type ChildDeviceParams = BasicPageParams & {
--- a/src/views/camera/manage/ContactDrawer.vue
View file @fe2fd1c
+++ b/src/views/camera/manage/ContactDrawer.vue
View file @fe2fd1c
@@ -15,7 +15,8 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { saveOrEditAlarmContact } from '/@/api/alarm/contact/alarmContact';
+  import { createOrEditCameraManage } from '/@/api/camera/cameraManager';
+
   import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
@@ -54,7 +55,7 @@
           setDrawerProps({ confirmLoading: true });
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';
-          await saveOrEditAlarmContact(values, unref(isUpdate));
+          await createOrEditCameraManage(values);
           closeDrawer();
           emit('success');
           createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
--- a/src/views/camera/manage/config.data.ts
View file @fe2fd1c
+++ b/src/views/camera/manage/config.data.ts
View file @fe2fd1c
@@ -6,22 +6,22 @@ import { copyTransFun } from '/@/utils/fnUtils';
 export const columns: BasicColumn[] = [
   {
     title: '视频名字',
-    dataIndex: 'email',
+    dataIndex: 'name',
     width: 120,
   },
   {
     title: '视频厂家',
-    dataIndex: 'remark',
+    dataIndex: 'brand',
     width: 120,
   },
   {
     title: '摄像头编号',
-    dataIndex: 'username',
+    dataIndex: 'sn',
     width: 120,
   },
   {
     title: '视频流',
-    dataIndex: 'wechat',
+    dataIndex: 'videoUrl',
     width: 120,
   },
   {
--- a/src/views/camera/manage/index.vue
View file @fe2fd1c
+++ b/src/views/camera/manage/index.vue
View file @fe2fd1c
@@ -27,6 +27,11 @@
           <TableAction
             :actions="[
               {
+                label: '预览',
+                icon: 'clarity:note-edit-line',
+                onClick: handleViewVideo.bind(null, record),
+              },
+              {
                 label: '编辑',
                 icon: 'clarity:note-edit-line',
                 onClick: handleCreateOrEdit.bind(null, record),
@@ -57,7 +62,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import ContactDrawer from './ContactDrawer.vue';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
-  import { getAlarmContact, deleteAlarmContact } from '/@/api/alarm/contact/alarmContact';
+  import { cameraPage, deleteCameraManage } from '/@/api/camera/cameraManager';
   import { searchFormSchema, columns } from './config.data';
   export default defineComponent({
     components: {
@@ -79,7 +84,7 @@
       // 表格hooks
       const [registerTable, { reload }] = useTable({
         title: '视频列表',
-        api: getAlarmContact,
+        api: cameraPage,
         columns,
         clickToRowSelect: false,
         formConfig: {
@@ -128,13 +133,13 @@
       const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
         if (record) {
           try {
-            await deleteAlarmContact([record.id]);
+            await deleteCameraManage([record.id]);
             createMessage.success('删除联系人成功');
             handleSuccess();
           } catch (e) {}
         } else {
           try {
-            await deleteAlarmContact(selectedRowIds.value);
+            await deleteCameraManage(selectedRowIds.value);
             createMessage.success('批量删除联系人成功');
             selectedRowIds.value = [];
             handleSuccess();
@@ -147,6 +152,9 @@
         searchInfo.organizationId = organizationId;
         handleSuccess();
       };
+      const handleViewVideo = (r) => {
+        console.log(r);
+      };
       return {
         searchInfo,
         hasBatchDelete,
@@ -157,6 +165,7 @@
         registerTable,
         registerDrawer,
         organizationIdTreeRef,
+        handleViewVideo,
       };
     },
   });