Merge remote-tracking branch 'origin/main'

src/api/screen/service.js

@@ -538,6 +538,82 @@ export function inspectionSchemeNumY() {
   })
 }
 
+/*------------------楼宇中控-------------------*/
+//楼宇本周用电量
+export function thisWeekElectricity() {
+  return request({
+    url: '/large/third/thisWeekElectricity',
+    method: 'get'
+  })
+}
+
+// 专业所属电表明细
+export function thisAmmeterDetail(appOrg) {
+  return request({
+    url: '/large/third/thisAmmeterDetail?type='+ appOrg,
+    method: 'get'
+  })
+}
+
+
+// 异常点位查看
+export function abnormalPoint(appOrg) {
+  return request({
+    url: '/large/third/abnormalPoint?type='+ appOrg,
+    method: 'get'
+  })
+}
+
+//楼宇今日总用电量
+export function todayElectricity() {
+  return request({
+    url: '/large/third/todayElectricity',
+    method: 'get'
+  })
+}
+
+//楼宇每月用电量
+export function monthElectricity() {
+  return request({
+    url: '/large/third/monthElectricity',
+    method: 'get'
+  })
+}
+
+
+//配电室重要回路负荷情况
+export function roomLoad() {
+  return request({
+    url: '/large/third/roomLoad',
+    method: 'get'
+  })
+}
+
+//楼宇中当前告警的设备
+export function warnDevice() {
+  return request({
+    url: '/large/third/warnDevice',
+    method: 'get'
+  })
+}
+
+//告警事件的历史统计
+export function warnEvent() {
+  return request({
+    url: '/large/third/warnEvent',
+    method: 'get'
+  })
+}
+
+//水箱的水位情况
+export function waterState() {
+  return request({
+    url: '/large/third/waterState',
+    method: 'get'
+  })
+}
+
+
 
 
 

src/views/screen/building/alarmDevice.vue

@@ -14,9 +14,9 @@
               </div>
               <div class="table-bot">
                 <div class="table-list" v-for="(item,index) in floorDataList" :key="index">
-                  <div class="fir">{{item.number}}</div>
-                  <div class="snd">{{item.name}}</div>
-                  <div class="thr">{{item.type}}</div>
+                  <div class="fir">{{item.alertEquipment}}</div>
+                  <div class="snd">{{item.alertPosition}}</div>
+                  <div class="thr">{{item.alertName}}</div>
                 </div>
               </div>
             </div>
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { getFoodsList } from "@/api/screen/service";
+import { getFoodsList,abnormalPoint } from "@/api/screen/service";
 import pinyin from "../data/pinyin.js";
 
 export default {
@@ -44,25 +44,7 @@ export default {
   },
   data() {
     return {
-      floorDataList: [
-       { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-      { number: '1# 1-3', name: '消火栓泵' ,type:'消防'},
-
-
-     ],
+      floorDataList: [],
       dataList: [],
       weeks: ["周一", "周二", "周三", "周四", "周五"],
       list: [],
@@ -75,12 +57,23 @@ export default {
     };
   },
   created() {
+    this.abnormalPoint()
     this.getFoodsList();
   },
   destroyed() {},
   beforeDestroy() {},
   mounted() {},
   methods: {
+    abnormalPoint() {
+          // alert(this.IntionList)
+          abnormalPoint(this.$props.appOrg).then((res) => {   
+        if (Number(res.code) === 200) {
+          this.floorDataList=res.data;
+        }
+      }
+    );
+    },
+     
     //获取数据概况
     getFoodsList() {
       let appOrg = this.$props.appOrg == '0000' ? '10001' : this.$props.appOrg;
@@ -252,6 +245,19 @@ export default {
     align-items: center;
     font-size:18px;
     color:#00FFFF;
+      .flo{
+    width:50%;
+    text-align: center;
+  }
+  .pot{
+    width:25%;
+    text-align: center;
+  }
+  .spa{
+    width:25%;
+    text-align: center;
+  }
+
   }
   .table-bot{
     width:100%;
@@ -270,34 +276,23 @@ export default {
       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%;
+    width:50%;
     text-align: center;
     border-left: 1px solid #40E5F2;
   }
   .snd{
-    width:33%;
+    width:25%;
     text-align: center;
   }
   .thr{
-      width:33%;
+      width:25%;
       text-align: center;
   }
+  }
+
+
 
   // .color{
   //   color:#FF8C00;

src/views/screen/building/consumptionList.vue

@@ -16,9 +16,9 @@
                 <div class="table-bot">
                   <div class="table-list" v-for="(item,index) in floorDataList" :key="index">
                     <div class="fir">{{item.number}}</div>
-                    <div class="snd">{{item.name}}</div>
+                    <div class="snd">{{item.EqName}}</div>
                     <div class="thr">{{item.type}}</div>
-                    <div class="fou">{{item.power}}</div>
+                    <div class="fou">{{item.Kwh}}</div>
                   </div>
                 </div>
               </div>
@@ -29,40 +29,21 @@
   </template>
   
   <script>
-  import { getFoodsList } from "@/api/screen/service";
+  import { thisAmmeterDetail, } from "@/api/screen/service";
   import pinyin from "../data/pinyin.js";
   
   export default {
-    name: "WeekFoods",
+    name: "consumptionList",
+   
     props: {
-      week: {
-        type: String,
-        default: "",
-      },
-      appOrg: {
-        type: String,
-        default: "10001",
-      },
-    },
+      IntionList: {  // 保持驼峰命名（在模板中会自动匹配 kebab-case）
+    type: String,
+    default: ""  // 默认值改为空字符串
+  }
+  },
     data() {
       return {
-        floorDataList: [
-         { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-        { number: '1# 1-3', name: '消火栓泵' ,type:'消防',power:'50kWh'},
-       ],
+        floorDataList: [],
         dataList: [],
         weeks: ["周一", "周二", "周三", "周四", "周五"],
         list: [],
@@ -75,90 +56,26 @@
       };
     },
     created() {
-      this.getFoodsList();
+
+      this.thisAmmeterDetail();
     },
     destroyed() {},
     beforeDestroy() {},
     mounted() {},
     methods: {
-      //获取数据概况
-      getFoodsList() {
-        let appOrg = this.$props.appOrg == '0000' ? '10001' : this.$props.appOrg;
-        if(this.appOrgs.indexOf(appOrg) == -1){
-          appOrg = "1J001";
-        }
-        getFoodsList(appOrg).then((res) => {
-          if (Number(res.code) === 200) {
-            let foodsList = JSON.parse(res.data.foodInfo);
-            this.foodsList = foodsList;
-            // 转换后的数据
-      const transformedData = {};
-  
-      // 映射关系
-      const dayMap = {"monday": "1","tuesday": "2","wednesday": "3","thursday": "4","friday": "5",};
-      const mealTypeMap = {"breakfast": "1", "lunch": "2", "dinner": "3"};
-  
-     // 遍历原始数据并转换
-     for (const day in foodsList) {
-    if (foodsList.hasOwnProperty(day)) {
-      const dayNumber = dayMap[day];
-      transformedData[dayNumber] = [];
-      for (const mealTypeKey in foodsList[day]) { 
-        if (foodsList[day].hasOwnProperty(mealTypeKey)) {
-          const mealTypeNumber = mealTypeMap[mealTypeKey];
-          foodsList[day][mealTypeKey].forEach(meal => {
-            const newDishes = [
-              {"name": meal.name, "type": mealTypeNumber},
-            ];
-            transformedData[dayNumber] = transformedData[dayNumber].concat(newDishes);
-          });
+        //
+        thisAmmeterDetail() {
+          // alert(this.IntionList)
+          thisAmmeterDetail(this.$props.IntionList).then((res) => {   
+        if (Number(res.code) === 200) {
+          this.floorDataList=res.data;
         }
       }
-    }
-  }
-        //console.log('888888888',JSON.parse(JSON.stringify(transformedData)));
-              this.foodsList=JSON.parse(JSON.stringify(transformedData))
-             let index = parseInt(this.weeks.indexOf(this.$props.week)) + 1;
-             let lists =JSON.parse(JSON.stringify(transformedData[index]));
-         
-            this.lists = lists;
-            // let list = foodsList[index];
-            // this.list = list;
-            //区分早中晚
-            let list = [];
-            let type = parseInt(this.foods.indexOf(this.food)) + 1;
-            let that = this;    
-       // 用于存储所有的"name"字段及其对应的餐次编号
-           lists.forEach((item) => {
-              if (item.type == type) {
-                //处理图片
-                // item.img = require('../../../assets/caidanImgs/'+ pinyin.chineseToPinYin(item.name) +'.jpg');
-                that.loadImage(item);
-                list.push(item);
-              }
-            });
-       this.list = list;
-          }
-        });
-      },
-   
-  
-      //默认显示暂无菜品
-      errorImg(item) {
-        item.img = require("@/assets/images/main/no-data.jpg");
-      },
+    );
+    },
+     
   
-      loadImage(item) {
-        try {
-          // 尝试加载图片
-          item.img = require("@/assets/caidanImgs/" +
-            pinyin.chineseToPinYin(item.name) +
-            ".jpg");
-        } catch (e) {
-          // 处理图片不存在的情况
-          item.img = require("@/assets/images/main/no-data.jpg"); // 使用默认图片
-        }
-      },
+ 
   
   
   

src/views/screen/building/energyRate.vue

@@ -12,7 +12,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>光伏用电量</div>
                     </div>
-                    <div class="num">56<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[0].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list" style="margin-right: -28px;">
@@ -21,7 +21,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>楼外设备用电量</div>
                     </div>
-                    <div class="num">51<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[1].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list" style="margin-right: -30px;">
@@ -30,7 +30,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>充电桩用电量</div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[2].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list" style="padding-right: 41px;">
@@ -39,7 +39,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>地下室用电量</div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[3].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
               </div>
@@ -50,7 +50,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>制冷机组用电量</div>
                     </div>
-                    <div class="num">56<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[4].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list" style="margin-left: -4px;">
@@ -59,7 +59,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>消防用电量</div>
                     </div>
-                    <div class="num">51<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[5].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list" style="margin-left: 22px;">
@@ -68,7 +68,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>电梯用电量</div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[6].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list" style="padding-right: 55px;">
@@ -77,7 +77,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>办公用电量</div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[7].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
               </div>
@@ -89,7 +89,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>公共照明用电量</div>
                     </div>
-                    <div class="num">56<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[8].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -98,7 +98,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>供热设备用电量</div>
                     </div>
-                    <div class="num">51<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[9].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -107,7 +107,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>厨房用电量</div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[10].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list" style="padding-right: 24px;">
@@ -117,7 +117,7 @@
                       <div>机房总用电量</div>
                       <div class="arrow"></div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[11].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
               </div>
@@ -129,7 +129,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>生活水泵用电量</div>
                     </div>
-                    <div class="num">56<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[12].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -138,7 +138,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>冷源泵用电量</div>
                     </div>
-                    <div class="num">51<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[13].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -147,7 +147,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>热源泵用电量</div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[14].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -156,7 +156,7 @@
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
                       <div>通信辅助设备用电量</div>
                     </div>
-                    <div class="num">48<span class="unit">kWh</span></div>
+                    <div class="num">{{ thisWeekElectricityList.total[15].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
               </div>
@@ -203,6 +203,10 @@ import PieChart from "@/components/Echarts/PieChart.vue";
 import BarChart from "@/components/Echarts/BarChart.vue";
 import echarts from "echarts";
 import {carbonEmissionStatistics, energyForYear} from "@/api/screen/service";
+import {
+
+thisWeekElectricity,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
+} from "@/api/screen/service";
 
 export default {
   name: "EnergyRate",
@@ -215,6 +219,7 @@ export default {
   },
   data() {
     return {
+      thisWeekElectricityList:{},
       //楼宇每月用电量
      yearLineData: [],
         //楼宇今日总用电量
@@ -238,10 +243,12 @@ export default {
     };
   },
   created() {
-         //楼宇今日用电量
-         this.handleBuildData()
-       //楼宇每月用电量
-       this.handleYearData()
+    //楼宇本周用电量
+    this.thisWeekElectricity()
+         //楼宇今日总用电量
+    this.todayElectricity()
+         //楼宇每月用电量
+    this.monthElectricity()
 
     //碳排放量月度变化趋势图
     this.carbonEmissionStatistics();
@@ -253,11 +260,25 @@ export default {
   beforeDestroy() {},
   mounted() {},
   methods: {
-         //楼宇今日总用电量
-         handleBuildData(){
+     //资产存量
+     thisWeekElectricity() {
+        thisWeekElectricity(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.thisWeekElectricityList=res.data;
+        }
+      });
+    },
+   
+       
+    //楼宇今日总用电量
+    todayElectricity() {
+      todayElectricity(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+        const buildLineDataList = res.data.map(item => item.Kwh);
+        const buildLineDataTime = res.data.map(item => item.time);
       this.buildLineData = [
         {
-          name: "楼宇一",
+          name: "当前楼宇",
           type: "line",
           // areaStyle: {
           //   opacity: 0.8,
@@ -280,12 +301,12 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-                color: '#00EBFC', // 节点颜色
-                borderColor: '#00EBFC', // 节点边框颜色
-                borderWidth: 4 // 节点边框宽度
+              color: '#00EBFC', // 节点颜色
+              borderColor: '#00EBFC', // 节点边框颜色
+              borderWidth: 4 // 节点边框宽度
             }
-        },
-          data: [460,620, 900, 1180,1300, 1450,1560,1670,1300,1000,1700,3000 ],
+          },
+          data: buildLineDataList,
         },
 
 
@@ -293,9 +314,7 @@ export default {
       ];
       this.buildLineAxis = {
         type: "category",
-        data: [
-          "1点","2点","3点","4点","5点","6点","7点","8点","9点","10点","11点","12点",
-        ],
+        data:buildLineDataTime,
         axisTick: {
           show: false,
         },
@@ -304,7 +323,7 @@ export default {
             color: "#FFF",
           },
         },
-        splitArea:false,
+        splitArea: false,
         boundaryGap: false,
       };
       this.buildLineYAxis = {
@@ -312,7 +331,7 @@ export default {
         nameTextStyle: {
           color: '#fff',
         },
-        axisLine:{
+        axisLine: {
           show: false,
         },
         axisLabel: {
@@ -322,36 +341,32 @@ export default {
         splitLine: {
           show: true,
           lineStyle: {
-             type:'dashed',
+            type: 'dashed',
             color: '#1D2F38', // 背景线颜色
             width: 1// 背景线宽度
-        }
+          }
         },
         axisTick: {
           show: false,
         },
-        splitArea:false
+        splitArea: false
       }
+    }
+    });
     },
-       //楼宇每月用电量
-       handleYearData(){
+   
+      //楼宇每月用电量
+    monthElectricity() {
+      monthElectricity(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+        const buildLineDataFirstList= res.data.first.map(item => item.Kwh);
+        const buildLineDataSecondList= res.data.second.map(item => item.Kwh);
+        const buildLineDataThirdList= res.data.third.map(item => item.Kwh);
+        const buildLineDataTime = res.data.first.map(item => item.time);
       this.yearLineData = [
         {
           name: "配电室一",
           type: "line",
-          // areaStyle: {
-          //   opacity: 0.8,
-          //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-          //     {
-          //       offset: 0.03,
-          //       color: "rgba(30, 240, 215, 0.4196)",
-          //     },
-          //     {
-          //       offset: 0.68,
-          //       color: "rgba(23, 240, 240, 0)",
-          //     },
-          //   ]),
-          // },
           lineStyle: {
             width: 3, // 设置线宽
             color: "#00EBFC", // 设置线的颜色
@@ -360,29 +375,17 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-                color: '#00EBFC', // 节点颜色
-                borderColor: '#00EBFC', // 节点边框颜色
-                borderWidth: 4 // 节点边框宽度
+              color: '#00EBFC', // 节点颜色
+              borderColor: '#00EBFC', // 节点边框颜色
+              borderWidth: 4 // 节点边框宽度
             }
-        },
-          data: [460,620, 900, 1180,1300, 1450,1560,1670,1300,1000,900,3000 ],
+          },
+          data: buildLineDataFirstList,
         },
         {
           name: "配电室二",
           type: "line",
-          // areaStyle: {
-          //   opacity: 0.8,
-          //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-          //     {
-          //       offset: 0.03,
-          //       color: "rgba(214, 124, 21, 0.1804)",
-          //     },
-          //     {
-          //       offset: 0.68,
-          //       color: "rgba(23, 240, 240, 0)",
-          //     },
-          //   ]),
-          // },
+
           lineStyle: {
             width: 3, // 设置线宽
             color: "#00D390", // 设置线的颜色
@@ -391,31 +394,17 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-                color: '"#00D390', // 节点颜色
-                borderColor: '#00D390', // 节点边框颜色
-                borderWidth: 4 // 节点边框宽度
+              color: '"#00D390', // 节点颜色
+              borderColor: '#00D390', // 节点边框颜色
+              borderWidth: 4 // 节点边框宽度
             }
-        },
-          data: [2800, 2700, 2650, 3500,3000, 2400,2300,2200,1900,1800,1700,1500 ],
+          },
+          data: buildLineDataSecondList,
 
         },
         {
           name: "配电室三",
           type: "line",
-
-          // areaStyle: {
-          //   opacity: 0.8,
-          //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-          //     {
-          //       offset: 0.03,
-          //       color: "rgba(30, 240, 215, 0.4196)",
-          //     },
-          //     {
-          //       offset: 0.68,
-          //       color: "rgba(23, 240, 240, 0)",
-          //     },
-          //   ]),
-          // },
           lineStyle: {
             width: 3, // 设置线宽
             color: "#FFED00", // 设置线的颜色
@@ -424,19 +413,19 @@ export default {
           smooth: false,
           itemStyle: {
             normal: {
-                color: '"#FFED00', // 节点颜色
-                borderColor: '#FFED00', // 节点边框颜色
-                borderWidth: 4 // 节点边框宽度
+              color: '"#FFED00', // 节点颜色
+              borderColor: '#FFED00', // 节点边框颜色
+              borderWidth: 4 // 节点边框宽度
             }
-        },
-          data: [1400, 1200, 1100, 1000,900, 880,800,270,30,400,500,520 ],
+          },
+          data: buildLineDataThirdList,
         },
 
       ];
       this.yearLineAxis = {
         type: "category",
         data: [
-          "1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月",
+          "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月",
         ],
         axisTick: {
           show: false,
@@ -446,7 +435,7 @@ export default {
             color: "#FFF",
           },
         },
-        splitArea:false,
+        splitArea: false,
         boundaryGap: false,
       };
       this.yearLineYAxis = {
@@ -454,7 +443,7 @@ export default {
         nameTextStyle: {
           color: '#fff',
         },
-        axisLine:{
+        axisLine: {
           show: false,
         },
         axisLabel: {
@@ -464,17 +453,20 @@ export default {
         splitLine: {
           show: true,
           lineStyle: {
-             type:'dashed',
+            type: 'dashed',
             color: '#1D2F38', // 背景线颜色
             width: 1// 背景线宽度
-        }
+          }
         },
         axisTick: {
           show: false,
         },
-        splitArea:false
+        splitArea: false
       }
-    },
+    }
+  });
+},
+
 
     //碳排放量月度变化趋势图
     carbonEmissionStatistics() {

src/views/screen/logistics/assets/codeBillDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main-data code-bill-dialog" @click.stop="preventDefault" >
+  <div class="main-data code-bill-dialog" @click.stop="preventDefault" @mouseleave="leaveFun">
     <div class="dialog-title">
       <img
         src="@/assets/images/main/cont_title_bg.png"
@@ -227,6 +227,43 @@
             </div>
           </div>
         </div>
+
+        <div class="content">
+              <div class="total-cont">
+                <span class="title">楼宇设备运行情况</span>
+              </div>
+              <div class="rightList">
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/grow.png">
+                    <div class="left-info">
+                    <div class="name">巡检异常数量</div>
+                    <div class="num">{{ operationList.inspectionAnomalyRecordNum }}<span class="unit">个</span></div>
+                  </div>
+                 </div>
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/grow.png">
+                    <div class="left-info">
+                    <div class="name">检修记录数量</div>
+                    <div class="num">{{operationList.repairRecordNum}}<span class="unit">条</span></div>
+                  </div>
+                 </div>
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/grow.png">
+                    <div class="left-info">
+                    <div class="name">维保记录数量</div>
+                    <div class="num">{{operationList.maintenanceRecordNum  }}<span class="unit">条</span></div>
+                  </div>
+                 </div>
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/setting.png">
+                    <div class="left-info">
+                    <div class="name">重点设备巡检覆盖率</div>
+                    <div class="num">{{ operationList.importantDeviceTypeInspectionExecuteRate }}<span class="unit">%</span></div>
+                  </div>
+                 </div>
+              </div>
+
+            </div>
       </div>
 
       <div class="dialog-right">
@@ -262,7 +299,7 @@
                     y-color="#FFF"
                     l-color="#FFF"
                     width="500px"
-                    height="160px"
+                    height="360px"
                   />
                 </div>
                 <div class="charts-cont" v-else-if="showBox === 'region'">
@@ -273,47 +310,12 @@
                     y-color="#FFF"
                     l-color="#FFF"
                     width="500px"
-                    height="160px"
+                    height="360px"
                   />
                 </div>
             </div>
 
-            <div class="content">
-              <div class="total-cont">
-                <span class="title">楼宇设备运行情况</span>
-              </div>
-              <div class="rightList">
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/grow.png">
-                    <div class="left-info">
-                    <div class="name">巡检异常数量</div>
-                    <div class="num">{{ operationList.inspectionAnomalyRecordNum }}<span class="unit">个</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/grow.png">
-                    <div class="left-info">
-                    <div class="name">检修记录数量</div>
-                    <div class="num">{{operationList.repairRecordNum}}<span class="unit">条</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/grow.png">
-                    <div class="left-info">
-                    <div class="name">维保记录数量</div>
-                    <div class="num">{{operationList.maintenanceRecordNum  }}<span class="unit">条</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/setting.png">
-                    <div class="left-info">
-                    <div class="name">重点设备巡检覆盖率</div>
-                    <div class="num">{{ operationList.importantDeviceTypeInspectionExecuteRate }}<span class="unit">%</span></div>
-                  </div>
-                 </div>
-              </div>
-
-            </div>
+        
 
             <div class="content">
               <div class="total-cont">
@@ -348,7 +350,7 @@
             y-color="#FFF"
             l-color="#FFF"
             width="500px"
-            height="160px"
+            height="360px"
           />
             </div>
             </div>
@@ -895,7 +897,7 @@ export default {
             data: res.data.xList,
             axisLabel: {
               color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 0,
+              rotate: 75,
               interval: 0
             },
             axisLine: {
@@ -1008,7 +1010,7 @@ export default {
             data: res.data.xList,
             axisLabel: {
               color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 45,
+              rotate: 75,
               interval: 0
             },
             axisLine: {
@@ -1180,7 +1182,7 @@ export default {
   }
 
   .content {
-    //margin-top: 10px;
+    margin-top: 20px;
     padding-left: 20px;
   }
 
@@ -1311,7 +1313,7 @@ export default {
   .rightList{
     display: flex;
     flex-wrap: wrap;
-    padding: 0 15px 0 15px;
+    padding: 15px 15px 0 15px;
     .left-list{
         display: flex;
         align-items: center;