修改轨迹查询添加车辆编号、网格增加属性、按时间段查询指标、明细与网格指标不对应的现象
7个文件已修改
40 ■■■■■ 已修改文件
config/config.json 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/changable_params.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/taxiRouteReplay/view.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/taxiRouteReplay/view.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/widget_detail/view.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/widget_summary/view.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
config/config.json
@@ -83,7 +83,8 @@
        "type": "group",
        "layers": [
          { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["51915011aa0997aa2ddd7e38504fa8bc"] }
        ]
        ],
        "zIndex": 0
      }
    ],
    "layers": [
js/changable_params.js
@@ -52,7 +52,8 @@
  , 3000: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
}
var tiandituArr = ['51915011aa0997aa2ddd7e38504fa8bc', '51915011aa0997aa2ddd7e38504fa8bc']
var default_system_params = { geoserver_url_predix: 'http://223.167.111.168:7001/', nodejs_url_predix: 'http://112.74.77.127:8090/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:2};
// http://112.74.77.127:8090/  http://223.167.111.168:7002/
var default_system_params = { geoserver_url_predix: 'http://223.167.111.168:7001/', nodejs_url_predix: 'http://223.167.111.168:7002/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:2};
var default_grid_camerview = {grid5000:{"lat":30.367931,"lng":121.518409,"alt":128482,"heading":2,"pitch":-57},grid3000:{"lat":30.902475,"lng":121.487751,"alt":38716,"heading":2,"pitch":-57},grid1000:{"lat":31.066346,"lng":121.462529,"alt":10026,"heading":2,"pitch":-57},grid500:{"lat":31.112561,"lng":121.458433,"alt":2483,"heading":2,"pitch":-57}};
function bindPopupFunction(event) {
@@ -142,8 +143,8 @@
        grid = array[3]
      }
    }
    return grid + "米网格"+
      "<br /><br />数据时间:" +
    return grid + "米网格 <br/><br /> grid_id:"+item["grid_id"]+
      "<br />数据时间:" +
      item["datatime"] + 
      "<table>" +
      "<tr><td>PM₂.₅:</td><td align= right>" + item["pm25"] + '&nbsp' + "</td><td>μg/m³</td></tr>" +
@@ -152,6 +153,7 @@
      "<tr><td>CO:</td><td align= right>" + item["co"] + '&nbsp' + "</td><td>mg/m³</td></tr>" +
      "<tr><td>NOₓ:</td><td align= right>" + item["nox"] + '&nbsp' + "</td><td>μg/m³</td></tr>" +
      "<tr><td>NO:</td><td align= right>" + item["no"] + '&nbsp' + "</td><td>μg/m³</td></tr>" +
      "<tr><td>备注:</td><td align= right>" + item["remarks"] + '&nbsp' + "</td><td></td></tr>" +
      "</table>" +
      "<br /><br /><p><a href='#' onclick='javascript:showDetail(" + layerid + ",\"" + item["code"] + "\",\"" + qindex + "\")' >详细信息</a>&nbsp;&nbsp;&nbsp;<a href='#' onclick='javascript:addGraphictoHighlightLayer()' >保持高亮显示</a></p>";
  } else{
js/index.js
@@ -51,7 +51,7 @@
  //   window.top.location = mars3d.global_variables.un_authorization_url;
  // }
  // mars3d.global_variables.userid = request?.userid || 2;
  mars3d.global_variables.userid = request?.userid || 2;
  regionCode = mars3d.global_variables.regionCode
  var configfile = "config/config.json"; //默认地址
widgetsTS/taxiRouteReplay/view.html
@@ -54,6 +54,12 @@
      </td>
    </tr>
    <tr>
      <td class="nametd">车辆编号:</td>
      <td>
        <input type='text' class="form-control text" id='taxisn' name="taxisn" />
      </td>
    </tr>
    <tr>
      <td>
        <button type="button" id="startQueryTaxiData" class="btn btn-primary" style="width:130px;"><span
            id="startQueryTaxiDataText">轨迹查询</span></button>
widgetsTS/taxiRouteReplay/view.js
@@ -53,7 +53,11 @@
  //开始查询轨迹
  $("#startQueryTaxiData").click(function () {
    haoutil.loading.show();
    $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + thisWidget.taxi_sn, {
    thisWidget.appDateHourStart = $("#appDateHourStart").val()
    thisWidget.appDateHourEnd = $("#appDateHourEnd").val()
    if(!$("#taxisn").val() || $("#taxisn").val()=='') {$("#taxisn").val(thisWidget.taxi_sn)}
    $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + $("#taxisn").val(), {
    // $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + thisWidget.taxi_sn, {
      datatime1: thisWidget.appDateHourStart,
      datatime2: thisWidget.appDateHourEnd
    }, (result) => {
widgetsTS/widget_detail/view.js
@@ -11,6 +11,11 @@
    //开始查询历史数据
    $("#startQueryHistory").click(function () {
        queryEchartDataByTimePeriod();
        if (tmpQueryParams.layerid == 3001 || tmpQueryParams.layerid == 3002 || tmpQueryParams.layerid == 3003 || tmpQueryParams.layerid == 3000) {
            loadDetailedInfobyGrid(tmpQueryParams)
        } else {
            loadDetailedInfobySiteid(tmpQueryParams);
        }
    });
}
@@ -22,6 +27,7 @@
    // all 1006xx layer has the same legend !!
    console.log(tmpQueryParams)
    echart_show(backend_url,tmpQueryParams)
}
function DatePicker(beginSelector, endSelector) {
@@ -141,7 +147,8 @@
function loadDetailedInfobyGrid(params) {
    $("#indexTb").empty();
    $("#headInfo").empty();
    var backend_url = params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + params.layerid + "_single&datatype=" + params.datatype + "&siteid=" + params.siteid + "&datatime=" + params.datatime;
//    var backend_url = params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + params.layerid + "_single&datatype=" + params.datatype + "&siteid=" + params.siteid + "&datatime=" + params.datatime;
    var backend_url = params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + params.layerid + "_single&datatype=" + params.datatype + "&siteid=" + params.siteid + "&datatime1=" + params.appDateHourStart + "&datatime2="+ params.appDateHourEnd;
    $.ajax({
        type: 'get',
        dataType: 'json',
widgetsTS/widget_summary/view.js
@@ -71,6 +71,8 @@
            }
        },   
        error: function (request, textStatus) {
            console.log(request);
            console.log(textStatus);
            haoutil.msg("系统后台错误,请联系管理员处理!");
        }
    });
@@ -96,6 +98,8 @@
            }
        },
        error: function (request, textStatus) {
            console.log(request);
            console.log(textStatus);
            haoutil.msg("系统后台错误,请联系管理员处理!");
        }
    });
@@ -164,6 +168,8 @@
        },
        error: function (request, textStatus) {
            console.log(request);
            console.log(textStatus);
            haoutil.msg("系统后台错误,请联系管理员处理!");
        }
    });