Merge branch 'all-v4-lhf' into 'all-v4'

fix: 取消公司预览和车间预览功能

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

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

@@ -5,56 +5,56 @@ const { appPCUrl } = useGlobSetting()
 
 export const colomns = [
   { label: '名称', prop: 'name', minWidth: 300 },
-  { label: '设置', prop: 'labelName', minWidth: 300,
-      render: ({ row }) => {
-        if(row.nodeType === DrawerType.company) {
-          return (
-            <a
-              href={`./#/layout/scene-config?companyId=${row.id}&companyName=${row.name}&viewType=1`}
-            >
-              布局设置
-            </a>
-          );  
-        } else if (row.nodeType === DrawerType.workshop) {
-          return (
-            <a 
-            href={`./#/layout/camera-config?workshopId=${row.id}&workshopName=${row.name}&viewType=1`}
-            >
-              相机导航设置
-            </a>
-          );
-        }
-      }, 
-    },
-  // { label: '场景标签', prop: 'labelName', minWidth: 300 },
-  // { label: '代码', prop: 'code' },
   {
-    label: '预览',
-    prop: 'preview',
-    minWidth: 300,
-    render: ({ row, column }) => {
+    label: '设置', prop: 'labelName', minWidth: 300,
+    render: ({ row }) => {
       if (row.nodeType === DrawerType.company) {
         return (
-          // TODO 这里的跳转需要根据前台的路由地址来
           <a
-            href={`${appPCUrl}#/company?companyId=${row.id}`}
-            target="_blank"
+            href={`./#/layout/scene-config?companyId=${row.id}&companyName=${row.name}&viewType=1`}
           >
-            公司预览
+            布局设置
           </a>
         );
       } else if (row.nodeType === DrawerType.workshop) {
         return (
-          <a href={`${appPCUrl}#/shop?id=${row.id}`} target="_blank">
-            车间预览
+          <a
+            href={`./#/layout/camera-config?workshopId=${row.id}&workshopName=${row.name}&viewType=1`}
+          >
+            相机导航设置
           </a>
         );
       }
     },
   },
+  // { label: '场景标签', prop: 'labelName', minWidth: 300 },
+  // { label: '代码', prop: 'code' },
+  // {
+  //   label: '预览',
+  //   prop: 'preview',
+  //   minWidth: 300,
+  //   render: ({ row, column }) => {
+  //     if (row.nodeType === DrawerType.company) {
+  //       return (
+  //         // TODO 这里的跳转需要根据前台的路由地址来
+  //         <a
+  //           href={`${appPCUrl}#/company?companyId=${row.id}`}
+  //           target="_blank"
+  //         >
+  //           公司预览
+  //         </a>
+  //       );
+  //     } else if (row.nodeType === DrawerType.workshop) {
+  //       return (
+  //         <a href={`${appPCUrl}#/shop?id=${row.id}`} target="_blank">
+  //           车间预览
+  //         </a>
+  //       );
+  //     }
+  //   },
+  // },
 ];
 
-
 // interface DataSourceUser
 //   extends UseComType<UseWorkshopType<UseWorkspaceType>> {
 //   parent?: UseComType<UseWorkshopType<UseWorkspaceType>> | null;