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

chenhuan

2024-05-28 67e03b179e1a257622cf2b5b21ec0610115c3bf9

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

@@ -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>
@@ -370,18 +373,77 @@
   }

   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: []
            },
            {
               name: '入库',
               type: 'bar',
               stack: 'Ad',
               emphasis: {
                  focus: 'series'
               },
               data: []
            },

         ]
      };

      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;
@@ -391,14 +453,12 @@
   }
   //场地进度
   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",
@@ -482,7 +542,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);
@@ -538,11 +598,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;