Merge branch 'all-v4-bxy' into 'all-v4'

fix: 修复相机设备编辑错误

See merge request skyeye/skyeye_frontend/skyeye-admin!358

src/views/cameras/overview/components/ConditionQuery.vue

@@ -68,17 +68,13 @@
 
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
+  import { storeToRefs } from 'pinia';
   import { queryTypeSelect, cameraAddType, AddType } from '@/types/camera/constant';
   import useCameraOverview from '../stores/useCameraOverview';
-  // import useSceneInfos from '@/hooks/useSceneInfos';
-  import { storeToRefs } from 'pinia';
   import useTreeWorkspaceInfo from '../hooks/useTreeWorkspaceInfo';
 
   const treeWorkspaceInfo = useTreeWorkspaceInfo();
-  const { workspaceInfo, getWorkspaceFromTreeInfo } = treeWorkspaceInfo;
-
-  // const sceneInfos = useSceneInfos();
-  // const { scenesTree, getScenesTree } = sceneInfos;
+  const { workspaceInfo, getWorkspaceFromTreeInfo, getWorkspaceIdFromTreeNode } = treeWorkspaceInfo;
 
   const cameraOverview = useCameraOverview();
   const {
@@ -96,11 +92,12 @@
   const locationProp = { multiple: true, expandTrigger: 'hover' as const }; // 级联选择器（打开多选）
 
   const handleCascaderChange = () => {
-    const tempArr = [];
+    const tempArr = [] as number[];
     queryWorkSpaces.value = [];
     if (tempWorkSpaces.value.length !== 0) {
       tempWorkSpaces.value.forEach((item) => {
-        tempArr.push(item[2]);
+        const workspaceId = getWorkspaceIdFromTreeNode(item[2]);
+        tempArr.push(Number(workspaceId));
       });
       queryWorkSpaces.value = tempArr;
     }
@@ -122,7 +119,6 @@
 
   onMounted(() => {
     getWorkspaceFromTreeInfo();
-    // getScenesTree({ level: 3, valueKey: 'code', labelKey: 'name' });
   });
 </script>
 

src/views/cameras/overview/hooks/useTreeWorkspaceInfo.ts

@@ -16,7 +16,7 @@ interface TreeWorkspaceInfoType {
 }
 
 interface ElTreeItem {
-  value: number;
+  value: string;
   label: string;
   children?: ElTreeItem[];
   // disabled?: boolean;
@@ -34,8 +34,7 @@ export function useTreeWorkspaceInfo() {
     }
     for (const item of infos) {
       const newItem = {
-        // value: `${item.nodeType}-${item.id}`,
-        value: item.id,
+        value: `${item.nodeType}-${item.id}`,
         label: item.name,
         workshopId: item.workshopId,
         principalName: item.principalName,

src/views/cameras/overview/stores/useCameraOverview.ts

@@ -17,7 +17,7 @@ export const useCameraOverview = defineStore('camera-overview', () => {
   const queryType = ref('');
   const queryTypeContent = ref('');
   const queryCameraType = ref('');
-  const queryWorkSpaces = ref([]);
+  const queryWorkSpaces = ref<number[]>([]);
   const querySourceType = ref('');
   const networkingState = ref<number>(ALL);
   const integrationState = ref<number>(ALL);
@@ -56,7 +56,6 @@ export const useCameraOverview = defineStore('camera-overview', () => {
       paramDetails.value.workspaceIdList = queryWorkSpaces.value;
     }
     if (querySourceType.value) {
-      console.log('queryCameraType.value', querySourceType.value);
       paramDetails.value.sourceType = querySourceType.value;
     }
     if (networkingState.value != ALL) {