diff --git a/.gitignore b/.gitignore index 75ef73c..9df1358 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules dist +build out .DS_Store .eslintcache diff --git a/.vscode/settings.json b/.vscode/settings.json index 90ff31b..23c39da 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "vscode.typescript-language-features" }, "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -13,4 +13,4 @@ "src/renderer/src/assets/i18n/lang" ], "liveServer.settings.port": 5501 -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 59e8964..6a6dc25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "axios": "^1.11.0", "electron-updater": "^6.3.9", "element-plus": "^2.10.4", + "js-md5": "^0.8.3", "mitt": "^3.0.1", "pinia": "^3.0.3", "pinia-plugin-persistedstate": "^4.4.1", @@ -8452,6 +8453,11 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/js-md5": { + "version": "0.8.3", + "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.8.3.tgz", + "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/src/renderer/index.html b/src/renderer/index.html index ec9ba4f..6bcd376 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -5,8 +5,7 @@ Electron - + diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts index 92aeb01..da8f44c 100644 --- a/src/renderer/src/I18n/zh-CN.ts +++ b/src/renderer/src/I18n/zh-CN.ts @@ -64,6 +64,71 @@ export default { ersanwei: '二三维', junbiao3d: '三维军标' }, + effect: { + trajectoryMotion:"轨迹运动", + electronicFence: "电子围墙", + // nightVision: '实体墙', + radarLightWave: "扩散光波", + diffusedLightWave: "雷达光波", + scanStereoscopic: "立体雷达", + multilateralBody: "多边体", + waterSurface: "水面", + fountain: '喷泉', + waterL: '水柱', + fire: "火焰", + explosion: "爆炸", + smoke: "烟雾", + nightVision: '夜视', + // nightVision: '飞线', + }, + analysis:{ + inundationAnalysis: "淹没分析", + profileAnalysis: "剖面分析", + sightAnalysis: "视线分析", + kenAnalysis: "视域分析", + circleKen: "圆形视域", + slopeDirection: "坡度坡向", + cutFill: "土方分析", + globalContour: "全局等高线", + contour: "等高线", + clear: "清除", + }, + measure:{ + projectionArea: "投影面积", + projectionDistanceMeasure: '投影距离', + areaMeasure: "贴地面积", + distanceMeasure: "贴地距离", + heightMeasure: "垂直高度", + triangleMeasure: "空间三角", + MeasureAzimuth: '方位角', + MeasureAngle: "夹角", + lopeDistanceMeasures: '坡度', + coorMeasure: "坐标", + clear: "清除测量", + + }, + tool:{ + routePlan: "路径规划", + //清除轨迹 + graffiti: "涂鸦", + // stopGraffiti: "结束涂鸦", + clearGraffiti: "清除涂鸦", + path: "飞行漫游", + coorLocation: "坐标定位", + mouseLocation: "鼠标定位", + annotationAggregation: "标注点聚合", + // 卷帘对比 + // 屏幕截图 + // 高清出图 + // 视频录制 + pressModel: "模型压平", + terrainDig: "地形开挖", + tilesetClipping: "剖切", + clearTilesetClipping: "清除剖切", + projConvert: '度分秒', + projectionConvert: '投影转换', + gdbImport: "gdb导入" + }, bottomMenu: { groundText: '贴地文字', standText: '立体文字', diff --git a/src/renderer/src/api/login/index.ts b/src/renderer/src/api/login/index.ts index 0f92e14..869cba3 100644 --- a/src/renderer/src/api/login/index.ts +++ b/src/renderer/src/api/login/index.ts @@ -4,8 +4,14 @@ export const LoginApi = { // 查询活动分页 login: async (data: any) => { return await request.post({ - url: `/api/v1/system/login`, + url: `/user/login`, data }) + }, + logout: async () => { + return await request.post({ + url: `/user/logout`, + + }) } } diff --git a/src/renderer/src/api/tree/index.ts b/src/renderer/src/api/tree/index.ts index 39dacd0..66eb7cf 100644 --- a/src/renderer/src/api/tree/index.ts +++ b/src/renderer/src/api/tree/index.ts @@ -4,9 +4,18 @@ export const TreeApi = { // 查询树的所有节点 getTreeList: async () => { return await request.get({ - url: `/yjearth4/api/v1/source/list` + url: `/source/list` + // url: `/yjearth4/api/v1/source/list` }) }, + // 新增其他资源 /source/addOtherSource + addOtherSource: async (data: any) => { + return await request.post({ + url: `/source/addOtherSource`, + data + }) + }, + //新增节点 addDirectory: async (data: any) => { return await request.post({ diff --git a/src/renderer/src/assets/images/second/MeasureAngle.png b/src/renderer/src/assets/images/second/MeasureAngle.png new file mode 100644 index 0000000..b86b3d6 Binary files /dev/null and b/src/renderer/src/assets/images/second/MeasureAngle.png differ diff --git a/src/renderer/src/assets/images/second/MeasureAzimuth.png b/src/renderer/src/assets/images/second/MeasureAzimuth.png new file mode 100644 index 0000000..3c448e0 Binary files /dev/null and b/src/renderer/src/assets/images/second/MeasureAzimuth.png differ diff --git a/src/renderer/src/assets/images/second/annotationAggregation.png b/src/renderer/src/assets/images/second/annotationAggregation.png new file mode 100644 index 0000000..bc50b3d Binary files /dev/null and b/src/renderer/src/assets/images/second/annotationAggregation.png differ diff --git a/src/renderer/src/assets/images/second/areaMeasure.png b/src/renderer/src/assets/images/second/areaMeasure.png new file mode 100644 index 0000000..f366102 Binary files /dev/null and b/src/renderer/src/assets/images/second/areaMeasure.png differ diff --git a/src/renderer/src/assets/images/second/circleKen.png b/src/renderer/src/assets/images/second/circleKen.png new file mode 100644 index 0000000..eff46be Binary files /dev/null and b/src/renderer/src/assets/images/second/circleKen.png differ diff --git a/src/renderer/src/assets/images/second/clear.png b/src/renderer/src/assets/images/second/clear.png new file mode 100644 index 0000000..8a08304 Binary files /dev/null and b/src/renderer/src/assets/images/second/clear.png differ diff --git a/src/renderer/src/assets/images/second/clearGraffiti.png b/src/renderer/src/assets/images/second/clearGraffiti.png new file mode 100644 index 0000000..e3f19e6 Binary files /dev/null and b/src/renderer/src/assets/images/second/clearGraffiti.png differ diff --git a/src/renderer/src/assets/images/second/clearTilesetClipping.png b/src/renderer/src/assets/images/second/clearTilesetClipping.png new file mode 100644 index 0000000..23ba88b Binary files /dev/null and b/src/renderer/src/assets/images/second/clearTilesetClipping.png differ diff --git a/src/renderer/src/assets/images/second/contour.png b/src/renderer/src/assets/images/second/contour.png new file mode 100644 index 0000000..b4698b1 Binary files /dev/null and b/src/renderer/src/assets/images/second/contour.png differ diff --git a/src/renderer/src/assets/images/second/coorLocation.png b/src/renderer/src/assets/images/second/coorLocation.png new file mode 100644 index 0000000..912d4f9 Binary files /dev/null and b/src/renderer/src/assets/images/second/coorLocation.png differ diff --git a/src/renderer/src/assets/images/second/coorMeasure.png b/src/renderer/src/assets/images/second/coorMeasure.png new file mode 100644 index 0000000..89c0be5 Binary files /dev/null and b/src/renderer/src/assets/images/second/coorMeasure.png differ diff --git a/src/renderer/src/assets/images/second/cutFill.png b/src/renderer/src/assets/images/second/cutFill.png new file mode 100644 index 0000000..2892b1b Binary files /dev/null and b/src/renderer/src/assets/images/second/cutFill.png differ diff --git a/src/renderer/src/assets/images/second/diffusedLightWave.png b/src/renderer/src/assets/images/second/diffusedLightWave.png new file mode 100644 index 0000000..d6ae12a Binary files /dev/null and b/src/renderer/src/assets/images/second/diffusedLightWave.png differ diff --git a/src/renderer/src/assets/images/second/distanceMeasure.png b/src/renderer/src/assets/images/second/distanceMeasure.png new file mode 100644 index 0000000..a4667cd Binary files /dev/null and b/src/renderer/src/assets/images/second/distanceMeasure.png differ diff --git a/src/renderer/src/assets/images/second/electronicFence.png b/src/renderer/src/assets/images/second/electronicFence.png new file mode 100644 index 0000000..849c9f5 Binary files /dev/null and b/src/renderer/src/assets/images/second/electronicFence.png differ diff --git a/src/renderer/src/assets/images/second/explosion.png b/src/renderer/src/assets/images/second/explosion.png new file mode 100644 index 0000000..c652b27 Binary files /dev/null and b/src/renderer/src/assets/images/second/explosion.png differ diff --git a/src/renderer/src/assets/images/second/fire.png b/src/renderer/src/assets/images/second/fire.png new file mode 100644 index 0000000..eba310e Binary files /dev/null and b/src/renderer/src/assets/images/second/fire.png differ diff --git a/src/renderer/src/assets/images/second/fountain.png b/src/renderer/src/assets/images/second/fountain.png new file mode 100644 index 0000000..f29c3ad Binary files /dev/null and b/src/renderer/src/assets/images/second/fountain.png differ diff --git a/src/renderer/src/assets/images/second/gdbImport.png b/src/renderer/src/assets/images/second/gdbImport.png new file mode 100644 index 0000000..0dc41ac Binary files /dev/null and b/src/renderer/src/assets/images/second/gdbImport.png differ diff --git a/src/renderer/src/assets/images/second/globalContour.png b/src/renderer/src/assets/images/second/globalContour.png new file mode 100644 index 0000000..0149a17 Binary files /dev/null and b/src/renderer/src/assets/images/second/globalContour.png differ diff --git a/src/renderer/src/assets/images/second/graffiti.png b/src/renderer/src/assets/images/second/graffiti.png new file mode 100644 index 0000000..3d95ff4 Binary files /dev/null and b/src/renderer/src/assets/images/second/graffiti.png differ diff --git a/src/renderer/src/assets/images/second/heightMeasure.png b/src/renderer/src/assets/images/second/heightMeasure.png new file mode 100644 index 0000000..7f07e38 Binary files /dev/null and b/src/renderer/src/assets/images/second/heightMeasure.png differ diff --git a/src/renderer/src/assets/images/second/inundationAnalysis.png b/src/renderer/src/assets/images/second/inundationAnalysis.png new file mode 100644 index 0000000..98fe389 Binary files /dev/null and b/src/renderer/src/assets/images/second/inundationAnalysis.png differ diff --git a/src/renderer/src/assets/images/second/kenAnalysis.png b/src/renderer/src/assets/images/second/kenAnalysis.png new file mode 100644 index 0000000..0497a6e Binary files /dev/null and b/src/renderer/src/assets/images/second/kenAnalysis.png differ diff --git a/src/renderer/src/assets/images/second/lopeDistanceMeasures.png b/src/renderer/src/assets/images/second/lopeDistanceMeasures.png new file mode 100644 index 0000000..c19f0ea Binary files /dev/null and b/src/renderer/src/assets/images/second/lopeDistanceMeasures.png differ diff --git a/src/renderer/src/assets/images/second/mouseLocation.png b/src/renderer/src/assets/images/second/mouseLocation.png new file mode 100644 index 0000000..478174e Binary files /dev/null and b/src/renderer/src/assets/images/second/mouseLocation.png differ diff --git a/src/renderer/src/assets/images/second/multilateralBody.png b/src/renderer/src/assets/images/second/multilateralBody.png new file mode 100644 index 0000000..dc39e04 Binary files /dev/null and b/src/renderer/src/assets/images/second/multilateralBody.png differ diff --git a/src/renderer/src/assets/images/second/nightVision.png b/src/renderer/src/assets/images/second/nightVision.png new file mode 100644 index 0000000..74cd25c Binary files /dev/null and b/src/renderer/src/assets/images/second/nightVision.png differ diff --git a/src/renderer/src/assets/images/second/path.png b/src/renderer/src/assets/images/second/path.png new file mode 100644 index 0000000..33675f3 Binary files /dev/null and b/src/renderer/src/assets/images/second/path.png differ diff --git a/src/renderer/src/assets/images/second/pressModel.png b/src/renderer/src/assets/images/second/pressModel.png new file mode 100644 index 0000000..ebf1ced Binary files /dev/null and b/src/renderer/src/assets/images/second/pressModel.png differ diff --git a/src/renderer/src/assets/images/second/profileAnalysis.png b/src/renderer/src/assets/images/second/profileAnalysis.png new file mode 100644 index 0000000..afb3b04 Binary files /dev/null and b/src/renderer/src/assets/images/second/profileAnalysis.png differ diff --git a/src/renderer/src/assets/images/second/projConvert.png b/src/renderer/src/assets/images/second/projConvert.png new file mode 100644 index 0000000..e7cb1c4 Binary files /dev/null and b/src/renderer/src/assets/images/second/projConvert.png differ diff --git a/src/renderer/src/assets/images/second/projectionArea.png b/src/renderer/src/assets/images/second/projectionArea.png new file mode 100644 index 0000000..e9ccdf7 Binary files /dev/null and b/src/renderer/src/assets/images/second/projectionArea.png differ diff --git a/src/renderer/src/assets/images/second/projectionConvert.png b/src/renderer/src/assets/images/second/projectionConvert.png new file mode 100644 index 0000000..3ed72c5 Binary files /dev/null and b/src/renderer/src/assets/images/second/projectionConvert.png differ diff --git a/src/renderer/src/assets/images/second/projectionDistanceMeasure.png b/src/renderer/src/assets/images/second/projectionDistanceMeasure.png new file mode 100644 index 0000000..57c6d1b Binary files /dev/null and b/src/renderer/src/assets/images/second/projectionDistanceMeasure.png differ diff --git a/src/renderer/src/assets/images/second/radarLightWave.png b/src/renderer/src/assets/images/second/radarLightWave.png new file mode 100644 index 0000000..6bacc01 Binary files /dev/null and b/src/renderer/src/assets/images/second/radarLightWave.png differ diff --git a/src/renderer/src/assets/images/second/routePlan.png b/src/renderer/src/assets/images/second/routePlan.png new file mode 100644 index 0000000..4c2b967 Binary files /dev/null and b/src/renderer/src/assets/images/second/routePlan.png differ diff --git a/src/renderer/src/assets/images/second/scanStereoscopic.png b/src/renderer/src/assets/images/second/scanStereoscopic.png new file mode 100644 index 0000000..2779502 Binary files /dev/null and b/src/renderer/src/assets/images/second/scanStereoscopic.png differ diff --git a/src/renderer/src/assets/images/second/sightAnalysis.png b/src/renderer/src/assets/images/second/sightAnalysis.png new file mode 100644 index 0000000..9cba520 Binary files /dev/null and b/src/renderer/src/assets/images/second/sightAnalysis.png differ diff --git a/src/renderer/src/assets/images/second/slopeDirection.png b/src/renderer/src/assets/images/second/slopeDirection.png new file mode 100644 index 0000000..22ce5ec Binary files /dev/null and b/src/renderer/src/assets/images/second/slopeDirection.png differ diff --git a/src/renderer/src/assets/images/second/smoke.png b/src/renderer/src/assets/images/second/smoke.png new file mode 100644 index 0000000..679d95b Binary files /dev/null and b/src/renderer/src/assets/images/second/smoke.png differ diff --git a/src/renderer/src/assets/images/second/terrainDig.png b/src/renderer/src/assets/images/second/terrainDig.png new file mode 100644 index 0000000..09660ce Binary files /dev/null and b/src/renderer/src/assets/images/second/terrainDig.png differ diff --git a/src/renderer/src/assets/images/second/tilesetClipping.png b/src/renderer/src/assets/images/second/tilesetClipping.png new file mode 100644 index 0000000..e814536 Binary files /dev/null and b/src/renderer/src/assets/images/second/tilesetClipping.png differ diff --git a/src/renderer/src/assets/images/second/trajectoryMotion.png b/src/renderer/src/assets/images/second/trajectoryMotion.png new file mode 100644 index 0000000..85595ea Binary files /dev/null and b/src/renderer/src/assets/images/second/trajectoryMotion.png differ diff --git a/src/renderer/src/assets/images/second/triangleMeasure.png b/src/renderer/src/assets/images/second/triangleMeasure.png new file mode 100644 index 0000000..da3ef38 Binary files /dev/null and b/src/renderer/src/assets/images/second/triangleMeasure.png differ diff --git a/src/renderer/src/assets/images/second/waterSurface.png b/src/renderer/src/assets/images/second/waterSurface.png new file mode 100644 index 0000000..a0f8372 Binary files /dev/null and b/src/renderer/src/assets/images/second/waterSurface.png differ diff --git a/src/renderer/src/assets/images/secondBj.png b/src/renderer/src/assets/images/secondBj.png new file mode 100644 index 0000000..0b4b2f9 Binary files /dev/null and b/src/renderer/src/assets/images/secondBj.png differ diff --git a/src/renderer/src/axios/index.ts b/src/renderer/src/axios/index.ts index 2783759..27644bb 100644 --- a/src/renderer/src/axios/index.ts +++ b/src/renderer/src/axios/index.ts @@ -1,3 +1,4 @@ +import router from '@renderer/router' import axios from 'axios' import type { AxiosInstance, @@ -9,14 +10,14 @@ import type { const pendingRequests = new Map() let baseURL: any if (window && window.process && window.process.type === 'renderer') { - baseURL = localStorage.getItem('ip') || 'http://127.0.0.1:8808' + baseURL = localStorage.getItem('ip') ||'http://192.168.110.25:8848'|| 'http://127.0.0.1:8808' } else { baseURL = '' } // 创建自定义配置的axios实例 const service: AxiosInstance = axios.create({ - baseURL, + baseURL:'http://192.168.110.25:8848', timeout: 10000, headers: { 'Content-Type': 'application/json', @@ -47,9 +48,12 @@ service.interceptors.request.use( pendingRequests.set(key, controller) // 在这里添加认证token - const token = localStorage.getItem('access_token') + const token = localStorage.getItem('Authorization') +console.log("localStorage.getItem('Authorization')",token); + if (token && config.headers) { - config.headers.Authorization = `Bearer ${token}` + // Bearer + config.headers.Authorization = `${token}` } return config }, @@ -63,18 +67,24 @@ service.interceptors.response.use( (response: AxiosResponse) => { const key = getRequestKey(response.config) pendingRequests.delete(key) +console.log(response); // 统一处理HTTP状态码 if (response.status === 200) { - if (response.data.code == 0) { + if ([0,200].includes(response.data.code)) { return response } - if (response.data.code != 0) { + if (response.data.code==401) { + router.push('/') + localStorage.removeItem('Authorization') + } + if (![0,200].includes(response.data.code)) { ElMessage({ message: response.data.msg || response.data.message, type: 'error' }) } + } return Promise.reject(new Error('Error')) }, diff --git a/src/renderer/src/main.ts b/src/renderer/src/main.ts index aeab955..5b9437f 100644 --- a/src/renderer/src/main.ts +++ b/src/renderer/src/main.ts @@ -25,7 +25,7 @@ import '../public/tree/jquery.ztree.exhide.js' import '../public/tree/fuzzysearch.js' import '../public/tree/newFuzzySearch' import Pagination from './components/Pagination/index.vue' - +process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true"; const i18n = createI18n({ legacy: false, locale: 'zh-CN', @@ -38,6 +38,9 @@ const i18n = createI18n({ // 注册全局指令 const setApp = createApp(App) +// 定义全局方法 + +// setApp.config.globalProperties.$md5 = md5 setApp.component('Pagination', Pagination) setupStore(setApp) setupSvgIcon(setApp) diff --git a/src/renderer/src/router/index.ts b/src/renderer/src/router/index.ts index ef42e51..bf7a99e 100644 --- a/src/renderer/src/router/index.ts +++ b/src/renderer/src/router/index.ts @@ -23,5 +23,16 @@ const router = createRouter({ history: createWebHashHistory(), routes }) +router.beforeEach((to, from, next) => { + // 去登录,放行 + if (to.path === '/') { + next() + } else { + if(localStorage.getItem('Authorization')) { + next() + }else + next("/") + } +}) export default router diff --git a/src/renderer/src/views/components/headers/components/setTool/setTool.vue b/src/renderer/src/views/components/headers/components/setTool/setTool.vue index e81a45e..0a115ac 100644 --- a/src/renderer/src/views/components/headers/components/setTool/setTool.vue +++ b/src/renderer/src/views/components/headers/components/setTool/setTool.vue @@ -13,14 +13,8 @@ --> -
+
@@ -28,14 +22,23 @@ @@ -110,6 +113,7 @@ const setList = ref([ position: relative; cursor: pointer; } + .set_item::after { content: ''; position: absolute; @@ -117,17 +121,16 @@ const setList = ref([ top: 0; bottom: 0; width: 1px; - background: linear-gradient( - 180deg, - rgba(0, 255, 255, 0), - rgba(0, 255, 255, 1), - rgba(204, 204, 204, 0) - ); + background: linear-gradient(180deg, + rgba(0, 255, 255, 0), + rgba(0, 255, 255, 1), + rgba(204, 204, 204, 0)); } .set_item.last-item::after { display: none; } + ::v-deep .el-dialog__body { padding: 10px; } diff --git a/src/renderer/src/views/components/leftSide/leftSideFirst.vue b/src/renderer/src/views/components/leftSide/leftSideFirst.vue index 5ed2f5b..6a4a828 100644 --- a/src/renderer/src/views/components/leftSide/leftSideFirst.vue +++ b/src/renderer/src/views/components/leftSide/leftSideFirst.vue @@ -2,19 +2,19 @@