bug修复

src/pages/components/tableList.vue

@@ -66,7 +66,7 @@ export default {
   props: {
     maxHeight: {
       type: String,
-      default: ''
+      default: null
     },
     tableData: {
       type: Array
@@ -94,7 +94,8 @@ export default {
     },
     // 行点击事件
     currentChange: {
-      type: Function
+      type: Function,
+      default: () => {}
     }
   },
   data() {

src/pages/eq/office/page.vue

@@ -19,20 +19,25 @@
           :showStateColor="true"
           :currentMode="currentModel"
         >
-          <template v-slot:operation="scope">
-            <el-button type="text" @click="statusHandle(scope.scope, 1)"
+          <template v-slot:operation="scope" v-if="activeTab=='b6af764f2a6e454490a6b1b3c9057e57'||activeTab == '173466a2cf9a42a6a17b2bdfbeae36d5'">
+              <!-- (1运行，2停止，3离线，4故障) -->
+            <el-button v-if='scope.scope.status==2' type="text" @click="statusHandle(scope.scope, 1)"
               >开启</el-button
             >
-            <el-button type="text" @click="statusHandle(scope.scope, 0)"
+            <el-button  v-if='scope.scope.status==1' type="text" @click="statusHandle(scope.scope, 0)"
               >关闭</el-button
             >
             <el-button
-              v-if="activeTab != 'b6af764f2a6e454490a6b1b3c9057e57'"
+              v-if="activeTab != 'b6af764f2a6e454490a6b1b3c9057e57'&&scope.scope.status==1"
               type="text"
               @click="settingJfkt(scope.scope, 3)"
               >设置</el-button
             >
           </template>
+          <template v-slot:operation="scope" v-else>
+              <span>--</span>
+          </template>
+
         </table-list>
         <el-dialog
           title="空调设置"

src/pages/kb/outdoor/index.vue

@@ -11,7 +11,7 @@ card-warp(title="室外气象数据", height="45px", showBackground)
     .data-warp
       .data-item(v-for="item in typeList")
         .type {{ item.type }}
-        div(:style="{ color: item.color }")
+        div(:style="{ color: item.color,'margin-top':'3px' }")
           span.num {{ item.num }}
           span.unit {{ item.unit }}
     .clearfix
@@ -338,11 +338,11 @@ export default {
       padding-top: 15px;
     }
     .num {
-      font-size: 32px;
+      font-size: 26px;
       font-family: PingFang SC;
       font-weight: 600;
       // color: #21ACFC;
-      // padding-top: 26px;
+      padding-top: 26px;
     }
     .unit {
       font-size: 18px;