From dc9784b9f149e15b0ddfb439135fe712ba2f8e8b Mon Sep 17 00:00:00 2001
From: zhanmingkan <496160012@qq.com>
Date: 星期一, 16 五月 2022 12:59:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB
---
assets/utils/popup.js | 2 +-
view/project/editPoint.html | 3 +--
view/project/layerAnalysis.html | 24 +++++++++++++-----------
assets/images/icon/icon1.png | 0
assets/map/map3D.js | 16 ++++++++--------
view/project/editLabel.html | 2 +-
6 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/assets/images/icon/icon1.png b/assets/images/icon/icon1.png
index 3f49cac..c2381f1 100644
--- a/assets/images/icon/icon1.png
+++ b/assets/images/icon/icon1.png
Binary files differ
diff --git a/assets/map/map3D.js b/assets/map/map3D.js
index d378aa4..7d997e6 100644
--- a/assets/map/map3D.js
+++ b/assets/map/map3D.js
@@ -224,9 +224,9 @@
maxmin: false,
scrollbar: false,
shadeClose: true,
- area: ['310px', '480px'],
+ area: ['320px', '480px'],
resize: false,
- offset: ['50px',document.body.clientWidth-320],
+ offset: ['50px',document.body.clientWidth-330],
content: 'project/editLabel.html',
success: function (layero, index) {
var iframe = window['layui-layer-iframe' + index];
@@ -254,9 +254,9 @@
maxmin: false,
scrollbar: false,
shadeClose: true,
- area: ['300px', '330px'],
+ area: ['320px', '335px'],
resize: false,
- offset: ['50px',document.body.clientWidth-320],
+ offset: ['50px',document.body.clientWidth-330],
content: 'project/editPoint.html',
success: function (layero, index) {
var iframe = window['layui-layer-iframe' + index];
@@ -282,9 +282,9 @@
maxmin: false,
scrollbar: false,
shadeClose: true,
- area: ['310px', '300px'],
+ area: ['320px', '300px'],
resize: false,
- offset: ['50px',document.body.clientWidth-320],
+ offset: ['50px',document.body.clientWidth-330],
content: 'project/editLine.html',
success: function (layero, index) {
var iframe = window['layui-layer-iframe' + index];
@@ -309,9 +309,9 @@
maxmin: false,
scrollbar: false,
shadeClose: true,
- area: ['310px', '300px'],
+ area: ['320px', '300px'],
resize: false,
- offset: ['50px',document.body.clientWidth-320],
+ offset: ['50px',document.body.clientWidth-330],
content: 'project/editPolygon.html',
success: function (layero, index) {
var iframe = window['layui-layer-iframe' + index];
diff --git a/assets/utils/popup.js b/assets/utils/popup.js
index 4ddc047..751619f 100644
--- a/assets/utils/popup.js
+++ b/assets/utils/popup.js
@@ -31,7 +31,7 @@
testConfig= {
header:_this.entity.title,
//header:"",
- content:'<textarea class="textarea" style="color:white;width:100%;height:150px;max-width:200px;max-height:150px;background:transparent;"></textarea>'
+ content:'<textarea class="textarea" style="color:white;width:100%;height:150px;max-width:200px;max-height:150px;background:transparent;resize:none" readonly="true";></textarea>'
}
}
_this.ctn.append(_this.createHtml(testConfig.header,testConfig.content,_this.id));
diff --git a/view/project/editLabel.html b/view/project/editLabel.html
index 3ee14b0..9cce956 100644
--- a/view/project/editLabel.html
+++ b/view/project/editLabel.html
@@ -38,7 +38,7 @@
color: white;
}
.textarea{
- width: 240px;
+ width: 260px;
height: 140px;
margin-left: 25px;
margin-right: 50px;
diff --git a/view/project/editPoint.html b/view/project/editPoint.html
index b8529a8..dd4c95c 100644
--- a/view/project/editPoint.html
+++ b/view/project/editPoint.html
@@ -139,8 +139,7 @@
<i class="layui-icon"></i>涓婁紶鍥炬爣
</button>
</div>
- <div>
- <br/>
+ <div style="clear: both">
<span class="text2">鍥剧墖</span>
<button type="button" class="layui-btn layui-bg-black" style="width:150px;height:30px;margin-top:15px;margin-left: 30px;line-height: 30px;float: left;" id="uploadImg">
<i class="layui-icon"></i>涓婁紶鍥剧墖
diff --git a/view/project/layerAnalysis.html b/view/project/layerAnalysis.html
index 8ee58f4..1df3ed5 100644
--- a/view/project/layerAnalysis.html
+++ b/view/project/layerAnalysis.html
@@ -185,21 +185,23 @@
}
}
- else if (type == 'DDE') {
+ else if (type == 'DDE') {
var lon, lat, alt;
lon = obj.data.lon;
lat = obj.data.lat;
alt = obj.data.altitude;
- console.log(lon,lat,alt);
- let flyPromise = viewer.camera.flyTo({
- duration: 3,
- destination: Cesium.Cartesian3.fromDegrees(Number(lon), Number(lat), alt),
- orientation: {
- heading: Cesium.Math.toRadians(0), //缁曞瀭鐩翠簬鍦板績鐨勮酱鏃嬭浆
- pitch: Cesium.Math.toRadians(-90), //缁曠含搴︾嚎鏃嬭浆
- roll: Cesium.Math.toRadians(0) //缁曠粡搴︾嚎鏃嬭浆
- },
- });
+ console.log(lon, lat, alt);
+ if (lon != undefined && lat != undefined && alt != undefined) {
+ let flyPromise = viewer.camera.flyTo({
+ duration: 3,
+ destination: Cesium.Cartesian3.fromDegrees(Number(lon), Number(lat), alt),
+ orientation: {
+ heading: Cesium.Math.toRadians(0), //缁曞瀭鐩翠簬鍦板績鐨勮酱鏃嬭浆
+ pitch: Cesium.Math.toRadians(-90), //缁曠含搴︾嚎鏃嬭浆
+ roll: Cesium.Math.toRadians(0) //缁曠粡搴︾嚎鏃嬭浆
+ },
+ });
+ }
}
}
, oncheck: function (obj) {
--
Gitblit v1.9.1