Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

qinbo

2021-11-05 d86c1f8ded5a5609e5bd3f7fb81a5251d47c47e5

Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

 js/changable_params.js

@@ -40,7 +40,7 @@
  , 100611: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
}

var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false };
var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50};

function bindPopupFunction(event) {


 js/function.js

@@ -47,11 +47,11 @@
function getDefaultDateTimeGeo() {
  var date = new Date;
  date.setHours(date.getHours() - 2);
  var year = date.getFullYear();//年
  var year = date.getFullYear();//年   
  var month = date.getMonth();//月
  var day = date.getDate();//日
  var hours = date.getHours();//时
  return year +
  return (year +"")+
    ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) +
    (day > 9 ? day : ("0" + day)) +
    (hours > 9 ? hours : ("0" + hours)) + "0000";

 widgetsTS/dataTime/widget.js

@@ -57,17 +57,7 @@
      this.defaultDate = getDefaultDateLocal();
      this.defaultDateTime = getDefaultDateTimeLocal();

      // var queryDataTStartGeoday = this.defaultDate
      // queryDataTStartGeoday = this.defaultDate.replace(/\:/g,"").replace(/-/g,"").replace(/\s+/g,"");
      // mars3d.global_variables.queryDataTStartGeo = queryDataTStartGeoday
      // reLoadLayers();

      
      // var queryDataTStartGeohour = this.defaultDateTime
      // queryDataTStartGeohour = this.defaultDateTime.replace(/\:/g,"").replace(/-/g,"").replace(/\s+/g,"");
      // mars3d.global_variables.queryDataTStartGeo = queryDataTStartGeohour
      // console.log(mars3d.global_variables.queryDataTStartGeo)
      reLoadLayers();
    
    }

    //每个窗口创建完成后调用

 widgetsTS/widget_summary/view.html

@@ -63,9 +63,17 @@
                <a id="href6" class="color_white" href="#">
                    <img src="img/count6.png" class="layui-nav-img">
                    <span class="layui-badge" id="count6">0</span>
                    <span class="padding_right_2_p" id="countName6">道路</span>
                    <span class="padding_right_2_p" id="countName6">道路路段</span>
                </a>
                <input class="codeInput" type="hidden" id="countCode6">
            </div>
            <div class="cnt_right_div cnt_btn">
                <a id="href7" class="color_white" href="#" _code="100500" _name="道路">
                    <img src="img/count6.png" class="layui-nav-img">
                    <span class="layui-badge" id="count7">8610</span>
                    <span class="padding_right_2_p" id="countName7">道路</span>
                </a>
                <input class="codeInput" type="hidden" id="countCode7">
            </div>
        </div>
    </div>
@@ -74,7 +82,7 @@
    <div class="layui-row">
        <span class="layui-breadcrumb" lay-separator="|">
            <a href="#"></a>
            <a href="#" style="color: white!important;">监测Top30</a>
            <a href="#" style="color: white!important;"><span id="topN_name">监测Top50</span></a>
            <a href="#"></a>
        </span>
    </div>

 widgetsTS/widget_summary/view.js

@@ -46,7 +46,7 @@
            }
        },
        error: function (request, textStatus) {

            haoutil.msg("系统后台错误，请联系管理员处理！");
        }
    });

@@ -76,7 +76,7 @@

function reloadData() {
    $("#top10Tb").empty();
    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime + "&qindex=" + current_selected_monitor_qindex + "&pageno=1&pagesize=30";
    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime + "&qindex=" + current_selected_monitor_qindex + "&pageno=1&pagesize="+default_system_params.summary_topN_count;
    //加入cntId
    $.ajax({
        type: 'get',
@@ -88,7 +88,7 @@
        success: function (data) {
            var tableData = data.data.result;
            //console.log(tableData);
            if (tableData != null) {
            if (tableData != null && tableData.length>0) {
                for (var i = 0; length = tableData.length, i < length ; i++) {
                    var j = i + 1;
                    var topObj = tableData[i];
@@ -103,11 +103,13 @@
                        $("#top10Tb").append(_tr);
                    }
                }      
         }else{
            haoutil.msg("查询无数据，请更换查询条件！");
         }

        },
        error: function (request, textStatus) {

            haoutil.msg("系统后台错误，请联系管理员处理！");
        }
    });
}
@@ -133,5 +135,12 @@
    if (lon && lon != 'undefined') {
        thisWidget.locateAndHighlight(lon, lat);
    }
    thisWidget.showDetailedWindow({ "nodejs_url_predix": thisWidget.nodejs_url_predix, "datatype": thisWidget.datatype,"selected_qindex": current_selected_monitor_qindex,"datatime": thisWidget.datatime, "layerid": current_selected_monitor_type, "siteid": siteId });
    if (current_selected_monitor_type !=100500){
        thisWidget.showDetailedWindow({ "nodejs_url_predix": thisWidget.nodejs_url_predix, "datatype": thisWidget.datatype,"selected_qindex": current_selected_monitor_qindex,"datatime": thisWidget.datatime, "layerid": current_selected_monitor_type, "siteid": siteId });
    }
}

function setTopNname(count){
    $("#topN_name").html("Top"+count);

}

 widgetsTS/widget_summary/widget.js

@@ -8,11 +8,11 @@
                type: 'window',
                url: 'view.html',
                windowOptions: {
                    width: 380,
                    width: 434,
                    position: {
                        top: 180,
                        top: 170,
                        left: 5,
                        bottom: 110
                        bottom: 100
                    },
                },
            }
@@ -51,6 +51,8 @@
        //每个窗口创建完成后调用
        winCreateOK(opt, result) {
            this.winPage = result;

            this.winPage.setTopNname(mars3d.global_variables.summary_topN_count);
        }

        //打开激活