From 9bcddf02208aa75a683f429e7c9f18fa9169ff15 Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期六, 20 一月 2024 21:27:32 +0800
Subject: [PATCH] 合并
---
src/components/leftMenu/sousuo.vue | 2 +-
src/components/viewer.vue | 1 +
src/components/login.vue | 3 ++-
src/components/sideMenu/roamPanel/roamPanel.vue | 2 +-
static/img/image/ddrf1.png | 0
src/router/index.js | 1 +
src/components/rightNavigation/NavigationBar.vue | 2 +-
7 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/leftMenu/sousuo.vue b/src/components/leftMenu/sousuo.vue
index 6adbe67..a0f0477 100644
--- a/src/components/leftMenu/sousuo.vue
+++ b/src/components/leftMenu/sousuo.vue
@@ -499,7 +499,7 @@
billboard: {
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
scale: 1,
- image: window.SmartEarthRootUrl + "/Workers/image/mark.png",
+ image: window.SmartEarthRootUrl + "/Workers/image/mark1.png",
heightReference: 1,
disableDepthTestDistance: Number.POSITIVE_INFINITY,
},
diff --git a/src/components/login.vue b/src/components/login.vue
index 5ccfd93..9fccbff 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -9,7 +9,8 @@
return {};
},
mounted() {
- this.getQueryString("focus-open-code");
+ this.$router.push("/index");
+ // this.getQueryString("focus-open-code");
// if (
// window.location.href.match(/=(\S*)#/) &&
// window.location.href.match(/=(\S*)#/)[1] != ""
diff --git a/src/components/rightNavigation/NavigationBar.vue b/src/components/rightNavigation/NavigationBar.vue
index 54c3244..969199d 100644
--- a/src/components/rightNavigation/NavigationBar.vue
+++ b/src/components/rightNavigation/NavigationBar.vue
@@ -109,7 +109,7 @@
handleMenuListShow() {
// 娓呴櫎瀹氱偣缁曢
if (window.pointerFly) {
- window.pointerFly && window.pointerFly.end();
+ window.pointerFly.end && window.pointerFly.end();
window.pointerFly = null;
}
//娓呴櫎鎼滅储鐐�
diff --git a/src/components/sideMenu/roamPanel/roamPanel.vue b/src/components/sideMenu/roamPanel/roamPanel.vue
index 55e2417..deb4cff 100644
--- a/src/components/sideMenu/roamPanel/roamPanel.vue
+++ b/src/components/sideMenu/roamPanel/roamPanel.vue
@@ -94,7 +94,7 @@
},
// 婕父
handleRoamClick(result) {
- store.setBasicMap("涓夌淮褰卞儚");
+ store.setBasicMap("涓夌淮妯″瀷");
store.setRoamPanelShow(false);
store.setSearchPanelShow(false);
const val = roman.filter((res) => {
diff --git a/src/components/viewer.vue b/src/components/viewer.vue
index 673aaef..a40f629 100644
--- a/src/components/viewer.vue
+++ b/src/components/viewer.vue
@@ -130,6 +130,7 @@
let that = this;
let option = {
// licenseServer: "http://183.162.245.49:18080",
+ // StaticFileBaseUrl: "../../Mobile/static/CimSDK/",
url: "./static/img/cesium/earth.jpg",
toolbar: false,
// fullscreenButton: true,
diff --git a/src/router/index.js b/src/router/index.js
index 2d99d79..688d3d7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,6 +25,7 @@
];
const router = new Router({
mode: "history",
+ // base: '/Mobile',//娴嬭瘯鐗� 鎵撳寘鏃惰В寮�
routes,
});
diff --git a/static/img/image/ddrf1.png b/static/img/image/ddrf1.png
new file mode 100644
index 0000000..61ce6f3
--- /dev/null
+++ b/static/img/image/ddrf1.png
Binary files differ
--
Gitblit v1.9.3