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

wangzhibo

2021-12-04 dbd6b0242bc8d652c8db9040d4a7a2dc092c403d

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

 img/tuglie/gk_co.png

 img/tuglie/gk_no2.png

 img/tuglie/gk_o3.png

 img/tuglie/gk_pm10.png

 img/tuglie/gk_pm25.png

 img/tuglie/gk_so2.png

 img/tuglie/other_co.png

 img/tuglie/wz_co.png

 img/tuglie/wz_no2.png

 img/tuglie/wz_o3.png

 img/tuglie/wz_pm10.png

 img/tuglie/wz_pm25.png

 img/tuglie/wz_so2.png

 js/function.js

@@ -141,9 +141,10 @@
  mars3d.global_variables.tmpHighlightGraphics.forEach((item) => {
    mars3d.global_variables.tmpHighlightGraphicLayer.addGraphic(item);
  });

}



function addHighlightLayerClearButton() {
  let clearButton = new mars3d.control.ToolButton({
    title: "清除高亮图层",

 widgets/manageLayers_style/view.js

@@ -52,7 +52,7 @@

  var item = layer.options;

  if (!item.name) {
  if (!item.name || item.name == "") {
    console.log("未命名图层不加入图层管理", layer);
    return;
  }

 widgets/manageLayers_style/widget.js

@@ -108,9 +108,9 @@
          this.map.on(mars3d.EventType.addLayer, this._onAddLayerHandler, this);
        }
      } else {
        if (layer.options.type=="wms" && layer.isAdded) {
          this.map.removeLayer(layer)
        }
        // if (layer.options.type=="wms" && layer.isAdded) {
        //   this.map.removeLayer(layer)
        // }
      }
    }
  }

 widgetsTS/taxiRouteReplay/view.html

@@ -55,15 +55,14 @@
    </tr>
    <tr>
      <td>
        <button type="button" id="SprinkleQueryTaxiData" class="btn btn-primary" style="width:80px;"><span
            id="SprinkleQueryTaxiDataText">撒点查询</span></button>        
      </td>
      <td>
        <button type="button" id="startQueryTaxiData" class="btn btn-primary" style="width:130px;"><span
            id="startQueryTaxiDataText">轨迹查询</span></button>
      </td>
    </tr>
  </table>
  <div>
    
  </div>
  <div class="line"></div>

  <div class="route_box" id="route_box" style="display: none">
@@ -78,6 +77,10 @@
              id="btnSuspendDHText">暂停回放</span></button>
        </td>
        <td>
          <button type="button" id="SprinkleQueryTaxiData" class="btn btn-primary" style="width:80px;"><span
              id="SprinkleQueryTaxiDataText">撒点显示</span></button>        
        </td>
        <td>
          <span class="span_sjgs"><input class="sjgs" id="checkbox_sjgs" type="checkbox">视角跟随</span>
        </td>
      </tr>

 widgetsTS/tuglie/view.html

@@ -35,7 +35,7 @@
        }

        #day04 {
            width: 100px;
            width: 130px;
        }

        .showTime {
@@ -72,7 +72,7 @@
            <li id="day01">国控点</li>
            <li id="day02">微站</li>
            <li id="day03">监测点</li>
            <li id="day04">道路与区域</li>
            <li id="day04">车辆 | 道路 | 区域</li>

        </ul>
        <div class="showTime">
@@ -81,12 +81,16 @@
                <img src="../../img/tuglie/gk_pm10.png" alt="">
                <img src="../../img/tuglie/gk_no2.png" alt="">
                <img src="../../img/tuglie/gk_co.png" alt="">
                <img src="../../img/tuglie/gk_so2.png" alt="">
                <img src="../../img/tuglie/gk_o3.png" alt="">
            </p>
            <p id="content02">
                <img src="../../img/tuglie/wz_pm25.png" alt="">
                <img src="../../img/tuglie/wz_pm10.png" alt="">
                <img src="../../img/tuglie/wz_no2.png" alt="">
                <img src="../../img/tuglie/wz_co.png" alt="">
                <img src="../../img/tuglie/wz_so2.png" alt="">
                <img src="../../img/tuglie/wz_o3.png" alt="">
            </p>
            <p id="content03">
                <img src="../../img/tuglie/jc_tsp.png" alt="">

 widgetsTS/widget_search/view.css

@@ -36,6 +36,10 @@
    border-bottom: 1px solid rgba(77,255,255,.5);
}

.top_10_table td,
.top_10_table th{
   padding: 9px 10px;
}

.cnt_div{
    color: #fff;

 widgetsTS/widget_search/widget.js

@@ -122,6 +122,7 @@
            var primitive = new mars3d.graphic.PolygonEntity({
                positions: positions,
                style: {
                    opacity:0.3,
                    height: 50,
                    diffHeight: 200,
                    materialType: mars3d.MaterialType.PolyGradient,

 widgetsTS/widget_summary/view.css

@@ -16,6 +16,11 @@
    /* border-radius: 10px; */
}

.top_10_table td,
.top_10_table th{
   padding: 9px 9px;
}

.no_bgc_table{
    width: 100%;
    height: 50%;

 widgetsTS/widget_summary/view.js

@@ -19,7 +19,7 @@
        current_selected_monitor_type = $(this).attr("_code");
        current_selected_monitor_name = $(this).attr("_name");
        changeQindexSelection();
        reloadData();
        throttling()
    });

    $("#selectedALL").click(function() { 
@@ -37,6 +37,16 @@

}

// 节流，防止用户点击多次请求多次
let timeout;
//需要定义在方法外
function throttling(){
    //先清理
    clearTimeout(timeout)	
    timeout = setTimeout(() => {
        reloadData()
    }, 500)
}
//加载count
function loadCountByUserid() {
    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid;