refactor: 场景管理代码重构

src/api/scene/scene-relate.ts

@@ -1,42 +0,0 @@
-import { http } from '@/utils/http/axios';
-
-//查询场景标签
-
-export interface CompanyType {
-  tenantId: number;
-  userId: number;
-  createDate: string;
-  modifyDate: string;
-  tenantCode: string;
-  tenantName: string;
-  beginDate: string;
-  endDate: string;
-  tenantStatus:number;
-  isDelete:boolean;
-}
-
-export const getCompanyList = (): Promise<CompanyType[]> => {
-  return http.request({
-    url: '/relationship/getEnterpriseList',
-    method: 'get',
-  });
-};
-
-//查询场景模板
-
-export interface InputType {
-  tenantCode: string;
-  tenantId: number;
-  type: string;
-}
-
-export const changeRelate = (data: InputType) => {
-  return http.request({
-    url: '/relationship/addEnterpriseRel',
-    method: 'put',
-    data,
-  });
-};
-
-
-

src/api/scene/scene.ts

@@ -1,198 +1,50 @@
 import { http } from '@/utils/http/axios';
-
-/** 场景标签信息 */
-export type SceneLabelOrModuleItem = {
-  /** 标签id */
-  id: number;
-  /** 标签代码 */
-  code: string;
-  /** 创建时间 */
-  createdAt: string;
-  /** 0-未删除，大于0-已删除 */
-  isDeleted: number;
-  /** 标签名称 */
-  name: string;
-  /** 说明 */
-  remark: string;
-  /** 状态: 0-正常，1-不正常 */
-  status: number;
-  /** 更新时间 */
-  updatedAt: string;
-};
-
-/** 工位信息 */
-export type WorkSpaceInfoItem = {
-  /** 工位id */
-  id: number;
-  /** 所属工厂id */
-  workshopId: number;
-  /** 工位名称 */
-  name: string;
-  /** 工位code */
-  code: string;
-  /** 工位描述 */
-  remark: string;
-  /** 状态: 0-启用, 1-禁用 */
-  status: number;
-  /** 创建时间 */
-  createdAt: string;
-  /** 更新时间 */
-  updatedAt: string;
-  /** 	0-未删除，大于0-已删除 */
-  isDeleted: number;
-  /** 工位负责人 */
-  principal: string;
-  /** 排序序号 */
-  serial: number;
-};
-
-/** 工厂信息 */
-export type WorkShopInfoItem = {
-  /** 工厂id */
-  id: number;
-  /** 所属公司id */
-  companyId: number;
-  /** 1-生产安全 2-安全环保 */
-  // type: number;
-  /** 工厂名称 */
-  name: string;
-  /** 工厂code */
-  code: string;
-  /** 工厂描述 */
-  remark: string;
-  /** 状态: 0-启用, 1-禁用 */
-  status: number;
-  /** 创建时间 */
-  createdAt: string;
-  /** 更新时间 */
-  updatedAt: string;
-  /** 	0-未删除，大于0-已删除 */
-  isDeleted: number;
-  /** 下属工位列表 */
-  children: WorkSpaceInfoItem[];
-  /** 场景标签 */
-  labelName: string;
-  /** 场景标签id */
-  sceneLabelId: number;
-  /** 排序序号 */
-  serial: number;
-  /** 车间模板 */
-  workshopModule: SceneLabelOrModuleItem;
-};
-
-/** 公司信息 */
-export type CompanyInfoItem = {
-  /** 公司id */
-  id: number;
-  /** 上级公司ID, 无上级为0 */
-  parentId: number;
-  /** 公司名称 */
-  name: string;
-  /** 公司code */
-  code: string;
-  /** 公司描述 */
-  remark: string;
-  /** 状态: 0-启用, 1-禁用 */
-  status: number;
-  /** 创建时间 */
-  createdAt: string;
-  /** 更新时间 */
-  updatedAt: string;
-  /** 排序序号 */
-  serial: number;
-  /** 	0-未删除，大于0-已删除 */
-  isDeleted: number;
-  /** 下属工厂列表 */
-  children: WorkShopInfoItem[];
-  /** 场景标签列表 */
-  labelList: SceneLabelOrModuleItem[];
-  /** 场景模板列表 */
-  moduleList: SceneLabelOrModuleItem[];
-  // 模板列表信息
-  labelModuleList: { sceneLabel: SceneLabelOrModuleItem; sceneModule: SceneLabelOrModuleItem }[];
-};
+import { ViewType } from '@/types/scene/constant.ts';
+import * as SceneTypes from '@/types/scene/type.ts';
 
 /** 获取公司-工厂-工位数据 */
 export const getShopSpaceList = () => {
-  return http.request<CompanyInfoItem[]>({
+  return http.request<SceneTypes.CompanyInfoItem[]>({
     url: '/scene/getList',
     method: 'get',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
   });
 };
 
-interface LayoutResp {
-  /** 创建时间 */
-  createdAt: string;
-  /** 自增主键 */
-  id: number;
-  /** 页面布局json	 */
-  layout: string;
-  /** 目标id: 对应公司ID/车间ID */
-  targetId: number;
-  viewType: ViewType;
-  integrationState?: number;
-}
-
 /** 查询地图布局 */
 export const getLayoutApi = (param: { workshopId: string; viewType: ViewType }) => {
-  return http.request<LayoutResp[]>({
+  return http.request<SceneTypes.LayoutResp[]>({
     url: `/layout/getWorkshopLayout?viewType=${param.viewType}&workshopId=${param.workshopId}`,
     method: 'get',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
   });
 };
+
 /** 查询车间小地图布局 */
 export const getWorkshopMiniMapLayoutApi = (workshopId: string) => {
   return getLayoutApi({ viewType: ViewType.minMap, workshopId }).then((res) => res[0]);
 };
 
-enum ViewType {
-  safety = 1,
-  minMap = 2,
-}
-
-interface UpdateViewLayoutParam {
-  layout: string;
-  targetId: string;
-  viewType: ViewType;
-}
-
 /** 更新-新增小地图页面布局 */
-export const updateLayoutApi = (data: UpdateViewLayoutParam) => {
-  return http.request<LayoutResp[]>({
+export const updateLayoutApi = (data: SceneTypes.UpdateViewLayoutParam) => {
+  return http.request<SceneTypes.LayoutResp[]>({
     url: `/layout/updateViewLayout`,
     method: 'post',
     data: new URLSearchParams(data as any).toString(),
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
   });
 };
+
 /** 更新-新增小地图页面布局 */
 export const updateMinMapViewLayoutApi = (
-  param: Pick<UpdateViewLayoutParam, 'layout' | 'targetId'>,
+  param: Pick<SceneTypes.UpdateViewLayoutParam, 'layout' | 'targetId'>,
 ) => {
   return updateLayoutApi({ viewType: ViewType.minMap, ...param });
 };
 
-export type CameraItem = {
-  /** 相机名称 */
-  name: string;
-  /** 相机code */
-  code: string;
-  /** 相机IP地址 */
-  cameraIp: string;
-  /** 相机描述 */
-  remark: string;
-  /** 状态: 0-启用, 1-禁用 */
-  status: number;
-  /** 推流地址 */
-  pushstreamIp: string;
-};
-
-export type WorkSpaceCameraRelative = WorkSpaceInfoItem & { cameraList: CameraItem[] };
-
+/** ??? */
 export const getCamerasByWorkSpace = (params: { workshopId: number }) => {
-  return http.request<WorkSpaceCameraRelative[]>({
+  return http.request<SceneTypes.WorkSpaceCameraRelative[]>({
     url: '/workshop/getWorkspaceCameraList',
     method: 'get',
     params,
@@ -200,17 +52,8 @@ export const getCamerasByWorkSpace = (params: { workshopId: number }) => {
   });
 };
 
-/** 公司主页配置 */
-interface UpdateCompanyLayoutParam extends Omit<UpdateViewLayoutParam, 'targetId'> {
-  /** 标签id */
-  labelId: number;
-  targetId: number;
-  /** 更新时需要上传layout布局id */
-  id?: number;
-}
-
 /** 新增公司主页配置 */
-export const uploadCompanyLayoutApi = (data: UpdateCompanyLayoutParam) => {
+export const uploadCompanyLayoutApi = (data: SceneTypes.UpdateCompanyLayoutParam) => {
   return http.request({
     url: '/homepageConfig/saveCompanyLayout',
     method: 'post',
@@ -218,12 +61,15 @@ export const uploadCompanyLayoutApi = (data: UpdateCompanyLayoutParam) => {
   });
 };
 
-export const uploadCompanyLayout = (param: Omit<UpdateCompanyLayoutParam, 'viewType'>) => {
+/** ??? */
+export const uploadCompanyLayout = (
+  param: Omit<SceneTypes.UpdateCompanyLayoutParam, 'viewType'>,
+) => {
   return uploadCompanyLayoutApi({ ...param, viewType: ViewType.safety });
 };
 
 /** 更新公司主页配置 */
-export const updateCompanyLayoutApi = (data: UpdateCompanyLayoutParam) => {
+export const updateCompanyLayoutApi = (data: SceneTypes.UpdateCompanyLayoutParam) => {
   return http.request({
     url: '/homepageConfig/updateCompanyLayout',
     method: 'put',
@@ -231,7 +77,10 @@ export const updateCompanyLayoutApi = (data: UpdateCompanyLayoutParam) => {
   });
 };
 
-export const updateCompanyLayout = (param: Omit<UpdateCompanyLayoutParam, 'viewType'>) => {
+/** ??? */
+export const updateCompanyLayout = (
+  param: Omit<SceneTypes.UpdateCompanyLayoutParam, 'viewType'>,
+) => {
   return updateCompanyLayoutApi({ ...param, viewType: ViewType.safety });
 };
 
@@ -269,3 +118,213 @@ export const delCompanyLayout = (params: number) => {
     method: 'delete',
   });
 };
+
+/**
+ * @description: 添加公司
+ */
+export const addCompany = (data: SceneTypes.ComAddDatas): Promise<number> => {
+  return http.request({
+    url: '/scene/saveCompany',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * @description: 编辑公司
+ */
+export const editCompany = (data: SceneTypes.ComAddDatas): Promise<number> => {
+  return http.request({
+    url: '/scene/updateCompany',
+    method: 'put',
+    data,
+  });
+};
+
+/**
+ * @description: 删除公司
+ */
+export const delCompany = (companyId: number) => {
+  return http.request({
+    url: `/scene/deleteCompany?companyId=${companyId}`,
+    method: 'DELETE',
+  });
+};
+
+/**
+ * @description: 添加车间
+ */
+export const addWorkshop = (data: SceneTypes.WorkshopAddDatas): Promise<number> => {
+  return http.request({
+    url: '/scene/saveWorkshop',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * @description: 编辑车间
+ */
+export const editWorkshop = (data: SceneTypes.WorkshopAddDatas): Promise<number> => {
+  return http.request({
+    url: '/scene/updateWorkshop',
+    method: 'put',
+    data,
+  });
+};
+
+/**
+ * @description: 删除车间
+ */
+export const delWorkshop = (workshopId: number) => {
+  return http.request({
+    url: `/scene/deleteWorkshop?workshopId=${workshopId}`,
+    method: 'DELETE',
+  });
+};
+
+/**
+ * @description: 添加工位
+ */
+export const addWorkspace = (data: SceneTypes.WorkspaceAddDatas): Promise<number> => {
+  return http.request({
+    url: '/scene/saveWorkspace',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * @description: 编辑工位
+ */
+export const editWorkspace = (data: SceneTypes.WorkspaceAddDatas): Promise<number> => {
+  return http.request({
+    url: '/scene/updateWorkspace',
+    method: 'put',
+    data,
+  });
+};
+
+/**
+ * @description: 删除工位
+ */
+export const delWorkspace = (workspaceId: number) => {
+  return http.request({
+    url: `/scene/deleteWorkspace?workspaceId=${workspaceId}`,
+    method: 'DELETE',
+  });
+};
+
+/** ??? */
+export const getSceneList = (
+  skipPerm: boolean = true,
+): Promise<
+  SceneTypes.SceneListType<
+    SceneTypes.GetListWorkshop<SceneTypes.WorkspaceAddDatas, SceneTypes.WorkShopTempleteType>,
+    SceneTypes.LabelModuleListType
+  >[]
+> => {
+  return http.request({
+    url: `/scene/getList?skipPerm=${skipPerm}`,
+    method: 'get',
+  });
+};
+
+//排序列表
+export const sortSceneList = (
+  data: SceneTypes.SceneListType<
+    SceneTypes.GetListWorkshop<SceneTypes.WorkspaceAddDatas, SceneTypes.WorkShopTempleteType>,
+    SceneTypes.LabelModuleListType
+  >[],
+) => {
+  return http.request({
+    url: '/scene/updateSort',
+    method: 'put',
+    data,
+  });
+};
+
+/** ??? */
+export const getCompanyList = (): Promise<SceneTypes.CompanyType[]> => {
+  return http.request({
+    url: '/relationship/getEnterpriseList',
+    method: 'get',
+  });
+};
+
+/** ??? */
+export const changeRelate = (data: SceneTypes.InputType) => {
+  return http.request({
+    url: '/relationship/addEnterpriseRel',
+    method: 'put',
+    data,
+  });
+};
+
+/** ??? */
+export const querySceneLabel = (): Promise<SceneTypes.SceneLabelType[]> => {
+  return http.request({
+    url: '/template/getSceneLabelList',
+    method: 'get',
+  });
+};
+
+/** ??? */
+export const querytemplate = (): Promise<SceneTypes.TemplateType[]> => {
+  return http.request({
+    url: '/template/getSceneModuleList',
+    method: 'get',
+  });
+};
+
+/** ??? */
+export const queryWorkshopModule = (): Promise<SceneTypes.WorkshopModuleType[]> => {
+  return http.request({
+    url: '/template/getWorkshopModuleList',
+    method: 'get',
+  });
+};
+
+/** ??? */
+export const querySceneLabelByCompany = (): Promise<SceneTypes.SceneLabelByCompanyType[]> => {
+  return http.request({
+    url: '/template/findSceneLabelByCompany',
+    method: 'get',
+  });
+};
+
+/** ??? */
+export const addCompanyModuleLabel = (data: SceneTypes.SceneTempleteType[]) => {
+  return http.request({
+    url: '/template/saveCompanyModuleLabelRel',
+    method: 'post',
+    data,
+  });
+};
+
+//编辑公司-场景标签-场景模板关系
+export const editCompanyModuleLabel = (data: SceneTypes.SceneTempleteType[]) => {
+  return http.request({
+    url: '/template/updateCompanyModuleLabelRel',
+    method: 'post',
+    data,
+  });
+};
+
+/** ??? */
+export const addWorkshopModuleLabel = (data: SceneTypes.WorkShopTempleteType) => {
+  return http.request({
+    url: '/template/saveWorkshopModuleRel',
+    method: 'post',
+    data,
+  });
+};
+
+/** ??? */
+export const editWorkshopModuleLabel = (data: SceneTypes.WorkShopTempleteType) => {
+  return http.request({
+    url: '/template/updateWorkshopModuleRel',
+    method: 'post',
+    data,
+  });
+};

src/api/scene/sceneOperate.ts

@@ -1,232 +0,0 @@
-import { http } from '@/utils/http/axios';
-import { WorkShopTempleteType } from './secene-templet';
-
-// 传入参数类型    还缺个场景list
-export interface ComAddDatas {
-  code?: string; //公司编码
-  createdAt?: string; //创建时间
-  id?: number; //新增后返回的唯一com的id
-  isDeleted?: number; //是否删除
-  name: string; //公司名字
-  parentId?: number; //上级公司id  无上级为0
-  remark?: string; //描述
-  status?: number; //状态  0-启动  1-禁用
-  updatedAt?: string;
-  serial?: number; //排序
-  labelList?: string[]; //创建的多个场景标签   自定义后面需要修改 这里没
-  parent?: null | ComAddDatas;
-  longitude?: number; //经度
-  latitude?: number; //纬度
-  regionCode?: string;
-  thumbnail?: string;
-}
-
-/**
- * @description: 添加公司
- */
-export const addCompany = (data: ComAddDatas): Promise<number> => {
-  return http.request({
-    url: '/scene/saveCompany',
-    method: 'post',
-    data,
-  });
-};
-
-/**
- * @description: 编辑公司
- */
-export const editCompany = (data: ComAddDatas): Promise<number> => {
-  return http.request({
-    url: '/scene/updateCompany',
-    method: 'put',
-    data,
-  });
-};
-
-/**
- * @description: 删除公司
- */
-export const delCompany = (companyId: number) => {
-  return http.request({
-    url: `/scene/deleteCompany?companyId=${companyId}`,
-    method: 'DELETE',
-  });
-};
-
-// 传入参数类型
-export interface WorkshopAddDatas {
-  code?: string;
-  companyId?: number; //公司id
-  sceneLabelId?: number; //类型  1-车间  2-危险点  3-物流  4-生活园区
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name: string;
-  remark?: string;
-  status?: number;
-  updatedAt?: string;
-  serial?: number;
-  parent?: null | WorkshopAddDatas;
-  workshopModule?: WorkShopTempleteType;
-  labelList?: WorkShopTempleteType[];
-  longitude?: number; //经度
-  latitude?: number; //纬度
-  // templete?: string; //车间模板
-  // tag?: string; //场景标签
-}
-
-/**
- * @description: 添加车间
- */
-export const addWorkshop = (data: WorkshopAddDatas): Promise<number> => {
-  return http.request({
-    url: '/scene/saveWorkshop',
-    method: 'post',
-    data,
-  });
-};
-
-/**
- * @description: 编辑车间
- */
-export const editWorkshop = (data: WorkshopAddDatas): Promise<number> => {
-  return http.request({
-    url: '/scene/updateWorkshop',
-    method: 'put',
-    data,
-  });
-};
-
-/**
- * @description: 删除车间
- */
-export const delWorkshop = (workshopId: number) => {
-  return http.request({
-    url: `/scene/deleteWorkshop?workshopId=${workshopId}`,
-    method: 'DELETE',
-  });
-};
-
-// 传入参数类型
-export interface WorkspaceAddDatas {
-  code?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name: string;
-  principal?: string; //工位负责人
-  remark?: string;
-  status?: number;
-  serial?: number;
-  updatedAt?: string;
-  workshopId?: number; //车间id
-  parent?: null | WorkspaceAddDatas;
-  longitude?: number; //经度
-  latitude?: number; //纬度
-  // tag?: string; //场景标签
-}
-
-/**
- * @description: 添加工位
- */
-export const addWorkspace = (data: WorkspaceAddDatas): Promise<number> => {
-  return http.request({
-    url: '/scene/saveWorkspace',
-    method: 'post',
-    data,
-  });
-};
-
-/**
- * @description: 编辑工位
- */
-export const editWorkspace = (data: WorkspaceAddDatas): Promise<number> => {
-  return http.request({
-    url: '/scene/updateWorkspace',
-    method: 'put',
-    data,
-  });
-};
-
-/**
- * @description: 删除工位
- */
-export const delWorkspace = (workspaceId: number) => {
-  return http.request({
-    url: `/scene/deleteWorkspace?workspaceId=${workspaceId}`,
-    method: 'DELETE',
-  });
-};
-
-//获取列表
-// 传入参数类型
-export interface SceneListType<T, S> {
-  code?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name?: string;
-  parentId?: number;
-  remark?: string;
-  status?: number;
-  serial?: number;
-  updatedAt?: string;
-  children?: T[]; //车间-工位信息
-  labelList?: S[]; //创建的多个场景标签
-  moduleList?: S[]; //创建得多个模板
-}
-
-export interface LabelModuleListType {
-  code?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name?: string;
-  remark?: string;
-  status?: number;
-  updatedAt?: string;
-}
-
-export interface GetListWorkshop<U, A> {
-  code?: string;
-  companyId?: number; //公司id
-  sceneLabelId?: number; //类型  1-车间  2-危险点  3-物流  4-生活园区
-  labelName?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name?: string;
-  remark?: string;
-  serial?: number;
-  status?: number;
-  updatedAt?: string;
-  children?: U[]; //工位信息
-  workshopModule?: A; //车间模板
-  workshopFuncPermissions: number[];
-  // tag?: string; //场景标签  自定义  后面需要修改
-}
-
-export const getSceneList = (
-  skipPerm: boolean = true,
-): Promise<
-  SceneListType<GetListWorkshop<WorkspaceAddDatas, WorkShopTempleteType>, LabelModuleListType>[]
-> => {
-  return http.request({
-    url: `/scene/getList?skipPerm=${skipPerm}`,
-    method: 'get',
-  });
-};
-
-//排序列表
-export const sortSceneList = (
-  data: SceneListType<
-    GetListWorkshop<WorkspaceAddDatas, WorkShopTempleteType>,
-    LabelModuleListType
-  >[],
-) => {
-  return http.request({
-    url: '/scene/updateSort',
-    method: 'put',
-    data,
-  });
-};

src/api/scene/secene-templet.ts

@@ -1,137 +0,0 @@
-import { http } from '@/utils/http/axios';
-
-//查询场景标签
-
-export interface SceneLabelType {
-  code?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name?: string;
-  remark?: string;
-  status?: number;
-  updatedAt?: string;
-}
-
-export const querySceneLabel = (): Promise<SceneLabelType[]> => {
-  return http.request({
-    url: '/template/getSceneLabelList',
-    method: 'get',
-  });
-};
-
-//查询场景模板
-
-export interface TemplateType {
-  code?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name?: string;
-  remark?: string;
-  status?: number;
-  updatedAt?: string;
-}
-
-export const querytemplate = (): Promise<TemplateType[]> => {
-  return http.request({
-    url: '/template/getSceneModuleList',
-    method: 'get',
-  });
-};
-
-//查询车间模板
-
-export interface WorkshopModuleType {
-  code?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name?: string;
-  remark?: string;
-  status?: number;
-  updatedAt?: string;
-}
-
-export const queryWorkshopModule = (): Promise<WorkshopModuleType[]> => {
-  return http.request({
-    url: '/template/getWorkshopModuleList',
-    method: 'get',
-  });
-};
-
-//根据公司ID查询场景标签
-export interface SceneLabelByCompanyType {
-  code?: string;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  name?: string;
-  remark?: string;
-  status?: number;
-  updatedAt?: string;
-}
-
-export const querySceneLabelByCompany = (): Promise<SceneLabelByCompanyType[]> => {
-  return http.request({
-    url: '/template/findSceneLabelByCompany',
-    method: 'get',
-  });
-};
-
-//保存公司-场景标签-场景模板关系
-
-export interface SceneTempleteType {
-  companyId?: number;
-  createdAt?: string;
-  id?: number;
-  isDeleted?: number;
-  remark?: string;
-  sceneLabelId?: number;
-  sceneModuleId?: number;
-  updatedAt?: string;
-}
-
-export const addCompanyModuleLabel = (data: SceneTempleteType[]) => {
-  return http.request({
-    url: '/template/saveCompanyModuleLabelRel',
-    method: 'post',
-    data,
-  });
-};
-
-//编辑公司-场景标签-场景模板关系
-export const editCompanyModuleLabel = (data: SceneTempleteType[]) => {
-  return http.request({
-    url: '/template/updateCompanyModuleLabelRel',
-    method: 'post',
-    data,
-  });
-};
-
-//保存车间-车间模板关系
-export interface WorkShopTempleteType {
-  id?: number;
-  workshopId?: number;
-  workshopModuleId?: number;
-  remark?: string;
-  createdAt?: string;
-  isDeleted?: number;
-  updatedAt?: string;
-}
-
-export const addWorkshopModuleLabel = (data: WorkShopTempleteType) => {
-  return http.request({
-    url: '/template/saveWorkshopModuleRel',
-    method: 'post',
-    data,
-  });
-};
-
-export const editWorkshopModuleLabel = (data: WorkShopTempleteType) => {
-  return http.request({
-    url: '/template/updateWorkshopModuleRel',
-    method: 'post',
-    data,
-  });
-};

src/hooks/useSceneInfos.ts

@@ -1,13 +1,13 @@
 import { computed, ref } from 'vue';
-import { CompanyInfoItem, getShopSpaceList, getCamerasByWorkSpace } from '@/api/scene/scene';
-
- type ElTreeItem = {
+import { getShopSpaceList, getCamerasByWorkSpace } from '@/api/scene/scene';
+import { CompanyInfoItem } from '@/types/scene/type.ts';
+type ElTreeItem = {
   value: any;
   label: string;
   children?: ElTreeItem[];
 };
 
- type TreeProps = {
+type TreeProps = {
   /** level：1-数据读取至公司 2-数据读取至工厂 3-数据读取至工位 */
   level: number;
   labelKey: string;
@@ -36,7 +36,7 @@ export function useSceneInfos() {
     }, []);
   });
 
-   const calculateTreeData = (infos: any[], treeProps: TreeProps, level: number): ElTreeItem[] => {
+  const calculateTreeData = (infos: any[], treeProps: TreeProps, level: number): ElTreeItem[] => {
     return infos.map((data) => {
       return {
         value: data[treeProps.valueKey],

src/views/system-config/scene-manage/constant.ts

@@ -14,3 +14,8 @@ export enum DrawerType {
   workshop = 'workshop',
   workspace = 'workspace',
 }
+
+export enum ViewType {
+  safety = 1,
+  minMap = 2,
+}

src/types/scene/type.ts

@@ -0,0 +1,365 @@
+import { ViewType } from './constant';
+
+/** 场景标签信息 */
+export type SceneLabelOrModuleItem = {
+  /** 标签id */
+  id: number;
+  /** 标签代码 */
+  code: string;
+  /** 创建时间 */
+  createdAt: string;
+  /** 0-未删除，大于0-已删除 */
+  isDeleted: number;
+  /** 标签名称 */
+  name: string;
+  /** 说明 */
+  remark: string;
+  /** 状态: 0-正常，1-不正常 */
+  status: number;
+  /** 更新时间 */
+  updatedAt: string;
+};
+
+/** 工位信息 */
+export type WorkSpaceInfoItem = {
+  /** 工位id */
+  id: number;
+  /** 所属工厂id */
+  workshopId: number;
+  /** 工位名称 */
+  name: string;
+  /** 工位code */
+  code: string;
+  /** 工位描述 */
+  remark: string;
+  /** 状态: 0-启用, 1-禁用 */
+  status: number;
+  /** 创建时间 */
+  createdAt: string;
+  /** 更新时间 */
+  updatedAt: string;
+  /** 	0-未删除，大于0-已删除 */
+  isDeleted: number;
+  /** 工位负责人 */
+  principal: string;
+  /** 排序序号 */
+  serial: number;
+};
+
+/** 工厂信息 */
+export type WorkShopInfoItem = {
+  /** 工厂id */
+  id: number;
+  /** 所属公司id */
+  companyId: number;
+  /** 1-生产安全 2-安全环保 */
+  // type: number;
+  /** 工厂名称 */
+  name: string;
+  /** 工厂code */
+  code: string;
+  /** 工厂描述 */
+  remark: string;
+  /** 状态: 0-启用, 1-禁用 */
+  status: number;
+  /** 创建时间 */
+  createdAt: string;
+  /** 更新时间 */
+  updatedAt: string;
+  /** 	0-未删除，大于0-已删除 */
+  isDeleted: number;
+  /** 下属工位列表 */
+  children: WorkSpaceInfoItem[];
+  /** 场景标签 */
+  labelName: string;
+  /** 场景标签id */
+  sceneLabelId: number;
+  /** 排序序号 */
+  serial: number;
+  /** 车间模板 */
+  workshopModule: SceneLabelOrModuleItem;
+};
+
+/** 公司信息 */
+export type CompanyInfoItem = {
+  /** 公司id */
+  id: number;
+  /** 上级公司ID, 无上级为0 */
+  parentId: number;
+  /** 公司名称 */
+  name: string;
+  /** 公司code */
+  code: string;
+  /** 公司描述 */
+  remark: string;
+  /** 状态: 0-启用, 1-禁用 */
+  status: number;
+  /** 创建时间 */
+  createdAt: string;
+  /** 更新时间 */
+  updatedAt: string;
+  /** 排序序号 */
+  serial: number;
+  /** 	0-未删除，大于0-已删除 */
+  isDeleted: number;
+  /** 下属工厂列表 */
+  children: WorkShopInfoItem[];
+  /** 场景标签列表 */
+  labelList: SceneLabelOrModuleItem[];
+  /** 场景模板列表 */
+  moduleList: SceneLabelOrModuleItem[];
+  // 模板列表信息
+  labelModuleList: { sceneLabel: SceneLabelOrModuleItem; sceneModule: SceneLabelOrModuleItem }[];
+};
+
+/** 公司主页配置 */
+export interface UpdateCompanyLayoutParam extends Omit<UpdateViewLayoutParam, 'targetId'> {
+  /** 标签id */
+  labelId: number;
+  targetId: number;
+  /** 更新时需要上传layout布局id */
+  id?: number;
+}
+
+/** ??? */
+export interface LayoutResp {
+  /** 创建时间 */
+  createdAt: string;
+  /** 自增主键 */
+  id: number;
+  /** 页面布局json	 */
+  layout: string;
+  /** 目标id: 对应公司ID/车间ID */
+  targetId: number;
+  viewType: ViewType;
+  integrationState?: number;
+}
+
+/** ??? */
+export interface UpdateViewLayoutParam {
+  layout: string;
+  targetId: string;
+  viewType: ViewType;
+}
+
+/** ??? */
+export type CameraItem = {
+  /** 相机名称 */
+  name: string;
+  /** 相机code */
+  code: string;
+  /** 相机IP地址 */
+  cameraIp: string;
+  /** 相机描述 */
+  remark: string;
+  /** 状态: 0-启用, 1-禁用 */
+  status: number;
+  /** 推流地址 */
+  pushstreamIp: string;
+};
+
+/** ??? */
+export type WorkSpaceCameraRelative = WorkSpaceInfoItem & { cameraList: CameraItem[] };
+
+// 传入参数类型    还缺个场景list
+export interface ComAddDatas {
+  code?: string; //公司编码
+  createdAt?: string; //创建时间
+  id?: number; //新增后返回的唯一com的id
+  isDeleted?: number; //是否删除
+  name: string; //公司名字
+  parentId?: number; //上级公司id  无上级为0
+  remark?: string; //描述
+  status?: number; //状态  0-启动  1-禁用
+  updatedAt?: string;
+  serial?: number; //排序
+  labelList?: string[]; //创建的多个场景标签   自定义后面需要修改 这里没
+  parent?: null | ComAddDatas;
+  longitude?: number; //经度
+  latitude?: number; //纬度
+  regionCode?: string;
+  thumbnail?: string;
+}
+
+// 传入参数类型
+export interface WorkshopAddDatas {
+  code?: string;
+  companyId?: number; //公司id
+  sceneLabelId?: number; //类型  1-车间  2-危险点  3-物流  4-生活园区
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name: string;
+  remark?: string;
+  status?: number;
+  updatedAt?: string;
+  serial?: number;
+  parent?: null | WorkshopAddDatas;
+  workshopModule?: WorkShopTempleteType;
+  labelList?: WorkShopTempleteType[];
+  longitude?: number; //经度
+  latitude?: number; //纬度
+  // templete?: string; //车间模板
+  // tag?: string; //场景标签
+}
+
+// 传入参数类型
+export interface WorkspaceAddDatas {
+  code?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name: string;
+  principal?: string; //工位负责人
+  remark?: string;
+  status?: number;
+  serial?: number;
+  updatedAt?: string;
+  workshopId?: number; //车间id
+  parent?: null | WorkspaceAddDatas;
+  longitude?: number; //经度
+  latitude?: number; //纬度
+  // tag?: string; //场景标签
+}
+
+//获取列表
+// 传入参数类型
+export interface SceneListType<T, S> {
+  code?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name?: string;
+  parentId?: number;
+  remark?: string;
+  status?: number;
+  serial?: number;
+  updatedAt?: string;
+  children?: T[]; //车间-工位信息
+  labelList?: S[]; //创建的多个场景标签
+  moduleList?: S[]; //创建得多个模板
+}
+
+/** ??? */
+export interface LabelModuleListType {
+  code?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name?: string;
+  remark?: string;
+  status?: number;
+  updatedAt?: string;
+}
+
+/** ??? */
+export interface GetListWorkshop<U, A> {
+  code?: string;
+  companyId?: number; //公司id
+  sceneLabelId?: number; //类型  1-车间  2-危险点  3-物流  4-生活园区
+  labelName?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name?: string;
+  remark?: string;
+  serial?: number;
+  status?: number;
+  updatedAt?: string;
+  children?: U[]; //工位信息
+  workshopModule?: A; //车间模板
+  workshopFuncPermissions: number[];
+  // tag?: string; //场景标签  自定义  后面需要修改
+}
+
+//查询场景标签
+export interface CompanyType {
+  tenantId: number;
+  userId: number;
+  createDate: string;
+  modifyDate: string;
+  tenantCode: string;
+  tenantName: string;
+  beginDate: string;
+  endDate: string;
+  tenantStatus: number;
+  isDelete: boolean;
+}
+
+//查询场景模板
+export interface InputType {
+  tenantCode: string;
+  tenantId: number;
+  type: string;
+}
+
+//查询场景标签
+export interface SceneLabelType {
+  code?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name?: string;
+  remark?: string;
+  status?: number;
+  updatedAt?: string;
+}
+
+//查询场景模板
+export interface TemplateType {
+  code?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name?: string;
+  remark?: string;
+  status?: number;
+  updatedAt?: string;
+}
+
+//查询车间模板
+export interface WorkshopModuleType {
+  code?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name?: string;
+  remark?: string;
+  status?: number;
+  updatedAt?: string;
+}
+
+//根据公司ID查询场景标签
+export interface SceneLabelByCompanyType {
+  code?: string;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  name?: string;
+  remark?: string;
+  status?: number;
+  updatedAt?: string;
+}
+
+//保存公司-场景标签-场景模板关系
+export interface SceneTempleteType {
+  companyId?: number;
+  createdAt?: string;
+  id?: number;
+  isDeleted?: number;
+  remark?: string;
+  sceneLabelId?: number;
+  sceneModuleId?: number;
+  updatedAt?: string;
+}
+
+//保存车间-车间模板关系
+export interface WorkShopTempleteType {
+  id?: number;
+  workshopId?: number;
+  workshopModuleId?: number;
+  remark?: string;
+  createdAt?: string;
+  isDeleted?: number;
+  updatedAt?: string;
+}

src/views/map-config/mini-map/use-mini-map.ts

@@ -1,6 +1,7 @@
 import { computed, ref, toRefs } from 'vue';
 import useSceneInfos from '@/hooks/useSceneInfos';
-import { CameraItem, getWorkshopMiniMapLayoutApi } from '@/api/scene/scene';
+import { getWorkshopMiniMapLayoutApi } from '@/api/scene/scene';
+import { CameraItem } from '@/types/scene/type.ts';
 import { defineStore } from 'pinia';
 import safeParse from '@/utils/safeParse';
 import { ElMessage } from 'element-plus';

src/views/message/systemNotifications/components/WorkShopTree.vue

@@ -64,7 +64,7 @@
   import { ElTree } from 'element-plus';
   import { countLeafNodes } from '@/views/message/persongroup/utils/index';
   import { getList } from '@/api/message/system-notifications';
-  import useScene from '@/views/system-config/scene-manage/use-scene';
+  import useScene from '@/views/system-config/scene-manage/hook/use-scene';
   import { storeToRefs } from 'pinia';
   import { cloneDeep } from 'lodash-es';
   import { TreeKey } from 'element-plus/es/components/tree/src/tree.type';

src/views/page-config/ConfigEdit.vue

@@ -170,7 +170,7 @@
   import { storeToRefs } from 'pinia';
   import { ElMessage, ElInput, ElSwitch } from 'element-plus';
   import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
-  import { WorkShopInfoItem } from '@/api/scene/scene';
+  import { WorkShopInfoItem } from '@/types/scene/type.ts';
   import { computed } from 'vue';
   import { Search, Refresh, ArrowLeftBold } from '@element-plus/icons-vue';
   import usePageConfig from './usePageConfig';

src/views/page-config/stores/useMapEditor.ts

@@ -1,6 +1,6 @@
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
-import { WorkShopInfoItem } from '@/api/scene/scene';
+import { WorkShopInfoItem } from '@/types/scene/type.ts';
 import { cloneDeep } from 'lodash-es';
 import { useGlobSetting } from '@/hooks/setting';
 import safeParse from '@/utils/safeParse';

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

@@ -44,7 +44,7 @@
     </el-card>
 
     <div v-if="disableDepartmentEdit">
-      <!-- 添加的抽屉内容 -->
+      <!-- 上飞定制的抽屉表单 -->
       <!-- 公司 -->
       <CompanyDrawer_shangfei
         v-if="showDrawer === DrawerType.company"
@@ -65,7 +65,6 @@
         @on-close="handleUpdataWorkshopTab"
         @on-ok="subWorkshop"
       />
-
       <!-- 工位 -->
       <WorkspaceDrawer_shangfei
         v-if="showDrawer === DrawerType.workspace"
@@ -76,6 +75,7 @@
       />
     </div>
     <div v-else>
+      <!-- 其他项目的抽屉表单 -->
       <CompanyDrawer
         v-if="showDrawer === DrawerType.company"
         :comEdit="comEdit"
@@ -102,49 +102,7 @@
         @on-close="handleUpdataWorkspaceTab"
         @on-ok="subWorkspace"
     /></div>
-
     <SceneDialog v-if="dialogVisible" @close-dialog="closeDialog" />
-    <!-- <el-dialog v-model="dialogVisible" title="添加企业信息" width="500">
-      <div>
-        <div class="relate-select">
-          <div class="select-title">企业分类</div>
-          <el-select v-model="companyType" placeholder="请选择企业类型" style="width: 180px">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </div>
-        <div class="relate-select">
-          <div class="select-title">企业名称</div>
-          <el-select
-            v-model="tenantName"
-            placeholder="请选择企业租户信息"
-            style="width: 180px"
-            @change="changeCom"
-          >
-            <el-option
-              v-for="item in companyList"
-              :key="item.tenantCode"
-              :label="item.tenantName"
-              :value="item.tenantCode"
-            />
-          </el-select>
-        </div>
-        <div v-if="tenantCode" class="relate-select">
-          <div class="select-title">企业租户信息</div>
-          <el-input v-model="tenantCode" style="width: 180px" disabled />
-        </div>
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="close"> 确定 </el-button>
-        </div>
-      </template>
-    </el-dialog> -->
   </page-wrapper>
 </template>
 
@@ -152,16 +110,15 @@
   import { ref, onMounted, reactive, h, computed } from 'vue';
   import { Plus } from '@element-plus/icons-vue';
   import { BasicTable, BasicColumn } from '@/components/Table';
-  import ActionColomn from './actionColomns.vue';
-  import CompanyDrawer from './CompanyDrawer.vue';
-  import CompanyDrawer_shangfei from './CompanyDrawer-shangfei.vue';
-  import WorkshopDrawer from './WorkshopDrawer.vue';
-  import WorkshopDrawer_shangfei from './WorkshopDrawer-shangfei.vue';
-  import WorkspaceDrawer from './WorkspaceDrawer.vue';
-  import WorkspaceDrawer_shangfei from './WorkspaceDrawer-shangfei.vue';
-  import AddCompanyInfo from './AddCompanyInfo.vue';
-  import { DATA_LEVEL, DrawerType, ENABLED } from './constant';
-  import SceneDialog from './SceneDialog.vue';
+  import ActionColomn from './components/ActionColomns.vue';
+  import CompanyDrawer from './components/CompanyDrawer.vue';
+  import CompanyDrawer_shangfei from './components/CompanyDrawer-shangfei.vue';
+  import WorkshopDrawer from './components/WorkshopDrawer.vue';
+  import WorkshopDrawer_shangfei from './components/WorkshopDrawer-shangfei.vue';
+  import WorkspaceDrawer from './components/WorkspaceDrawer.vue';
+  import WorkspaceDrawer_shangfei from './components/WorkspaceDrawer-shangfei.vue';
+  import { DATA_LEVEL, DrawerType, ENABLED } from '@/types/scene/constant.ts';
+  import SceneDialog from './components/SceneDialog.vue';
   import {
     colomns,
     updateSerials,
@@ -169,18 +126,11 @@
     removeParent,
     flattenCodes,
     getParent,
-  } from './use-method.tsx';
-  import {
-    ComAddDatas,
-    delCompany,
-    WorkshopAddDatas,
-    delWorkshop,
-    WorkspaceAddDatas,
-    delWorkspace,
-    sortSceneList,
-  } from '@/api/scene/sceneOperate';
-  import useScene from './use-scene';
-  import useSceneTemplete from './use-sence-templete';
+  } from './hook/use-method';
+  import { delCompany, delWorkshop, delWorkspace, sortSceneList } from '@/api/scene/scene';
+  import { ComAddDatas, WorkshopAddDatas, WorkspaceAddDatas } from '@/types/scene/type.ts';
+  import useScene from './hook/use-scene';
+  import useSceneTemplete from './hook/use-sence-templete';
   import { useRouter } from 'vue-router';
   import { storeToRefs } from 'pinia';
   import { cloneDeep } from 'lodash-es';
@@ -237,7 +187,6 @@
   onMounted(() => {
     //添加父级，主要用于排序功能
     //dataSourceWithParent(tableData.value, null);
-
     //获取tableData数据
     getSceneDetail();
     // getCompanyList().then((res) => {
@@ -405,7 +354,7 @@
   };
 
   const handleEdit = (row) => {
-    editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中，以便编辑
+    editedItem.value = { ...row } as ComAddDatas; // 将当前行的内容拷贝到 editedItem 中，以便编辑
     level.value = findItemLevel(tableData.value, row.id, row.name);
     if (level.value === DATA_LEVEL.company) {
       showDrawer.value = DrawerType.company;

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

@@ -20,16 +20,16 @@
       <div v-else style="margin-right: 10px; width: 67px"></div
     ></div>
     <div style="width: 1px; height: 14px; color: #e9e9e9; margin-right: 14px">|</div>
-    <img src="../../../assets/icons/edit.png" @click="changeEdit" class="action-img" alt="" />
-    <img src="../../../assets/icons/delete.png" @click="changeDelete" class="action-img" alt="" />
+    <img src="@/assets/icons/edit.png" @click="changeEdit" class="action-img" alt="" />
+    <img src="@/assets/icons/delete.png" @click="changeDelete" class="action-img" alt="" />
     <img
-      src="../../../assets/icons/up.png"
+      src="@/assets/icons/up.png"
       @click="changeUp"
       :class="{ 'action-disable': isFirst, 'action-img': !isFirst }"
       alt=""
     />
     <img
-      src="../../../assets/icons/down.png"
+      src="@/assets/icons/down.png"
       @click="changeDown"
       :class="{ 'action-disable': isLast, 'action-img': !isLast }"
       alt=""
@@ -39,13 +39,13 @@
 
 <script setup lang="ts">
   import { computed } from 'vue';
-  import { ComAddDatas, WorkshopAddDatas, WorkspaceAddDatas } from '@/api/scene/sceneOperate.ts';
-  import useScene from './use-scene';
+  import { ComAddDatas, WorkshopAddDatas, WorkspaceAddDatas } from '@/types/scene/type.ts';
+  import useScene from '../hook/use-scene';
   import { storeToRefs } from 'pinia';
   import { useUserStore } from '@/store/modules/user';
 
   // '
- const userStore = useUserStore();
+  const userStore = useUserStore();
   const useSceneList = useScene();
   const { tableData } = storeToRefs(useSceneList);
 

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

@@ -1,4 +1,5 @@
 <template>
+  <!-- This component is not referenced by any other components. -->
   <el-dialog v-model="dialogVisible" title="添加企业信息" width="500" @close="() => emit('close')">
     <div>
       <div class="relate-select">
@@ -44,12 +45,12 @@
 
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
-  import { options } from './use-method.tsx';
-  import { getCompanyList, CompanyType, changeRelate } from '@/api/scene/scene-relate';
-import { ElMessage } from 'element-plus';
+  import { options } from '../hook/use-method';
+  import { getCompanyList, changeRelate } from '@/api/scene/scene.ts';
+  import { CompanyType } from '@/types/scene/type.ts';
+  import { ElMessage } from 'element-plus';
 
-
-const emit = defineEmits(['close']);
+  const emit = defineEmits(['close']);
   onMounted(() => {
     getCompanyList().then((res) => {
       companyList.value = res;
@@ -81,22 +82,20 @@ const emit = defineEmits(['close']);
         type: 'success',
       });
       reset();
-      emit('close')
+      emit('close');
     });
   };
 
-  const reset=()=>{
-  tenantName.value = '';
-  tenantCode.value = '';
-  tenantId.value = null;
-  companyType.value =''
-  }
-
+  const reset = () => {
+    tenantName.value = '';
+    tenantCode.value = '';
+    tenantId.value = null;
+    companyType.value = '';
+  };
 </script>
 
 <style lang="scss" scoped>
-
-.relate-select {
+  .relate-select {
     display: flex;
 
     align-items: center;

src/views/system-config/scene-manage/CompanyDrawer-shangfei.vue

@@ -120,17 +120,19 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
+
   import {
     addCompanyModuleLabel,
     editCompanyModuleLabel,
-    SceneLabelType,
-    TemplateType,
-  } from '@/api/scene/secene-templet';
-  import { ENABLED } from './constant';
+    addCompany,
+    editCompany,
+  } from '@/api/scene/scene.ts';
+  import { SceneLabelType, TemplateType } from '@/types/scene/type.ts';
+
+  import { ENABLED } from '@/types/scene/constant.ts';
   import type { FormInstance, FormRules } from 'element-plus';
   import { ElMessage, ElMessageBox } from 'element-plus';
   import { CirclePlus } from '@element-plus/icons-vue';
-  import { addCompany, editCompany } from '@/api/scene/sceneOperate';
   import { getProvinceList } from '@/api/system/region';
   import { useRequest } from 'vue-hooks-plus';
 

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

@@ -141,17 +141,19 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch, onMounted } from 'vue';
+
   import {
     addCompanyModuleLabel,
     editCompanyModuleLabel,
-    SceneLabelType,
-    TemplateType,
-  } from '@/api/scene/secene-templet';
-  import { ENABLED } from './constant';
+    addCompany,
+    editCompany,
+  } from '@/api/scene/scene.ts';
+  import { SceneLabelType, TemplateType } from '@/types/scene/type.ts';
+
+  import { ENABLED } from '@/types/scene/constant.ts';
   import type { FormInstance, FormRules } from 'element-plus';
   import { ElMessage, ElMessageBox } from 'element-plus';
   import { CirclePlus } from '@element-plus/icons-vue';
-  import { addCompany, editCompany } from '@/api/scene/sceneOperate';
   import { getProvinceList } from '@/api/system/region';
   import { useRequest } from 'vue-hooks-plus';
   import { Plus } from '@element-plus/icons-vue';

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

@@ -1,6 +1,11 @@
 <template>
   <page-wrapper>
-    <el-dialog :model-value="true" @close="() => emit('closeDialog')" title="添加企业信息" width="500">
+    <el-dialog
+      :model-value="true"
+      @close="() => emit('closeDialog')"
+      title="添加企业信息"
+      width="500"
+    >
       <!-- <span>This is a message</span> -->
       <div>
         <div class="relate-select">
@@ -48,8 +53,9 @@
 <script setup lang="ts">
   import { ref, onMounted } from 'vue';
   import { ElMessage } from 'element-plus';
-  import { options } from './use-method.tsx';
-  import { getCompanyList, CompanyType, changeRelate } from '@/api/scene/scene-relate';
+  import { options } from '../hook/use-method.tsx';
+  import { getCompanyList, changeRelate } from '@/api/scene/scene.ts';
+  import { CompanyType } from '@/types/scene/type.ts';
 
   const emit = defineEmits<{
     (e: 'closeDialog'): unknown;
@@ -82,7 +88,7 @@
         type: 'success',
       });
       reset();
-      emit('closeDialog')
+      emit('closeDialog');
     });
   };
   const changeCom = (val: any) => {
@@ -99,9 +105,9 @@
       companyList.value = res;
     });
   });
-  const cancel = ()=>{
-    emit('closeDialog')
-  }
+  const cancel = () => {
+    emit('closeDialog');
+  };
 </script>
 
 <style scoped>

src/views/system-config/scene-manage/WorkshopDrawer-shangfei.vue

@@ -93,14 +93,15 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from './constant';
+  import { ENABLED } from '@/types/scene/constant.ts';
   import { ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
-  import { LabelModuleListType, addWorkshop, editWorkshop } from '@/api/scene/sceneOperate';
   import {
-    WorkshopModuleType,
+    addWorkshop,
+    editWorkshop,
     addWorkshopModuleLabel,
     editWorkshopModuleLabel,
-  } from '@/api/scene/secene-templet';
+  } from '@/api/scene/scene.ts';
+  import { LabelModuleListType, WorkshopModuleType } from '@/types/scene/type.ts';
   import { getWorkshopInfoList } from '@/api/workShopData';
 
   type WorkshopListType = {

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

@@ -83,14 +83,15 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from './constant';
+  import { ENABLED } from '@/types/scene/constant.ts';
   import { ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
-  import { LabelModuleListType, addWorkshop, editWorkshop } from '@/api/scene/sceneOperate';
   import {
-    WorkshopModuleType,
     addWorkshopModuleLabel,
     editWorkshopModuleLabel,
-  } from '@/api/scene/secene-templet';
+    addWorkshop,
+    editWorkshop,
+  } from '@/api/scene/scene.ts';
+  import { LabelModuleListType, WorkshopModuleType } from '@/types/scene/type.ts';
 
   const props = defineProps<{
     allCodes: string[];

src/views/system-config/scene-manage/WorkspaceDrawer-shangfei.vue

@@ -65,9 +65,9 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from './constant';
-  import { ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
-  import { addWorkspace, editWorkspace } from '@/api/scene/sceneOperate';
+  import { ENABLED } from '@/types/scene/constant.ts';
+  import { type FormInstance, type FormRules } from 'element-plus';
+  import { addWorkspace, editWorkspace } from '@/api/scene/scene.ts';
   import { getWorkSpaceInfoList } from '@/api/workShopData';
 
   const props = defineProps<{

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

@@ -55,9 +55,9 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from './constant';
+  import { ENABLED } from '@/types/scene/constant.ts';
   import { ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
-  import { addWorkspace, editWorkspace } from '@/api/scene/sceneOperate';
+  import { addWorkspace, editWorkspace } from '@/api/scene/scene.ts';
 
   const props = defineProps<{
     allCodes: string[];

src/views/system-config/scene-manage/use-scene.ts

@@ -1,11 +1,11 @@
+import { getSceneList } from '@/api/scene/scene.ts';
 import {
+  WorkShopTempleteType,
   WorkspaceAddDatas,
+  LabelModuleListType,
   SceneListType,
   GetListWorkshop,
-  getSceneList,
-  LabelModuleListType,
-} from '@/api/scene/sceneOperate';
-import { WorkShopTempleteType } from '@/api/scene/secene-templet';
+} from '@/types/scene/type.ts';
 import { defineStore } from 'pinia';
 import { ref } from 'vue';
 import { dataSourceWithParent } from './use-method';

src/views/system-config/scene-manage/use-sence-templete.ts

@@ -1,11 +1,5 @@
-import {
-  SceneLabelType,
-  querySceneLabel,
-  TemplateType,
-  querytemplate,
-  queryWorkshopModule,
-  WorkshopModuleType,
-} from '@/api/scene/secene-templet';
+import { querySceneLabel, querytemplate, queryWorkshopModule } from '@/api/scene/scene.ts';
+import { TemplateType, SceneLabelType, WorkshopModuleType } from '@/types/scene/type.ts';
 import { onMounted, ref } from 'vue';
 
 export function useSceneTemplete() {

src/views/system/role/CreateUserDrawer.vue

@@ -90,7 +90,7 @@
   import { ElMessage } from 'element-plus';
   import type { userFormParamsType } from './types';
   import { addRole, getFeaturePermissions, roleUserInfo, updateRole } from '@/api/system/role';
-  import useScene from '@/views/system-config/scene-manage/use-scene';
+  import useScene from '@/views/system-config/scene-manage/hook/use-scene';
   import { storeToRefs } from 'pinia';
   import { useGlobSetting } from '@/hooks/setting';
   import { uid } from 'uid';

utils/devProxy/local/proxy.ts

@@ -3,7 +3,7 @@ import path from 'path';
 
 // 连后端本机时的代理staff环境
 const proxyStaff: PROXY_TYPE = {
-  serverHost: 'http://192.168.22.233:8800/',
+  serverHost: 'http://192.168.13.68/eye_api_bak',
   loginHost: 'http://192.168.13.68/skyeye-login/',
   skyeyeFileUploadHost: 'http://192.168.13.68/skyeye-file-upload',
   nvrDownload: 'http://192.168.13.68/nvr_download',