Merge remote-tracking branch 'origin/main'

src/api/login.js

@@ -9,7 +9,7 @@ export function login(username, password, code, uuid) {
     code,
     uuid
   }
-  const loginPath = isPadDevice() ? '/doLogin' : '/login';
+  const loginPath ='/login';
   return request({
     url: loginPath,
     headers: {

src/views/pad/building/alarmDevice.vue

@@ -8,15 +8,15 @@
         <div class="data-list">
           <div class="table-cont">
               <div class="table-top">
-                <div class="flo">抽屉柜编号</div>
-                <div class="pot">设备名称</div>
-                <div class="spa">类别</div>
+                <div class="flo1">抽屉柜编号</div>
+                <div class="pot1">设备名称</div>
+                <div class="spa1">类别</div>
               </div>
               <div class="table-bot">
                 <div class="table-list" v-for="(item,index) in floorDataList" :key="index">
-                  <div class="fir">{{item.alertEquipment}}</div>
-                  <div class="snd">{{item.alertPosition}}</div>
-                  <div class="thr">{{item.alertName}}</div>
+                  <div class="fir1">{{item.alertEquipment}}</div>
+                  <div class="snd1">{{item.alertPosition}}</div>
+                  <div class="thr1">{{item.alertName}}</div>
                 </div>
               </div>
             </div>
@@ -160,15 +160,15 @@ export default {
     align-items: center;
     font-size:18px;
     color:#00FFFF;
-      .flo{
+      .flo1{
     width:50%;
     text-align: center;
   }
-  .pot{
+  .pot1{
     width:25%;
     text-align: center;
   }
-  .spa{
+  .spa1{
     width:25%;
     text-align: center;
   }
@@ -192,16 +192,16 @@ export default {
       //border: 1px dotted #14302F;
     }
     
-  .fir{
+  .fir1{
     width:50%;
     text-align: center;
     border-left: 1px solid #40E5F2;
   }
-  .snd{
+  .snd1{
     width:25%;
     text-align: center;
   }
-  .thr{
+  .thr1{
       width:25%;
       text-align: center;
   }

src/views/pad/building/consumptionList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main-data consumption-list">
-    <div class="title-area">消防用电量情况</div>
+    <div class="title-area">用电量情况</div>
 
     <div class="close-btn" @click="close"></div>
     <div class="content-area">

src/views/pad/building/distributionList.vue

@@ -31,7 +31,7 @@ import { roomLoadDetail } from "@/api/screen/service";
 import pinyin from "../data/pinyin.js";
 
 export default {
-  name: "WeekFoods",
+  name: "distributionList",
   props: {
     power: {  // 保持驼峰命名（在模板中会自动匹配 kebab-case）
   type: Number ,
@@ -165,6 +165,19 @@ customParams: {  // 保持驼峰命名（在模板中会自动匹配 kebab-case
     align-items: center;
     font-size:18px;
     color:#00FFFF;
+    .flo{
+    width:20%;
+    text-align: center;
+  }
+  .pot{
+    width:40%;
+    text-align: center;
+  } 
+  .spa{
+    width:40%;
+    text-align: center;
+  }
+
   }
   .table-bot{
     width:100%;
@@ -183,34 +196,23 @@ customParams: {  // 保持驼峰命名（在模板中会自动匹配 kebab-case
       font-weight: 500;
       //border: 1px dotted #14302F;
     }
-  }
-  .flo{
-    width:33%;
-    text-align: center;
-  }
-  .pot{
-    width:33%;
-    text-align: center;
-  } 
-  .spa{
-    width:33%;
-    text-align: center;
-  }
-
-
-  .fir{
-    width:33%;
+    .fir{
+    width:20%;
     text-align: center;
     border-left: 1px solid #40E5F2;
   }
   .snd{
-    width:33%;
+    width:40%;
     text-align: center;
   }
   .thr{
-      width:33%;
+      width:40%;
       text-align: center;
   }
+  }
+
+
+  
 
   // .color{
   //   color:#FF8C00;

src/views/pad/building/energyRateDialog.vue

@@ -123,10 +123,10 @@
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div @click="macShow = !macShow">机房总用电量</div>
-                    <div class="arrow" @click="macShow = !macShow"></div>
+                    <div class="arrow"></div>
                     <!-- 机房总用电量 -->
                     <transition name="fade-grow">
-                      <div class="machine" v-if="macShow" @click="macShow = !macShow">
+                      <div class="machine" v-if="macShow">
                         <div class="macBox">
                           <div class="content-title">
                             <span class="title">机房总用电量</span>
@@ -224,7 +224,7 @@
                     </transition>
 
                   </div>
-                  <div class="num" @mouseenter="macShow = true">{{ thisWeekElectricityList.total[11].num }}<span
+                  <div class="num" @click="macShow = !macShow">{{ thisWeekElectricityList.total[11].num }}<span
                       class="unit">kWh</span></div>
                 </div>
               </div>
@@ -423,7 +423,7 @@
 
                     </div>
                   </div>
-                  <div class="left-list2" @click="abnormalClick(0,'水浸')">
+                  <div class="left-list2" @click="abnormalClick(0,'1')">
                     <div class="left-info">
                       <div class="name">
                         <div class="dor">{{ warnDeviceList.sj.ycdw}}</div>
@@ -459,7 +459,7 @@
 
                   </div>
                 </div>
-                <div class="left-list2" @click="abnormalClick(0,'烟雾')">
+                <div class="left-list2" @click="abnormalClick(0,'2')">
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
@@ -495,7 +495,7 @@
 
                   </div>
                 </div>
-                <div class="left-list2" @click="abnormalClick(0,'电表')">
+                <div class="left-list2" @click="abnormalClick(0,'3')">
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
@@ -531,7 +531,7 @@
 
                   </div>
                 </div>
-                <div class="left-list2" @click="abnormalClick(0,'液位')">
+                <div class="left-list2" @click="abnormalClick(0,'4')">
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
@@ -1644,7 +1644,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#00D390', // 节点颜色
+              color: '#00D390', // 节点颜色
               borderColor: '#00D390', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1663,7 +1663,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#FFED00', // 节点颜色
+              color: '#FFED00', // 节点颜色
               borderColor: '#FFED00', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1959,7 +1959,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#00D390', // 节点颜色
+              color: '#00D390', // 节点颜色
               borderColor: '#00D390', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1979,7 +1979,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#FFED00', // 节点颜色
+              color: '#FFED00', // 节点颜色
               borderColor: '#FFED00', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1998,7 +1998,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#F3A141', // 节点颜色
+              color: '#F3A141', // 节点颜色
               borderColor: '#F3A141', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }

src/views/screen/building/alarmDevice.vue

@@ -8,15 +8,15 @@
         <div class="data-list">
           <div class="table-cont">
               <div class="table-top">
-                <div class="flo">抽屉柜编号</div>
-                <div class="pot">设备名称</div>
-                <div class="spa">类别</div>
+                <div class="flo1">抽屉柜编号</div>
+                <div class="pot1">设备名称</div>
+                <div class="spa1">类别</div>
               </div>
               <div class="table-bot">
                 <div class="table-list" v-for="(item,index) in floorDataList" :key="index">
-                  <div class="fir">{{item.alertEquipment}}</div>
-                  <div class="snd">{{item.alertPosition}}</div>
-                  <div class="thr">{{item.alertName}}</div>
+                  <div class="fir1">{{item.alertEquipment}}</div>
+                  <div class="snd1">{{item.alertPosition}}</div>
+                  <div class="thr1">{{item.alertName}}</div>
                 </div>
               </div>
             </div>
@@ -160,15 +160,15 @@ export default {
     align-items: center;
     font-size:18px;
     color:#00FFFF;
-      .flo{
+      .flo1{
     width:50%;
     text-align: center;
   }
-  .pot{
+  .pot1{
     width:25%;
     text-align: center;
   }
-  .spa{
+  .spa1{
     width:25%;
     text-align: center;
   }
@@ -192,16 +192,16 @@ export default {
       //border: 1px dotted #14302F;
     }
     
-  .fir{
+  .fir1{
     width:50%;
     text-align: center;
     border-left: 1px solid #40E5F2;
   }
-  .snd{
+  .snd1{
     width:25%;
     text-align: center;
   }
-  .thr{
+  .thr1{
       width:25%;
       text-align: center;
   }

src/views/screen/building/consumptionList.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="main-data consumption-list">
-      <div class="title-area">消防用电量情况</div>
+      <div class="title-area">用电量情况</div>
   
       <div class="close-btn" @click="close"></div>
       <div class="content-area">

src/views/screen/building/distributionList.vue

@@ -31,7 +31,7 @@
   import pinyin from "../data/pinyin.js";
   
   export default {
-    name: "WeekFoods",
+    name: "distributionList",
     props: {
       power: {  // 保持驼峰命名（在模板中会自动匹配 kebab-case）
     type: Number ,
@@ -165,6 +165,19 @@
       align-items: center;
       font-size:18px;
       color:#00FFFF;
+      .flo{
+      width:20%;
+      text-align: center;
+    }
+    .pot{
+      width:40%;
+      text-align: center;
+    } 
+    .spa{
+      width:40%;
+      text-align: center;
+    }
+  
     }
     .table-bot{
       width:100%;
@@ -183,22 +196,7 @@
         font-weight: 500;
         //border: 1px dotted #14302F;
       }
-    }
-    .flo{
-      width:20%;
-      text-align: center;
-    }
-    .pot{
-      width:40%;
-      text-align: center;
-    } 
-    .spa{
-      width:40%;
-      text-align: center;
-    }
-  
-  
-    .fir{
+      .fir{
       width:20%;
       text-align: center;
       border-left: 1px solid #40E5F2;
@@ -211,6 +209,10 @@
         width:40%;
         text-align: center;
     }
+    }
+  
+  
+    
   
     // .color{
     //   color:#FF8C00;

src/views/screen/building/energyRateDialog.vue

@@ -122,11 +122,11 @@
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
-                    <div @mouseenter="macShow = true">机房总用电量</div>
-                    <div class="arrow" @mouseenter="macShow = true"></div>
+                    <div @click="macShow = !macShow">机房总用电量</div>
+                    <div class="arrow"></div>
                     <!-- 机房总用电量 -->
                     <transition name="fade-grow">
-                      <div class="machine" v-if="macShow" @mouseleave="macShow = false">
+                      <div class="machine" v-if="macShow">
                         <div class="macBox">
                           <div class="content-title">
                             <span class="title">机房总用电量</span>
@@ -224,7 +224,7 @@
                     </transition>
 
                   </div>
-                  <div class="num" @mouseenter="macShow = true">{{ thisWeekElectricityList.total[11].num }}<span
+                  <div class="num" @click="macShow = !macShow">{{ thisWeekElectricityList.total[11].num }}<span
                       class="unit">kWh</span></div>
                 </div>
               </div>
@@ -423,7 +423,7 @@
 
                     </div>
                   </div>
-                  <div class="left-list2" @click="abnormalClick(0,'水浸')">
+                  <div class="left-list2" @click="abnormalClick(0,'1')">
                     <div class="left-info">
                       <div class="name">
                         <div class="dor">{{ warnDeviceList.sj.ycdw}}</div>
@@ -459,7 +459,7 @@
 
                   </div>
                 </div>
-                <div class="left-list2" @click="abnormalClick(0,'烟雾')">
+                <div class="left-list2" @click="abnormalClick(0,'2')">
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
@@ -495,7 +495,7 @@
 
                   </div>
                 </div>
-                <div class="left-list2" @click="abnormalClick(0,'电表')">
+                <div class="left-list2" @click="abnormalClick(0,'3')">
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
@@ -531,7 +531,7 @@
 
                   </div>
                 </div>
-                <div class="left-list2" @click="abnormalClick(0,'液位')">
+                <div class="left-list2" @click="abnormalClick(0,'4')">
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
@@ -1640,7 +1640,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#00D390', // 节点颜色
+              color: '#00D390', // 节点颜色
               borderColor: '#00D390', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1659,7 +1659,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#FFED00', // 节点颜色
+              color: '#FFED00', // 节点颜色
               borderColor: '#FFED00', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1955,7 +1955,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#00D390', // 节点颜色
+              color: '#00D390', // 节点颜色
               borderColor: '#00D390', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1975,7 +1975,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#FFED00', // 节点颜色
+              color: '#FFED00', // 节点颜色
               borderColor: '#FFED00', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }
@@ -1994,7 +1994,7 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-              color: '"#F3A141', // 节点颜色
+              color: '#F3A141', // 节点颜色
               borderColor: '#F3A141', // 节点边框颜色
               borderWidth: 4 // 节点边框宽度
             }