From 52b753885d4704d14d86aaabb6c2e102b390581d Mon Sep 17 00:00:00 2001 From: zh <972939975@qq.com> Date: Sat, 11 Oct 2025 16:29:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron.vite.config.ts | 4 +- src/renderer/src/axios/index.ts | 6 +-- src/renderer/src/common/initMapData.ts | 2 +- src/renderer/src/global.d.ts | 1 - .../setPup/components/graphLabelManage.vue | 2 +- .../setPup/components/modelManage.vue | 2 +- .../setPup/components/photoManage.vue | 2 +- .../views/components/propertyBox/graph.vue | 2 +- .../views/components/propertyBox/imagePop.vue | 2 +- .../views/components/propertyBox/model.vue | 2 +- .../views/components/propertyBox/photo.vue | 2 +- .../src/views/components/selectImg/index.vue | 2 +- .../tree/components/hooks/rightOperate.ts | 2 +- .../src/views/components/tree/entityClick.ts | 2 +- src/renderer/src/views/home/index.vue | 2 +- src/renderer/src/views/login/useSetUp.ts | 46 ++++++++++++++----- 16 files changed, 51 insertions(+), 30 deletions(-) diff --git a/electron.vite.config.ts b/electron.vite.config.ts index 70c99a6..35ce06c 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -43,10 +43,10 @@ export default defineConfig({ }) ] // server: { - // port: 8808, + // port: 8848, // proxy: { // '/api': { - // target: localStorage.getItem('ip') || 'http://127.0.0.1:8808', + // target: localStorage.getItem('ip') || 'http://127.0.0.1:8848', // changeOrigin: true, // rewrite: (path) => path.replace(/^\/api/, '') // } diff --git a/src/renderer/src/axios/index.ts b/src/renderer/src/axios/index.ts index 13433e3..d1a416a 100644 --- a/src/renderer/src/axios/index.ts +++ b/src/renderer/src/axios/index.ts @@ -10,12 +10,12 @@ import type { const pendingRequests = new Map() let baseURL: any if (window && window.process && window.process.type === 'renderer') { - // baseURL = localStorage.getItem('ip') ||'http://192.168.110.25:8848'|| 'http://127.0.0.1:8808' - baseURL = 'http://127.0.0.1:8848' + baseURL = localStorage.getItem('ip') || 'http://127.0.0.1:8848' + // baseURL = 'http://127.0.0.1:8848' } else { baseURL = 'http://192.168.110.25:8848' } -localStorage.setItem('service', baseURL) +// localStorage.setItem('service', baseURL) // 创建自定义配置的axios实例 const service: AxiosInstance = axios.create({ diff --git a/src/renderer/src/common/initMapData.ts b/src/renderer/src/common/initMapData.ts index 06ca53b..9a7a19f 100644 --- a/src/renderer/src/common/initMapData.ts +++ b/src/renderer/src/common/initMapData.ts @@ -3,7 +3,7 @@ import { renderVector } from '../views/components/tree/components/hooks/renderVe export const initMapData = async (type, data, cd) => { let entityObject let options - let baseURL = localStorage.getItem('service') + let baseURL = localStorage.getItem('ip') switch (type) { case 'groundText': entityObject = new YJ.Obj.GroundText(window.earth, data) diff --git a/src/renderer/src/global.d.ts b/src/renderer/src/global.d.ts index 955736c..3485d2e 100644 --- a/src/renderer/src/global.d.ts +++ b/src/renderer/src/global.d.ts @@ -6,7 +6,6 @@ interface Window { sendMessage: (msg: string) => void onReply: (callback: (msg: string) => void) => void } - isStandAlone: any treeObj: any AllNodes: any } diff --git a/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue b/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue index f7d30ea..65a4f13 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/graphLabelManage.vue @@ -151,7 +151,7 @@ const fs = require('fs') const eventBus: any = inject('bus') var clickTreeNode: any = reactive({}) var leftClickTreeNode: any = reactive({}) -const service = ref(localStorage.getItem('service')) +const service = ref(localStorage.getItem('ip')) interface TypeNode { id: string diff --git a/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue b/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue index bd99382..bffe75e 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/modelManage.vue @@ -159,7 +159,7 @@ const fs = require('fs') const eventBus: any = inject('bus') var clickTreeNode: any = reactive({}) var leftClickTreeNode: any = reactive({}) -const service = ref(localStorage.getItem('service')) +const service = ref(localStorage.getItem('ip')) interface TypeNode { id: string diff --git a/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue b/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue index 2f82805..c428d1e 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue @@ -193,7 +193,7 @@ const fs = require('fs') const eventBus: any = inject('bus') const imageRef: any = ref('') var clickTreeNode: any = reactive({}) -const service = ref(localStorage.getItem('service')) +const service = ref(localStorage.getItem('ip')) interface TypeNode { id: string diff --git a/src/renderer/src/views/components/propertyBox/graph.vue b/src/renderer/src/views/components/propertyBox/graph.vue index aba518a..98787dd 100644 --- a/src/renderer/src/views/components/propertyBox/graph.vue +++ b/src/renderer/src/views/components/propertyBox/graph.vue @@ -121,7 +121,7 @@ const isShowPup = ref(false) const eventBus: any = inject('bus') const { cusUpdateNode } = useTreeNode() var modelName = ref('') -const service = ref(localStorage.getItem('service')) +const service = ref(localStorage.getItem('ip')) //tab interface Model { diff --git a/src/renderer/src/views/components/propertyBox/imagePop.vue b/src/renderer/src/views/components/propertyBox/imagePop.vue index bdde1c8..e21a640 100644 --- a/src/renderer/src/views/components/propertyBox/imagePop.vue +++ b/src/renderer/src/views/components/propertyBox/imagePop.vue @@ -45,7 +45,7 @@ const eventBus: any = inject('bus') const viewPointHeight: any = ref(1.8) var rowData: any = reactive([]) var imageData: any = ref(null) -const service = ref(localStorage.getItem('service')) +const service = ref(localStorage.getItem('ip')) // var newData: any = reactive({ // name: '' // }) diff --git a/src/renderer/src/views/components/propertyBox/model.vue b/src/renderer/src/views/components/propertyBox/model.vue index b35381a..637ba0a 100644 --- a/src/renderer/src/views/components/propertyBox/model.vue +++ b/src/renderer/src/views/components/propertyBox/model.vue @@ -122,7 +122,7 @@ const eventBus: any = inject('bus') var modelName = ref('') var clickTreeNode: any = ref('') -const service = ref(localStorage.getItem('service')) +const service = ref(localStorage.getItem('ip')) //tab interface Model { diff --git a/src/renderer/src/views/components/propertyBox/photo.vue b/src/renderer/src/views/components/propertyBox/photo.vue index f3bafe3..039ace0 100644 --- a/src/renderer/src/views/components/propertyBox/photo.vue +++ b/src/renderer/src/views/components/propertyBox/photo.vue @@ -173,7 +173,7 @@ const { cusUpdateNode } = useTreeNode() var modelName = ref('') const availablePort = ref(55110) -const service = ref(localStorage.getItem('service')) +const service = ref(localStorage.getItem('ip')) ipcRenderer.invoke('get-available-port').then((port) => { availablePort.value = port diff --git a/src/renderer/src/views/components/selectImg/index.vue b/src/renderer/src/views/components/selectImg/index.vue index 60e75c7..548adf1 100644 --- a/src/renderer/src/views/components/selectImg/index.vue +++ b/src/renderer/src/views/components/selectImg/index.vue @@ -168,7 +168,7 @@ const init = (obj, selected, hasGEMarker = true, isUrl) => { activeName.value = arr[0]; } hasGEMarker1.value = hasGEMarker; - url.value = localStorage.getItem('service') + url.value = localStorage.getItem('ip') for (const objKey in obj) { let imgList: any = []; diff --git a/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts b/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts index e8f64c5..f5e73d0 100644 --- a/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts +++ b/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts @@ -104,7 +104,7 @@ export const useRightOperate = () => { renderVector(params, true) } else if (["geojson"].includes(sourceType)) { - let baseURL = localStorage.getItem('service') + let baseURL = localStorage.getItem('ip') await addMapSource({ type: 'geojson', id: id, diff --git a/src/renderer/src/views/components/tree/entityClick.ts b/src/renderer/src/views/components/tree/entityClick.ts index 09294e6..a321b8a 100644 --- a/src/renderer/src/views/components/tree/entityClick.ts +++ b/src/renderer/src/views/components/tree/entityClick.ts @@ -178,7 +178,7 @@ async function tankuang(id, node, info) { let availablePort = await ipcRenderer.invoke('get-available-port'); window.treeObj.selectNode(node); console.log('BrowserWindow---------------------', electron.BrowserWindow) - let baseURL = localStorage.getItem('service') + let baseURL = localStorage.getItem('ip') // console.log("node.detail.namenode.detail.namenode.detail.name", node.detail); let _winMap = await ipcRenderer.invoke('get-_winMap') if (!_winMap.has(id)) { diff --git a/src/renderer/src/views/home/index.vue b/src/renderer/src/views/home/index.vue index 5c4fe51..62217d0 100644 --- a/src/renderer/src/views/home/index.vue +++ b/src/renderer/src/views/home/index.vue @@ -436,7 +436,7 @@ const getStatus = (time) => { } onMounted(async () => { - let baseURL = localStorage.getItem('service') + let baseURL = localStorage.getItem('ip') getAuthInfo() await YJ.on({ host: baseURL }) createEarth() diff --git a/src/renderer/src/views/login/useSetUp.ts b/src/renderer/src/views/login/useSetUp.ts index f1e5e07..bf16de4 100644 --- a/src/renderer/src/views/login/useSetUp.ts +++ b/src/renderer/src/views/login/useSetUp.ts @@ -1,6 +1,6 @@ import { validateURL } from '@/utils/validate' import { ElMessage } from 'element-plus' -import { setIP } from '@/utils/index' +import { setIP,getIP } from '@/utils/index' export const useSetUp = () => { const serviceDialog = ref(false) // 服务设置对话框 const servVal = ref('单机') // 服务类型选择值 @@ -8,13 +8,32 @@ export const useSetUp = () => { const ip = ref('192.168.1.1') const port = ref('8890') const localip = ref('127.0.0.1') - const localport = ref('8808') + const localport = ref('8848') const gpsVal = ref('') // 服务类型选择值 const gpsOptions: any = ref([]) const servOptions: any = ref([{ name: '单机' }, { name: '网络' }]) const selectedService = ref('接口服务') const serviceOptions: any = ref([{ name: '接口服务' }, { name: '北斗串口' }]) + let serveUrl:any = getIP() + let isOk = validateURL(serveUrl) + let serverMode = localStorage.getItem('serverMode') + if(isOk) { + const parsedUrl = new URL(serveUrl); + const host = parsedUrl.host; + const ipPort = host.split(':'); + if(serverMode === 'false') { + servVal.value = '网络' + ip.value = ipPort[0] + port.value = ipPort[1] + prototype.value = parsedUrl.protocol.slice(0, -1) + } + else { + localip.value = ipPort[0] + localport.value = ipPort[1] + } + } + const submit = () => { switch (selectedService.value) { case '接口服务': @@ -39,7 +58,7 @@ export const useSetUp = () => { // 验证url 合法性 if (isOk) { // 网络走这里 - window.isStandAlone = false //判断走哪个服务 + localStorage.setItem('serverMode', 'false') //判断走哪个服务 setIP(url) serviceDialog.value = false } else { @@ -47,21 +66,24 @@ export const useSetUp = () => { } } else { //单机走这里 - window.isStandAlone = true + localStorage.setItem('serverMode', 'true') setIP('http://127.0.0.1:' + localport.value) serviceDialog.value = false } } const initialize = () => { - if (!window.isStandAlone) { - setIP('http://127.0.0.1:' + localport.value) - } else { - let url = prototype.value + '://' + ip.value + ':' + port.value - let isOk = validateURL(url) - if (isOk) { - setIP(url) + if(localStorage.getItem('ip')) {} + else { + if (serverMode==='false') { + setIP('http://127.0.0.1:' + localport.value) } else { - ElMessage.error('url不合法') + let url = prototype.value + '://' + ip.value + ':' + port.value + let isOk = validateURL(url) + if (isOk) { + setIP(url) + } else { + ElMessage.error('url不合法') + } } } }