f11f559192ca5fd9b8ca66197016a1ec7ead9729..5853f6c45bbf6a9e4ccfdb1d159826f8948a0457
2022-05-16 ansel0926
Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB
5853f6 对比 | 目录
2022-05-16 ansel0926
提交
e6c257 对比 | 目录
3个文件已修改
21 ■■■■ 已修改文件
assets/map/map3D.js 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
view/project/editLabel.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
view/project/editPoint.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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];
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>上传图片