fix: 添加相机不加principle+角色管理找不到结构树

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

@@ -99,6 +99,7 @@
           (item) => item.code === cameraIPData.value.workspaceCode,
         ).id;
         delete (copyData as any).workspaceCode;
+        delete (copyData as any).principal;
         emits('confirm-execute', copyData);
       }
     });

src/views/cameras/overview/overviewColumns.ts

@@ -17,6 +17,11 @@ export const columns: BasicColumn[] = [
     type: 'index',
     fixed: 'left',
   },
+  {
+    label: '公司名称',
+    prop: 'companyName',
+    minWidth: 100,
+  },
   {
     label: '名称',
     prop: 'name',

src/views/map-config/mini-map/MapBase/KonvaMap.vue

@@ -372,7 +372,7 @@
           return item;
         })
         ?.filter((cam) => {
-          if (shopCameraList.value.findIndex((x) => x.code === cam.code) >= 0) {
+          if (shopCameraList.value.findIndex((x) => x.code === cam.id) >= 0) {
             return true;
           } else {
             unExitList.push(cam.code);

src/views/map-config/mini-map/MiniMapConfig.vue

@@ -240,7 +240,9 @@
   const filterShopCameraList = computed(() => {
     const k = searchKey.value.trim();
     if (!k) return shopCameraList.value;
-    return shopCameraList.value.filter((x) => x.code?.includes(k) || x.workSpaceName?.includes(k));
+    return shopCameraList.value.filter(
+      (x) => x.code?.includes(k) || x.name?.includes(k) || x.workSpaceName?.includes(k),
+    );
   });
 
   const handleAddCamera = (cameraId: string) => {

src/views/page-config/ConfigEdit.vue

@@ -187,13 +187,15 @@
   // 是否已有背景图
   const hasBg = ref(false);
 
-  const handleBeforeUpload = () => {
+  const handleBeforeUpload = (rawFile) => {
     if (!selectedCompany.value || !label.value) {
       ElMessage.error({
         message: '请先选择公司和标签',
       });
       return false;
     }
+    // console.log(rawFile.type);
+    // return false;
   };
 
   /** 判断相机是否已经添加 */

src/views/system/role/CreateUserDrawer.vue

@@ -88,9 +88,11 @@
 
   import { addRole, getFeaturePermissions, roleUserInfo, updateRole } from '@/api/system/role';
   import useScene from '@/views/system-config/scene-manage/use-scene';
+  import { storeToRefs } from 'pinia';
 
   const sceneInfos = useScene();
-  const { tableData, getSceneDetail } = sceneInfos;
+  const { tableData } = storeToRefs(sceneInfos);
+  const { getSceneDetail } = sceneInfos;
 
   // 默认功能权限全部勾选，有未勾选的添加至excludeFeaturePermissionMap中：[workdshopCode]: [permission数组]
   const featurePermissionMap = {};