提交

src/renderer/src/axios/index.ts

@@ -1,3 +1,4 @@
+//@ts-nocheck
 import router from '@renderer/router'
 import axios from 'axios'
 import type {
@@ -13,13 +14,14 @@ if (window && window.process && window.process.type === 'renderer') {
   baseURL = localStorage.getItem('ip') || 'http://127.0.0.1:8848'
   // baseURL = 'http://127.0.0.1:8848'
 } else {
+  localStorage.setItem('ip', 'http://192.168.110.25:8848')
   baseURL = 'http://192.168.110.25:8848'
 }
 // localStorage.setItem('service', baseURL)
 
 // 创建自定义配置的axios实例
 const service: AxiosInstance = axios.create({
-  baseURL: baseURL,
+  // baseURL: baseURL,
   timeout: 300000,
   headers: {
     'Content-Type': 'application/json',
@@ -35,6 +37,10 @@ function getRequestKey(config: AxiosRequestConfig): string {
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
+    if (!config.url.startsWith("http://"))
+      config.url = new URL(config.url,
+        localStorage.getItem('ip')
+      ).href;
     const key = getRequestKey(config)
 
     // 检查是否有相同请求正在进行

src/renderer/src/views/components/leftSide/leftSideSecond.vue

@@ -3,15 +3,12 @@
     <div class="leftSideSecondBox">
       <template v-if="obj">
         <div class="menuItem" v-for="value in obj.children" @click="handleClick(value)">
-          <img
+          <img :src="'http://localhost:' + `${availablePort}` + '/icon/' + `${value}` + '.png'"
-            :src="'http://localhost:' + `${availablePort}` + '/icon/' + `${value}` + '.png'"
+            style="color: rgb(255, 0, 0)" alt="" />
-            style="color: rgb(255, 0, 0)"
-            alt=""
-          />
           <!-- <svg-icon :name="value" :size="20" color="rgba(0, 255, 255, 1)"></svg-icon> -->
           <span :style="{ color: !clickChange[value] ? 'var(--color-text)' : 'rgb(255,0,0)' }">{{
-            t(`${obj.key}.${value}`)
+        t(`${obj.key}.${value}`)
-          }}</span>
+      }}</span>
         </div>
       </template>
     </div>
@@ -34,6 +31,7 @@ import {
 } from '@/utils/communication'
 import { ElMessage, ElLoading } from 'element-plus'
 import dayjs from 'dayjs'
+import { renderVector } from '../tree/components/hooks/renderVector'
 const { ipcRenderer } = require('electron')
 const { t } = useI18n()
 const { findParentId, findTreeIndex, cusAddNodes } = useTreeNode()
@@ -600,7 +598,7 @@ const methodMap = {
         filters: [{ name: '保存图片', extensions: ['jpg'] }]
       })
       $recvElectronChanel('selectedFileItem', (e, path) => {
-        fs.writeFile(path, dataBuffer, (res) => {})
+        fs.writeFile(path, dataBuffer, (res) => { })
       })
     }
 
@@ -734,11 +732,11 @@ const methodMap = {
             TreeApi.addOtherSource(paramsData)
             paramsData.isShow = true
             paramsData.params = JSON.stringify(paramsData.params)
-            ;(window as any).pressModelMap.set(id + '_' + selectedNode.id, paramsData)
+              ; (window as any).pressModelMap.set(id + '_' + selectedNode.id, paramsData)
-            ;(window as any).pressModelEntities.set(id, flat)
+              ; (window as any).pressModelEntities.set(id, flat)
             cusAddNodes(window.treeObj, paramsData.parentId, [paramsData])
             // //鼠标右键点击事件
-            flat.onRightClick = () => {}
+            flat.onRightClick = () => { }
             // _entityMap.set(node.source_id, flat)
           } else {
             // this.$message.warning('至少三个点')
@@ -842,13 +840,20 @@ const methodMap = {
         let selectedNode = window.treeObj.getSelectedNodes()[0]
         let DbOption: any = {
           params: {
-            richText: {}
+            id: id,
+            path: path[0],
+            field: 'id',
+            name: name,
+            headTables: [],
+            opacity: 1,
+            color: 'rgba(0,255,184,0.5)',
+            show: true
           },
           id,
           sourceName: name,
-          sourceType: 'gdb',
+          sourceType: 'vector',
           // isShow: true,
-          sourcePath: path[0],
+          // sourcePath: path[0],
           parentId: selectedNode
             ? selectedNode.sourceType == 'directory'
               ? selectedNode.id
@@ -858,7 +863,9 @@ const methodMap = {
         TreeApi.addOtherSource(DbOption)
         DbOption.isShow = true
         DbOption.params = JSON.stringify(DbOption.params)
-        // cusAddNodes(window.treeObj, DbOption.parentId, [DbOption])
+        cusAddNodes(window.treeObj, DbOption.parentId, [DbOption])
+        let entityObject = renderVector(DbOption, true);
+        (window as any)._entityMap.set(id, entityObject)
         // }
         // })
       }

src/renderer/src/views/components/propertyBox/model.vue

@@ -358,7 +358,8 @@ const renderModel = async (data, model) => {
           z
         }
       }
-      let Model = await new YJ.Obj.Model(window.earth, option)
+      let Model = await new YJ.Obj.Model(window.earth, option);
+      (window as any)._entityMap.set(id, Model)
 
       let DbOption: any = {
         params: option,

src/renderer/src/views/components/tree/components/hooks/rightOperate.ts

@@ -101,7 +101,8 @@ export const useRightOperate = () => {
           params.isShow = true
           params.params = JSON.stringify(params.params)
           cusAddNodes(window.treeObj, params.parentId, [params])
-          renderVector(params, true)
+          let entityObject = renderVector(params, true);
+          (window as any)._entityMap.set(id, entityObject)
         }
         else if (["geojson"].includes(sourceType)) {
           let baseURL = localStorage.getItem('ip')

src/renderer/src/views/home/index.vue

@@ -479,7 +479,7 @@ const getStatus = (time) => {
 onMounted(async () => {
   let baseURL = localStorage.getItem('ip')
   getAuthInfo()
-  await YJ.on({ host: baseURL })
+  await YJ.on({ host: baseURL, token: localStorage.getItem('Authorization') })
   createEarth()
 })
 </script>