地质所 沉降监测网建设项目
9383485ba4326b0131abc03b51822075dfc00e92..96023cbf1e734aac93c3e2780379e2e78717515f
2024-05-16 zmk
Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
96023c 对比 | 目录
2024-05-16 zmk
提交代码
9d3b2a 对比 | 目录
1 文件已重命名
3个文件已修改
90 ■■■■ 已修改文件
javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/beijing.json 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/beijing.json
javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js
@@ -5,6 +5,9 @@
    //bindEvent();
})
// 加载地图
var countries = [];
var countriesOverlay = new T.D3Overlay(init,redraw);
var countriesOverlay1 = new T.D3Overlay(init1,redraw1);
function loadMap() {
    let map = new T.Map('map_div');
    map.centerAndZoom(new T.LngLat(116.38, 39.9), 11);
@@ -12,25 +15,60 @@
    var control = new T.Control.Zoom();
    control.setPosition(T_ANCHOR_TOP_RIGHT);
    map.addControl(control);// 添加缩放平移控件
    var scale = new T.Control.Scale();// 创建比例尺控件对象
    // var ctrl = new T.Control.MapType();
    // ctrl.setPosition(T_ANCHOR_BOTTOM_RIGHT);
    // 添加控件
    map.addControl(ctrl);
    // const sourceGeoJson = new VectorSource({
    //     format: new GeoJSON(),
    //     url:'/beijing.geojson'
    // });
    //
    // const layerGeoJson = new VectorLayer({
    //     source:sourceGeoJson,
    // });
    //
    // map.addLayer(layerGeoJson);
    d3.json("/bjfw/js/custom/beijing.json", function (data) {
        countries = data.features;
        map.addOverLay(countriesOverlay)
        countriesOverlay.bringToBack();
        map.addOverLay(countriesOverlay1)
        countriesOverlay.bringToBack();
    });
}
function init(sel, transform) {
    var upd = sel.selectAll('path.geojson').data(countries);
    upd.enter()
        .append('path')
        .attr("class", "geojson")
        .attr('stroke', 'grey')
        .attr('fill', function (d, i) {
            //return d3.hsl(Math.random() * 360, 0.9, 0.5)
            return "transparent"
        })
        .attr('fill-opacity', '0')
}
function redraw(sel, transform) {
    sel.selectAll('path.geojson').each(
        function (d, i) {
            d3.select(this).attr('d', transform.pathFromGeojson)
        }
    )
}
function init1(sel, transform) {
    var upd = sel.selectAll('path.geojson1').data(countries);
    upd.enter()
        .append('path')
        .attr("class", "geojson1")
        .attr('stroke', 'grey')
        .attr('fill', function (d, i) {
            return d3.hsl(Math.random() * 360, 0.9, 0.5)
        })
        .attr('fill-opacity', '0.1')
}
function redraw1(sel, transform) {
    sel.selectAll('path.geojson1').each(
        function (d, i) {
            d3.select(this).attr('d', transform.pathFromGeojson)
        }
    )
}
// 获取数据库真实数据
function getReallyData() {
    let url = window.location.protocol + "//" + window.location.host + "/bjfw/geotdp/index/indexCollect";
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -31,13 +31,7 @@
                    <div class="row">
                        <div class="col-sm-8">
<!--                            <div>-->
<!--                                <div class="col-md-4">-->
<!--                                    <input type="text" class="form-control" placeholder="项目关键词查询定位">-->
<!--                                </div>-->
<!--                                <button type="button" class="btn btn-success">查询</button>-->
<!--                            </div>-->
                            <div id="map_div" style="width: 100%;height: 570px;margin-top: 10px"></div>
                            <div id="map_div" style="width: 100%;height: 750px;"></div>
                        </div>
                        <div class="col-sm-4">
@@ -67,7 +61,13 @@
    <script th:src="@{/ajax/libs/flot/jquery.flot.js}"></script>
    <script th:src="@{/ajax/libs/report/echarts/echarts-all.js}"></script>
    <script th:src="@{/js/tdt.js}" type="text/javascript"></script>
    <script src="http://lbs.tianditu.gov.cn/js/lib/d3/d3.min.js" type="text/javascript"></script>
    <script src="http://lbs.tianditu.gov.cn/api/js4.0/opensource/openlibrary/D3SvgOverlay.js" type="text/javascript"></script>
    <script th:src="@{/js/custom/main.js}"></script>
    <th:block th:include="include :: sparkline-js" />
    
    <th:block th:include="include :: footer" />
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
@@ -55,13 +55,13 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">经度:</label>
                <div class="col-sm-8">
                    <input name="lng" class="form-control" required type="text">
                    <input name="lng" class="form-control" required type="text"  placeholder="请填写经度,经纬度格式">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">纬度:</label>
                <div class="col-sm-8">
                    <input name="lat" class="form-control" required type="text">
                    <input name="lat" class="form-control" required type="text"  placeholder="请填写纬度,经纬度格式">
                </div>
            </div>
            <div class="form-group">