Merge branch 'all-v4-lkh' into 'all-v4-sf-custom'

feat: 上飞定制环境中工位采用自由输入，不采用下拉框

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

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

@@ -58,7 +58,8 @@
         @on-ok="subWorkshop"
       />
       <!-- 工位 -->
-      <WorkspaceDrawer_shangfei
+      <!-- 上飞定制环境中工位采用自由输入，不采用下拉框 -->
+      <WorkspaceDrawer
         v-if="showDrawer === DrawerType.workspace"
         :detail="detail"
         @on-close="handleUpdataWorkspaceTab"
@@ -107,18 +108,8 @@
   import { DrawerType } from '@/types/scene/constant.ts';
   import SceneDialog from './components/SceneDialog.vue';
   import { colomns } from './hook/use-table-method';
-  import {
-    delCompany,
-    delWorkshop,
-    delWorkspace,
-    updateComShopSpaceTreeSort,
-  } from '@/api/scene/scene';
-  import {
-    ComTreeType,
-    UseComType,
-    UseWorkshopType,
-    UseWorkspaceType,
-  } from '@/types/scene/type.ts';
+  import { delCompany, delWorkshop, delWorkspace, updateComShopSpaceTreeSort } from '@/api/scene/scene';
+  import { ComTreeType, UseComType, UseWorkshopType, UseWorkspaceType } from '@/types/scene/type.ts';
   import useComTree from './store/use-com-tree';
   import { storeToRefs } from 'pinia';
   import { useGlobSetting } from '@/hooks/setting';
@@ -229,8 +220,7 @@
   };
 
   // 公司，车间，工位的模板数据
-  const editedItem: Ref<(UseComType<any> & UseWorkshopType<any> & UseWorkspaceType) | undefined> =
-    ref();
+  const editedItem: Ref<(UseComType<any> & UseWorkshopType<any> & UseWorkspaceType) | undefined> = ref();
 
   //点击所有添加和编辑时显示的数据内容
   const detail = ref({});