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

zmk

2024-05-28 3f1889e77f861a8284770c85bdd83204f6863f39

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

@@ -407,7 +407,11 @@
               emphasis: {
                  focus: 'series'
               },
               data: []
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#e2b507'
               }
            },
            {
               name: '入库',
@@ -416,7 +420,11 @@
               emphasis: {
                  focus: 'series'
               },
               data: []
               data: [],
               itemStyle: {
                  // 修改柱子的颜色
                  color: '#2992c6'
               }
            },

         ]
@@ -598,6 +606,7 @@
      map.openInfoWindow(markerInfoWin, point); //开启信息窗口
   }


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