165c834d414f2c5f56ad6d259b5f18c26921cc94..ab663303cf980d26b436bd16ce379c0ce0ad9d4d
2022-10-24 wangrong
添加权限
ab6633 对比 | 目录
2022-10-24 wangrong
添加权限
67f943 对比 | 目录
7个文件已修改
56 ■■■■■ 已修改文件
js/function.js 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/function_1004.js 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
mobile/js/widget_search_view.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/taxi_layer/widget.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/widget_detail/view.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/widget_grid/view.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/widget_summary/view.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/function.js
@@ -272,6 +272,28 @@
});
map.addLayer(geoJsonLayer);
    }
<<<<<<< HEAD
    debugger;
    //geojson 各行政区边界线
      geoJsonLayer = new mars3d.layer.GeoJsonLayer({
        url: "./data/"+regionCode+".geojson",
        mask: true, //标识为遮罩层【重点参数】
        symbol: {
          styleOptions: {
            fill: true,
            color: "rgb(2,26,79)",
            outline: true,
            outlineColor: "#39E09B",
            outlineWidth: 3,
            outlineOpacity: 0.5,
            arcType: Cesium.ArcType.GEODESIC,
            clampToGround: true,
          },
        },
      });
      map.addLayer(geoJsonLayer);
=======
   
>>>>>>> 165c834d414f2c5f56ad6d259b5f18c26921cc94
}
js/function_1004.js
@@ -36,9 +36,9 @@
}
function getTaxiListFromServerByUserId(tmpLayer) {
  debugger;
  setTaxiLayerMapClock();
  $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_list_by_userid&userid=" + mars3d.global_variables.userid, (result) => {
  $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_list_by_userid&regionCode="+mars3d.global_variables.regionCode+"&userid=" + mars3d.global_variables.userid, (result) => {
    data_list_1004 = result.data.result;
    for (var i = 0, len = result.data.result.length; i < len; i++) {
      let item = result.data.result[i];
mobile/js/widget_search_view.js
@@ -29,9 +29,9 @@
}
monitortype();
//加载count
//加载count,"regionCode":mars3d.global_variables.regionCode
function loadCountByUserid() {
    var backend_url = default_system_params.nodejs_url_predix_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + default_system_params.userid;
    var backend_url = default_system_params.nodejs_url_predix_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + default_system_params.userid+"&regionCode="+mars3d.global_variables.regionCode;
    $.ajax({
        type: 'get',
        dataType: 'json',
@@ -90,8 +90,10 @@
        datatime_ = document.getElementById("appDateHour").value;
        querytype_ = 'hour';
    }
    var avgnam = 50; //每页显示个数
    var backend_url = default_system_params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + querytype_ + "&datatime=" + datatime_ + "&qindex=" + current_selected_monitor_qindex + "&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
    var avgnam = 50; //每页显示个数
    var backend_url = default_system_params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + querytype_ + "&datatime=" + datatime_
        + "&qindex=" + current_selected_monitor_qindex + "&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam
        + "&regionCode="+mars3d.global_variables.regionCode;
    $.ajax({
        type: "GET",
        url: backend_url,
widgetsTS/taxi_layer/widget.js
@@ -105,7 +105,7 @@
            "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\")' ><span style='color:#ff00ff'>历史轨迹回放</span></a></p>";
        return html;
      });
      debugger;
      $.getJSON("http://58.246.27.194:7012/dataapi/Bdata?bid=get_1004_list_by_userid&userid=2", (result) => {
        for (var i = 0, len = result.data.result.length; i < len; i++) {
          let item = result.data.result[i];
widgetsTS/widget_detail/view.js
@@ -24,8 +24,10 @@
    if (myCharts) {
        $('#echart').removeAttr('_echarts_instance_');
    }
    var backend_url = tmpQueryParams.nodejs_url_predix + "dataapi/Bdata?bid=get_" + tmpQueryParams.layerid + "_single_path&datatype=" + tmpQueryParams.datatype + "&siteid=" + tmpQueryParams.siteid + "&datatime1=" + tmpQueryParams.appDateHourStart + "&datatime2=" + tmpQueryParams.appDateHourEnd + "&count=10";
    // all 1006xx layer has the same legend !!
    var backend_url = tmpQueryParams.nodejs_url_predix + "dataapi/Bdata?bid=get_" + tmpQueryParams.layerid + "_single_path&datatype=" + tmpQueryParams.datatype
        + "&siteid=" + tmpQueryParams.siteid + "&datatime1=" + tmpQueryParams.appDateHourStart + "&datatime2=" + tmpQueryParams.appDateHourEnd
        + "&regionCode="+mars3d.global_variables.regionCode+"&count=10";
    // all 1006xx layer has the same legend !!  "regionCode":mars3d.global_variables.regionCode
    console.log(tmpQueryParams)
    echart_show(backend_url,tmpQueryParams)
widgetsTS/widget_grid/view.js
@@ -186,7 +186,8 @@
function queryGridHeatmapData(grid_item) {
    return new Promise(function (resolve, reject) {
        $.ajax({
            url: thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_grid_heatmap&gridlevel=" + grid_item.level + "&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime,
            url: thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_grid_heatmap&gridlevel=" + grid_item.level + "&datatype=" + thisWidget.datatype
                + "&datatime=" + thisWidget.datatime+ "&regionCode="+mars3d.global_variables.regionCode,
            type: "get",
            dataType: "json",
            success: function (result) {
widgetsTS/widget_summary/view.js
@@ -50,7 +50,7 @@
}
//加载count
function loadCountByUserid() {
    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid;
    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid+"regionCode="+mars3d.global_variables.regionCode;
    $.ajax({
        type: 'get',
        dataType: 'json',
@@ -76,7 +76,8 @@
            haoutil.msg("系统后台错误,请联系管理员处理!");
        }
    });
    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_count_all&datatype=" + thisWidget.datatype + "&datatime="+ thisWidget.datatime;
    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_count_all&datatype=" + thisWidget.datatype
        + "&datatime="+ thisWidget.datatime+"&regionCode="+mars3d.global_variables.regionCode;
    $.ajax({
        type: 'get',
        dataType: 'json',
@@ -143,7 +144,9 @@
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+ "&userid=" + thisWidget.userid + "&qindex=" + current_selected_monitor_qindex + "&pageno=1&pagesize=" + default_system_params.summary_topN_count;
    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list&datatype=" + thisWidget.datatype
        + "&datatime=" + thisWidget.datatime+ "&userid=" + thisWidget.userid + "&qindex=" + current_selected_monitor_qindex
        + "&pageno=1&pagesize=" + default_system_params.summary_topN_count+"regionCode="+mars3d.global_variables.regionCode;
    //加入cntId
    $.ajax({
        type: 'get',