Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-06-25 880c8f54cddc8533f00f674da3f14c2cf0d34340

 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>
@@ -263,26 +263,29 @@
               <div style="height: 200px;width: 100%;">
                  <h3>材料统计</h3>
                  <el-col :span="10" style="height: 200px;">
                     <template>
                        <el-table :data="tubLogs" border size="small" style="width: 100%"
                                :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
                                :row-class-name="tableRowClassName">
<!--                           <el-table-column prop="code" label="序号"></el-table-column>-->
                           <el-table-column prop="tubName" label="名称"></el-table-column>
                           <el-table-column prop="inboundNumber" label="入库数量"></el-table-column>
                           <el-table-column prop="outboundNumber" label="出库数量"></el-table-column>
                           <el-table-column prop="unit" label="单位"></el-table-column>
                     <div style="margin-top: 15px">
                        <template>
                           <el-table :data="tubLogs" border size="small" style="width: 100%"
                                   :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
                                   :row-class-name="tableRowClassName">
                              <!--                           <el-table-column prop="code" label="序号"></el-table-column>-->
                              <el-table-column prop="tubName" label="名称"></el-table-column>
                              <el-table-column prop="inboundNumber" label="入库数量"></el-table-column>
                              <el-table-column prop="outboundNumber" label="出库数量"></el-table-column>
                              <el-table-column prop="unit" label="单位"></el-table-column>

                        </el-table>
                     </template>
                           </el-table>
                        </template>
                     </div>
                  </el-col>
                  <el-col :span="14" style="height: 200px;">
                     <div id="column-chart" style="height: 180px; width: 100%;"></div>
                  </el-col>
               </div>
            </el-card>

            <el-card class="box-card" style="margin-top: 20px;">
               <div id="map_div" style="width: 100%;height: 550px;"></div>
               <div id="map_div" style="width: 100%;height: 550px;margin-top: -5px"></div>
            </el-card>

         </el-col>
@@ -291,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>
@@ -370,35 +373,101 @@
   }

   function tubLogs() {
      let url = ctx + "/system/tubLogData";

      const chart = echarts.init(document.getElementById("column-chart"));
      const option = {
         tooltip: {
            trigger: 'axis',
            axisPointer: {
               type: 'shadow'
            }
         },
         legend: {},
         grid: {
            left: '3%',
            right: '4%',
            bottom: '3%',
            containLabel: true
         },
         xAxis: [
            {
               type: 'category',
               data: []
            }
         ],
         yAxis: [
            {
               type: 'value'
            }
         ],
         series: [
            {
               name: '出库',
               type: 'bar',
               emphasis: {
                  focus: 'series'
               },
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#e2b507'
               }
            },
            {
               name: '入库',
               type: 'bar',
               stack: 'Ad',
               emphasis: {
                  focus: 'series'
               },
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#2992c6'
               }
            },

         ]
      };

      let url = ctx + "/system/stat/tubLogData";
      $.ajaxSettings.async = false;
      $.get(url,{},function(res){
         vm.tubLogs = res.tubLogs;

         res.tubLogs.forEach(function(value, index, array) {
            const tubName = value.tubName;
            const inboundNumber = value.inboundNumber;
            const outboundNumber = value.outboundNumber;
            const unit = value.unit;
            option.xAxis[0].data[index] = tubName;
            option.series[0].data[index] = outboundNumber;
            option.series[1].data[index] = inboundNumber;
         });
         chart.setOption(option, true);
      })
      $.ajaxSettings.async = false;
      console.log(vm.tubLogs);
   }

   //首页第一行个数统计
   function indexCount() {
      let url = ctx + "/system/indexDataCount";
      let url = ctx + "/system/stat/indexDataCount";
      $.ajaxSettings.async = false;
      $.get(url,{},function(res){
         vm.indexDataCount = res.data;
         vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
      })
      $.ajaxSettings.async = false;

   }
   //场地进度
   function stationProcess() {
      let url = ctx + "/system/projectProcess";
      let url = ctx + "/system/stat/projectProcess";
      $.ajaxSettings.async = false;
      $.get(url,{},function(res){
         vm.stationProcessData = res.projectData;
      })
      $.ajaxSettings.async = false;
      console.log(vm.stationProcessData);

   }
   var vm = new Vue({
      el: "#app",
@@ -439,6 +508,8 @@
         map.addOverLay(countriesOverlay1)
         countriesOverlay.bringToBack();
      });

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

   function init(sel, transform) {
@@ -482,7 +553,7 @@

   // 获取数据库真实数据
   function getReallyData() {
      let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/project";
      let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/stat/project";
      $.get(url,function(res){
         var data = res.projects;
         showProjectPoint(data);
@@ -490,12 +561,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});
@@ -538,11 +625,12 @@
      map.openInfoWindow(markerInfoWin, point); //开启信息窗口
   }


   //总进度仪表盘
   function totalProcess() {
      var Chart1 = echarts.init(document.getElementById('Chart1'));
      var pointerData = 0; // 仪表指针数据
      let url = ctx + "/system/totalProcess";
      let url = ctx + "/system/stat/totalProcess";
      $.ajaxSettings.async = false;
      $.get(url,{},function(res){
         pointerData = res.pointerData;