Merge remote-tracking branch 'origin/main'

src/utils/request.js

@@ -110,7 +110,7 @@ service.interceptors.response.use(
     }
 
     // 判断是否为登录接口
-    if (res.config.url.includes('/login')) {
+    if (res.config.url.includes('/login' || res.config.url.includes('/loginPad'))) {
       // 跳过登录接口的统一处理，交由业务逻辑处理
       if (code !== 200) {
         return Promise.reject(res.data); // 返回原始错误数据
@@ -128,7 +128,14 @@ service.interceptors.response.use(
         }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '#/login';
+             const loginPath = isPadDevice() ? 2 : 1;
+            // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+            if(loginPath==1){
+              location.href = '#/login'; 
+              }else{
+                location.href = '#/loginPad';
+              }
+          
           });
         }).catch(() => {
           isRelogin.show = false;

src/utils/request2.js

@@ -7,6 +7,7 @@ import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 import aes from './aes.js'
+import { isPadDevice } from '@/utils/device'; // 设备检测工具函数
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -29,13 +30,12 @@ service.interceptors.request.use(config => {
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
   if (getToken() && !isToken) {
      const loginPath = isPadDevice() ? 2 : 1;
-        // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        if(loginPath==1){
-          config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-        }else{
-          config.headers['Authorization'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-        }
-   
+ // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+ if(loginPath==1){
+    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+   }else{
+    config.headers['Authorization'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+   }
   }
   // 请求参数加密
   if (process.env.VUE_APP_AES_ENCRYPT_ENABLED == 'true') {
@@ -110,7 +110,7 @@ service.interceptors.response.use(
     }
 
     // 判断是否为登录接口
-    if (res.config.url.includes('/login')) {
+    if (res.config.url.includes('/login' || res.config.url.includes('/loginPad'))) {
       // 跳过登录接口的统一处理，交由业务逻辑处理
       if (code !== 200) {
         return Promise.reject(res.data); // 返回原始错误数据
@@ -128,7 +128,14 @@ service.interceptors.response.use(
         }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '#/login';
+             const loginPath = isPadDevice() ? 2 : 1;
+            // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+            if(loginPath==1){
+              location.href = '#/login'; 
+              }else{
+                location.href = '#/loginPad';
+              }
+          
           });
         }).catch(() => {
           isRelogin.show = false;

src/views/pad/building/energyRate.vue

@@ -161,6 +161,52 @@
                  </div>
               </div>
 
+              <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">楼宇本周发电量</span>
+            </div>
+            <div class="content">
+              <div style="display: flex;">
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">112<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">光伏发电量</div>
+                    </div>
+                    <div class="left-inf">
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">薄膜发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">光伏板发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                    </div>
+
+                  </div>
+                  <div></div>
+                </div>
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">电梯能量回收</div>
+                    </div>
+                 
+
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
               <div class="content-title">
                   <span class="title">楼宇今日总用电量</span>
               </div>
@@ -197,6 +243,7 @@
   </div>
 </template>
 
+
 <script>
 import LineChart from "@/components/Echarts/LineChart.vue";
 import PieChart from "@/components/Echarts/PieChart.vue";
@@ -683,6 +730,53 @@ export default {
       width: 100%;
     }
   }
+  .cFox{
+       display: flex;
+       justify-content: space-around;
+       margin: 15px 0 15px 0;
+    .num {
+            font-size: 30px;
+            color: #00FFFF;
+            font-family: "electronicFont";
+            display: flex;
+            flex-direction: row;
+            align-items: baseline;
+    }
+            .unit {
+              font-size: 12px;
+              font-family: 'element-icons';
+            }
+            .left-inf {
+        // padding-left:12px;
+
+        .num {
+          font-size: 30px;
+          color: #00FFFF;
+          font-family: "electronicFont";
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+
+
+          .unit {
+            font-size: 12px;
+            font-family: 'PingFangSC';
+            font-weight: bold;
+            padding-top: 5px;
+          }
+        }
+
+        .name {
+          display: flex;
+          font-size: 14px;
+          color: #FFFFFF;
+          font-family: 'fashionZh';
+          padding-top: 4px;
+        }
+
+
+      }
+  }
   //左边菜单
   .rightList1{
     display: flex;

src/views/pad/building/energyRateDialog.vue

@@ -4,7 +4,7 @@
       <img src="@/assets/images/main/cont_title_bg.png" />
       <div class="title">楼宇中控</div>
     </div>
-    <div class="dialog-cont1">
+    <div class="dialog-cont">
       <div class="dialog-left">
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -18,7 +18,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>光伏用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'光伏')" >{{ thisWeekElectricityList.total[0].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'光伏')">{{ thisWeekElectricityList.total[0].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: 15px;">
@@ -27,7 +28,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>楼外设备用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'楼外设备')">{{ thisWeekElectricityList.total[1].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'楼外设备')">{{ thisWeekElectricityList.total[1].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -12px;">
@@ -36,7 +38,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>充电桩用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'充电桩')">{{ thisWeekElectricityList.total[2].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'充电桩')">{{ thisWeekElectricityList.total[2].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-right: 18px;">
@@ -45,7 +48,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>地下室用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'地下室')">{{ thisWeekElectricityList.total[3].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'地下室')">{{ thisWeekElectricityList.total[3].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
             </div>
@@ -57,7 +61,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>制冷机组用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'制冷机组')">{{ thisWeekElectricityList.total[4].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'制冷机组')">{{ thisWeekElectricityList.total[4].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -20px;">
@@ -66,7 +71,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>消防用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'消防')">{{ thisWeekElectricityList.total[5].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'消防')">{{ thisWeekElectricityList.total[5].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -75,7 +81,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>电梯用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'电梯')">{{ thisWeekElectricityList.total[6].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'电梯')">{{ thisWeekElectricityList.total[6].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="padding-right: 28px;">
@@ -84,7 +91,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>办公用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'办公')">{{ thisWeekElectricityList.total[7].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'办公')">{{ thisWeekElectricityList.total[7].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
             </div>
@@ -96,7 +104,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>公共照明用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'公共照明')">{{ thisWeekElectricityList.total[8].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'公共照明')">{{ thisWeekElectricityList.total[8].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -10px;">
@@ -105,7 +114,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>供热设备用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'供热设备')">{{ thisWeekElectricityList.total[9].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'供热设备')">{{ thisWeekElectricityList.total[9].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -10px;">
@@ -114,10 +124,11 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>厨房用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'厨房')">{{ thisWeekElectricityList.total[10].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'厨房')">{{ thisWeekElectricityList.total[10].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" >
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -137,7 +148,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>信息UPS用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'信息UPS')">{{ thisWeekElectricityList.room[0].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'信息UPS')">{{
+                                  thisWeekElectricityList.room[0].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list" style="margin-right: 34px;">
@@ -146,7 +158,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>信息空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'信息空调')">{{ thisWeekElectricityList.room[4].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'信息空调')">{{ thisWeekElectricityList.room[4].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -157,7 +170,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>调度UPS用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'调度UPS')">{{ thisWeekElectricityList.room[1].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'调度UPS')">{{
+                                  thisWeekElectricityList.room[1].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list" style="margin-right: 32px;">
@@ -166,7 +180,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>调度空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'调度空调')">{{ thisWeekElectricityList.room[5].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'调度空调')">{{ thisWeekElectricityList.room[5].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -177,7 +192,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>通信UPS用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'通信UPS')">{{ thisWeekElectricityList.room[2].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'通信UPS')">{{
+                                  thisWeekElectricityList.room[2].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list" style="margin-right: 30px;">
@@ -186,7 +202,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>通信空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'通信空调')">{{ thisWeekElectricityList.room[6].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'通信空调')">{{ thisWeekElectricityList.room[6].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -197,7 +214,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>交易机房用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'交易机房')">{{ thisWeekElectricityList.room[3].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'交易机房')">{{ thisWeekElectricityList.room[3].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list">
@@ -206,7 +224,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>管控机房空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'管控机房空调')">{{ thisWeekElectricityList.room[7].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'管控机房空调')">{{
+                                  thisWeekElectricityList.room[7].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -228,7 +247,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>生活水泵用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'生活水泵')">{{ thisWeekElectricityList.total[12].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'生活水泵')">{{ thisWeekElectricityList.total[12].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -237,7 +257,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>冷源泵用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'冷源泵')">{{ thisWeekElectricityList.total[13].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'冷源泵')">{{ thisWeekElectricityList.total[13].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -246,7 +267,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>热源泵用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'热源泵')">{{ thisWeekElectricityList.total[14].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'热源泵')">{{ thisWeekElectricityList.total[14].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -255,7 +277,54 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>通信辅助设备用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'通信辅助设备')">{{ thisWeekElectricityList.total[15].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'通信辅助设备')">{{ thisWeekElectricityList.total[15].num }}<span
+                      class="unit">kWh</span></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">楼宇本周发电量</span>
+            </div>
+            <div class="content">
+              <div style="display: flex;">
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">112<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">光伏发电量</div>
+                    </div>
+                    <div class="left-inf">
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">薄膜发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">光伏板发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                    </div>
+
+                  </div>
+                  <div></div>
+                </div>
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">电梯能量回收</div>
+                    </div>
+                 
+
+                  </div>
                 </div>
               </div>
             </div>
@@ -287,16 +356,18 @@
         </div>
 
         <div class="dialog-list">
-          <div class="dialog-item wid100">
-            <div class="content-title">
-              <span class="title">配电室重要回路负荷情况</span>
-            </div>
-            <div class="content" @click="abnormalClick(2)">
-              <bar-chart :chart-data="barData" :x-axis="barAxis" :y-axis="barYAxis" :grid="barGrid" :legend="barLegend"
-                y-color="#FFF" l-color="#FFF" width="560px" height="180px" />
+              <div class="dialog-item wid100">
+                <div class="content-title">
+                  <span class="title">配电室重要回路负荷情况</span>
+                </div>
+                <div class="content" @click="abnormalClick(2)">
+                  <bar-chart :chart-data="barData" :x-axis="barAxis" :y-axis="barYAxis" :grid="barGrid"
+                    :legend="barLegend" y-color="#FFF" l-color="#FFF" width="560px" height="180px" />
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
+
+
       </div>
 
       <div class="dialog-right">
@@ -503,7 +574,7 @@
                   </div>
                   <div class="ocBox">
                     <div class="water-cont">
-                       <span class="title">负二层生活水箱</span>
+                      <span class="title">负二层生活水箱</span>
                     </div>
                     <!-- 水箱 -->
                     <!-- <div class="rightTank"></div> -->
@@ -516,6 +587,8 @@
 
               </div>
             </div>
+
+           
           </div>
         </div>
 
@@ -525,6 +598,7 @@
   </div>
 </template>
 
+
 <script>
 import LineChart from "@/components/Echarts/LineChart";
 import PieChart from "@/components/Echarts/PieChart";
@@ -2308,6 +2382,7 @@ export default {
         background: url("../../../assets/images/building_guarantee/danger.png") no-repeat;
         background-size: 100% 100%;
         justify-content: center;
+        cursor: pointer;
 
         .dor {
           display: flex;
@@ -2675,7 +2750,52 @@ export default {
       }
     }
   }
+  .cFox{
+       display: flex;
+       justify-content: space-around;
+    .num {
+            font-size: 30px;
+            color: #00FFFF;
+            font-family: "electronicFont";
+            display: flex;
+            flex-direction: row;
+            align-items: baseline;
+    }
+            .unit {
+              font-size: 12px;
+              font-family: 'element-icons';
+            }
+            .left-inf {
+        // padding-left:12px;
+
+        .num {
+          font-size: 30px;
+          color: #00FFFF;
+          font-family: "electronicFont";
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+
+
+          .unit {
+            font-size: 12px;
+            font-family: 'PingFangSC';
+            font-weight: bold;
+            padding-top: 5px;
+          }
+        }
 
+        .name {
+          display: flex;
+          font-size: 14px;
+          color: #FFFFFF;
+          font-family: 'fashionZh';
+          padding-top: 4px;
+        }
+
+
+      }
+  }
   .total-cont {
     width: 100%;
     height: 35px;

src/views/screen/building/cameraDataDialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="main-data dialog-area" @click.stop="preventDefault" @mouseleave="leaveFun">
+    <div class="main-data dialog-area" @click.stop="preventDefault"  @mouseleave="leaveFun">
       <div class="dialog-title">
         <img
           src="@/assets/images/main/cont_title_bg.png"
@@ -587,7 +587,7 @@
     },
     data() {
       return {
-        energyList:{},
+        energyList:[{name: "water", value: 0}, {name: "power", value: 0}],
         airOverviewList:{},
         curBodex:0,
         showBox: "indoor",

src/views/screen/building/energyRate.vue

@@ -161,6 +161,52 @@
                  </div>
               </div>
 
+              <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">楼宇本周发电量</span>
+            </div>
+            <div class="content">
+              <div style="display: flex;">
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">112<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">光伏发电量</div>
+                    </div>
+                    <div class="left-inf">
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">薄膜发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">光伏板发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                    </div>
+
+                  </div>
+                  <div></div>
+                </div>
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">电梯能量回收</div>
+                    </div>
+                 
+
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
               <div class="content-title">
                   <span class="title">楼宇今日总用电量</span>
               </div>
@@ -683,6 +729,53 @@ export default {
       width: 100%;
     }
   }
+  .cFox{
+       display: flex;
+       justify-content: space-around;
+       margin: 15px 0 15px 0;
+    .num {
+            font-size: 30px;
+            color: #00FFFF;
+            font-family: "electronicFont";
+            display: flex;
+            flex-direction: row;
+            align-items: baseline;
+    }
+            .unit {
+              font-size: 12px;
+              font-family: 'element-icons';
+            }
+            .left-inf {
+        // padding-left:12px;
+
+        .num {
+          font-size: 30px;
+          color: #00FFFF;
+          font-family: "electronicFont";
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+
+
+          .unit {
+            font-size: 12px;
+            font-family: 'PingFangSC';
+            font-weight: bold;
+            padding-top: 5px;
+          }
+        }
+
+        .name {
+          display: flex;
+          font-size: 14px;
+          color: #FFFFFF;
+          font-family: 'fashionZh';
+          padding-top: 4px;
+        }
+
+
+      }
+  }
   //左边菜单
   .rightList1{
     display: flex;

src/views/screen/building/energyRateDialog.vue

@@ -18,7 +18,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>光伏用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'光伏')" >{{ thisWeekElectricityList.total[0].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'光伏')">{{ thisWeekElectricityList.total[0].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: 15px;">
@@ -27,7 +28,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>楼外设备用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'楼外设备')">{{ thisWeekElectricityList.total[1].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'楼外设备')">{{ thisWeekElectricityList.total[1].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -12px;">
@@ -36,7 +38,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>充电桩用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'充电桩')">{{ thisWeekElectricityList.total[2].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'充电桩')">{{ thisWeekElectricityList.total[2].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-right: 18px;">
@@ -45,7 +48,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>地下室用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'地下室')">{{ thisWeekElectricityList.total[3].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'地下室')">{{ thisWeekElectricityList.total[3].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
             </div>
@@ -57,7 +61,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>制冷机组用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'制冷机组')">{{ thisWeekElectricityList.total[4].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'制冷机组')">{{ thisWeekElectricityList.total[4].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -20px;">
@@ -66,7 +71,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>消防用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'消防')">{{ thisWeekElectricityList.total[5].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'消防')">{{ thisWeekElectricityList.total[5].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -75,7 +81,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>电梯用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'电梯')">{{ thisWeekElectricityList.total[6].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'电梯')">{{ thisWeekElectricityList.total[6].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="padding-right: 28px;">
@@ -84,7 +91,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>办公用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'办公')">{{ thisWeekElectricityList.total[7].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'办公')">{{ thisWeekElectricityList.total[7].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
             </div>
@@ -96,7 +104,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>公共照明用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'公共照明')">{{ thisWeekElectricityList.total[8].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'公共照明')">{{ thisWeekElectricityList.total[8].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -10px;">
@@ -105,7 +114,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>供热设备用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'供热设备')">{{ thisWeekElectricityList.total[9].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'供热设备')">{{ thisWeekElectricityList.total[9].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list" style="margin-left: -10px;">
@@ -114,10 +124,11 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>厨房用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'厨房')">{{ thisWeekElectricityList.total[10].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'厨房')">{{ thisWeekElectricityList.total[10].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" >
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -137,7 +148,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>信息UPS用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'信息UPS')">{{ thisWeekElectricityList.room[0].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'信息UPS')">{{
+                                  thisWeekElectricityList.room[0].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list" style="margin-right: 34px;">
@@ -146,7 +158,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>信息空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'信息空调')">{{ thisWeekElectricityList.room[4].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'信息空调')">{{ thisWeekElectricityList.room[4].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -157,7 +170,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>调度UPS用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'调度UPS')">{{ thisWeekElectricityList.room[1].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'调度UPS')">{{
+                                  thisWeekElectricityList.room[1].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list" style="margin-right: 32px;">
@@ -166,7 +180,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>调度空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'调度空调')">{{ thisWeekElectricityList.room[5].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'调度空调')">{{ thisWeekElectricityList.room[5].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -177,7 +192,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>通信UPS用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'通信UPS')">{{ thisWeekElectricityList.room[2].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'通信UPS')">{{
+                                  thisWeekElectricityList.room[2].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list" style="margin-right: 30px;">
@@ -186,7 +202,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>通信空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'通信空调')">{{ thisWeekElectricityList.room[6].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'通信空调')">{{ thisWeekElectricityList.room[6].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -197,7 +214,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>交易机房用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'交易机房')">{{ thisWeekElectricityList.room[3].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'交易机房')">{{ thisWeekElectricityList.room[3].num
+                                  }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                             <div class="left-list">
@@ -206,7 +224,8 @@
                                   <div> <img src="@/assets/images/service_new/quantity.png"></div>
                                   <div>管控机房空调用电量</div>
                                 </div>
-                                <div class="num" @click="abnormalClick(1,'管控机房空调')">{{ thisWeekElectricityList.room[7].num }}<span class="unit">kWh</span></div>
+                                <div class="num" @click="abnormalClick(1,'管控机房空调')">{{
+                                  thisWeekElectricityList.room[7].num }}<span class="unit">kWh</span></div>
                               </div>
                             </div>
                           </div>
@@ -228,7 +247,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>生活水泵用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'生活水泵')">{{ thisWeekElectricityList.total[12].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'生活水泵')">{{ thisWeekElectricityList.total[12].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -237,7 +257,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>冷源泵用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'冷源泵')">{{ thisWeekElectricityList.total[13].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'冷源泵')">{{ thisWeekElectricityList.total[13].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -246,7 +267,8 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>热源泵用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'热源泵')">{{ thisWeekElectricityList.total[14].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'热源泵')">{{ thisWeekElectricityList.total[14].num }}<span
+                      class="unit">kWh</span></div>
                 </div>
               </div>
               <div class="left-list">
@@ -255,7 +277,54 @@
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
                     <div>通信辅助设备用电量</div>
                   </div>
-                  <div class="num" @click="abnormalClick(1,'通信辅助设备')">{{ thisWeekElectricityList.total[15].num }}<span class="unit">kWh</span></div>
+                  <div class="num" @click="abnormalClick(1,'通信辅助设备')">{{ thisWeekElectricityList.total[15].num }}<span
+                      class="unit">kWh</span></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">楼宇本周发电量</span>
+            </div>
+            <div class="content">
+              <div style="display: flex;">
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">112<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">光伏发电量</div>
+                    </div>
+                    <div class="left-inf">
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">薄膜发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                      <div class="name">
+                        <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                        <div style="padding-left: 5px;">光伏板发电量</div>
+                      </div>
+                      <div class="num">29<span class="unit">kWh</span></div>
+                    </div>
+
+                  </div>
+                  <div></div>
+                </div>
+                <div style="width: 50%;">
+                  <div class="cFox">
+                    <div>
+                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div><img src="@/assets/images/service_new/cicleFox.png"></div>
+                      <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">电梯能量回收</div>
+                    </div>
+                 
+
+                  </div>
                 </div>
               </div>
             </div>
@@ -287,16 +356,18 @@
         </div>
 
         <div class="dialog-list">
-          <div class="dialog-item wid100">
-            <div class="content-title">
-              <span class="title">配电室重要回路负荷情况</span>
-            </div>
-            <div class="content" @click="abnormalClick(2)">
-              <bar-chart :chart-data="barData" :x-axis="barAxis" :y-axis="barYAxis" :grid="barGrid" :legend="barLegend"
-                y-color="#FFF" l-color="#FFF" width="560px" height="180px" />
+              <div class="dialog-item wid100">
+                <div class="content-title">
+                  <span class="title">配电室重要回路负荷情况</span>
+                </div>
+                <div class="content" @click="abnormalClick(2)">
+                  <bar-chart :chart-data="barData" :x-axis="barAxis" :y-axis="barYAxis" :grid="barGrid"
+                    :legend="barLegend" y-color="#FFF" l-color="#FFF" width="560px" height="180px" />
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
+
+
       </div>
 
       <div class="dialog-right">
@@ -503,7 +574,7 @@
                   </div>
                   <div class="ocBox">
                     <div class="water-cont">
-                       <span class="title">负二层生活水箱</span>
+                      <span class="title">负二层生活水箱</span>
                     </div>
                     <!-- 水箱 -->
                     <!-- <div class="rightTank"></div> -->
@@ -516,6 +587,8 @@
 
               </div>
             </div>
+
+           
           </div>
         </div>
 
@@ -2787,7 +2860,52 @@ export default {
       color: #fff !important;
     }
   }
+  .cFox{
+       display: flex;
+       justify-content: space-around;
+    .num {
+            font-size: 30px;
+            color: #00FFFF;
+            font-family: "electronicFont";
+            display: flex;
+            flex-direction: row;
+            align-items: baseline;
+    }
+            .unit {
+              font-size: 12px;
+              font-family: 'element-icons';
+            }
+            .left-inf {
+        // padding-left:12px;
 
+        .num {
+          font-size: 30px;
+          color: #00FFFF;
+          font-family: "electronicFont";
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+
+
+          .unit {
+            font-size: 12px;
+            font-family: 'PingFangSC';
+            font-weight: bold;
+            padding-top: 5px;
+          }
+        }
+
+        .name {
+          display: flex;
+          font-size: 14px;
+          color: #FFFFFF;
+          font-family: 'fashionZh';
+          padding-top: 4px;
+        }
+
+
+      }
+  }
   .table-cont {
     width: 100%;
 

src/views/screen/engineering/issueSubDia.vue

@@ -96,8 +96,8 @@ export default {
       this.$refs.fileInput.click();
     },
     add() {
-       alert(this.imgUrl)
-      return
+      //  alert(this.imgUrl)
+      // return
       const issueData = {
         title:this.title,
         description:this.description,

src/views/screen/service/shareStation.vue

@@ -110,9 +110,9 @@ export default {
   watch:{
     appOrg(newValue,oldValue){
       //建设完成率
-    this.getOverviewData();
-    //工具箱二具数量
-    this.getToolsChartsList();
+    // this.getOverviewData();
+    // //工具箱二具数量
+    // this.getToolsChartsList();
     },
   },
   data() {