调整

src/views/pad/building/energyRate.vue

@@ -197,7 +197,7 @@
                 <div style="width: 50%;">
                   <div class="cFox">
                     <div>
-                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div class="num" style="justify-content: center;">{{ fllEleList.weekTotal }}<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>
@@ -254,7 +254,7 @@ import BarChart from "@/components/Echarts/BarChart.vue";
 import echarts from "echarts";
 import {
 
-thisWeekElectricity,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
+thisWeekElectricity,controlElevator,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
 } from "@/api/screen/service";
 
 export default {
@@ -269,6 +269,7 @@ export default {
   data() {
     return {
       thisWeekElectricityList:{},
+      fllEleList:{},
       //楼宇每月用电量
      yearLineData: [],
         //楼宇今日总用电量
@@ -294,6 +295,8 @@ export default {
   created() {
     //楼宇本周用电量
     this.thisWeekElectricity()
+    //电梯能量回收
+    this.controlElevator()
          //楼宇今日总用电量
     this.todayElectricity()
          //楼宇每月用电量
@@ -315,6 +318,15 @@ export default {
         }
       });
     },
+   
+      //电梯能量回收
+      controlElevator() {
+          controlElevator(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.fllEleList=res.data;
+        }
+      });
+    },
 
 
     //楼宇今日总用电量

src/views/pad/building/energyRateDialog.vue

@@ -318,7 +318,7 @@
                 <div style="width: 50%;">
                   <div class="cFox">
                     <div>
-                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div class="num" style="justify-content: center;">{{ fllEleList.weekTotal }}<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>
@@ -607,7 +607,7 @@ import CylinderChart from "@/components/Echarts/cylinderChart.vue";
 import echarts from "echarts";
 import {
 
-  thisWeekElectricity,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
+  thisWeekElectricity,controlElevator,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
 } from "@/api/screen/service";
 
 export default {
@@ -627,6 +627,7 @@ export default {
   data() {
     return {
       thisWeekElectricityList:{},
+      fllEleList:{},
       warnDeviceList:{},
       barWidth: 100,
       macShow: false,
@@ -740,6 +741,8 @@ export default {
   created() {
     //楼宇本周用电量
     this.thisWeekElectricity()
+     //电梯能量回收
+     this.controlElevator()
     //楼宇每月用电量
     this.monthElectricity()
     //楼宇今日总用电量
@@ -772,6 +775,15 @@ export default {
         }
       });
     },
+      //电梯能量回收
+      controlElevator() {
+          controlElevator(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.fllEleList=res.data;
+        }
+      });
+    },
+
    
       //水箱
     // 二十三层生活水箱丶消防水箱

src/views/pad/building/unitMonitorDialog.vue

@@ -91,7 +91,7 @@ import PieChart from "@/components/Echarts/PieChart";
 import BarChart from "@/components/Echarts/BarChart.vue";
 import echarts from "echarts";
 import RaddarChart from "@/components/Echarts/RaddarChart.vue";
-import {monitorList,frequency,patrol,patrolPoint} from "@/api/screen/service";
+import {frequency,patrol,patrolPoint} from "@/api/screen/service";
 
 export default {
   name: "UnitMonitorDialog",
@@ -199,7 +199,7 @@ export default {
           ]
         },
       ],
-      monitorList: [],
+     
        //巡更点统计
        floorDataList: [],
     };
@@ -210,7 +210,7 @@ export default {
     //巡更点统计
     this.patrolPoint();
     this.patrol();
-    this.getMonitorList();
+
     this.handleUnitDataList();
   },
   destroyed() {},
@@ -331,20 +331,6 @@ export default {
       });
     },
 
-    //视频流列表 各公司出入口监控
-    getMonitorList() {
-      let index = this.cityNameList.indexOf(this.monitorName);
-      let code = "0000";
-      if(index >= 0){
-        code = this.cityCodeList[index];
-      }
-      console.log(code, index,this.monitorName)
-      monitorList(code).then((res) => {
-        if (Number(res.code) === 200) {
-          this.monitorList = res.data
-        }
-      });
-    },
 
     //初始化
     handleUnitDataList() {
@@ -387,10 +373,7 @@ export default {
       console.log(11)
     },
 
-    //选择单个视频流
-    chooseMonitor(index){
-      this.$emit("chooseMonitor", this.monitorList[index]);
-    }
+ 
   },
 };
 </script>

src/views/pad/data/company.json

@@ -35,62 +35,62 @@
       },
       {
         "value": "1A003",
-        "label": "国网太原供电公司",
+        "label": "国网电力公司太原供电公司",
         "poi": [112.573038, 37.872962],
         "city": "太原市",
         "children": [
           {
             "value": "1A003",
-            "label": "国网太原供电公司",
+            "label": "国网电力公司太原供电公司",
             "poi": [112.573038, 37.872962],
             "city": "太原市"
           },
           {
             "value": "1A00301",
-            "label": "小店供电公司",
+            "label": "国网电力公司小店供电公司",
             "poi": [112.573038, 37.872962],
             "city": "太原市",
             "area": "小店区"
           },
           {
             "value": "1A00302",
-            "label": "科创城供电公司",
+            "label": "国网电力公司科创城供电公司",
             "poi": [112.592319, 37.734528],
             "city": "太原市"
           },
           {
             "value": "1A00303",
-            "label": "滨河供电公司",
+            "label": "国网电力公司滨河供电公司",
             "poi": [112.487826, 37.936797],
             "city": "太原市"
           },
           {
             "value": "1A00304",
-            "label": "晋源供电公司",
+            "label": "国网电力公司晋源供电公司",
             "poi": [112.493612, 37.699236],
             "city": "太原市"
           },
           {
             "value": "1A00305",
-            "label": "清徐供电公司",
+            "label": "国网电力公司清徐供电公司",
             "poi": [112.364981, 37.597803],
             "city": "太原市"
           },
           {
             "value": "1A00306",
-            "label": "阳曲供电公司",
+            "label": "国网电力公司阳曲供电公司",
             "poi": [112.677995, 38.061061],
             "city": "太原市"
           },
           {
             "value": "1A00307",
-            "label": "古交供电公司",
+            "label": "国网电力公司古交供电公司",
             "poi": [112.178924, 37.901643],
             "city": "太原市"
           },
           {
             "value": "1A00308",
-            "label": "娄烦供电公司",
+            "label": "国网电力公司娄烦供电公司",
             "poi": [111.797581, 38.068692],
             "city": "太原市"
           }
@@ -98,96 +98,96 @@
       },
       {
         "value": "1M001",
-        "label": "国网运城供电公司",
+        "label": "国网电力公司运城供电公司",
         "poi": [110.952935, 35.136313],
         "children": [
           {
             "value": "1M001",
-            "label": "运城市公司(本部)",
+            "label": "国网电力公司运城市公司(本部)",
             "poi": [110.952935, 35.136313],
             "city": "运城市"
           },
           {
             "value": "1M00101",
-            "label": "永济供电公司",
+            "label": "国网电力公司永济供电公司",
             "poi": [110.449161, 34.863149],
             "city": "运城市"
           },
           {
             "value": "1M00102",
-            "label": "盐湖供电公司",
+            "label": "国网电力公司盐湖供电公司",
             "poi": [110.997981, 35.022705],
             "city": "运城市"
           },
           {
             "value": "1M00103",
-            "label": "开发区供电公司",
+            "label": "国网电力公司开发区供电公司",
             "poi": [112.573038, 37.872962],
             "city": "运城市"
           },
           {
             "value": "1M00104",
-            "label": "河津供电公司",
+            "label": "国网电力公司河津供电公司",
             "poi": [110.71132, 35.590984],
             "city": "运城市"
           },
           {
             "value": "1M00105",
-            "label": "闻喜供电公司",
+            "label": "国网电力公司闻喜供电公司",
             "poi": [111.220802, 35.356682],
             "city": "运城市"
           },
           {
             "value": "1M00106",
-            "label": "稷山供电公司",
+            "label": "国网电力公司稷山供电公司",
             "poi": [110.980245, 35.604106],
             "city": "运城市"
           },
           {
             "value": "1M00107",
-            "label": "临猗供电公司",
+            "label": "国网电力公司临猗供电公司",
             "poi": [110.775537, 35.141042],
             "city": "运城市"
           },
           {
             "value": "1M00108",
-            "label": "夏县供电公司",
+            "label": "国网电力公司夏县供电公司",
             "poi": [111.220915, 35.137628],
             "city": "运城市"
           },
           {
             "value": "1M00109",
-            "label": "万荣供电公司",
+            "label": "国网电力公司万荣供电公司",
             "poi": [110.834879, 35.411705],
             "city": "运城市"
           },
           {
             "value": "1M00110",
-            "label": "新绛供电公司",
+            "label": "国网电力公司新绛供电公司",
             "poi": [111.223912, 35.619106],
             "city": "运城市"
           },
           {
             "value": "1M00111",
-            "label": "绛县供电公司",
+            "label": "国网电力公司绛县供电公司",
             "poi": [111.579256, 35.490951],
             "city": "运城市"
           },
           {
             "value": "1M00112",
-            "label": "平陆供电公司",
+            "label": "国网电力公司平陆供电公司",
             "poi": [111.215091, 34.836233],
             "city": "运城市"
           },
           {
             "value": "1M00113",
-            "label": "芮城供电公司",
+            "label": "国网电力公司芮城供电公司",
             "poi": [110.508215, 34.622612],
             "city": "运城市"
           },
           {
             "value": "1M00114",
-            "label": "垣曲供电公司",
+            "label": "国网电力公司垣曲供电公司",
             "poi": [111.669712, 35.295328],
             "city": "运城市"
           }
@@ -195,96 +195,96 @@
       },
       {
         "value": "1L001",
-        "label": "国网临汾供电公司",
+        "label": "国网电力公司临汾供电公司",
         "poi": [111.536574, 36.079109],
         "children": [
           {
             "value": "1L001",
-            "label": "国网临汾供电公司",
+            "label": "国网电力公司临汾供电公司",
             "poi": [111.536574, 36.079109],
             "city": "临汾市"
           },
           {
             "value": "1L00101",
-            "label": "霍州供电公司",
+            "label": "国网电力公司霍州供电公司",
             "poi": [112.573038, 37.872962],
             "city": "临汾市"
           },
           {
             "value": "1L00102",
-            "label": "永和供电公司",
+            "label": "国网电力公司永和供电公司",
             "poi": [110.637981, 36.768462],
             "city": "临汾市"
           },
           {
             "value": "1L00103",
-            "label": "大宁供电公司",
+            "label": "国网电力公司大宁供电公司",
             "poi": [110.762769, 36.466201],
             "city": "临汾市"
           },
           {
             "value": "1L00104",
-            "label": "汾西供电公司",
+            "label": "国网电力公司汾西供电公司",
             "poi": [111.575232, 36.65213],
             "city": "临汾市"
           },
           {
             "value": "1L00105",
-            "label": "古县供电公司",
+            "label": "国网电力公司古县供电公司",
             "poi": [112.573038, 37.872962],
             "city": "临汾市"
           },
           {
             "value": "1L00106",
-            "label": "曲沃供电公司",
+            "label": "国网电力公司曲沃供电公司",
             "poi": [111.466924, 35.758894],
             "city": "临汾市"
           },
           {
             "value": "1L00107",
-            "label": "洪洞供电公司",
+            "label": "国网电力公司洪洞供电公司",
             "poi": [111.695144, 36.245872],
             "city": "临汾市"
           },
           {
             "value": "1L00108",
-            "label": "侯马供电公司",
+            "label": "国网电力公司侯马供电公司",
             "poi": [111.370814, 35.615973],
             "city": "临汾市"
           },
           {
             "value": "1L00109",
-            "label": "吉县供电公司",
+            "label": "国网电力公司吉县供电公司",
             "poi": [110.685584, 36.101287],
             "city": "临汾市"
           },
           {
             "value": "1L00110",
-            "label": "隰县供电公司",
+            "label": "国网电力公司隰县供电公司",
             "poi": [110.94267, 36.699669],
             "city": "临汾市"
           },
           {
             "value": "1L00111",
-            "label": "襄汾供电公司",
+            "label": "国网电力公司襄汾供电公司",
             "poi": [111.427173, 35.878825],
             "city": "临汾市"
           },
           {
             "value": "1L00112",
-            "label": "尧都供电公司",
+            "label": "国网电力公司尧都供电公司",
             "poi": [111.502956, 36.198799],
             "city": "临汾市"
           },
           {
             "value": "1L00113",
-            "label": "浮山供电公司",
+            "label": "国网电力公司浮山供电公司",
             "poi": [111.849345, 35.970463],
             "city": "临汾市"
           },
           {
             "value": "1L00114",
-            "label": "翼城供电公司",
+            "label": "国网电力公司翼城供电公司",
             "poi": [111.717582, 35.741062],
             "city": "临汾市"
           }
@@ -292,42 +292,42 @@
       },
       {
         "value": "1E001",
-        "label": "国网晋城供电公司",
+        "label": "国网电力公司晋城供电公司",
         "poi": [112.266473, 35.683795],
         "children": [
           {
             "value": "1E001",
-            "label": "国网晋城供电公司",
+            "label": "国网电力公司晋城供电公司",
             "poi": [112.266473, 35.683795],
             "city": "晋城市"
           },
           {
             "value": "1E00101",
-            "label": "陵川供电公司",
+            "label": "国网电力公司陵川供电公司",
             "poi": [112.573038, 37.872962],
             "city": "晋城市"
           },
           {
             "value": "1E00102",
-            "label": "高平供电公司",
+            "label": "国网电力公司高平供电公司",
             "poi": [112.936866, 35.797878],
             "city": "晋城市"
           },
           {
             "value": "1E00103",
-            "label": "沁水供电公司",
+            "label": "国网电力公司沁水供电公司",
             "poi": [112.18406, 35.689003],
             "city": "晋城市"
           },
           {
             "value": "1E00104",
-            "label": "泽州供电公司",
+            "label": "国网电力公司泽州供电公司",
             "poi": [112.88138, 35.492394],
             "city": "晋城市"
           },
           {
             "value": "1E00105",
-            "label": "阳城供电公司",
+            "label": "国网电力公司阳城供电公司",
             "poi": [112.405509, 35.491841],
             "city": "晋城市"
           }
@@ -335,84 +335,84 @@
       },
       {
         "value": "1D001",
-        "label": "国网长治供电公司",
+        "label": "国网电力公司长治供电公司",
         "poi": [112.768247, 36.82958],
         "children": [
           {
             "value": "1D001",
-            "label": "国网长治供电公司",
+            "label": "国网电力公司长治供电公司",
             "poi": [112.768247, 36.82958],
             "city": "长治市"
           },
           {
             "value": "1D00101",
-            "label": "壶关供电公司",
+            "label": "国网电力公司壶关供电公司",
             "poi": [113.199585, 36.096526],
             "city": "长治市"
           },
           {
             "value": "1D00102",
-            "label": "武乡供电公司",
+            "label": "国网电力公司武乡供电公司",
             "poi": [112.863594,36.737996],
             "city": "长治市"
           },
           {
             "value": "1D00103",
-            "label": "屯留供电公司",
+            "label": "国网电力公司屯留供电公司",
             "poi": [112.896305, 36.310993],
             "city": "长治市"
           },
           {
             "value": "1D00104",
-            "label": "黎城供电公司",
+            "label": "国网电力公司黎城供电公司",
             "poi": [113.054382, 36.052635],
             "city": "长治市"
           },
           {
             "value": "1D00105",
-            "label": "上党供电公司",
+            "label": "国网电力公司上党供电公司",
             "poi": [113.051439,36.053437],
             "city": "长治市"
           },
           {
             "value": "1D00106",
-            "label": "沁源供电公司",
+            "label": "国网电力公司沁源供电公司",
             "poi": [112.242802, 36.503242],
             "city": "长治市"
           },
           {
             "value": "1D00107",
-            "label": "襄垣供电公司",
+            "label": "国网电力公司襄垣供电公司",
             "poi": [113.048441, 36.530788],
             "city": "长治市"
           },
           {
             "value": "1D00108",
-            "label": "长子供电公司",
+            "label": "国网电力公司长子供电公司",
             "poi": [112.892397, 36.119711],
             "city": "长治市"
           },
           {
             "value": "1D00109",
-            "label": "潞州供电公司",
+            "label": "国网电力公司潞州供电公司",
             "poi": [113.122039, 36.192431],
             "city": "长治市"
           },
           {
             "value": "1D00110",
-            "label": "平顺供电公司",
+            "label": "国网电力公司平顺供电公司",
             "poi": [113.442215, 36.200717],
             "city": "长治市"
           },
           {
             "value": "1D00111",
-            "label": "潞城供电公司",
+            "label": "国网电力公司潞城供电公司",
             "poi": [113.225458, 36.32835],
             "city": "长治市"
           },
           {
             "value": "1D00112",
-            "label": "沁县供电公司",
+            "label": "国网电力公司沁县供电公司",
             "poi": [112.697448, 36.760236],
             "city": "长治市"
           }
@@ -420,42 +420,42 @@
       },
       {
         "value": "1J001",
-        "label": "国网吕梁供电公司",
+        "label": "国网电力公司吕梁供电公司",
         "poi": [111.152032, 37.516873],
         "children": [
           {
             "value": "1J001",
-            "label": "国网吕梁供电公司",
+            "label": "国网吕梁电力公司供电公司",
             "poi": [111.152032, 37.516873],
             "city": "吕梁市"
           },
           {
             "value": "1J00101",
-            "label": "交城供电公司",
+            "label": "国网电力公司交城供电公司",
             "poi": [112.161583, 37.554133],
             "city": "吕梁市"
           },
           {
             "value": "1J00102",
-            "label": "文水供电公司",
+            "label": "国网电力公司文水供电公司",
             "poi": [112.03641, 37.436655],
             "city": "吕梁市"
           },
           {
             "value": "1J00103",
-            "label": "汾阳供电公司",
+            "label": "国网电力公司汾阳供电公司",
             "poi": [111.773383, 37.266639],
             "city": "吕梁市"
           },
           {
             "value": "1J00104",
-            "label": "孝义供电公司",
+            "label": "国网电力公司孝义供电公司",
             "poi": [111.652554, 37.133186],
             "city": "吕梁市"
           },
           {
             "value": "1J00105",
-            "label": "岚县供电公司",
+            "label": "国网电力公司岚县供电公司",
             "poi": [111.672293, 38.279653],
             "city": "吕梁市"
           }
@@ -463,78 +463,78 @@
       },
       {
         "value": "1K001",
-        "label": "国网晋中供电公司",
+        "label": "国网电力公司晋中供电公司",
         "poi": [112.751429, 37.699199],
         "children": [
           {
             "value": "1K001",
-            "label": "国网晋中供电公司",
+            "label": "国网电力公司晋中供电公司",
             "poi": [112.751429, 37.699199],
             "city": "晋中市"
           },
           {
             "value": "1K00101",
-            "label": "榆次供电公司",
+            "label": "国网电力公司榆次供电公司",
             "poi": [112.733484, 37.604933],
             "city": "晋中市"
           },
           {
             "value": "1K00102",
-            "label": "祁县供电公司",
+            "label": "国网电力公司祁县供电公司",
             "poi": [112.332742, 37.357958],
             "city": "晋中市"
           },
           {
             "value": "1K00103",
-            "label": "太谷供电公司",
+            "label": "国网电力公司太谷供电公司",
             "poi": [112.562051, 37.42032],
             "city": "晋中市"
           },
           {
             "value": "1K00104",
-            "label": "榆社供电公司",
+            "label": "国网电力公司榆社供电公司",
             "poi": [112.973375, 37.074445],
             "city": "晋中市"
           },
           {
             "value": "1K00105",
-            "label": "介休供电公司",
+            "label": "国网电力公司介休供电公司",
             "poi": [111.906882, 37.024713],
             "city": "晋中市"
           },
           {
             "value": "1K00106",
-            "label": "灵石供电公司",
+            "label": "国网电力公司灵石供电公司",
             "poi": [111.582002, 36.750353],
             "city": "晋中市"
           },
           {
             "value": "1K00107",
-            "label": "左权供电公司",
+            "label": "国网电力公司左权供电公司",
             "poi": [113.360512, 37.078016],
             "city": "晋中市"
           },
           {
             "value": "1K00108",
-            "label": "和顺供电公司",
+            "label": "国网电力公司和顺供电公司",
             "poi": [113.575027, 37.331564],
             "city": "晋中市"
           },
           {
             "value": "1K00109",
-            "label": "昔阳供电公司",
+            "label": "国网电力公司昔阳供电公司",
             "poi": [113.701757, 37.609083],
             "city": "晋中市"
           },
           {
             "value": "1K00110",
-            "label": "寿阳供电公司",
+            "label": "国网电力公司寿阳供电公司",
             "poi": [113.165423, 37.899167],
             "city": "晋中市"
           },
           {
             "value": "1K00111",
-            "label": "平遥供电公司",
+            "label": "国网电力公司平遥供电公司",
             "poi": [112.170071, 37.202912],
             "city": "晋中市"
           }
@@ -542,90 +542,90 @@
       },
       {
         "value": "1H001",
-        "label": "国网忻州供电公司",
+        "label": "国网电力公司忻州供电公司",
         "poi": [112.732551, 38.455998],
         "children": [
           {
             "value": "1H001",
-            "label": "国网忻州供电公司",
+            "label": "国网电力公司忻州供电公司",
             "poi": [112.732551, 38.455998],
             "city": "忻州市"
           },
           {
             "value": "1H00101",
-            "label": "河曲供电公司",
+            "label": "国网电力公司河曲供电公司",
             "poi": [111.354317, 39.377921],
             "city": "忻州市"
           },
           {
             "value": "1H00102",
-            "label": "偏关供电公司",
+            "label": "国网电力公司偏关供电公司",
             "poi": [111.50442, 39.44374],
             "city": "忻州市"
           },
           {
             "value": "1H00103",
-            "label": "原平供电公司",
+            "label": "国网电力公司原平供电公司",
             "poi": [112.725641, 38.723267],
             "city": "忻州市"
           },
           {
             "value": "1H00104",
-            "label": "代县供电公司",
+            "label": "国网电力公司代县供电公司",
             "poi": [112.978493, 39.082103],
             "city": "忻州市"
           },
           {
             "value": "1H00105",
-            "label": "忻府供电公司",
+            "label": "国网电力公司忻府供电公司",
             "poi": [112.746188,38.323807],
             "city": "忻州市"
           },
           {
             "value": "1H00106",
-            "label": "五寨供电公司",
+            "label": "国网电力公司五寨供电公司",
             "poi": [111.841898, 38.914325],
             "city": "忻州市"
           },
           {
             "value": "1H00107",
-            "label": "五台供电公司",
+            "label": "国网电力公司五台供电公司",
             "poi": [113.252555, 38.72187],
             "city": "忻州市"
           },
           {
             "value": "1H00108",
-            "label": "神池供电公司",
+            "label": "国网电力公司神池供电公司",
             "poi": [112.219179, 39.095656],
             "city": "忻州市"
           },
           {
             "value": "1H00109",
-            "label": "宁武供电公司",
+            "label": "国网电力公司宁武供电公司",
             "poi": [112.315447, 39.008705],
             "city": "忻州市"
           },
           {
             "value": "1H00110",
-            "label": "岢岚供电公司",
+            "label": "国网电力公司岢岚供电公司",
             "poi": [111.572965,38.703991],
             "city": "忻州市"
           },
           {
             "value": "1H00111",
-            "label": "繁峙供电公司",
+            "label": "国网电力公司繁峙供电公司",
             "poi": [113.280065, 39.19077],
             "city": "忻州市"
           },
           {
             "value": "1H00112",
-            "label": "定襄供电公司",
+            "label": "国网电力公司定襄供电公司",
             "poi": [112.967108, 38.486391],
             "city": "忻州市"
           },
           {
             "value": "1H00113",
-            "label": "保德供电公司",
+            "label": "国网电力公司保德供电公司",
             "poi": [112.967108, 38.486391],
             "city": "忻州市"
           }
@@ -633,66 +633,66 @@
       },
       {
         "value": "1B001",
-        "label": "国网大同供电公司",
+        "label": "国网电力公司大同供电公司",
         "poi": [113.293305, 40.07701],
         "children": [
           {
             "value": "1B001",
-            "label": "国网大同供电公司",
+            "label": "国网电力公司大同供电公司",
             "poi": [113.293305, 40.07701],
             "city": "大同市"
           },
           {
             "value": "1B00101",
-            "label": "云冈供电公司",
+            "label": "国网电力公司云冈供电公司",
             "poi": [113.149591,40.004904],
             "city": "大同市"
           },
           {
             "value": "1B00102",
-            "label": "新荣供电公司",
+            "label": "国网电力公司新荣供电公司",
             "poi": [113.1429, 40.257904],
             "city": "大同市"
           },
           {
             "value": "1B00103",
-            "label": "云州供电公司",
+            "label": "国网电力公司云州供电公司",
             "poi": [113.612463,40.040288],
             "city": "大同市"
           },
           {
             "value": "1B00104",
-            "label": "阳高供电公司",
+            "label": "国网电力公司阳高供电公司",
             "poi": [113.747671, 40.36597],
             "city": "大同市"
           },
           {
             "value": "1B00105",
-            "label": "天镇供电公司",
+            "label": "国网电力公司天镇供电公司",
             "poi": [114.09394, 40.436161],
             "city": "大同市"
           },
           {
             "value": "1B00106",
-            "label": "浑源供电公司",
+            "label": "国网电力公司浑源供电公司",
             "poi": [113.714675, 39.701893],
             "city": "大同市"
           },
           {
             "value": "1B00107",
-            "label": "灵丘供电公司",
+            "label": "国网电力公司灵丘供电公司",
             "poi": [114.227499, 39.437211],
             "city": "大同市"
           },
           {
             "value": "1B00108",
-            "label": "广灵供电公司",
+            "label": "国网电力公司广灵供电公司",
             "poi": [114.289298, 39.767572],
             "city": "大同市"
           },
           {
             "value": "1B00109",
-            "label": "左云供电公司",
+            "label": "国网电力公司左云供电公司",
             "poi": [112.723254, 40.014756],
             "city": "大同市"
           }
@@ -700,48 +700,48 @@
       },
       {
         "value": "1F001",
-        "label": "国网朔州供电公司",
+        "label": "国网电力公司朔州供电公司",
         "poi": [112.428691, 39.326848],
         "children": [
           {
             "value": "1F001",
-            "label": "国网朔州供电公司",
+            "label": "国网电力公司朔州供电公司",
             "poi": [112.428691, 39.326848],
             "city": "朔州市"
           },
           {
             "value": "1F00101",
-            "label": "神头供电公司",
+            "label": "国网电力公司神头供电公司",
             "poi": [112.549562, 39.342887],
             "city": "朔州市"
           },
           {
             "value": "1F00102",
-            "label": "平鲁供电公司",
+            "label": "国网电力公司平鲁供电公司",
             "poi": [112.083193, 39.504376],
             "city": "朔州市"
           },
           {
             "value": "1F00103",
-            "label": "怀仁供电公司",
+            "label": "国网电力公司怀仁供电公司",
             "poi": [113.10673, 39.817233],
             "city": "朔州市"
           },
           {
             "value": "1F00104",
-            "label": "山阴供电公司",
+            "label": "国网电力公司山阴供电公司",
             "poi": [113.10673, 39.817233],
             "city": "朔州市"
           },
           {
             "value": "1F00105",
-            "label": "应县供电公司",
+            "label": "国网电力公司应县供电公司",
             "poi": [113.191069, 39.553121],
             "city": "朔州市"
           },
           {
             "value": "1F00106",
-            "label": "右玉供电公司",
+            "label": "国网电力公司右玉供电公司",
             "poi": [112.467712, 39.986117],
             "city": "朔州市"
           }
@@ -749,36 +749,36 @@
       },
       {
         "value": "1C001",
-        "label": "国网阳泉供电公司",
+        "label": "国网电力公司阳泉供电公司",
         "poi": [113.598369, 37.856476],
         "children": [
           {
             "value": "1C001",
-            "label": "国网阳泉供电公司",
+            "label": "国网电力公司阳泉供电公司",
             "poi": [113.598369, 37.856476],
             "city": "阳泉市"
           },
           {
             "value": "1C00101",
-            "label": "平定供电公司",
+            "label": "国网电力公司平定供电公司",
             "poi": [113.629756,37.754749],
             "city": "阳泉市"
           },
           {
             "value": "1C00102",
-            "label": "盂县供电公司",
+            "label": "国网电力公司盂县供电公司",
             "poi": [113.400151, 38.091752],
             "city": "阳泉市"
           },
           {
             "value": "1C00103",
-            "label": "荫营供电公司",
+            "label": "国网电力公司荫营供电公司",
             "poi": [113.571929, 37.936917],
             "city": "阳泉市"
           },
           {
             "value": "1C00104",
-            "label": "平坦供电公司",
+            "label": "国网电力公司平坦供电公司",
             "poi": [113.791159, 37.860301],
             "city": "阳泉市"
           }

src/views/pad/official/carWarning.vue

@@ -241,7 +241,7 @@ export default {
           color: "white",
           fontSize: 12,
           interval: 0,
-          rotate: 65,
+          rotate: 75,
           padding: [2, 0, 2, 0]
         },
         axisTick: {
@@ -307,7 +307,7 @@ export default {
           color: "white",
           fontSize: 12,
           interval: 0,
-          rotate: 65,
+          rotate: 75,
           padding: [2, 0, 2, 0]
         },
         axisTick: {

src/views/pad/service/canteenDialog.vue

@@ -1237,7 +1237,7 @@ export default {
           
           this.canteenTotalRankBarData = [
           {
-          name: "员工",
+          name: "厨师",
           type: "bar",
           itemStyle: {
             color: "#43DCDB",
@@ -1247,10 +1247,10 @@ export default {
           data: [res.data[0].chefs],
         },
         {
-          name: "访客",
+          name: "服务员",
           type: "bar",
           itemStyle: {
-            color: "#FFD296",
+            color: "#efb164",
             //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
           },
           barWidth: 20,
@@ -1683,10 +1683,10 @@ export default {
           display: flex;
           align-items: center;
           color:#00FFFF;
-          font-size: 36px;
-          font-weight: bold;
+          font-size: 32px;
+          // font-weight: bold;
           padding-top:5px;
-          font-family: 'electronicFont';
+          // font-family: 'electronicFont';
 
           .unit{
             font-size:22px;
@@ -1722,7 +1722,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        font-size:18px;
+        font-size:25px;
         color:#00FFFF;
         font-family: 'electronicFont';
         padding-bottom: 18px;
@@ -1766,7 +1766,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        font-size:18px;
+        font-size:25px;
         color:#ffffff;
         font-family: 'electronicFont';
 

src/views/pad/service/employeeProfileDialog.vue

@@ -259,10 +259,10 @@ export default {
       sexBarYAxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name: '人',
+        name: '单位：人',
         nameTextStyle: {
           color: '#fff',
-          padding: [0,35,0,0]
+          padding: [0,35,0,30]
         },
         axisLine:{
           show:false
@@ -652,7 +652,7 @@ export default {
         display: flex;
         align-items: center;
         position: relative;
-        top:15px;
+        top:25px;
 
         .unit{
           font-size:13px;

src/views/pad/service/main.vue

@@ -159,7 +159,7 @@
             <div class="cont-title">共享驿站</div>
           </div>
           <div class="components-item">
-            <share-station :appOrg="appOrg"></share-station>
+            <share-station :key="appOrg" :appOrg="appOrg"></share-station>
           </div>
         </div>
         <div

src/views/pad/service/propertyDialog.vue

@@ -183,7 +183,7 @@ export default {
       barYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name: '个',
+        name: '单位：个',
         nameTextStyle: {
           color: '#fff',
         },
@@ -224,7 +224,7 @@ export default {
       carFlowBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name: '车辆',
+        name: '单位：辆',
         nameTextStyle: {
           color: '#fff',
         },

src/views/screen/building/energyRate.vue

@@ -197,7 +197,7 @@
                 <div style="width: 50%;">
                   <div class="cFox">
                     <div>
-                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div class="num" style="justify-content: center;">{{ fllEleList.weekTotal }}<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>
@@ -253,7 +253,7 @@ import BarChart from "@/components/Echarts/BarChart.vue";
 import echarts from "echarts";
 import {
 
-thisWeekElectricity,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
+thisWeekElectricity,controlElevator,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
 } from "@/api/screen/service";
 
 export default {
@@ -268,6 +268,7 @@ export default {
   data() {
     return {
       thisWeekElectricityList:{},
+      fllEleList:{},
       //楼宇每月用电量
      yearLineData: [],
         //楼宇今日总用电量
@@ -293,6 +294,9 @@ export default {
   created() {
     //楼宇本周用电量
     this.thisWeekElectricity()
+    //电梯能量回收
+    this.controlElevator()
+    
          //楼宇今日总用电量
     this.todayElectricity()
          //楼宇每月用电量
@@ -314,6 +318,15 @@ export default {
         }
       });
     },
+    
+         //电梯能量回收
+         controlElevator() {
+          controlElevator(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.fllEleList=res.data;
+        }
+      });
+    },
 
 
     //楼宇今日总用电量

src/views/screen/building/energyRateDialog.vue

@@ -318,7 +318,7 @@
                 <div style="width: 50%;">
                   <div class="cFox">
                     <div>
-                      <div class="num" style="justify-content: center;">56<span class="unit">kWh</span></div>
+                      <div class="num" style="justify-content: center;">{{ fllEleList.weekTotal }}<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>
@@ -606,7 +606,7 @@ import CylinderChart from "@/components/Echarts/cylinderChart.vue";
 import echarts from "echarts";
 import {
 
-  thisWeekElectricity,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
+  thisWeekElectricity,controlElevator,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
 } from "@/api/screen/service";
 
 export default {
@@ -626,6 +626,7 @@ export default {
   data() {
     return {
       thisWeekElectricityList:{},
+      fllEleList:{},
       warnDeviceList:{},
       barWidth: 100,
       macShow: false,
@@ -739,6 +740,8 @@ export default {
   created() {
     //楼宇本周用电量
     this.thisWeekElectricity()
+     //电梯能量回收
+     this.controlElevator()
     //楼宇每月用电量
     this.monthElectricity()
     //楼宇今日总用电量
@@ -771,6 +774,14 @@ export default {
         }
       });
     },
+       //电梯能量回收
+       controlElevator() {
+          controlElevator(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.fllEleList=res.data;
+        }
+      });
+    },
    
       //水箱
     // 二十三层生活水箱丶消防水箱

src/views/screen/building/unitMonitorDialog.vue

@@ -91,7 +91,7 @@ import PieChart from "@/components/Echarts/PieChart";
 import BarChart from "@/components/Echarts/BarChart.vue";
 import echarts from "echarts";
 import RaddarChart from "@/components/Echarts/RaddarChart.vue";
-import {monitorList,frequency,patrol,patrolPoint} from "@/api/screen/service";
+import {frequency,patrol,patrolPoint} from "@/api/screen/service";
 
 export default {
   name: "UnitMonitorDialog",
@@ -199,7 +199,7 @@ export default {
           ]
         },
       ],
-      monitorList: [],
+    
        //巡更点统计
        floorDataList: [],
     };
@@ -210,7 +210,7 @@ export default {
     //巡更点统计
     this.patrolPoint();
     this.patrol();
-    this.getMonitorList();
+  
     this.handleUnitDataList();
   },
   destroyed() {},
@@ -331,20 +331,7 @@ export default {
       });
     },
 
-    //视频流列表 各公司出入口监控
-    getMonitorList() {
-      let index = this.cityNameList.indexOf(this.monitorName);
-      let code = "0000";
-      if(index >= 0){
-        code = this.cityCodeList[index];
-      }
-      console.log(code, index,this.monitorName)
-      monitorList(code).then((res) => {
-        if (Number(res.code) === 200) {
-          this.monitorList = res.data
-        }
-      });
-    },
+   
 
     //初始化
     handleUnitDataList() {
@@ -387,10 +374,8 @@ export default {
       console.log(11)
     },
 
-    //选择单个视频流
-    chooseMonitor(index){
-      this.$emit("chooseMonitor", this.monitorList[index]);
-    }
+  
+   
   },
 };
 </script>

src/views/screen/data/company.json

@@ -35,62 +35,62 @@
       },
       {
         "value": "1A003",
-        "label": "国网太原供电公司",
+        "label": "国网电力公司太原供电公司",
         "poi": [112.573038, 37.872962],
         "city": "太原市",
         "children": [
           {
             "value": "1A003",
-            "label": "国网太原供电公司",
+            "label": "国网电力公司太原供电公司",
             "poi": [112.573038, 37.872962],
             "city": "太原市"
           },
           {
             "value": "1A00301",
-            "label": "小店供电公司",
+            "label": "国网电力公司小店供电公司",
             "poi": [112.573038, 37.872962],
             "city": "太原市",
             "area": "小店区"
           },
           {
             "value": "1A00302",
-            "label": "科创城供电公司",
+            "label": "国网电力公司科创城供电公司",
             "poi": [112.592319, 37.734528],
             "city": "太原市"
           },
           {
             "value": "1A00303",
-            "label": "滨河供电公司",
+            "label": "国网电力公司滨河供电公司",
             "poi": [112.487826, 37.936797],
             "city": "太原市"
           },
           {
             "value": "1A00304",
-            "label": "晋源供电公司",
+            "label": "国网电力公司晋源供电公司",
             "poi": [112.493612, 37.699236],
             "city": "太原市"
           },
           {
             "value": "1A00305",
-            "label": "清徐供电公司",
+            "label": "国网电力公司清徐供电公司",
             "poi": [112.364981, 37.597803],
             "city": "太原市"
           },
           {
             "value": "1A00306",
-            "label": "阳曲供电公司",
+            "label": "国网电力公司阳曲供电公司",
             "poi": [112.677995, 38.061061],
             "city": "太原市"
           },
           {
             "value": "1A00307",
-            "label": "古交供电公司",
+            "label": "国网电力公司古交供电公司",
             "poi": [112.178924, 37.901643],
             "city": "太原市"
           },
           {
             "value": "1A00308",
-            "label": "娄烦供电公司",
+            "label": "国网电力公司娄烦供电公司",
             "poi": [111.797581, 38.068692],
             "city": "太原市"
           }
@@ -98,96 +98,96 @@
       },
       {
         "value": "1M001",
-        "label": "国网运城供电公司",
+        "label": "国网电力公司运城供电公司",
         "poi": [110.952935, 35.136313],
         "children": [
           {
             "value": "1M001",
-            "label": "运城市公司(本部)",
+            "label": "国网电力公司运城市公司(本部)",
             "poi": [110.952935, 35.136313],
             "city": "运城市"
           },
           {
             "value": "1M00101",
-            "label": "永济供电公司",
+            "label": "国网电力公司永济供电公司",
             "poi": [110.449161, 34.863149],
             "city": "运城市"
           },
           {
             "value": "1M00102",
-            "label": "盐湖供电公司",
+            "label": "国网电力公司盐湖供电公司",
             "poi": [110.997981, 35.022705],
             "city": "运城市"
           },
           {
             "value": "1M00103",
-            "label": "开发区供电公司",
+            "label": "国网电力公司开发区供电公司",
             "poi": [112.573038, 37.872962],
             "city": "运城市"
           },
           {
             "value": "1M00104",
-            "label": "河津供电公司",
+            "label": "国网电力公司河津供电公司",
             "poi": [110.71132, 35.590984],
             "city": "运城市"
           },
           {
             "value": "1M00105",
-            "label": "闻喜供电公司",
+            "label": "国网电力公司闻喜供电公司",
             "poi": [111.220802, 35.356682],
             "city": "运城市"
           },
           {
             "value": "1M00106",
-            "label": "稷山供电公司",
+            "label": "国网电力公司稷山供电公司",
             "poi": [110.980245, 35.604106],
             "city": "运城市"
           },
           {
             "value": "1M00107",
-            "label": "临猗供电公司",
+            "label": "国网电力公司临猗供电公司",
             "poi": [110.775537, 35.141042],
             "city": "运城市"
           },
           {
             "value": "1M00108",
-            "label": "夏县供电公司",
+            "label": "国网电力公司夏县供电公司",
             "poi": [111.220915, 35.137628],
             "city": "运城市"
           },
           {
             "value": "1M00109",
-            "label": "万荣供电公司",
+            "label": "国网电力公司万荣供电公司",
             "poi": [110.834879, 35.411705],
             "city": "运城市"
           },
           {
             "value": "1M00110",
-            "label": "新绛供电公司",
+            "label": "国网电力公司新绛供电公司",
             "poi": [111.223912, 35.619106],
             "city": "运城市"
           },
           {
             "value": "1M00111",
-            "label": "绛县供电公司",
+            "label": "国网电力公司绛县供电公司",
             "poi": [111.579256, 35.490951],
             "city": "运城市"
           },
           {
             "value": "1M00112",
-            "label": "平陆供电公司",
+            "label": "国网电力公司平陆供电公司",
             "poi": [111.215091, 34.836233],
             "city": "运城市"
           },
           {
             "value": "1M00113",
-            "label": "芮城供电公司",
+            "label": "国网电力公司芮城供电公司",
             "poi": [110.508215, 34.622612],
             "city": "运城市"
           },
           {
             "value": "1M00114",
-            "label": "垣曲供电公司",
+            "label": "国网电力公司垣曲供电公司",
             "poi": [111.669712, 35.295328],
             "city": "运城市"
           }
@@ -195,96 +195,96 @@
       },
       {
         "value": "1L001",
-        "label": "国网临汾供电公司",
+        "label": "国网电力公司临汾供电公司",
         "poi": [111.536574, 36.079109],
         "children": [
           {
             "value": "1L001",
-            "label": "国网临汾供电公司",
+            "label": "国网电力公司临汾供电公司",
             "poi": [111.536574, 36.079109],
             "city": "临汾市"
           },
           {
             "value": "1L00101",
-            "label": "霍州供电公司",
+            "label": "国网电力公司霍州供电公司",
             "poi": [112.573038, 37.872962],
             "city": "临汾市"
           },
           {
             "value": "1L00102",
-            "label": "永和供电公司",
+            "label": "国网电力公司永和供电公司",
             "poi": [110.637981, 36.768462],
             "city": "临汾市"
           },
           {
             "value": "1L00103",
-            "label": "大宁供电公司",
+            "label": "国网电力公司大宁供电公司",
             "poi": [110.762769, 36.466201],
             "city": "临汾市"
           },
           {
             "value": "1L00104",
-            "label": "汾西供电公司",
+            "label": "国网电力公司汾西供电公司",
             "poi": [111.575232, 36.65213],
             "city": "临汾市"
           },
           {
             "value": "1L00105",
-            "label": "古县供电公司",
+            "label": "国网电力公司古县供电公司",
             "poi": [112.573038, 37.872962],
             "city": "临汾市"
           },
           {
             "value": "1L00106",
-            "label": "曲沃供电公司",
+            "label": "国网电力公司曲沃供电公司",
             "poi": [111.466924, 35.758894],
             "city": "临汾市"
           },
           {
             "value": "1L00107",
-            "label": "洪洞供电公司",
+            "label": "国网电力公司洪洞供电公司",
             "poi": [111.695144, 36.245872],
             "city": "临汾市"
           },
           {
             "value": "1L00108",
-            "label": "侯马供电公司",
+            "label": "国网电力公司侯马供电公司",
             "poi": [111.370814, 35.615973],
             "city": "临汾市"
           },
           {
             "value": "1L00109",
-            "label": "吉县供电公司",
+            "label": "国网电力公司吉县供电公司",
             "poi": [110.685584, 36.101287],
             "city": "临汾市"
           },
           {
             "value": "1L00110",
-            "label": "隰县供电公司",
+            "label": "国网电力公司隰县供电公司",
             "poi": [110.94267, 36.699669],
             "city": "临汾市"
           },
           {
             "value": "1L00111",
-            "label": "襄汾供电公司",
+            "label": "国网电力公司襄汾供电公司",
             "poi": [111.427173, 35.878825],
             "city": "临汾市"
           },
           {
             "value": "1L00112",
-            "label": "尧都供电公司",
+            "label": "国网电力公司尧都供电公司",
             "poi": [111.502956, 36.198799],
             "city": "临汾市"
           },
           {
             "value": "1L00113",
-            "label": "浮山供电公司",
+            "label": "国网电力公司浮山供电公司",
             "poi": [111.849345, 35.970463],
             "city": "临汾市"
           },
           {
             "value": "1L00114",
-            "label": "翼城供电公司",
+            "label": "国网电力公司翼城供电公司",
             "poi": [111.717582, 35.741062],
             "city": "临汾市"
           }
@@ -292,42 +292,42 @@
       },
       {
         "value": "1E001",
-        "label": "国网晋城供电公司",
+        "label": "国网电力公司晋城供电公司",
         "poi": [112.266473, 35.683795],
         "children": [
           {
             "value": "1E001",
-            "label": "国网晋城供电公司",
+            "label": "国网电力公司晋城供电公司",
             "poi": [112.266473, 35.683795],
             "city": "晋城市"
           },
           {
             "value": "1E00101",
-            "label": "陵川供电公司",
+            "label": "国网电力公司陵川供电公司",
             "poi": [112.573038, 37.872962],
             "city": "晋城市"
           },
           {
             "value": "1E00102",
-            "label": "高平供电公司",
+            "label": "国网电力公司高平供电公司",
             "poi": [112.936866, 35.797878],
             "city": "晋城市"
           },
           {
             "value": "1E00103",
-            "label": "沁水供电公司",
+            "label": "国网电力公司沁水供电公司",
             "poi": [112.18406, 35.689003],
             "city": "晋城市"
           },
           {
             "value": "1E00104",
-            "label": "泽州供电公司",
+            "label": "国网电力公司泽州供电公司",
             "poi": [112.88138, 35.492394],
             "city": "晋城市"
           },
           {
             "value": "1E00105",
-            "label": "阳城供电公司",
+            "label": "国网电力公司阳城供电公司",
             "poi": [112.405509, 35.491841],
             "city": "晋城市"
           }
@@ -335,84 +335,84 @@
       },
       {
         "value": "1D001",
-        "label": "国网长治供电公司",
+        "label": "国网电力公司长治供电公司",
         "poi": [112.768247, 36.82958],
         "children": [
           {
             "value": "1D001",
-            "label": "国网长治供电公司",
+            "label": "国网电力公司长治供电公司",
             "poi": [112.768247, 36.82958],
             "city": "长治市"
           },
           {
             "value": "1D00101",
-            "label": "壶关供电公司",
+            "label": "国网电力公司壶关供电公司",
             "poi": [113.199585, 36.096526],
             "city": "长治市"
           },
           {
             "value": "1D00102",
-            "label": "武乡供电公司",
+            "label": "国网电力公司武乡供电公司",
             "poi": [112.863594,36.737996],
             "city": "长治市"
           },
           {
             "value": "1D00103",
-            "label": "屯留供电公司",
+            "label": "国网电力公司屯留供电公司",
             "poi": [112.896305, 36.310993],
             "city": "长治市"
           },
           {
             "value": "1D00104",
-            "label": "黎城供电公司",
+            "label": "国网电力公司黎城供电公司",
             "poi": [113.054382, 36.052635],
             "city": "长治市"
           },
           {
             "value": "1D00105",
-            "label": "上党供电公司",
+            "label": "国网电力公司上党供电公司",
             "poi": [113.051439,36.053437],
             "city": "长治市"
           },
           {
             "value": "1D00106",
-            "label": "沁源供电公司",
+            "label": "国网电力公司沁源供电公司",
             "poi": [112.242802, 36.503242],
             "city": "长治市"
           },
           {
             "value": "1D00107",
-            "label": "襄垣供电公司",
+            "label": "国网电力公司襄垣供电公司",
             "poi": [113.048441, 36.530788],
             "city": "长治市"
           },
           {
             "value": "1D00108",
-            "label": "长子供电公司",
+            "label": "国网电力公司长子供电公司",
             "poi": [112.892397, 36.119711],
             "city": "长治市"
           },
           {
             "value": "1D00109",
-            "label": "潞州供电公司",
+            "label": "国网电力公司潞州供电公司",
             "poi": [113.122039, 36.192431],
             "city": "长治市"
           },
           {
             "value": "1D00110",
-            "label": "平顺供电公司",
+            "label": "国网电力公司平顺供电公司",
             "poi": [113.442215, 36.200717],
             "city": "长治市"
           },
           {
             "value": "1D00111",
-            "label": "潞城供电公司",
+            "label": "国网电力公司潞城供电公司",
             "poi": [113.225458, 36.32835],
             "city": "长治市"
           },
           {
             "value": "1D00112",
-            "label": "沁县供电公司",
+            "label": "国网电力公司沁县供电公司",
             "poi": [112.697448, 36.760236],
             "city": "长治市"
           }
@@ -420,42 +420,42 @@
       },
       {
         "value": "1J001",
-        "label": "国网吕梁供电公司",
+        "label": "国网电力公司吕梁供电公司",
         "poi": [111.152032, 37.516873],
         "children": [
           {
             "value": "1J001",
-            "label": "国网吕梁供电公司",
+            "label": "国网吕梁电力公司供电公司",
             "poi": [111.152032, 37.516873],
             "city": "吕梁市"
           },
           {
             "value": "1J00101",
-            "label": "交城供电公司",
+            "label": "国网电力公司交城供电公司",
             "poi": [112.161583, 37.554133],
             "city": "吕梁市"
           },
           {
             "value": "1J00102",
-            "label": "文水供电公司",
+            "label": "国网电力公司文水供电公司",
             "poi": [112.03641, 37.436655],
             "city": "吕梁市"
           },
           {
             "value": "1J00103",
-            "label": "汾阳供电公司",
+            "label": "国网电力公司汾阳供电公司",
             "poi": [111.773383, 37.266639],
             "city": "吕梁市"
           },
           {
             "value": "1J00104",
-            "label": "孝义供电公司",
+            "label": "国网电力公司孝义供电公司",
             "poi": [111.652554, 37.133186],
             "city": "吕梁市"
           },
           {
             "value": "1J00105",
-            "label": "岚县供电公司",
+            "label": "国网电力公司岚县供电公司",
             "poi": [111.672293, 38.279653],
             "city": "吕梁市"
           }
@@ -463,78 +463,78 @@
       },
       {
         "value": "1K001",
-        "label": "国网晋中供电公司",
+        "label": "国网电力公司晋中供电公司",
         "poi": [112.751429, 37.699199],
         "children": [
           {
             "value": "1K001",
-            "label": "国网晋中供电公司",
+            "label": "国网电力公司晋中供电公司",
             "poi": [112.751429, 37.699199],
             "city": "晋中市"
           },
           {
             "value": "1K00101",
-            "label": "榆次供电公司",
+            "label": "国网电力公司榆次供电公司",
             "poi": [112.733484, 37.604933],
             "city": "晋中市"
           },
           {
             "value": "1K00102",
-            "label": "祁县供电公司",
+            "label": "国网电力公司祁县供电公司",
             "poi": [112.332742, 37.357958],
             "city": "晋中市"
           },
           {
             "value": "1K00103",
-            "label": "太谷供电公司",
+            "label": "国网电力公司太谷供电公司",
             "poi": [112.562051, 37.42032],
             "city": "晋中市"
           },
           {
             "value": "1K00104",
-            "label": "榆社供电公司",
+            "label": "国网电力公司榆社供电公司",
             "poi": [112.973375, 37.074445],
             "city": "晋中市"
           },
           {
             "value": "1K00105",
-            "label": "介休供电公司",
+            "label": "国网电力公司介休供电公司",
             "poi": [111.906882, 37.024713],
             "city": "晋中市"
           },
           {
             "value": "1K00106",
-            "label": "灵石供电公司",
+            "label": "国网电力公司灵石供电公司",
             "poi": [111.582002, 36.750353],
             "city": "晋中市"
           },
           {
             "value": "1K00107",
-            "label": "左权供电公司",
+            "label": "国网电力公司左权供电公司",
             "poi": [113.360512, 37.078016],
             "city": "晋中市"
           },
           {
             "value": "1K00108",
-            "label": "和顺供电公司",
+            "label": "国网电力公司和顺供电公司",
             "poi": [113.575027, 37.331564],
             "city": "晋中市"
           },
           {
             "value": "1K00109",
-            "label": "昔阳供电公司",
+            "label": "国网电力公司昔阳供电公司",
             "poi": [113.701757, 37.609083],
             "city": "晋中市"
           },
           {
             "value": "1K00110",
-            "label": "寿阳供电公司",
+            "label": "国网电力公司寿阳供电公司",
             "poi": [113.165423, 37.899167],
             "city": "晋中市"
           },
           {
             "value": "1K00111",
-            "label": "平遥供电公司",
+            "label": "国网电力公司平遥供电公司",
             "poi": [112.170071, 37.202912],
             "city": "晋中市"
           }
@@ -542,90 +542,90 @@
       },
       {
         "value": "1H001",
-        "label": "国网忻州供电公司",
+        "label": "国网电力公司忻州供电公司",
         "poi": [112.732551, 38.455998],
         "children": [
           {
             "value": "1H001",
-            "label": "国网忻州供电公司",
+            "label": "国网电力公司忻州供电公司",
             "poi": [112.732551, 38.455998],
             "city": "忻州市"
           },
           {
             "value": "1H00101",
-            "label": "河曲供电公司",
+            "label": "国网电力公司河曲供电公司",
             "poi": [111.354317, 39.377921],
             "city": "忻州市"
           },
           {
             "value": "1H00102",
-            "label": "偏关供电公司",
+            "label": "国网电力公司偏关供电公司",
             "poi": [111.50442, 39.44374],
             "city": "忻州市"
           },
           {
             "value": "1H00103",
-            "label": "原平供电公司",
+            "label": "国网电力公司原平供电公司",
             "poi": [112.725641, 38.723267],
             "city": "忻州市"
           },
           {
             "value": "1H00104",
-            "label": "代县供电公司",
+            "label": "国网电力公司代县供电公司",
             "poi": [112.978493, 39.082103],
             "city": "忻州市"
           },
           {
             "value": "1H00105",
-            "label": "忻府供电公司",
+            "label": "国网电力公司忻府供电公司",
             "poi": [112.746188,38.323807],
             "city": "忻州市"
           },
           {
             "value": "1H00106",
-            "label": "五寨供电公司",
+            "label": "国网电力公司五寨供电公司",
             "poi": [111.841898, 38.914325],
             "city": "忻州市"
           },
           {
             "value": "1H00107",
-            "label": "五台供电公司",
+            "label": "国网电力公司五台供电公司",
             "poi": [113.252555, 38.72187],
             "city": "忻州市"
           },
           {
             "value": "1H00108",
-            "label": "神池供电公司",
+            "label": "国网电力公司神池供电公司",
             "poi": [112.219179, 39.095656],
             "city": "忻州市"
           },
           {
             "value": "1H00109",
-            "label": "宁武供电公司",
+            "label": "国网电力公司宁武供电公司",
             "poi": [112.315447, 39.008705],
             "city": "忻州市"
           },
           {
             "value": "1H00110",
-            "label": "岢岚供电公司",
+            "label": "国网电力公司岢岚供电公司",
             "poi": [111.572965,38.703991],
             "city": "忻州市"
           },
           {
             "value": "1H00111",
-            "label": "繁峙供电公司",
+            "label": "国网电力公司繁峙供电公司",
             "poi": [113.280065, 39.19077],
             "city": "忻州市"
           },
           {
             "value": "1H00112",
-            "label": "定襄供电公司",
+            "label": "国网电力公司定襄供电公司",
             "poi": [112.967108, 38.486391],
             "city": "忻州市"
           },
           {
             "value": "1H00113",
-            "label": "保德供电公司",
+            "label": "国网电力公司保德供电公司",
             "poi": [112.967108, 38.486391],
             "city": "忻州市"
           }
@@ -633,66 +633,66 @@
       },
       {
         "value": "1B001",
-        "label": "国网大同供电公司",
+        "label": "国网电力公司大同供电公司",
         "poi": [113.293305, 40.07701],
         "children": [
           {
             "value": "1B001",
-            "label": "国网大同供电公司",
+            "label": "国网电力公司大同供电公司",
             "poi": [113.293305, 40.07701],
             "city": "大同市"
           },
           {
             "value": "1B00101",
-            "label": "云冈供电公司",
+            "label": "国网电力公司云冈供电公司",
             "poi": [113.149591,40.004904],
             "city": "大同市"
           },
           {
             "value": "1B00102",
-            "label": "新荣供电公司",
+            "label": "国网电力公司新荣供电公司",
             "poi": [113.1429, 40.257904],
             "city": "大同市"
           },
           {
             "value": "1B00103",
-            "label": "云州供电公司",
+            "label": "国网电力公司云州供电公司",
             "poi": [113.612463,40.040288],
             "city": "大同市"
           },
           {
             "value": "1B00104",
-            "label": "阳高供电公司",
+            "label": "国网电力公司阳高供电公司",
             "poi": [113.747671, 40.36597],
             "city": "大同市"
           },
           {
             "value": "1B00105",
-            "label": "天镇供电公司",
+            "label": "国网电力公司天镇供电公司",
             "poi": [114.09394, 40.436161],
             "city": "大同市"
           },
           {
             "value": "1B00106",
-            "label": "浑源供电公司",
+            "label": "国网电力公司浑源供电公司",
             "poi": [113.714675, 39.701893],
             "city": "大同市"
           },
           {
             "value": "1B00107",
-            "label": "灵丘供电公司",
+            "label": "国网电力公司灵丘供电公司",
             "poi": [114.227499, 39.437211],
             "city": "大同市"
           },
           {
             "value": "1B00108",
-            "label": "广灵供电公司",
+            "label": "国网电力公司广灵供电公司",
             "poi": [114.289298, 39.767572],
             "city": "大同市"
           },
           {
             "value": "1B00109",
-            "label": "左云供电公司",
+            "label": "国网电力公司左云供电公司",
             "poi": [112.723254, 40.014756],
             "city": "大同市"
           }
@@ -700,48 +700,48 @@
       },
       {
         "value": "1F001",
-        "label": "国网朔州供电公司",
+        "label": "国网电力公司朔州供电公司",
         "poi": [112.428691, 39.326848],
         "children": [
           {
             "value": "1F001",
-            "label": "国网朔州供电公司",
+            "label": "国网电力公司朔州供电公司",
             "poi": [112.428691, 39.326848],
             "city": "朔州市"
           },
           {
             "value": "1F00101",
-            "label": "神头供电公司",
+            "label": "国网电力公司神头供电公司",
             "poi": [112.549562, 39.342887],
             "city": "朔州市"
           },
           {
             "value": "1F00102",
-            "label": "平鲁供电公司",
+            "label": "国网电力公司平鲁供电公司",
             "poi": [112.083193, 39.504376],
             "city": "朔州市"
           },
           {
             "value": "1F00103",
-            "label": "怀仁供电公司",
+            "label": "国网电力公司怀仁供电公司",
             "poi": [113.10673, 39.817233],
             "city": "朔州市"
           },
           {
             "value": "1F00104",
-            "label": "山阴供电公司",
+            "label": "国网电力公司山阴供电公司",
             "poi": [113.10673, 39.817233],
             "city": "朔州市"
           },
           {
             "value": "1F00105",
-            "label": "应县供电公司",
+            "label": "国网电力公司应县供电公司",
             "poi": [113.191069, 39.553121],
             "city": "朔州市"
           },
           {
             "value": "1F00106",
-            "label": "右玉供电公司",
+            "label": "国网电力公司右玉供电公司",
             "poi": [112.467712, 39.986117],
             "city": "朔州市"
           }
@@ -749,36 +749,36 @@
       },
       {
         "value": "1C001",
-        "label": "国网阳泉供电公司",
+        "label": "国网电力公司阳泉供电公司",
         "poi": [113.598369, 37.856476],
         "children": [
           {
             "value": "1C001",
-            "label": "国网阳泉供电公司",
+            "label": "国网电力公司阳泉供电公司",
             "poi": [113.598369, 37.856476],
             "city": "阳泉市"
           },
           {
             "value": "1C00101",
-            "label": "平定供电公司",
+            "label": "国网电力公司平定供电公司",
             "poi": [113.629756,37.754749],
             "city": "阳泉市"
           },
           {
             "value": "1C00102",
-            "label": "盂县供电公司",
+            "label": "国网电力公司盂县供电公司",
             "poi": [113.400151, 38.091752],
             "city": "阳泉市"
           },
           {
             "value": "1C00103",
-            "label": "荫营供电公司",
+            "label": "国网电力公司荫营供电公司",
             "poi": [113.571929, 37.936917],
             "city": "阳泉市"
           },
           {
             "value": "1C00104",
-            "label": "平坦供电公司",
+            "label": "国网电力公司平坦供电公司",
             "poi": [113.791159, 37.860301],
             "city": "阳泉市"
           }

src/views/screen/official/carWarning.vue

@@ -241,7 +241,7 @@ export default {
           color: "white",
           fontSize: 12,
           interval: 0,
-          rotate: 65,
+          rotate: 75,
           padding: [2, 0, 2, 0]
         },
         axisTick: {
@@ -307,7 +307,7 @@ export default {
           color: "white",
           fontSize: 12,
           interval: 0,
-          rotate: 65,
+          rotate: 75,
           padding: [2, 0, 2, 0]
         },
         axisTick: {

src/views/screen/service/canteenDialog.vue

@@ -1237,7 +1237,7 @@ export default {
           
           this.canteenTotalRankBarData = [
           {
-          name: "员工",
+          name: "厨师",
           type: "bar",
           itemStyle: {
             color: "#43DCDB",
@@ -1247,10 +1247,10 @@ export default {
           data: [res.data[0].chefs],
         },
         {
-          name: "访客",
+          name: "服务员",
           type: "bar",
           itemStyle: {
-            color: "#FFD296",
+            color: "#efb164",
             //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
           },
           barWidth: 20,
@@ -1683,10 +1683,10 @@ export default {
           display: flex;
           align-items: center;
           color:#00FFFF;
-          font-size: 36px;
-          font-weight: bold;
+          font-size: 32px;
+          // font-weight: bold;
           padding-top:5px;
-          font-family: 'electronicFont';
+          // font-family: 'electronicFont';
 
           .unit{
             font-size:22px;
@@ -1722,7 +1722,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        font-size:18px;
+        font-size:25px;
         color:#00FFFF;
         font-family: 'electronicFont';
         padding-bottom: 18px;
@@ -1766,7 +1766,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        font-size:18px;
+        font-size:25px;
         color:#ffffff;
         font-family: 'electronicFont';
 

src/views/screen/service/employeeProfileDialog.vue

@@ -259,10 +259,10 @@ export default {
       sexBarYAxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name: '人',
+        name: '单位：人',
         nameTextStyle: {
           color: '#fff',
-          padding: [0,35,0,0]
+          padding: [0,35,0,30]
         },
         axisLine:{
           show:false
@@ -652,7 +652,7 @@ export default {
         display: flex;
         align-items: center;
         position: relative;
-        top:15px;
+        top:25px;
 
         .unit{
           font-size:13px;

src/views/screen/service/main.vue

@@ -159,7 +159,7 @@
             <div class="cont-title">共享驿站</div>
           </div>
           <div class="components-item">
-            <share-station :appOrg="appOrg"></share-station>
+            <share-station :key="appOrg" :appOrg="appOrg"></share-station>
           </div>
         </div>
         <div

src/views/screen/service/propertyDialog.vue

@@ -183,7 +183,7 @@ export default {
       barYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name: '个',
+        name: '单位：个',
         nameTextStyle: {
           color: '#fff',
         },
@@ -224,7 +224,7 @@ export default {
       carFlowBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name: '车辆',
+        name: '单位：辆',
         nameTextStyle: {
           color: '#fff',
         },