From 4dd5bff4cd51da0dc6d2420c30f7c759013be7b0 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 10 Jun 2021 11:56:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/LeftNavigationBar/Widget.js | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 251 insertions(+), 37 deletions(-)
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index c4a3288..737ff9e 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -101,12 +101,17 @@
}
})
+
+ $(".jimu-widget-LeftNavigationBar .tree-layer-opcity .close").click(function () {
+ $(".jimu-widget-LeftNavigationBar .tree-layer-opcity").stop().hide();
+ })
},
closeToolBox: function (item) {},
onOpen: function () {
//面板打开的时候触发 （when open this panel trigger）
+
},
onClose: function () {
@@ -134,7 +139,7 @@
}
}).then((res) => {
if (res.data.code == '200') {
- // console.log(res, 'open', 898998)
+ console.log(res, 'open', 898998)
that.changeData(res.data.data); //重写数据
}
})
@@ -154,8 +159,19 @@
field: String(i),
src: d[k].serviceUrl,
id: d[k].id,
- serviceName: d[k].serviceName
+ serviceName: d[k].serviceName,
+ alpha: 1
}
+
+ if (d[k].serviceUrl.indexOf('.openrealspace') != -1) {
+ a.model = true
+ }
+
+ if (d[k].name == '三维倾斜数据') {
+ a.model = true
+ }
+
+
b.push(a);
i++;
if (d[k].children.length != 0) {
@@ -195,13 +211,15 @@
layer = layui.layer,
util = layui.util,
$ = layui.$;
+ var slider = layui.slider;
+
tree.render({
elem: '#left-tree-list' //默认是点击节点可进行收缩
,
data: data,
id: 'demoId1',
- showCheckbox: true //是否显示复选框
- ,
+ showCheckbox: true, //是否显示复选框
+ customOperate: true,
click: function (obj) {
var data = obj.data; //获取当前点击的节点数据
// layer.msg('状态：' + obj.state + '<br>节点数据：' + JSON.stringify(data));
@@ -217,8 +235,7 @@
// var jh = $(`[data-id='${data.id}']`).find('.layui-tree-entry').eq(0);
// jh.addClass('left-navigation-bar-main-current');
},
- showLine: false //是否开启连接线
- ,
+ showLine: false, //是否开启连接线
oncheck: function (obj) {
console.log(obj.data.id, '--', obj.checked, obj); //得到当前点击的节点数据
// console.log(obj.checked); //得到当前节点的展开状态：open、close、normal
@@ -233,30 +250,78 @@
if (obj.checked == true) {
- obj.data.children.forEach(item => {
- $.ajax({
- url: item.src + '/maps.json',
- type: 'get',
- dataType: 'JSON',
- success: function (res) {
-
- that[item.id] = that.map.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
- url: res[0].path,
- }));
-
- }
- })
- });
+ if (obj.data.model) {
+ obj.data.children.forEach(item => {
+ var host = that.returnStr(item.src).host;
+ var scene = that.map.scene;
+ var partOfUrl = that.returnStr(item.src).partOfUrl;
+ //添加S3M图层服务
+ that[item.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) {
+ // var cameraPosition = jsonData.camera;
+ // var tilt = Cesium.Math.toRadians(cameraPosition.tilt - 90);
+ // Cesium.when(promise, function (layer) {
+ // //设置相机位置、视角，便于观察场景
+ // scene.camera.setView({
+ // destination: new Cesium.Cartesian3.fromDegrees(cameraPosition.longitude, cameraPosition.latitude, cameraPosition.altitude),
+ // orientation: {
+ // heading: cameraPosition.heading,
+ // pitch: tilt,
+ // roll: 0
+ // }
+ // });
+ // if (!scene.pickPositionSupported) {
+ // alert('不支持深度纹理,无法拾取位置！');
+ // }
+ // }, function (e) {
+ // if (widget._showRenderLoopErrors) {
+ // var title = '加载SCP失败，请检查网络连接状态或者url地址是否正确？';
+ // widget.showErrorPanel(title, undefined, e);
+ // }
+ // });
+ // });
+ });
+ });
+ } else {
+ obj.data.children.forEach(item => {
+ $.ajax({
+ url: item.src + '/maps.json',
+ type: 'get',
+ dataType: 'JSON',
+ success: function (res) {
-
+ that[item.id] = that.map.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
+ url: res[0].path,
+ }));
+ that[obj.data.id].alpha = item.alpha
+ }
+ })
+ });
+
+ }
+
+
+
+
} else {
- obj.data.children.forEach(item => {
- if (that[item.id]) that.map.imageryLayers.remove(that[item.id]);
- });
+ if (obj.data.model) {
+ obj.data.children.forEach(item => {
+ Cesium.when(that[item.id], function (layer) {
+ that.map.scene.layers.remove(layer[0].name)
+ })
+ });
+ } else {
+ obj.data.children.forEach(item => {
+ if (that[item.id]) that.map.imageryLayers.remove(that[item.id]);
+ });
-
+ }
+
}
@@ -267,33 +332,174 @@
if (obj.checked == true) {
- $.ajax({
- url: obj.data.src + '/maps.json',
- type: 'get',
- dataType: 'JSON',
- success: function (res) {
- console.log(res, 123)
+ if (obj.data.model) {
+ var host = that.returnStr(obj.data.src).host;
+ var scene = that.map.scene;
+ var partOfUrl = that.returnStr(obj.data.src).partOfUrl;
+ //添加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) {
+ // var cameraPosition = jsonData.camera;
+ // var tilt = Cesium.Math.toRadians(cameraPosition.tilt - 90);
+ // Cesium.when(promise, function (layer) {
+ // //设置相机位置、视角，便于观察场景
+ // scene.camera.setView({
+ // destination: new Cesium.Cartesian3.fromDegrees(cameraPosition.longitude, cameraPosition.latitude, cameraPosition.altitude),
+ // orientation: {
+ // heading: cameraPosition.heading,
+ // pitch: tilt,
+ // roll: 0
+ // }
+ // });
+ // if (!scene.pickPositionSupported) {
+ // alert('不支持深度纹理,无法拾取位置！');
+ // }
+ // }, function (e) {
+ // if (widget._showRenderLoopErrors) {
+ // var title = '加载SCP失败，请检查网络连接状态或者url地址是否正确？';
+ // widget.showErrorPanel(title, undefined, e);
+ // }
+ // });
+ // });
+ });
- that[obj.data.id] = that.map.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
- url: res[0].path,
- }));
+ } else {
- }
- })
+ $.ajax({
+ url: obj.data.src + '/maps.json',
+ type: 'get',
+ dataType: 'JSON',
+ success: function (res) {
+ console.log(res, 123)
+ that[obj.data.id] = that.map.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
+ url: res[0].path,
+ }));
+ that[obj.data.id].alpha = obj.data.alpha
+ }
+ })
+
+ }
} else {
+ if (obj.data.model) {
+ Cesium.when(that[obj.data.id], function (layer) {
+ that.map.scene.layers.remove(layer[0].name)
+ })
- that.map.imageryLayers.remove(that[obj.data.id]);
+ } else {
+ that.map.imageryLayers.remove(that[obj.data.id]);
+
+ }
+
+
+
+ }
+
+
+ }
+ },
+ edit: ['add'],
+ operate: function (obj) {
+ var type = obj.type; //得到操作类型: add、edit、 del
+ var data = obj.data; //得到当前节点的数据
+ var elem = obj.elem; //得到当前节点元素var deptId = data.id;//得到节点索引var parentId = data.parentId;l/父节点
+ var depId = data.id;
+ var parentId = data.parentId;
+ if (type == 'add') {
+
+ $(".jimu-widget-LeftNavigationBar .tree-layer-opcity ul").empty();
+
+
+
+ console.log(type, data, elem, depId, parentId)
+
+ if (data.children) {
+
+ data.children.forEach(item => {
+ var liC = `<li>
+ <div title="${item.title}">
+ ${item.title}
+ </div>
+ <div id="${item.id + 'Layer'}">
+
+ </div>
+ </li>`;
+
+ $(".jimu-widget-LeftNavigationBar .tree-layer-opcity ul").append(liC)
+
+ $(".jimu-widget-LeftNavigationBar .tree-layer-opcity").stop().show();
+ slider.render({
+ elem: '#' + item.id + 'Layer',
+ min: 0,
+ max: 10,
+ value: item.alpha * 10,
+ step: 1,
+ theme: '#1E9FFF',
+ showstep: true,
+ change: function (value) {
+ item.alpha = value / 10
+ if (that[item.id]) {
+ that[item.id].alpha = item.alpha
+ }
+ }
+ });
+ })
+
+ } else {
+ var liC = `<li>
+ <div title="${data.title}">
+ ${data.title}
+ </div>
+ <div id="${data.id + 'Layer'}">
+
+ </div>
+ </li>`;
+
+ $(".jimu-widget-LeftNavigationBar .tree-layer-opcity ul").append(liC)
+
+ $(".jimu-widget-LeftNavigationBar .tree-layer-opcity").stop().show();
+ slider.render({
+ elem: '#' + data.id + 'Layer',
+ min: 0,
+ max: 10,
+ value: data.alpha * 10,
+ step: 1,
+ theme: '#1E9FFF',
+ showstep: true,
+ change: function (value) {
+ data.alpha = value / 10
+ if (that[data.id]) {
+ that[data.id].alpha = data.alpha
+ }
+ }
+ });
+
}
}
}
+
});
+
+ console.log($("#left-tree-list > .layui-tree > div"))
+ var jqDom = $("#left-tree-list > .layui-tree > div");
+
+ for (var i = 0; i < jqDom.length; i++) {
+ if ($(jqDom[i]).text().indexOf("三维倾斜数据") != -1) {
+ $(jqDom[i]).find('.layui-btn-group').remove()
+
+ }
+ }
+
+
//按钮事件
util.event('lay-demo', {
@@ -318,6 +524,14 @@
});
})
},
+ returnStr: function (url) {
+ var startIndex = url.indexOf("/iserver");
+ var endIndex = url.indexOf("/scenes");
+ return {
+ host: url.substring(0, startIndex),
+ partOfUrl: url.substring(startIndex, endIndex)
+ }
+ },
changeImg: true,
father: [],
data: [{
--
Gitblit v1.9.3