cshenfu
2022-10-26 ff1b6791e881326cd4b3614c570085735c0cf050
按照分钟提示BUG修改
10个文件已修改
29 ■■■■■ 已修改文件
js/changable_params.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/function.js 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/function_1001.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/function_1004.js 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgets/queryRoute/widget.js 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/dataTime/widget.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/logoAndMenu/view.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/taxiRouteReplay2/view.js 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/taxiRouteReplay2/widget.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
widgetsTS/taxi_layer/widget.js 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/changable_params.js
@@ -53,7 +53,7 @@
}
var tiandituArr = ['51915011aa0997aa2ddd7e38504fa8bc', '51915011aa0997aa2ddd7e38504fa8bc']
// 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:0};
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:0,timetype:"min"};
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) {
js/function.js
@@ -92,6 +92,7 @@
}
mars3d.global_variables = default_system_params;
mars3d.global_variables.grid_camerview = default_grid_camerview;
// mars3d.global_variables.timetype = "min"
mars3d.global_variables.queryDataTStart = getDefaultDateTime();
mars3d.global_variables.queryDataTStartGeo = getDefaultDateTimeGeo();
mars3d.global_variables.queryDataTStartTaxi = getDefaultDateTimeTaxi();
js/function_1001.js
@@ -214,6 +214,8 @@
  }
}
function timetype_change3(){ 
  console.log(mars3d,"mars3d");
  debugger;
  if(mars3d.global_variables.timetype == "min"){
    $(".menu3").attr('onclick'," ");  //$("#名称").attr("属性名","属性值");
    haoutil.msg("请切换至天或时查看数据!!!");
js/function_1004.js
@@ -82,7 +82,6 @@
  //current_date = "2021-07-01 00:00:32";
  taxi_layer.eachGraphic(function (item) {
    tmpattr = getTaxiAttrFromTimeListData(current_date, data_list_1004_paths.get(item.options.id));
    //console.log(tmpattr);
    if (tmpattr && tmpattr != null) {
      //item.options.attr = tmpattr;
      let tmpTaxiColor = getLayerPointColorByQindexandValue(1004, item._layer.options.style_selected, tmpattr[item._layer.options.style_selected]);
widgets/queryRoute/widget.js
@@ -245,6 +245,7 @@
          for (var i = 0; i < data.paths.length; i++) {
            var path = data.paths[i];
            var points = path.points;
            console.log(points,"轨迹回放")
            if (!path.steps || path.steps.length < 1 || !points || points.length < 1) {
              continue;
            }
widgetsTS/dataTime/widget.js
@@ -88,6 +88,7 @@
      //此处可以绑定页面dom事件
      $('input[type=radio][name=datatype]').change(function () {
        let value = $("input[type=radio][name=datatype]:checked").val()
        console.log("value",value)
        if (value == 'hour') {
          $('#current').text("小时:");
          $('#appDate').hide()
@@ -107,7 +108,7 @@
          timetype_change2();
          timetype_change3();
          timetype_change4();
          timetype_change5()
          // timetype_change5()
        }else if (value == 'day') {
          $('#current').text("天:");
          $('#appDateMin').hide()
@@ -127,9 +128,10 @@
          timetype_change2();
          timetype_change3();
          timetype_change4();
          timetype_change5()
          // timetype_change5()
        }else if(value = 'min'){ 
          console.log("this is min ")
          $('#current').text("15分钟(车辆):");
          $('#appDate').hide()
          $('#appDateHour').hide()
@@ -144,7 +146,7 @@
          timetype_change2();
          timetype_change3();
          timetype_change4();
          timetype_change5()
          // timetype_change5()
          // refreshWidgets();
        }
      });
widgetsTS/logoAndMenu/view.html
@@ -26,10 +26,13 @@
        </ul> -->
        <ul id="menu4Child" class="menu4-ul">
            <li class="widget-btn menu5-Taxirouter"
            <!-- <li class="widget-btn menu5-Taxirouter"
                onclick=timetype_change5()>
                <i class="fa fa-gear"></i>轨迹查询
            </li>
            </li> -->
            <li class="widget-btn"
                    onclick="javascript:activateWidget('widgetsTS/taxiRouteReplay2/widget.js');javascript:$('#menu4Child').toggle()"><i
                    class="fa fa-home"></i>轨迹查询</li>
            <li class="widget-btn menu4-Wind"
                onclick=timetype_change4()>
                <i class="fa fa-gear"></i>风场参数
widgetsTS/taxiRouteReplay2/view.js
@@ -161,7 +161,7 @@
      todayHighlight: 1,  //如果为true, 高亮当前日期
      endDate: new Date()
    }).on('changeDate', function (ev) {
        ev.preventDefault();
            ev.preventDefault();
                ev.stopPropagation();
                var startTime = ev.date;
                $(endSelector).datetimepicker('setStartDate',startTime);
@@ -187,7 +187,7 @@
      todayHighlight: 1,  //如果为true, 高亮当前日期
      endDate: new Date()
    }).on('changeDate', function (ev) {
        ev.preventDefault();
            ev.preventDefault();
                ev.stopPropagation();
                var endTime = ev.date;
                $(beginSelector).datetimepicker('setEndDate',endTime);
widgetsTS/taxiRouteReplay2/widget.js
@@ -220,6 +220,7 @@
    //每个窗口创建完成后调用
    winCreateOK(opt, result) {
      this.viewWindow = result;
      console.log(this)
      console.log(this.config.params,"this.taxi_sn")
      this.appDateHourStart = mars3d.global_variables.queryDataTStartTaxi;
      this.appDateHourEnd = mars3d.global_variables.queryDataTEnd;
@@ -230,6 +231,7 @@
    }
    //打开激活
    activate() {
        console.log(this,"this.map")
      this.map.addLayer(this.groupLayer);
      this.map.clock.shouldAnimate = false;
      this.old_map_clock_startTime = this.map.clock.startTime;
widgetsTS/taxi_layer/widget.js
@@ -44,6 +44,7 @@
        },
      });
      graphic.position = tmpPositionProperty;
      console.log(tmpPositionProperty,"xixixixixixxi")
      target_layer.addGraphic(graphic);
    }
  });