Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/pages/analysis/energy/page.vue

@@ -121,7 +121,7 @@ export default {
         },
         {
           value: '05',
-          label: '风幕机'
+          label: '防火卷帘门'
         },
         {
           value: '06',

src/pages/analysis/fault/pie4.vue

@@ -56,7 +56,7 @@ export default {
           right: 10,
           top: 20,
           bottom: 20,
-          data: ['测试', '测试2', '测试3', '测试4']
+          data: ['风冷热泵机组', '室内机风柜', '水泵', '多联室内机']
 
           // selected: this.list.selected
         },
@@ -67,10 +67,22 @@ export default {
             radius: '55%',
             center: ['40%', '50%'],
             data: [
-              { name: '测试', value: '100', itemStyle: { color: 'skyblue' } },
-              { name: '测试2', value: '130', itemStyle: { color: '#F2637B' } },
-              { name: '测试3', value: '400', itemStyle: { color: '#8EE0E0' } },
-              { name: '测试4', value: '100', itemStyle: { color: '#FFCC00' } }
+              {
+                name: '风冷热泵机组',
+                value: '100',
+                itemStyle: { color: 'skyblue' }
+              },
+              {
+                name: '室内机风柜',
+                value: '130',
+                itemStyle: { color: '#F2637B' }
+              },
+              { name: '水泵', value: '400', itemStyle: { color: '#8EE0E0' } },
+              {
+                name: '多联室内机',
+                value: '100',
+                itemStyle: { color: '#FFCC00' }
+              }
             ],
             emphasis: {
               itemStyle: {

src/pages/eq/office/config.js

@@ -153,7 +153,7 @@
 
   export const tableDataFour = [
     {
-      A: '风幕机',
+      A: '防火卷帘门',
       B: '售票厅',
       C: '开启',
       D: '10',
@@ -161,7 +161,7 @@
       F: 'JK-1'
     },
     {
-      A: '风幕机',
+      A: '防火卷帘门',
       B: '售票厅',
       C: '开启',
       D: '10',

src/pages/eq/office/page.vue

 <template>
-  <div class="office-area-control" style="height:100%;">
+  <div class="office-area-control" style="height: 100%">
     <cardList cardListTitle="办公区域控制">
       <div slot="content">
         <!-- <enTabs :tabList="officeTabList"></enTabs> -->
@@ -19,8 +19,36 @@
           isShowPage="true"
         >
           <template v-slot:operation="scope">
-            <el-button type="text" @click="statusHandle">开启</el-button>
-            <el-button type="text" @click="statusHandle">关闭</el-button>
+            <el-button
+              type="text"
+              @click="statusHandle"
+              v-if="activeTab != '04'"
+              >开启</el-button
+            >
+            <el-button
+              type="text"
+              @click="statusHandle"
+              v-if="activeTab != '04'"
+              >关闭</el-button
+            >
+            <el-button
+              type="text"
+              @click="statusHandle"
+              v-if="activeTab == '04'"
+              >上升</el-button
+            >
+            <el-button
+              type="text"
+              @click="statusHandle"
+              v-if="activeTab == '04'"
+              >下降</el-button
+            >
+            <el-button
+              type="text"
+              @click="statusHandle"
+              v-if="activeTab == '04'"
+              >停止</el-button
+            >
           </template>
         </en-table>
       </div>
@@ -70,7 +98,7 @@ export default {
         },
         {
           value: '04',
-          label: '风幕机'
+          label: '防火卷帘门'
         },
         {
           value: '05',

src/pages/kb/power/page.vue

@@ -173,7 +173,7 @@ export default {
         },
         {
           value: '05',
-          label: '风幕机'
+          label: '防火卷帘门'
         },
         {
           value: '06',