Merge branch 'ft' into 'main_dev'

feat(src/packages): 摄像头新增源类型获取 See merge request yunteng/thingskit-view!114

Merge branch 'ft' into 'main_dev'
feat(src/packages): 摄像头新增源类型获取 See merge request yunteng/thingskit-view!114
xp.Huang
2 parents 0c57acdb 963e08ac
Showing 6 changed files with 226 additions and 29 deletions
src/api/external/common/index.ts
src/api/external/common/model/index.ts
src/packages/components/external/Informations/Mores/Camera/config.ts
src/packages/components/external/Informations/Mores/Camera/config.vue
src/packages/components/external/Informations/Mores/SingleCamera/config.ts
src/packages/components/external/Informations/Mores/SingleCamera/config.vue
--- a/src/api/external/common/index.ts
View file @39f9876
+++ b/src/api/external/common/index.ts
View file @39f9876
 import { defHttp } from '@/utils/external/http/axios'
-import { DictItem, UploadResponse } from './model'
+import { DictItem, OrganizationListItem, UploadResponse } from './model'
 enum Api {
   GET_DICT = '/dict_item',
@@ -8,7 +8,9 @@ enum Api {
   AREALIST = '/area/list',
   PLATFORM = '/platform/get',
   CONFIGURATION = '/configuration/center',
-  CONFIGURATION_SHARE = '/configuration/center/share/'
+  CONFIGURATION_SHARE = '/configuration/center/share/',
+  BASEORIGINATION = '/organization/me/list/',
+  VIDEO = '/video/list'
 }
 export const getDictItemByCode = (value: string) => {
@@ -48,7 +50,7 @@ export const getConfigurationList = (params: object) => {
 }
 //组态设置是否公开或私有
-export const setConfigurationIsShare = (params: string,isShare:boolean,data:object) => {
+export const setConfigurationIsShare = (params: string, isShare: boolean, data: object) => {
   return defHttp.post({
     url: `${Api.CONFIGURATION_SHARE}${params}?isShare=${isShare}`,
     data
@@ -59,10 +61,24 @@ export const setConfigurationIsShare = (params: string,isShare:boolean,data:obje
 export const getDeviceActiveTime = (entityId: string) => {
   return defHttp.get(
     {
-      url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys=active`,
+      url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys=active`
     },
     {
-      joinPrefix: false,
+      joinPrefix: false
     }
-  );
-};
+  )
+}
+
+//获取组织列表
+export const getOrganizationList = (params?: OrganizationListItem) =>
+  defHttp.get({
+    url: Api.BASEORIGINATION,
+    params
+  })
+
+//获取视频列表
+export const getVideoList = (params?:object) =>
+  defHttp.get({
+    url: Api.VIDEO,
+    params
+  })
--- a/src/api/external/common/model/index.ts
View file @39f9876
+++ b/src/api/external/common/model/index.ts
View file @39f9876
@@ -16,3 +16,11 @@ export interface UploadResponse {
   size: number
   fileStaticUri: string
 }
+
+
+export interface OrganizationListItem {
+  id: string;
+  name: string;
+  parentId?: string;
+  remark: string;
+}
--- a/src/packages/components/external/Informations/Mores/Camera/config.ts
View file @39f9876
+++ b/src/packages/components/external/Informations/Mores/Camera/config.ts
View file @39f9876
@@ -3,10 +3,17 @@ import { CreateComponentType } from '@/packages/index.d'
 import { CameraConfig } from './index'
 import cloneDeep from 'lodash/cloneDeep'
+export enum sourceTypeEnum {
+  CUSTOM = 'custom',
+  PLATFORM = 'platform'
+}
+
 export const option = {
   dataset: [
     {
-      url: ''
+      url: '',
+      sourceType: 'custom',
+      organization: ''
     }
   ] as any,
   // 自动播放的间隔（ms）
--- a/src/packages/components/external/Informations/Mores/Camera/config.vue
View file @39f9876
+++ b/src/packages/components/external/Informations/Mores/Camera/config.vue
View file @39f9876
 <template>
   <CollapseItem name="播放器配置" :expanded="true">
-    <setting-item-box name="源地址" :alone="true">
-      <setting-item v-for="(item, index) in optionData.dataset" :key="index">
-        <n-input-group>
-          <n-input v-model:value="item.url" size="small" placeholder="请输入源地址"></n-input>
-          <n-button ghost @click="optionData.dataset.splice(index, 1)"> - </n-button>
-        </n-input-group>
-      </setting-item>
-      <setting-item>
-        <n-button v-if="optionData.dataset.length < 9" size="small" @click="optionData.dataset.push({ url: '' })">
-          +
-        </n-button>
-      </setting-item>
-    </setting-item-box>
+    <template v-for="(item, index) in optionData.dataset" :key="index">
+      <setting-item-box name="源类型" :alone="true">
+        <setting-item>
+          <n-radio-group @change="handleChecked($event, item)" v-model:value="item.sourceType" name="radiogroup">
+            <n-space>
+              <n-radio v-for="(item, index) in sourceTypes" :key="item.value" :value="item.value">
+                {{ item.label }}
+              </n-radio>
+            </n-space>
+          </n-radio-group>
+        </setting-item>
+      </setting-item-box>
+      <setting-item-box v-if="item.sourceType === sourceTypeEnum.CUSTOM" name="源地址" :alone="true">
+        <setting-item>
+          <n-input-group>
+            <n-input v-model:value="item.url" size="small" placeholder="请输入源地址"></n-input>
+          </n-input-group>
+        </setting-item>
+      </setting-item-box>
+      <setting-item-box v-if="item.sourceType === sourceTypeEnum.PLATFORM" name="组织" :alone="true">
+        <setting-item>
+          <n-tree-select
+            placement="top-start"
+            label-field="name"
+            v-model:value="item.organization"
+            key-field="id"
+            children-field="children"
+            :options="originationOption"
+            @update:value="handleUpdateTreeValue($event, item)"
+          />
+        </setting-item>
+      </setting-item-box>
+      <setting-item-box v-if="item.sourceType === sourceTypeEnum.PLATFORM" name="视频" :alone="true">
+        <setting-item>
+          <n-select v-model:value="item.url" :options="videoOptions" />
+        </setting-item>
+      </setting-item-box>
+      <n-button size="small" @click="optionData.dataset.splice(index, 1)"> - </n-button>
+    </template>
+    <n-button
+      style="margin-left: 10px"
+      v-if="optionData.dataset.length < 9"
+      size="small"
+      @click="optionData.dataset.push({ url: '', sourceType: 'custom', organization: '' })"
+    >
+      +
+    </n-button>
   </CollapseItem>
 </template>
 <script setup lang="ts">
-import { PropType } from 'vue'
-import { option } from './config'
+import { PropType, ref, onMounted } from 'vue'
+import { option, sourceTypeEnum } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { getOrganizationList, getVideoList } from '@/api/external/common/index'
+import { NTreeSelect } from 'naive-ui'
-defineProps({
+const props = defineProps({
   optionData: {
     type: Object as PropType<typeof option>,
     required: true
   }
 })
+
+const sourceTypes = [
+  {
+    value: 'custom',
+    label: '自定义'
+  },
+  {
+    value: 'platform',
+    label: '平台获取'
+  }
+]
+
+const originationOption = ref([])
+
+const videoOptions = ref([])
+
+const getOriginationList = async () => {
+  const res = await getOrganizationList()
+  originationOption.value = res
+}
+
+const handleUpdateTreeValue = (e: any, value: object) => {
+  getVideoLists(e)
+}
+
+const getVideoLists = async (organizationId: string) => {
+  const res = await getVideoList({ organizationId })
+  videoOptions.value = res?.data?.map((item: any) => ({ label: item.name, value: item.videoUrl }))
+}
+
+const handleChecked = ({ target }: any, values: object) => {
+  const { value } = target
+  if (value === sourceTypeEnum.PLATFORM) {
+    getOriginationList()
+  }
+}
+
+onMounted(() => {
+  props.optionData.dataset.forEach((item: any) => {
+    if (item.sourceType === sourceTypeEnum.PLATFORM) {
+      getOriginationList()
+      if (item.organization) {
+        getVideoLists(item.organization)
+      }
+    }
+  })
+})
 </script>
--- a/src/packages/components/external/Informations/Mores/SingleCamera/config.ts
View file @39f9876
+++ b/src/packages/components/external/Informations/Mores/SingleCamera/config.ts
View file @39f9876
@@ -3,10 +3,17 @@ import { CreateComponentType } from '@/packages/index.d'
 import { SingleCameraConfig } from './index'
 import cloneDeep from 'lodash/cloneDeep'
+export enum sourceTypeEnum {
+  CUSTOM = 'custom',
+  PLATFORM = 'platform'
+}
+
 export const option = {
   dataset: '',
   autoplay: false,
-  poster: ''
+  poster: '',
+  sourceType: 'custom',
+  organization: ''
 }
 export default class Config extends PublicConfigClass implements CreateComponentType {
--- a/src/packages/components/external/Informations/Mores/SingleCamera/config.vue
View file @39f9876
+++ b/src/packages/components/external/Informations/Mores/SingleCamera/config.vue
View file @39f9876
@@ -22,13 +22,42 @@
         </n-card>
       </setting-item>
     </setting-item-box>
-    <setting-item-box name="源地址" :alone="true">
+    <setting-item-box name="源类型" :alone="true">
+      <setting-item>
+        <n-radio-group @change="handleChecked" v-model:value="optionData.sourceType" name="radiogroup">
+          <n-space>
+            <n-radio v-for="(item, index) in sourceTypes" :key="item.value" :value="item.value">
+              {{ item.label }}
+            </n-radio>
+          </n-space>
+        </n-radio-group>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box v-if="optionData.sourceType === sourceTypeEnum.CUSTOM" name="源地址" :alone="true">
       <setting-item>
         <n-input-group>
           <n-input v-model:value="optionData.dataset" size="small" placeholder="请输入源地址"></n-input>
         </n-input-group>
       </setting-item>
     </setting-item-box>
+    <setting-item-box v-if="optionData.sourceType === sourceTypeEnum.PLATFORM" name="组织" :alone="true">
+      <setting-item>
+        <n-tree-select
+          placement="top-start"
+          label-field="name"
+          v-model:value="optionData.organization"
+          key-field="id"
+          children-field="children"
+          :options="originationOption"
+          @update:value="handleUpdateTreeValue"
+        />
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box v-if="optionData.sourceType === sourceTypeEnum.PLATFORM" name="视频" :alone="true">
+      <setting-item>
+        <n-select v-model:value="optionData.dataset" :options="videoOptions" />
+      </setting-item>
+    </setting-item-box>
     <setting-item-box name="自动播放">
       <setting-item>
         <n-switch v-model:value="optionData.autoplay" size="small" />
@@ -38,14 +67,15 @@
 </template>
 <script setup lang="ts">
-import { PropType, ref, nextTick } from 'vue'
-import { option } from './config'
+import { PropType, ref, nextTick, onMounted } from 'vue'
+import { option, sourceTypeEnum } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { FileTypeEnum } from '@/enums/fileTypeEnum'
 import { uploadFile } from '@/api/external/contentSave/content'
-import { UploadCustomRequestOptions } from 'naive-ui'
+import { UploadCustomRequestOptions, NTreeSelect } from 'naive-ui'
 import { backgroundImageSize } from '@/settings/designSetting'
 import { fetchRouteParamsLocation } from '@/utils'
+import { getOrganizationList, getVideoList } from '@/api/external/common/index'
 const props = defineProps({
   optionData: {
@@ -56,6 +86,52 @@ const props = defineProps({
 const uploadFileListRef = ref()
+const sourceTypes = [
+  {
+    value: 'custom',
+    label: '自定义'
+  },
+  {
+    value: 'platform',
+    label: '平台获取'
+  }
+]
+
+const originationOption = ref([])
+
+const videoOptions = ref([])
+
+const getOriginationList = async () => {
+  const res = await getOrganizationList()
+  originationOption.value = res
+}
+
+const handleUpdateTreeValue = (value: string) => {
+  props.optionData.dataset = ''
+  getVideoLists(value)
+}
+
+const getVideoLists = async (organizationId: string) => {
+  const res = await getVideoList({ organizationId })
+  videoOptions.value = res?.data?.map((item: any) => ({ label: item.name, value: item.videoUrl }))
+}
+
+const handleChecked = ({ target }: any) => {
+  const { value } = target
+  if (value === sourceTypeEnum.PLATFORM) {
+    getOriginationList()
+  }
+}
+
+onMounted(() => {
+  if (props.optionData.sourceType === sourceTypeEnum.PLATFORM) {
+    getOriginationList()
+    if (props.optionData.organization) {
+      getVideoLists(props.optionData.organization)
+    }
+  }
+})
+
 // 上传图片前置处理
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore