Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB

zhanmingkan

2022-05-16 dc9784b9f149e15b0ddfb439135fe712ba2f8e8b

 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];