Преглед изворни кода

增加返回平台的跳转逻辑

louhangfei пре 1 година
родитељ
комит
d1b762da04

+ 2 - 1
.env.development

@@ -14,7 +14,8 @@ VITE_DROP_CONSOLE = true
 # VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144:8800/api"]]
 #VITE_PROXY=[["/skyeye-admin-api","http://58.144.197.158:19980/skyeye-admin-api"],["/eye_api","http://58.144.197.158:19980/eye_api"],["/push_stream_host","http://58.144.197.158:19980/push_stream_host"],["/skyeye-login","http://58.144.197.158:19980/skyeye-login"]]
 # VITE_PROXY=[["/skyeye-admin-api","http://36.133.176.76:19980/skyeye-admin-api"],["/eye_api","http://36.133.176.76:19980/eye_api"],["/push_stream_host","http://36.133.176.76:19980/push_stream_host"],["/skyeye-login","http://36.133.176.76:19980/skyeye-login"]]
-VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144/skyeye-admin-api"],[],["/eye_api_bak","http://172.16.23.144/eye_api"],["/push_stream_host","http://172.16.23.144/push_stream_host"],["/skyeye-login","http://172.16.23.144/skyeye-login"],["/ws_api_bak","ws://172.16.23.144/ws_api_bak"]]
+# VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144/skyeye-admin-api"],[],["/eye_api_bak","http://172.16.23.144/eye_api"],["/push_stream_host","http://172.16.23.144/push_stream_host"],["/skyeye-login","http://172.16.23.144/skyeye-login"],["/ws_api_bak","ws://172.16.23.144/ws_api_bak"]]
+VITE_PROXY=[["/skyeye-admin-api","http://192.168.14.68/skyeye-admin-api"],[],["/eye_api_bak","http://192.168.14.68/eye_api"],["/push_stream_host","http://192.168.14.68/push_stream_host"],["/skyeye-login","http://192.168.14.68/skyeye-login"],["/ws_api_bak","ws://192.168.14.68/ws_api_bak"]]
 # VITE_PROXY=[["/skyeye-admin-api","http://192.168.32.47/skyeye-admin-api"],["/eye_api","http://192.168.32.47/eye_api"],["/push_stream_host","http:/192.168.32.47/push_stream_host"],["/skyeye-login","http://192.168.32.47/skyeye-login"]]
 # API 接口地址
 VITE_GLOB_API_URL = 

+ 4 - 3
src/layout/components/Header/index.vue

@@ -228,6 +228,7 @@
   import { Render, getRender } from '@/components/Render';
   import urlJoin from 'url-join';
   import { getRedirectUrl } from '@/utils/getRedirectUrl';
+  import { useGlobSetting } from '@/hooks/setting';
 
   defineEmits(['update:collapsed']);
 
@@ -249,6 +250,8 @@
 
   const BASE_LOGIN_NAME = PageEnum.BASE_LOGIN_NAME;
 
+  const { appPCUrl } = useGlobSetting();
+
   const drawerSetting = ref();
 
   const amendPwdRef = ref();
@@ -268,9 +271,7 @@
   });
 
   const getPLUrl = () => {
-    return userStore.getUserInfo.username?.includes('gov')
-      ? urlJoin(location.origin, '/skyeye-world/')
-      : urlJoin(location.origin, '/skyeyev3pc/');
+    return appPCUrl + '#/entry';
   };
 
   const getUsername = computed(() => {

+ 11 - 10
src/views/system-config/scene-manage/use-method.tsx

@@ -5,7 +5,9 @@ import {
   LabelModuleListType,
 } from '@/api/scene/sceneOperate';
 import { WorkShopTempleteType } from '@/api/scene/secene-templet';
-// skyeyev3pc/#/company?companyId=117&labelId=2
+import { useGlobSetting } from '@/hooks/setting';
+
+const { appPCUrl } = useGlobSetting()
 
 export const colomns = [
   { label: '场景名称', prop: 'name', width: 300 },
@@ -18,7 +20,7 @@ export const colomns = [
       if (!row.parent && row.labelList?.[0]?.id) {
         return (
           <a
-            href={`/skyeyev3pc/#/company?companyId=${row.id}&labelId=${row.labelList[0]?.id}`}
+            href={`${appPCUrl}#/company?companyId=${row.id}&labelId=${row.labelList[0]?.id}`}
             target="_blank"
           >
             公司预览
@@ -26,7 +28,7 @@ export const colomns = [
         );
       } else if (row.parent && !row.parent.parent) {
         return (
-          <a href={`/skyeyev3pc/#/shop?id=${row.id}`} target="_blank">
+          <a href={`${appPCUrl}#/shop?id=${row.id}`} target="_blank">
             车间预览
           </a>
         );
@@ -37,8 +39,8 @@ export const colomns = [
 
 interface DataSourceUser
   extends SceneListType<
-    GetListWorkshop<WorkspaceAddDatas, WorkShopTempleteType>,
-    LabelModuleListType
+  GetListWorkshop<WorkspaceAddDatas, WorkShopTempleteType>,
+  LabelModuleListType
   > {
   parent?: SceneListType<
     GetListWorkshop<WorkspaceAddDatas, WorkShopTempleteType>,
@@ -151,22 +153,21 @@ export const findItemLevel = (data, targetId, targetName, currentLevel = 0) => {
 
 
 //得到parent
-export const getParent = (data:DataSourceUser[], targetCode:string) => {
+export const getParent = (data: DataSourceUser[], targetCode: string) => {
+
 
-  
-  
   //let parentNode = {} as DataSourceUser
   for (let i = 0; i < data.length; i++) {
     const item = data[i];
 
-    if (item.code === targetCode ) {
+    if (item.code === targetCode) {
       // parentNode = item
       return item
     }
 
     if (item.children && item.children.length > 0) {
       const foundItem = getParent(item.children, targetCode);
-      if(foundItem){
+      if (foundItem) {
         return foundItem
       }
     }