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

zmk

2024-05-27 9166b7b4bdb84bfe499078dd68add5c3e462411f

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

@@ -15,6 +15,9 @@
      background-color: rgba(0,0,0,0.01) !important;
      padding:10px;
   }
   body{
      padding: 10px;
   }
   [v-cloak]{
      display: none;
   }
@@ -221,9 +224,15 @@
      <el-row>
         <el-col :span="16">
            <el-card class="box-card">
               <div style="height: 200px;">
               <div>
                  <h3>材料统计</h3>

                  <el-col :span="10" style="height: 200px;">
                  </el-col>
                  <el-col :span="14" style="height: 200px;">
                  </el-col>
               </div>

            </el-card>

            <el-card class="box-card" style="margin-top: 4px;">
@@ -302,12 +311,21 @@
      totalProcess();
      stationProcess();
      indexCount();
      tubLogs();
   })
   function viewStation(station) {
      var lng = station.lng;
      var lat = station.lat;
      map.centerAndZoom(new T.LngLat(lng, lat), 13);
      // $.modal.openTab("场地导航",ctx+"/geo/project/navigate?ids="+id);
   }

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

   function indexCount() {
@@ -335,6 +353,7 @@
         return {
            stationProcessData: [],
            indexDataCount :"",
            tubLogData:[],
         };
      },
      methods: {