Merge branch 'f-dev' into 'main'

fix：修改Teambition上的问题 pref：优化报表配置表单字段

See merge request huang/yun-teng-iot-front!265

+import { BasicPageParams } from '/@/api/model/baseModel';
+export type CameraQueryParam = BasicPageParams & CameraParam;
+
+export type CameraParam = {
+  status: true;
+  name: string;
+  organizationId: string;
+  orderFiled: string;
+  orderType: string;
+};
+
+export interface CameraModel {
+  accessMode: number;
+  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;
+  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 interface StreamingManageRecord {
+  id: string;
+  creator: string;
+  createTime: string;
+  name: string;
+  enabled: boolean;
+  tenantId: string;
+  sn: string;
+  organizationId: string;
+  organizationName: string;
+  status: boolean;
+  accessMode: number;
+  playProtocol: number;
+}
+
+export interface StreamingMediaModel {
+  id: string;
+  creator: string;
+  createTime: string;
+  enabled: boolean;
+  tenantId: string;
+  type: number;
+  host: string;
+  appKey: string;
+  appSecret: string;
+  ssl: number;
+}
+
+export interface StreamingQueryParam {
+  host?: string;
+}
+
+export interface StreamingSubmitParam {
+  type: number;
+  ssl: number;
+  host: string;
+  appKey: string;
+  appSecret: string;
+  id?: string;
+}
+
+export interface StreamingMediaDeleteParam {
+  tenantId?: string;
+  ids: string[];
+}

+import { defHttp } from '/@/utils/http/axios';
+import {
+  CameraModel,
+  CameraQueryParam,
+  StreamingMediaDeleteParam,
+  StreamingQueryParam,
+  StreamingSubmitParam,
+} from './model/reportModel';
+
+enum CameraManagerApi {
+  CAMERA_POST_URL = '/video',
+  CAMERA_GET_URL = '/video',
+  CAMERA_DELETE_URL = '/video',
+  CAMERA_GET_DETAIL_URL = '/video',
+  STREAMING_GET_URL = '/video/platform',
+  STREAMING_POST_URL = '/video/platform',
+  STREAMING_DELETE_URL = '/video/platform',
+  STREAMING_PLAY_GET_URL = '/video/url',
+}
+
+export const cameraPage = (params: CameraQueryParam) => {
+  return defHttp.get<CameraQueryParam>({
+    url: CameraManagerApi.CAMERA_GET_URL,
+    params,
+  });
+};
+
+/**
+ * 删除视频
+ * @param ids 删除的ids
+ */
+export const deleteCameraManage = (ids: string[]) => {
+  return defHttp.delete({
+    url: CameraManagerApi.CAMERA_DELETE_URL,
+    data: {
+      ids: ids,
+    },
+  });
+};
+
+// 创建或编辑视频
+export const createOrEditCameraManage = (data) => {
+  return defHttp.post<CameraModel>({
+    url: CameraManagerApi.CAMERA_POST_URL,
+    data,
+  });
+};
+
+// 查询视频详情
+export const getCameraManageDetail = (id: string) => {
+  return defHttp.get({
+    url: CameraManagerApi.CAMERA_GET_DETAIL_URL + `/${id}`,
+  });
+};
+
+/**
+ * @description 获取流媒体列表
+ * @param params
+ * @returns
+ */
+export const getStreamingMediaList = (params: StreamingQueryParam) => {
+  return defHttp.get({
+    url: CameraManagerApi.STREAMING_GET_URL,
+    params,
+  });
+};
+
+/**
+ * @description 更新/新增流媒体记录
+ * @param params
+ * @returns
+ */
+export const createOrUpdateStreamingMediaRecord = (params: StreamingSubmitParam) => {
+  return defHttp.post({
+    url: CameraManagerApi.STREAMING_POST_URL,
+    params,
+  });
+};
+
+/**
+ * @description 删除流媒体记录
+ * @param params
+ * @returns
+ */
+export const deleteStreamingMediaRecord = (params: StreamingMediaDeleteParam) => {
+  return defHttp.delete({
+    url: CameraManagerApi.STREAMING_POST_URL,
+    params,
+  });
+};
+
+/**
+ * @description 获取流媒体播放地址
+ * @param entityId
+ * @returns
+ */
+export const getStreamingPlayUrl = (entityId: string) => {
+  return defHttp.get({
+    url: `${CameraManagerApi.STREAMING_PLAY_GET_URL}/${entityId}`,
+  });
+};

@@ -77,7 +77,7 @@
         }
         }
 
 
         let resStr = '';
         let resStr = '';
-        let dirStr = isBefore ? t('component.time.after') : t('component.time.before');
+        let dirStr = isBefore ? t('component.time.before') : t('component.time.after');
 
 
         if (diff < ONE_SECONDS) {
         if (diff < ONE_SECONDS) {
           resStr = t('component.time.just');
           resStr = t('component.time.just');

@@ -42,8 +42,9 @@
                   alt="avatar"
                   alt="avatar"
                 />
                 />
                 <div v-else>
                 <div v-else>
-                  <div style="">
-                    <PlusOutlined style="font-size: 30px" />
+                  <div>
+                    <LoadingOutlined style="font-size: 30px" v-if="loading" />
+                    <PlusOutlined v-else style="font-size: 30px" />
                   </div>
                   </div>
                 </div>
                 </div>
               </Upload>
               </Upload>
@@ -53,10 +54,9 @@
         <Description
         <Description
           class="mt-8"
           class="mt-8"
           :column="1"
           :column="1"
-          :schema="schema"
           :bordered="true"
           :bordered="true"
           :data="getPersonalDetailValue"
           :data="getPersonalDetailValue"
-          @register="registerDesc"
+          :schema="schema"
         />
         />
       </div>
       </div>
       <div
       <div
@@ -83,7 +83,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal/index';
   import { BasicModal, useModalInner } from '/@/components/Modal/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './config';
   import { formSchema } from './config';
-  import { Description, DescItem, useDescription } from '/@/components/Description/index';
+  import { Description, DescItem } from '/@/components/Description/index';
   import { uploadApi, personalPut } from '/@/api/personal/index';
   import { uploadApi, personalPut } from '/@/api/personal/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
@@ -92,6 +92,7 @@
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
   import type { FileItem } from '/@/components/Upload/src/typing';
   import type { FileItem } from '/@/components/Upload/src/typing';
+  import { LoadingOutlined } from '@ant-design/icons-vue';
 
 
   const schema: DescItem[] = [
   const schema: DescItem[] = [
     {
     {
@@ -119,11 +120,20 @@
       label: '创建时间：',
       label: '创建时间：',
     },
     },
   ];
   ];
+  const mockData: Recordable = {
+    username: 'test',
+    phoneNumber: 'VB',
+    email: '123',
+    realName: '15695909xxx',
+    accountExpireTime: '190848757@qq.com',
+    createTime: '厦门市思明区',
+  };
   export default defineComponent({
   export default defineComponent({
     name: 'Index',
     name: 'Index',
-    components: { BasicModal, BasicForm, Description, Upload, PlusOutlined },
+    components: { BasicModal, BasicForm, Description, Upload, PlusOutlined, LoadingOutlined },
     emits: ['refreshPersonl', 'register'],
     emits: ['refreshPersonl', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {
+      const loading = ref(false);
       const userInfo = getAuthCache(USER_INFO_KEY);
       const userInfo = getAuthCache(USER_INFO_KEY);
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const getPersonalValue: any = ref({});
       const getPersonalValue: any = ref({});
@@ -133,21 +143,18 @@
       const getData: any = ref({});
       const getData: any = ref({});
       const updataPersonlData: any = ref({});
       const updataPersonlData: any = ref({});
       const userStore = useUserStore();
       const userStore = useUserStore();
-      // const getUpdateUserInfo: any = ref({});
-      const [registerDesc] = useDescription({
-        title: '个人详情',
-        schema: schema,
-      });
-
       const peresonalPic = ref();
       const peresonalPic = ref();
 
 
       const customUploadqrcodePic = async ({ file }) => {
       const customUploadqrcodePic = async ({ file }) => {
         if (beforeUploadqrcodePic(file)) {
         if (beforeUploadqrcodePic(file)) {
+          peresonalPic.value = '';
+          loading.value = true;
           const formData = new FormData();
           const formData = new FormData();
           formData.append('file', file);
           formData.append('file', file);
           const response = await uploadApi(formData);
           const response = await uploadApi(formData);
           if (response.fileStaticUri) {
           if (response.fileStaticUri) {
             peresonalPic.value = response.fileStaticUri;
             peresonalPic.value = response.fileStaticUri;
+            loading.value = false;
           }
           }
         }
         }
       };
       };
@@ -236,10 +243,11 @@
         compHeight,
         compHeight,
         handleSubmit,
         handleSubmit,
         getPersonalDetailValue,
         getPersonalDetailValue,
-        registerDesc,
         schema,
         schema,
         registerModal,
         registerModal,
         registerForm,
         registerForm,
+        loading,
+        mockData
       };
       };
     },
     },
   });
   });

 <template>
 <template>
   <div>
   <div>
-    <BasicTable @register="registerTable" :dataSource="tableData">
+    <BasicTable @register="registerTable" :dataSource="tableData" style="height: 12rem">
       <template #status>
       <template #status>
         <Switch
         <Switch
           checked-children="开"
           checked-children="开"
@@ -11,7 +11,7 @@
         />
         />
       </template>
       </template>
     </BasicTable>
     </BasicTable>
-    <div style="margin-top: -54vh">
+    <div style="margin-left: 0.44rem">
       <a-button type="primary" class="mr-4" :disabled="disabled" @click="handleFrpRemote"
       <a-button type="primary" class="mr-4" :disabled="disabled" @click="handleFrpRemote"
         >远程连接</a-button
         >远程连接</a-button
       >
       >
@@ -27,7 +27,6 @@
   import { Tag } from 'ant-design-vue';
   import { Tag } from 'ant-design-vue';
   import { frpGetInfoApi, frpPutInfoApi } from '/@/api/device/deviceConfigApi';
   import { frpGetInfoApi, frpPutInfoApi } from '/@/api/device/deviceConfigApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { ConsoleSqlOutlined } from '@ant-design/icons-vue';
 
 
   const props = defineProps({
   const props = defineProps({
     deviceDetail: {
     deviceDetail: {
@@ -42,7 +41,7 @@
   const disabled = ref<boolean>(true);
   const disabled = ref<boolean>(true);
   const viewDeviceColumn: BasicColumn[] = [
   const viewDeviceColumn: BasicColumn[] = [
     {
     {
-      title: 'Frp连接状态',
+      title: '远程连接状态',
       dataIndex: 'status',
       dataIndex: 'status',
       width: 80,
       width: 80,
       customRender: ({ record }) => {
       customRender: ({ record }) => {
@@ -53,7 +52,7 @@
       },
       },
     },
     },
     {
     {
-      title: '远程连接',
+      title: '允许远程连接',
       dataIndex: 'enableRemote',
       dataIndex: 'enableRemote',
       width: 80,
       width: 80,
       slots: { customRender: 'status' },
       slots: { customRender: 'status' },
@@ -78,7 +77,6 @@
   const address = ref('');
   const address = ref('');
   const enableRemoteDisabled = ref(false);
   const enableRemoteDisabled = ref(false);
   const getTableData = async () => {
   const getTableData = async () => {
-    // const res = await frpGetInfoApi('1000000061664FF');
     const res = await frpGetInfoApi(props.deviceDetail.sn);
     const res = await frpGetInfoApi(props.deviceDetail.sn);
     enableRemote.value = res.enableRemote;
     enableRemote.value = res.enableRemote;
     proxyName.value = res.proxyName;
     proxyName.value = res.proxyName;

@@ -15,7 +15,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { createOrEditCameraManage } from '/@/api/camera/cameraManager';
+  // import { createOrEditCameraManage } from '/@/api/camera/cameraManager';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const emit = defineEmits(['success', 'register']);
   const emit = defineEmits(['success', 'register']);
@@ -47,10 +47,11 @@
     try {
     try {
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const values = await validate();
       const values = await validate();
+      console.log(values);
       if (!values) return;
       if (!values) return;
       let saveMessage = '添加成功';
       let saveMessage = '添加成功';
       let updateMessage = '修改成功';
       let updateMessage = '修改成功';
-      await createOrEditCameraManage(values);
+      // await createOrEditCameraManage(values);
       closeDrawer();
       closeDrawer();
       emit('success');
       emit('success');
       createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
       createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);

@@ -5,6 +5,7 @@ import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
 import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
 import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+import { findDictItemByCode } from '/@/api/system/dict';
 
 
 export enum TypeEnum {
 export enum TypeEnum {
   IS_TIMING = 'TIMING',
   IS_TIMING = 'TIMING',
@@ -22,7 +23,6 @@ export const isMonth = (type: string) => {
   return type === TypeEnum.IS_MONTH;
   return type === TypeEnum.IS_MONTH;
 };
 };
 
 
-
 export enum AggregateDataEnum {
 export enum AggregateDataEnum {
   MIN = 'MIN',
   MIN = 'MIN',
   MAX = 'MAX',
   MAX = 'MAX',
@@ -139,7 +139,6 @@ export const formSchema: QFormSchema[] = [
     field: '1',
     field: '1',
     label: '报表名称',
     label: '报表名称',
     colProps: { span: 24 },
     colProps: { span: 24 },
-    helpMessage: ['报表配置', '只对拥有数值型属性', '的设备才能配置'],
     required: true,
     required: true,
     component: 'Input',
     component: 'Input',
     componentProps: {
     componentProps: {
@@ -241,7 +240,7 @@ export const formSchema: QFormSchema[] = [
     label: '周期',
     label: '周期',
     required: true,
     required: true,
     colProps: { span: 24 },
     colProps: { span: 24 },
-    defaultValue: '1',
+    defaultValue: 'day',
     componentProps: {
     componentProps: {
       placeholder: '请选择周期',
       placeholder: '请选择周期',
       options: [
       options: [
@@ -253,55 +252,56 @@ export const formSchema: QFormSchema[] = [
     ifShow: ({ values }) => isTiming(values.actionS),
     ifShow: ({ values }) => isTiming(values.actionS),
   },
   },
   {
   {
-    field: '5',
-    component: 'Select',
+    field: '51111',
+    component: 'ApiSelect',
     label: '每周',
     label: '每周',
     required: true,
     required: true,
     colProps: { span: 24 },
     colProps: { span: 24 },
-    defaultValue: '1',
+    defaultValue: '0 0 0 ? * 1',
     componentProps: {
     componentProps: {
       placeholder: '请选择周期',
       placeholder: '请选择周期',
-      options: [
-        { label: '星期一', value: '1' },
-        { label: '星期二', value: '2' },
-        { label: '星期三', value: '3' },
-        { label: '星期四', value: '3' },
-        { label: '星期五', value: '3' },
-      ],
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'every_week',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
     },
     ifShow: ({ values }) => isWeek(values.timeWeek),
     ifShow: ({ values }) => isWeek(values.timeWeek),
   },
   },
   {
   {
-    field: '5',
-    component: 'Select',
+    field: '71111',
+    component: 'ApiSelect',
     label: '每月',
     label: '每月',
     required: true,
     required: true,
     colProps: { span: 24 },
     colProps: { span: 24 },
-    defaultValue: '1',
+    defaultValue: '0 0 0 1 * ? *',
     componentProps: {
     componentProps: {
-      placeholder: '请选择周期',
-      options: [
-        { label: '1日', value: '1' },
-        { label: '2日', value: '7' },
-        { label: '3日', value: '30' },
-      ],
+      placeholder: '请选择月份',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'every_month',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
     },
     ifShow: ({ values }) => isMonth(values.timeWeek),
     ifShow: ({ values }) => isMonth(values.timeWeek),
   },
   },
   {
   {
-    field: '6',
-    component: 'Select',
+    field: '62121',
+    component: 'ApiSelect',
     label: '时间',
     label: '时间',
     required: true,
     required: true,
     colProps: { span: 24 },
     colProps: { span: 24 },
-    defaultValue: '1',
+    defaultValue: '0 0 0  * * ?',
     componentProps: {
     componentProps: {
       placeholder: '请选择时间',
       placeholder: '请选择时间',
-      options: [
-        { label: '00点', value: '1' },
-        { label: '01点', value: '2' },
-        { label: '02点', value: '3' },
-      ],
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'every_day',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
     },
     ifShow: ({ values }) => isTiming(values.actionS),
     ifShow: ({ values }) => isTiming(values.actionS),
   },
   },
@@ -309,6 +309,7 @@ export const formSchema: QFormSchema[] = [
     field: 'entityId',
     field: 'entityId',
     label: '设备',
     label: '设备',
     required: true,
     required: true,
+    helpMessage: ['报表配置只对拥有数值型属性的设备才能配置'],
     component: 'Select',
     component: 'Select',
     componentProps: {
     componentProps: {
       placeholder: '请选择设备',
       placeholder: '请选择设备',
@@ -359,7 +360,7 @@ export const formSchema: QFormSchema[] = [
       options: [
       options: [
         { label: '历史数据', value: '1' },
         { label: '历史数据', value: '1' },
         { label: '同比', value: '2' },
         { label: '同比', value: '2' },
-        { label: '环比', value: '2' },
+        { label: '环比', value: '3' },
       ],
       ],
     },
     },
     colProps: { span: 24 },
     colProps: { span: 24 },
@@ -393,32 +394,49 @@ export const formSchema: QFormSchema[] = [
     colProps: { span: 24 },
     colProps: { span: 24 },
   },
   },
   {
   {
-    field: '9',
+    field: '91112',
     label: '查询周期',
     label: '查询周期',
     required: true,
     required: true,
     component: 'Select',
     component: 'Select',
     componentProps: {
     componentProps: {
       placeholder: '请选择查询周期',
       placeholder: '请选择查询周期',
       options: [
       options: [
-        { label: '1分钟', value: '60000' },
-        { label: '2分钟', value: '120000' },
-        { label: '3分钟', value: '180000' },
+        { label: '1秒', value: '1000' },
+        { label: '5秒', value: '5000' },
+        { label: '10秒', value: '10000' },
+        { label: '15秒', value: '15000' },
+        { label: '30秒', value: '30000' },
+        { label: '1分', value: '60000' },
+        { label: '2分', value: '120000' },
+        { label: '5分', value: '300000' },
+        { label: '10分', value: '600000' },
+        { label: '15分', value: '900000' },
+        { label: '30分', value: '1800000' },
+        { label: '1小时', value: '3600000' },
+        { label: '2小时', value: '7200000' },
+        { label: '5小时', value: '18000000' },
+        { label: '10小时', value: '36000000' },
+        { label: '12小时', value: '43200000' },
+        { label: '1天', value: '86400000' },
+        { label: '7天', value: '604800000' },
+        { label: '30天', value: '2592000000' },
       ],
       ],
     },
     },
     colProps: { span: 24 },
     colProps: { span: 24 },
   },
   },
   {
   {
-    field: '10',
+    field: '102121',
     label: '间隔时间',
     label: '间隔时间',
     required: true,
     required: true,
     component: 'Select',
     component: 'Select',
     componentProps: {
     componentProps: {
       placeholder: '请选择间隔时间',
       placeholder: '请选择间隔时间',
       options: [
       options: [
-        { label: '1秒', value: '1000' },
-        { label: '5秒', value: '5000' },
-        { label: '10秒', value: '10000' },
-        { label: '15秒', value: '150000' },
+        { label: '2小时', value: '7200000' },
+        { label: '5小时', value: '18000000' },
+        { label: '10小时', value: '36000000' },
+        { label: '12小时', value: '43200000' },
+        { label: '1天', value: '86400000' },
       ],
       ],
     },
     },
     colProps: { span: 24 },
     colProps: { span: 24 },