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

zhanmingkan

2022-05-16 dc9784b9f149e15b0ddfb439135fe712ba2f8e8b

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

 assets/images/icon/icon1.png

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

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

 view/project/editLabel.html

@@ -38,7 +38,7 @@
            color: white;
        }
        .textarea{
            width: 240px;
            width: 260px;
            height: 140px;
            margin-left: 25px;
            margin-right: 50px;

 view/project/editPoint.html

@@ -139,8 +139,7 @@
                    <i class="layui-icon">&#xe67c;</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">&#xe67c;</i>上传图片

 view/project/layerAnalysis.html

@@ -191,6 +191,7 @@
                        lat = obj.data.lat;
                        alt = obj.data.altitude;
                        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),
@@ -202,6 +203,7 @@
                        });
                    }
                }
                }
                , oncheck: function (obj) {
                    if (isloading) {
                        return;