From c1615ff0d569b0a37c5786550fcff17b951d2516 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 11 Jun 2021 08:55:56 +0800
Subject: [PATCH] 地图底图，部分图片路径修改等
---
widgets/LeftNavigationBar/Widget.js | 3 +
widgets/legends/Widget.html | 10 ++--
widgets/visualAngle/Widget.js | 35 +++++++++++------
jimu.js/MapManager.js | 2
widgets/VrButton/Widget.js | 6 +-
widgets/HelpButton/Widget.js | 2
widgets/SceneMode/Widget.js | 6 +-
widgets/Tool/Widget.js | 1
widgets/FullScreen/Widget.js | 6 +-
widgets/HomeButton/Widget.js | 2
widgets/searchL/Widget.js | 4 +-
widgets/searchL/css/style.css | 2
12 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/jimu.js/MapManager.js b/jimu.js/MapManager.js
index 4d967a2..5775b0f 100644
--- a/jimu.js/MapManager.js
+++ b/jimu.js/MapManager.js
@@ -90,7 +90,7 @@
imageryLayers.removeAll();
this.map.baseLayerPicker.viewModel.selectedImagery = this.map.baseLayerPicker.viewModel.imageryProviderViewModels[1];
- this.map.baseLayerPicker.viewModel.selectedTerrain = this.map.baseLayerPicker.viewModel.terrainProviderViewModels[0];
+ this.map.baseLayerPicker.viewModel.selectedTerrain = this.map.baseLayerPicker.viewModel.terrainProviderViewModels[1];
$(".cesium-baseLayerPicker-sectionTitle").eq(0).html("底图");
$(".cesium-baseLayerPicker-sectionTitle").eq(1).html("地形");
diff --git a/widgets/FullScreen/Widget.js b/widgets/FullScreen/Widget.js
index 79d946f..fbfb3ed 100644
--- a/widgets/FullScreen/Widget.js
+++ b/widgets/FullScreen/Widget.js
@@ -23,18 +23,18 @@
new Cesium.FullscreenButton(this.domNode, null);
$('.cesium-fullscreenButton').attr('title', '全屏视角');
- $(".jimu-widget-fullScreen button.cesium-button").html("<img src='../../../images/全屏.png' alt=''>");
+ $(".jimu-widget-fullScreen button.cesium-button").html("<img src='./images/全屏.png' alt=''>");
$('.jimu-widget-fullScreen button.cesium-button').click(function () {
var title = $(this).attr('title');
if (title == "Exit full screen") {
- $(".jimu-widget-fullScreen button.cesium-button").html("<img src='../../../images/全屏.png' alt=''>");
+ $(".jimu-widget-fullScreen button.cesium-button").html("<img src='./images/全屏.png' alt=''>");
} else {
- $(".jimu-widget-fullScreen button.cesium-button").html("<img src='../../../images/收缩.png' alt=''>");
+ $(".jimu-widget-fullScreen button.cesium-button").html("<img src='./images/收缩.png' alt=''>");
}
})
diff --git a/widgets/HelpButton/Widget.js b/widgets/HelpButton/Widget.js
index 2577362..f572dfd 100644
--- a/widgets/HelpButton/Widget.js
+++ b/widgets/HelpButton/Widget.js
@@ -77,7 +77,7 @@
touch_help_rotate.parentNode.getElementsByClassName("cesium-navigation-help-details")[0].innerHTML = "双指反向拖动";
}
- $(".jimu-widget-helpbutton button.cesium-button").html("<img src='../../../images/问题指引.png' alt=''>");
+ $(".jimu-widget-helpbutton button.cesium-button").html("<img src='./images/问题指引.png' alt=''>");
}
diff --git a/widgets/HomeButton/Widget.js b/widgets/HomeButton/Widget.js
index 74d0039..049c3e0 100644
--- a/widgets/HomeButton/Widget.js
+++ b/widgets/HomeButton/Widget.js
@@ -33,7 +33,7 @@
var homeButton = new Cesium.HomeButton(this.domNode, this.map.scene);
- $(".jimu-widget-homebutton button.cesium-button").html("<img src='../../../images/回到原来的视角.png' alt=''>");
+ $(".jimu-widget-homebutton button.cesium-button").html("<img src='./images/回到原来的视角.png' alt=''>");
// Subscribe to the home button beforeExecute event so that we can clear the trackedEntity.
this.map._eventHelper.add(homeButton.viewModel.command.beforeExecute, Cesium.Viewer.prototype._clearTrackedObject, this.map);
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index de6441b..68aac90 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -216,7 +216,7 @@
id: d[k].id,
serviceName: d[k].serviceName,
alpha: 1,
- checked: d[k].menuStatus
+ // checked: d[k].menuStatus
}
if (d[k].serviceUrl.indexOf('.openrealspace') != -1) {
@@ -444,6 +444,7 @@
//添加S3M图层服务
that[obj.data.id] = scene.open(host + partOfUrl);
//定位到场景
+
Cesium.loadJson(host + partOfUrl + '/scenes.json').then(function (scenes) {
// var sname = scenes[0].name;
// Cesium.loadJson(host + partOfUrl + '/scenes/' + sname + '.json').then(function (jsonData) {
diff --git a/widgets/SceneMode/Widget.js b/widgets/SceneMode/Widget.js
index de6f64a..2b5fc86 100644
--- a/widgets/SceneMode/Widget.js
+++ b/widgets/SceneMode/Widget.js
@@ -29,14 +29,14 @@
layers: {},
startup: function () {
var that = this;
- $(".jimu-widget-SceneMode button").html("<img src='../../../images/2D.png' alt='' title='2D'>");
+ $(".jimu-widget-SceneMode button").html("<img src='./images/2D.png' alt='' title='2D'>");
$(".jimu-widget-SceneMode button").click(function () {
if ($(".jimu-widget-SceneMode button img").attr('title') == "2D") {
- $(".jimu-widget-SceneMode button").html("<img src='../../../images/3D.png' alt='' title='3D'>");
+ $(".jimu-widget-SceneMode button").html("<img src='./images/3D.png' alt='' title='3D'>");
that.map.scene.morphTo2D(0);
} else {
- $(".jimu-widget-SceneMode button").html("<img src='../../../images/2D.png' alt='' title='2D'>");
+ $(".jimu-widget-SceneMode button").html("<img src='./images/2D.png' alt='' title='2D'>");
that.map.scene.morphTo3D(0);
}
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index dfb0dfd..cf99f21 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -55,7 +55,6 @@
topic.publish('openRolling', 'Rolling');
$('.jimu-widget-Location').hide();
$('.jimu-widget-Rolling').show();
- $('#widgets_Rolling_Widget_17').show();
$('.jimu-widget-Measurement').hide();
$('.jimu-widget-FlyRoute').hide();
$('.jimu-widget-SplitScreen').hide();
diff --git a/widgets/VrButton/Widget.js b/widgets/VrButton/Widget.js
index 7c81079..dccc042 100644
--- a/widgets/VrButton/Widget.js
+++ b/widgets/VrButton/Widget.js
@@ -34,18 +34,18 @@
$('.cesium-vrButton').attr('title','VR模式');
- $(".jimu-widget-vrbutton button.cesium-button").html("<img src='../../../images/VR.png' alt=''>");
+ $(".jimu-widget-vrbutton button.cesium-button").html("<img src='./images/VR.png' alt=''>");
$('.jimu-widget-vrbutton button.cesium-button').click(function () {
var title = $(this).attr('title');
if (title == "Exit VR mode") {
- $(".jimu-widget-vrbutton button.cesium-button").html("<img src='../../../images/关闭VR.png' alt=''>");
+ $(".jimu-widget-vrbutton button.cesium-button").html("<img src='./images/关闭VR.png' alt=''>");
} else {
- $(".jimu-widget-vrbutton button.cesium-button").html("<img src='../../../images/VR.png' alt=''>");
+ $(".jimu-widget-vrbutton button.cesium-button").html("<img src='./images/VR.png' alt=''>");
}
})
diff --git a/widgets/legends/Widget.html b/widgets/legends/Widget.html
index 7f9540b..0313f26 100644
--- a/widgets/legends/Widget.html
+++ b/widgets/legends/Widget.html
@@ -1,13 +1,13 @@
<div>
<div class="title">图层列表</div>
<div class="main">
- <div class="m-init"> <i><img src="../../images/addL/dwblue.png"/></i> 全景站点 <i>(20个)</i> </div>
+ <div class="m-init"> <i><img src="./images/addL/dwblue.png"/></i> 全景站点 <i>(20个)</i> </div>
<div class="m-init m-i-child"> <i></i> 大湖池<i>(1个)</i> </div>
<div class="m-init m-i-child"> <i></i> 战备胡 <i>(1个)</i> </div>
- <div class="m-init"> <i><img src="../../images/addL/dworgin.png"/></i> 监控站点 <i>(50个)</i> </div>
+ <div class="m-init"> <i><img src="./images/addL/dworgin.png"/></i> 监控站点 <i>(50个)</i> </div>
<div class="m-init m-i-child"> <i></i> 大湖池 <i>(1个)</i> </div>
- <div class="m-init"> <i><img src="../../images/addL/forgin.png"/></i> 鄱阳湖面积 <i>(3253.52公顷)</i> </div>
- <div class="m-init"> <i><img src="../../images/addL/fred.png"/></i> 鄱阳湖范围 <i></i> </div>
- <div class="m-init"> <i><img src="../../images/addL/fblue.png"/></i> 其他 <i></i> </div>
+ <div class="m-init"> <i><img src="./images/addL/forgin.png"/></i> 鄱阳湖面积 <i>(3253.52公顷)</i> </div>
+ <div class="m-init"> <i><img src="./images/addL/fred.png"/></i> 鄱阳湖范围 <i></i> </div>
+ <div class="m-init"> <i><img src="./images/addL/fblue.png"/></i> 其他 <i></i> </div>
</div>
</div>
\ No newline at end of file
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index e2bb50b..f398064 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -35,7 +35,7 @@
//关键词&&坐标
$("#i-f-gjz").click(function () {
that.states = 'one';
- $("#i-f-zb").css({ 'backgroundColor': '#fff', 'color': '#000' });
+ $("#i-f-zb").css({ 'backgroundColor': '#fff', 'color': '#969696' });
$("#i-f-gjz").css({ 'backgroundColor': '#3E9FFC', 'color': '#fff' });
// $("#inputTwo").css({ 'display': 'none' });
// $("#local_data").css({ 'display': 'inline-block' });
@@ -44,7 +44,7 @@
})
$("#i-f-zb").click(function () {
that.states = 'two';
- $("#i-f-gjz").css({ 'backgroundColor': '#fff', 'color': '#000' });
+ $("#i-f-gjz").css({ 'backgroundColor': '#fff', 'color': '#969696' });
$("#i-f-zb").css({ 'backgroundColor': '#3E9FFC', 'color': '#fff' });
// $("#local_data").css({ 'display': 'none' });
// $("#inputTwo").css({ 'display': 'inline-block' });
diff --git a/widgets/searchL/css/style.css b/widgets/searchL/css/style.css
index f9631dd..a2e2fd3 100644
--- a/widgets/searchL/css/style.css
+++ b/widgets/searchL/css/style.css
@@ -9,7 +9,7 @@
/* left: calc(100%-300); */
/* 240px */
background: rgba(255, 255, 255, 1);
- color: #000;
+ color: #969696 !important;
/* border-right: 1px solid #000; */
border-radius: 6px 6px 6px 6px;
text-align: center;
diff --git a/widgets/visualAngle/Widget.js b/widgets/visualAngle/Widget.js
index 8932302..2eb5e8f 100644
--- a/widgets/visualAngle/Widget.js
+++ b/widgets/visualAngle/Widget.js
@@ -3,16 +3,16 @@
// 模块描述:显示坐标
///////////////////////////////////////////////////////////////////////////
define([
- 'dojo/_base/declare',
- 'dojo/_base/lang',
- 'dojo/_base/array',
- 'dojo/_base/html',
- 'dojo/topic',
- 'jimu/BaseWidget',
- 'jimu/utils',
- 'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
- 'libs/zTree_v3/js/jquery.ztree.all'
-],
+ 'dojo/_base/declare',
+ 'dojo/_base/lang',
+ 'dojo/_base/array',
+ 'dojo/_base/html',
+ 'dojo/topic',
+ 'jimu/BaseWidget',
+ 'jimu/utils',
+ 'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
+ 'libs/zTree_v3/js/jquery.ztree.all'
+ ],
function (declare,
lang,
array,
@@ -55,9 +55,20 @@
})
$(".v-a-Two").click(function () {
-
+
$(this).addClass('on').siblings().removeClass('on');
-
+ // 飞行路线
+
+ $('.jimu-widget-Location').hide();
+ $('.jimu-widget-MapPrinting').hide();
+ $('.jimu-widget-CoorPosition').hide();
+ $('.jimu-widget-Measurement').hide();
+ $('.jimu-widget-Sign').hide();
+ $('.jimu-widget-DynamicRiver').hide();
+ $('.jimu-widget-SplitScreen').hide();
+ $('.tool-y-box').stop().hide()
+ $('.jimu-widget-FlyRoute').show();
+
})
$(".v-a-Three").click(function () {
$(this).addClass('on').siblings().removeClass('on');
--
Gitblit v1.9.3