提交代码

zmk

2024-05-28 b2ce4cf46bda0570ad91636fab8760694cf0b3f0

 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>
@@ -373,6 +373,7 @@
   }

   function tubLogs() {

      const chart = echarts.init(document.getElementById("column-chart"));
      const option = {
         tooltip: {
@@ -406,7 +407,11 @@
               emphasis: {
                  focus: 'series'
               },
               data: []
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#e2b507'
               }
            },
            {
               name: '入库',
@@ -415,13 +420,17 @@
               emphasis: {
                  focus: 'series'
               },
               data: []
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#2992c6'
               }
            },

         ]
      };

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

   //首页第一行个数统计
   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;
@@ -541,7 +551,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);
@@ -597,11 +607,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;