From a79911b3d9021d92cd53846b3b14586a48c5fd40 Mon Sep 17 00:00:00 2001 From: zh <972939975@qq.com> Date: Mon, 20 Oct 2025 17:01:17 +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 --- resources/java/app/application.yml | 9 +- .../viewerCesiumNavigationMixin.min.js | 4 +- src/renderer/src/assets/base.css | 8 ++ src/renderer/src/utils/theme.ts | 32 +++++++ .../components/setPup/components/setting.vue | 10 +- .../components/leftSide/leftSideFirst.vue | 95 +++++++++++++------ .../components/propertyBox/attribute.vue | 50 ++++------ .../src/views/components/tree/entityClick.ts | 5 +- 8 files changed, 144 insertions(+), 69 deletions(-) create mode 100644 src/renderer/src/utils/theme.ts diff --git a/resources/java/app/application.yml b/resources/java/app/application.yml index 93278ac..1929d59 100644 --- a/resources/java/app/application.yml +++ b/resources/java/app/application.yml @@ -11,7 +11,8 @@ spring: active: sqlite mysql: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.110.65:6975/yjearth?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: >- + jdbc:mysql://192.168.110.65:6975/yjearth?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: yjearth password: kNGxrsSSYMexZ2t4 servlet: @@ -38,8 +39,8 @@ file: graphhopper: graphLocation: ./target/graphhopper profiles: - - car - - bike - - foot + - car + - bike + - foot sync: folder: E:\\地理资源 diff --git a/src/renderer/public/sdk/3rdparty/viewerCesiumNavigationMixin.min.js b/src/renderer/public/sdk/3rdparty/viewerCesiumNavigationMixin.min.js index ad3a602..5488b2d 100644 --- a/src/renderer/public/sdk/3rdparty/viewerCesiumNavigationMixin.min.js +++ b/src/renderer/public/sdk/3rdparty/viewerCesiumNavigationMixin.min.js @@ -20096,8 +20096,8 @@ var testing = '
' + + '双击：重置视图' + + '" data-bind="visible: showCompass, event: { mousedown: handleMouseDown, dblclick: handleDoubleClick }">' + '
' + "
" + "
" + diff --git a/src/renderer/src/assets/base.css b/src/renderer/src/assets/base.css index aff8bc1..df62b59 100644 --- a/src/renderer/src/assets/base.css +++ b/src/renderer/src/assets/base.css @@ -29,6 +29,14 @@ --color-background-mute: var(--ev-c-black-mute); --color-text: var(--ev-c-text-1); + + + + --color-border1: rgba(0, 194, 142, 1); + --color-border2: rgba(0, 255, 200, 1); + --color-border3: rgba(42, 200, 251, 1); + --color-border4: rgba(229, 93, 93, 1); + --color-border5: rgba(255, 165, 92, 1); } *, diff --git a/src/renderer/src/utils/theme.ts b/src/renderer/src/utils/theme.ts new file mode 100644 index 0000000..988651a --- /dev/null +++ b/src/renderer/src/utils/theme.ts @@ -0,0 +1,32 @@ +let theme = { + "yingguangse": new Map(), + "gonganlan": new Map(), + "hong": new Map(), +} +theme.yingguangse.set("--svg-headColor1", "rgba(11, 37, 40, 0.6)") +theme.yingguangse.set("--svg-headColor2", "rgba(11, 37, 40, 0.8)") +theme.yingguangse.set("--svg-headColor3", "#0ff") +theme.yingguangse.set("--svg-headColorbg", "rgba(0,255,255,0.1)") +// theme.yingguangse.set("--svg-headColor3", "#0ff") +theme.yingguangse.set("--svg-baseLineColor", "#0ff") +theme.yingguangse.set("--svg-divBgColor", "rgba(0, 0, 0, .5)") + +theme.gonganlan.set("--svg-headColor1", "rgba(11, 37, 40, 0.6)") +theme.gonganlan.set("--svg-headColor2", "rgba(17, 19, 69, 0.8)") +theme.gonganlan.set("--svg-headColor3", "#2ac8fb") +theme.gonganlan.set("--svg-headColorbg", "rgba(34,39,142,0.1)") +theme.gonganlan.set("--svg-headLineColor", "#22278e") +theme.gonganlan.set("--svg-baseLineColor", "#2ac8fb") +// theme.gonganlan.set("--svg-baseLineColor", "#fb2a2a") +theme.gonganlan.set("--svg-divBgColor", "rgba(0, 0, 0, .5)") + + +theme.hong.set("--svg-headColor1", "rgba(11, 37, 40, 0.6)") +theme.hong.set("--svg-headColor2", "rgba(17, 19, 69, 0.8)") +theme.hong.set("--svg-headColor3", "#bb1a29") +theme.hong.set("--svg-headColorbg", "rgba(187,26,41,0.1)") +theme.hong.set("--svg-headLineColor", "#bb1a29") +theme.hong.set("--svg-baseLineColor", "#bb1a29") +// theme.gonganlan.set("--svg-baseLineColor", "#fb2a2a") +theme.hong.set("--svg-divBgColor", "rgba(0, 0, 0, .5)") +export default theme; diff --git a/src/renderer/src/views/components/headers/components/setPup/components/setting.vue b/src/renderer/src/views/components/headers/components/setPup/components/setting.vue index a9432e3..aaadddc 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/setting.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/setting.vue @@ -410,6 +410,7 @@ import { ElMessage } from 'element-plus' import { inject, onMounted } from 'vue' import { TreeApi } from '@/api/tree' import { $sendElectronChanel } from '@/utils/communication' +import theme from "@/utils/theme"; const eventBus: any = inject('bus') @@ -523,7 +524,7 @@ const sysChange = async () => { let coor = systemSetting.value.coordinate ? systemSetting.value.coordinate : 'EPSG:4326' YJ.Global.setCoordinateSystem(window.earth, coor) //设置坐标格式 - YJ.Global.setDMS(window.earth, systemSetting.value.positionType) + // YJ.Global.setDMS(window.earth, systemSetting.value.positionType) //比例尺 await YJ.Global.SheetIndexStatusSwitch(window.earth, systemSetting.value.sheetIndexStatusSwitch) @@ -535,6 +536,13 @@ const sysChange = async () => { } else { YJ.Global.MapX.close(window.earth) } + + let skin = systemSetting.value.skinInfo ? systemSetting.value.skinInfo : "yingguangse"; + let colorVariable = Array.from(theme[skin].keys()); + colorVariable.forEach((key:any) => { + console.log('key', key) + document.documentElement.style.setProperty(key, theme[skin].get(key)); + }); } const searchWayChange = (val) => { localStorage.setItem('searchWay', val) diff --git a/src/renderer/src/views/components/leftSide/leftSideFirst.vue b/src/renderer/src/views/components/leftSide/leftSideFirst.vue index 987fe9a..7a62b72 100644 --- a/src/renderer/src/views/components/leftSide/leftSideFirst.vue +++ b/src/renderer/src/views/components/leftSide/leftSideFirst.vue @@ -2,19 +2,52 @@
-
-
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
@@ -22,10 +55,7 @@
- +
@@ -33,16 +63,16 @@