Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

2 天以前 116c203f50d03c11300a2f52ec296e871c9ff13e

 src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue

@@ -371,6 +371,7 @@
  border: 1px solid #1a58b0;
  padding: 18px;
  height: 240px;
  padding-top: 0px;
}

.equipment-header {