Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-07-03 5606efe6f2778ad09d8b35280d6360cfe8f34d91

 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html

@@ -215,11 +215,11 @@
                     
                  </div>
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     已安装  <span style="float: right">0</span>
                     已安装  <span style="float: right">{{indexDataCount.cameraCount}}</span>
<!--                     <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                  </span>
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     未安装   <span style="float: right">68</span>
                     未安装   <span style="float: right">{{indexDataCount.cameraCountNaN}}</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #409eff">-->
                  </span>
               </div>
@@ -294,7 +294,7 @@
            <el-card class="box-card">
               <div style="height: 200px;width: 100%">
                  <div style="width: 100%;height: 20px;">
                     <h3>项目总体进度2(%)</h3>
                     <h3>项目总体进度(%)</h3>
                  </div>
                  <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
               </div>
@@ -356,8 +356,13 @@
   <th:block th:include="include :: footer" />

   <script th:inline="javascript">
      var loginuser = [[${loginuser}]];

   $(function() {
      if(loginuser=='admin'){
         window.open("http://49.4.115.102:8000/onemap/onemap.html","_blank");
      }

      loadMap();
      getReallyData();
      totalProcess();
@@ -407,7 +412,11 @@
               emphasis: {
                  focus: 'series'
               },
               data: []
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#e2b507'
               }
            },
            {
               name: '入库',
@@ -416,7 +425,11 @@
               emphasis: {
                  focus: 'series'
               },
               data: []
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#2992c6'
               }
            },

         ]
@@ -447,6 +460,7 @@
      $.ajaxSettings.async = false;
      $.get(url,{},function(res){
         vm.indexDataCount = res.data;
         vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
      })
      $.ajaxSettings.async = false;

@@ -499,6 +513,8 @@
         map.addOverLay(countriesOverlay1)
         countriesOverlay.bringToBack();
      });

      //map.setStyle("indigo");
   }

   function init(sel, transform) {
@@ -550,12 +566,28 @@
   }
   //地图上展示项目点
   function showProjectPoint(data){
      var projectIcon = new T.Icon({
         iconUrl: '/bjfw/images/icon/6.png',
         iconSize: new T.Point(30, 30),
         iconAnchor: new T.Point(6, 40),
      });
      var projectIcon ;
      for(let i =0;i<data.length;i++){
         if (data[i].status === '1'){
            projectIcon = new T.Icon({
               iconUrl: '/bjfw/images/icon/yellow.png',
               iconSize: new T.Point(30, 30),
               iconAnchor: new T.Point(6, 40),
            });
         }else if (data[i].status === '2'){
            projectIcon = new T.Icon({
               iconUrl: '/bjfw/images/icon/blue.png',
               iconSize: new T.Point(30, 30),
               iconAnchor: new T.Point(6, 40),
            });
         }else {
            projectIcon = new T.Icon({
               iconUrl: '/bjfw/images/icon/red.png',
               iconSize: new T.Point(30, 30),
               iconAnchor: new T.Point(6, 40),
            });
         }

         let lng = data[i].lng;
         let lat = data[i].lat;
         let marker = new T.Marker(new T.LngLat(lng, lat), { title: "场地位置",icon:projectIcon});
@@ -598,6 +630,7 @@
      map.openInfoWindow(markerInfoWin, point); //开启信息窗口
   }


   //总进度仪表盘
   function totalProcess() {
      var Chart1 = echarts.init(document.getElementById('Chart1'));