Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/cockpit/common/ThreeStackedBarAndLine.vue

@@ -47,7 +47,7 @@ export default {
                     bottom: '5%',
                     containLabel: true,
                 },
-                color: ['#efc943', '#4ee1ac', '#186bb8'],
+                color: ['#186bb8', '#4ee1ac', '#efc943'],
 
                 legend: {
                     data: obj.legend_data,

src/views/cockpit/kjgh.vue

@@ -29,7 +29,7 @@
       </div>
       <div class="item">
         <div class="icon">
-          <div class="icon_jsydzzb">
+          <div class="icon_xzjsyd">
 
           </div>
         </div>