fix: 添加删除失败返回&修改车间管理里的跳转

src/views/system-config/scene-manage/SceneManage.vue

@@ -324,7 +324,6 @@
     if (row.children?.length > 0) {
       ElMessageBox.confirm('存在下级场景，无法删除该场景', '无法删除该条信息', {
         confirmButtonText: '确认',
-        cancelButtonText: '取消',
         type: 'error',
       });
     } else {
@@ -333,21 +332,24 @@
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(() => {
-          if (row.nodeType === DrawerType.company) {
-            return delCompany(row.id);
-          } else if (row.nodeType === DrawerType.workshop) {
-            return delWorkshop(row.id);
-          } else {
-            return delWorkspace(row.id);
+        .then(async () => {
+          try {
+            if (row.nodeType === DrawerType.company) {
+              await delCompany(row.id);
+            } else if (row.nodeType === DrawerType.workshop) {
+              await delWorkshop(row.id);
+            } else {
+              await delWorkspace(row.id);
+            }
+          } catch (e: any) {
+            ElMessageBox.confirm(e, {
+              confirmButtonText: '确认',
+              type: 'error',
+            });
           }
-        })
-        .catch(() => {
-          console.log('删除失败');
-        })
-        .finally(() => {
           getComTreeDetail();
-        });
+        })
+        .catch(() => {});
     }
   };
 

src/views/system-config/scene-manage/hook/use-table-method.tsx

@@ -6,24 +6,24 @@ import {
   
 } from '@/types/scene/type.ts';
 import { useGlobSetting } from '@/hooks/setting';
-
+import { DrawerType } from '@/types/scene/constant.ts';
 const { appPCUrl } = useGlobSetting()
 
 export const colomns = [
   { label: '名称', prop: 'name', minWidth: 300 },
   { label: '设置', prop: 'labelName', minWidth: 300,
       render: ({ row }) => {
-        if(!row.parent && row.labelList?.[0]?.id) {
+        if(row.nodeType === DrawerType.company) {
           return (
             <a
-              href={`/#/page-config/config?companyId=${row.id}`}
+              href={`/#/layout/scene-config?companyId=${row.id}&companyName=${row.name}&viewType=1`}
             >
               布局设置
             </a>
           );  
-        } else if (row.parent && !row.parent.parent) {
+        } else if (row.nodeType === DrawerType.workshop) {
           return (
-            <a href={`/#/map-config/layout?id=${row.id}`}>
+            <a href={`/#/layout/camera-config?workshopId=${row.id}&workshopName=${row.name}&viewType=1`}>
               相机导航设置
             </a>
           );
@@ -37,16 +37,17 @@ export const colomns = [
     prop: 'preview',
     minWidth: 300,
     render: ({ row, column }) => {
-      if (!row.parent && row.labelList?.[0]?.id) {
+      if (row.nodeType === DrawerType.company) {
         return (
+          // TODO 这里的跳转需要根据前台的路由地址来
           <a
-            href={`${appPCUrl}#/company?companyId=${row.id}&labelId=${row.labelList[0]?.id}`}
+            href={`${appPCUrl}#/company?companyId=${row.id}`}
             target="_blank"
           >
             公司预览
           </a>
         );
-      } else if (row.parent && !row.parent.parent) {
+      } else if (row.nodeType === DrawerType.workshop) {
         return (
           <a href={`${appPCUrl}#/shop?id=${row.id}`} target="_blank">
             车间预览