Merge remote-tracking branch 'origin/master'

src/components/HeaderCom.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="header">
     <div class="header-logo">
+      <!-- 大唐logo -->
+      <!-- <img src="@/assets/datang.png" slot="reference" /> -->
+      <!-- 中能 -->
       <img src="@/assets/logo.png" slot="reference" />
       <h2 class="conversion">中能智能</h2>
     </div>
@@ -139,7 +142,12 @@ export default {
       padding-left: 10px;
       font-weight: 600;
     }
-
+// 大唐
+    // img {
+    //   width: 200px;
+    //   height: 40px;
+    // }
+    // 中能
     img {
       width: 40px;
       height: 40px;

src/views/admin/cockpitManage/component/rightdata.vue

@@ -9,9 +9,7 @@
       <div class="BOX">
         <div style="display: flex">
           <div class="YC01">
-            <strong>
-              {{ equipment?.errCounrt ? equipment.errCounrt : 0 }}</strong
-            >
+            <strong> {{ equipment?.errCounrt ? equipment.errCounrt : 0 }}</strong>
             <span>异常总数</span>
           </div>
           <div class="YC02">