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

@@ -215,7 +215,7 @@
                     
                  </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;">
@@ -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'
               }
            },

         ]