Merge branch 'develop' into single-develop

src/views/ems/dzjk/home/index.vue

@@ -13,7 +13,7 @@
           class="common-card-container common-card-container-body-no-padding"
         >
           <div slot="header">
-            <span class="card-title">静态信息</span>
+            <span class="card-title">站点信息</span>
           </div>
           <div
             style="box-sizing: border-box; height: 250px; padding: 20px 15px"
@@ -105,11 +105,11 @@ export default {
       ],
       sjglData: [
         {
-          title: "今日充电量（MWh）",
+          title: "今日充电量（kWh）",
           attr: "dayChargedCap",
         },
         {
-          title: "今日放电量（MWh）",
+          title: "今日放电量（kWh）",
           attr: "dayDisChargedCap",
         },
         {
@@ -202,20 +202,4 @@ export default {
     }
   }
 }
-/* card标题里的时间选择器 */
-.time-range-card {
-  &.common-card-container .el-card__header {
-    padding-top: 0;
-    padding-bottom: 0;
-    .time-range-header {
-      height: 40px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .card-title {
-        line-height: 40px;
-      }
-    }
-  }
-}
 </style>