bug fix

wangzhibo

2021-10-04 5d26acb88448b966cba23aa3dab6cd95dfd7c335

bug fix

 data/getLayerListByUserid.json

@@ -61,10 +61,11 @@
            "pid":1006,
            "name": "机场",
            "type": "wms",
            "geoname_prefix":"vis_region_100600_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm10",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"00",
            "show":false
        },
        {
@@ -72,10 +73,11 @@
            "pid":1006,
            "name": "码头",
            "type": "wms",
            "geoname_prefix":"vis_region_100601_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm10",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"01",
            "show":false
        },
        {
@@ -83,10 +85,11 @@
            "pid":1006,
            "name": "环线",
            "type": "wms",
            "geoname_prefix":"vis_region_100602_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm25",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"02",
            "show":false
        },
        {
@@ -94,10 +97,11 @@
            "pid":1006,
            "name": "工业园区",
            "type": "wms",
            "geoname_prefix":"vis_region_100603_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm25",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"03",
            "show":false
        },
        {
@@ -105,10 +109,11 @@
            "pid":1006,
            "name": "进博会",
            "type": "wms",
            "geoname_prefix":"vis_region_100604_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm25",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"04",
            "show":false
        },
        {
@@ -116,10 +121,11 @@
            "pid":1006,
            "name": "边界",
            "type": "wms",
            "geoname_prefix":"vis_region_100605_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm25",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"05",
            "show":false
        },
        {
@@ -127,10 +133,11 @@
            "pid":1006,
            "name": "商圈",
            "type": "wms",
            "geoname_prefix":"vis_region_100607_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm25",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"06",
            "show":false
        },
        {
@@ -138,10 +145,11 @@
            "pid":1006,
            "name": "行政区",
            "type": "wms",
            "geoname_prefix":"vis_region_100610_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm25",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"10",
            "show":false
        },
        {
@@ -149,10 +157,11 @@
            "pid":1006,
            "name": "街道",
            "type": "wms",
            "geoname_prefix":"vis_region_100611_",
            "geoname_prefix":"vis_region_",
            "style_prefix":"polygon_region_",
            "style_selected":"pm25",
            "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
            "regiontype":"11",
            "show":false
        },
        {

 js/function_1001.js

@@ -4,13 +4,13 @@

var allLayer_color_nodata = '#C0C0C0';
var color_list_1001 = ['#0EE839', '#FEFE23', '#FD9D00', '#F70F0D', '#8A0B73', '#88041E'];
var color_list_1002 = ['#0EE839', '#FEFE23', '#F70F0D'];
var color_list_1003 = ['#0dd4f7', '#078901', '#FFFF00', '#fe7c23', '#F70F0D', '#88041E'];
var color_list_1002 = ['#0dd4f7', '#078901', '#FFFF00', '#fe7c23', '#F70F0D', '#88041E'];
var color_list_1003 = ['#0EE839', '#FEFE23', '#F70F0D'];
var color_list_1004_and_other = ['#0dd4f7', '#23fe9f', '#078901', '#d4fe23', '#FFFF00', '#febf23', '#fe7c23', '#F70F0D', '#8A0B73', '#88041E'];

var qindex_range_list_1001 = { 'pm25': [35, 75, 115, 150, 250], 'pm10': [50, 150, 250, 350, 420], 'no2': [100, 200, 700, 1200, 2340], 'co': [5, 10, 35, 60, 90] };
var qindex_range_list_1002 = { 'tsp': [0.2, 0.5] };
var qindex_range_list_1003 = { 'pm25': [10, 20, 50, 80, 100], 'pm10': [20, 50, 80, 150, 200], 'no2': [25, 50, 100, 150, 300], 'co': [0.5, 0.6, 0.8, 1, 1.5] };
var qindex_range_list_1002 = { 'pm25': [10, 20, 50, 80, 100], 'pm10': [20, 50, 80, 150, 200], 'no2': [25, 50, 100, 150, 300], 'co': [0.5, 0.6, 0.8, 1, 1.5] };
var qindex_range_list_1003 = { 'tsp': [0.2, 0.5] };
var qindex_range_list_1004_and_other = { 'pm25': [15, 35, 50, 75, 150, 250, 350, 500, 700], 'pm10': [20, 50, 100, 150, 200, 300, 500, 800, 1000], 'no': [10, 30, 60, 100, 200, 500, 1000, 2000, 3500], 'no2': [20, 80, 110, 150, 200, 250, 300, 400, 500], 'nox': [80, 110, 130, 150, 200, 500, 1000, 2000, 5000], 'co': [0.2, 0.4, 0.6, 0.8, 1, 1.5, 2.5, 4, 6] };
// for change color locally.
var data_list_1001;
@@ -30,7 +30,7 @@
      "styles": item.style_prefix + item.style_selected,
      "transparent": "true",
      "format": "image/png",
      "viewparams": "userid:" + mars3d.global_variables.userid + ";datatime:" + mars3d.global_variables.queryDataTStartGeo
      "viewparams": "userid:" + mars3d.global_variables.userid +";regiontype:" + item.regiontype + ";datatime:" + mars3d.global_variables.queryDataTStartGeo
    },
    center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
    noCenter: true,
@@ -183,9 +183,11 @@

  guokongLayer.on(mars3d.EventType.click, function (event) {
    console.log("监听layer，单击了矢量对象", event);
    console.log(event.graphic?.attr)
    console.log(event.graphic)
    var item = event.graphic?.attr;
    //haoutil.msg('单击了：' + item['高校名称'])
    mars3d.global_variables.tmpHighlightGraphic = event.graphic;

  });

  guokongLayer.bindPopup(bindPopupFunction);
@@ -220,25 +222,26 @@
        color: clr,
        heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
        highlight: {
          type: "divLightPoint",
          diffHeight: item[(tmplayer.options.style_selected).toUpperCase()],
          material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.CircleWave, {
            color: clr,
            count: 3,
            speed: 20,
          }),
        },
        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000), //按视距距离显示
          type: "circleP",
          style: {
            radius: 2000,
            material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.ScanLine, {
              color: new Cesium.Color(1.0, 1.0, 0.0, 1.0),
              speed: 10,
            }),
            clampToGround: true, //是否贴地
          }
        }
      },
      show: true,
      attr: item,
    });
    tmplayer.addGraphic(graphic);
  }


}



function getLayerPointColorByQindexandValue(layerid, qindex, value) {

  if (!value || value == null || value == 'null') {

 widgetsTS/widget_summary/view.js

@@ -123,15 +123,8 @@
    var lon = $(obj).attr("_lon");
    var lat = $(obj).attr("_lat");

    thisWidget.locateAndHighlight(lon,lat);

    if (mars3d.widget.isActivate("widgetsTS/widget_detail/widget.js")) {
        var detailWiget = mars3d.widget.getClass("widgetsTS/widget_detail/widget.js");
        detailWiget.reloadData({"layer":current_selected_monitor_type,"siteid":siteId});
      } else {
          mars3d.widget.activate({
          uri: "widgetsTS/widget_detail/widget.js",
          params: {"layer":current_selected_monitor_type,"siteid":siteId}
        });
    if (lon && lon !='undefined'){
        thisWidget.locateAndHighlight(lon,lat);
    }
   thisWidget.showDetailedWindow({"layer":current_selected_monitor_type,"siteid":siteId});
}

 widgetsTS/widget_summary/widget.js

@@ -13,7 +13,7 @@
                    position: {
                        top: 180,
                        left: 5,
                        bottom:30
                        bottom: 30
                    },
                },
            }
@@ -26,16 +26,30 @@
            this.datatime = mars3d.global_variables.queryDataTStart;
        }

        reloadData(params){
        reloadData(params) {
            this.datatype = mars3d.global_variables.queryDataType;
            this.datatime = mars3d.global_variables.queryDataTStart;
            this.winPage.reloadData();
        }

        locateAndHighlight(lon,lat){
            this.map.setCameraView({ y: lat, x: lon, z: 30000, heading: 3, pitch: -68, roll: 0 },{ duration: 3 });
        locateAndHighlight(lon, lat) {
            this.map.flyToPoint(Cesium.Cartesian3.fromDegrees(lon, lat, 0.2));
        }

        showDetailedWindow(params) {
            if (mars3d.widget.isActivate("widgetsTS/widget_detail/widget.js")) {
                var detailWiget = mars3d.widget.getClass("widgetsTS/widget_detail/widget.js");
                detailWiget.reloadData(params);
            } else {
                mars3d.widget.activate({
                    uri: "widgetsTS/widget_detail/widget.js",
                    params: params
                });
            }
        }





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