核心指标部分修改(除公车、双碳-车辆、双碳-文印)

src/components/business/analysis/analysis.vue

@@ -105,8 +105,8 @@ export default {
         this.coreData[1].title = "人均用水量(m³/人)";
       } else if ("hot" == type) {
         // 用热
-        this.coreData[0].title = "总用热量(kWh)";
-        this.coreData[1].title = "人均用热量(kWh/人)";
+        this.coreData[0].title = "总用热量(焦)";
+        this.coreData[1].title = "人均用热量(焦)";
       } else if ("cold" == type) {
         // 用冷
         this.coreData[0].title = "总用冷量(kWh)";
@@ -120,6 +120,14 @@ export default {
         this.coreData[0].title = "总用量(kWh)";
         this.coreData[1].title = "总用量m³)";
       }
+
+      if ("pv" == type) {
+        this.coreData[2].title = "总盈利(元)";
+        this.coreData[2].title = "平均盈利(元/台)";
+      } else {
+        this.coreData[2].title = "总能耗成本(元)";
+        this.coreData[2].title = "平均能耗成本(元/人)";
+      }
       this.getCoreData();
     },
     reset() {},

src/components/business/asset/asset.vue

@@ -131,7 +131,7 @@ export default {
       listData: listData,
       coreData: [
         {
-          title: "资产总金额(亿元)",
+          title: "资产总额(亿元)",
           num: "",
           historyDesc: "同比",
           historyNum: "",

src/components/dashboard/more/floorOverview.vue

@@ -7,7 +7,8 @@ export default {
       builtArea: 0,
       layersInt: 0,
       constructionPeriod: 0,
-      serviceLife: 0
+      serviceLife: 0,
+      companyNum: 0,
     }
   },
   components: {
@@ -22,6 +23,7 @@ export default {
         this.builtArea = res.builtArea
         this.layersInt = res.layersInt
         this.constructionPeriod = res.constructionPeriod
+        this.companyNum = res.companyNum
         this.serviceLife = res.serviceLife
       })
     }
@@ -46,8 +48,11 @@ export default {
           <a-col :span="12">
             <a-statistic class="overflowItem" title="已使用年限" :value="serviceLife" />
           </a-col>
+          <!--<a-col :span="12">-->
+          <!--  <a-statistic class="overflowItem" title="建筑年限" :value="constructionPeriod" />-->
+          <!--</a-col>-->
           <a-col :span="12">
-            <a-statistic class="overflowItem" title="建筑年限" :value="constructionPeriod" />
+            <a-statistic class="overflowItem" title="入驻企业数" :value="companyNum" />
           </a-col>
         </a-row>
       </div>

src/components/dashboard/more/pv/pvPowerProfitChart.vue

@@ -55,6 +55,7 @@ export default {
       let chart = this.$echarts.init(this.$refs.myChart);
       this.chart = chart;
       this.$util.chartsResize(this.chart);
+      this.option = this.$util.dataUtil.circleChartConfig(this.option)
       chart.setOption(this.option);
     },
     getData() {
@@ -77,6 +78,7 @@ export default {
             };
           }
         });
+        this.option = this.$util.dataUtil.circleChartConfig(this.option)
         this.chart.setOption(this.option);
       });
     },

src/components/doubleCarbon/overview/doubleCarbonOverview.vue

@@ -25,12 +25,14 @@ export default {
         companyId: "0",
         timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
+      companyOptions: [],
       coreData: [
         {
-          type: 1,
           title: "碳配额存量",
-          content: "",
-          numDesc: "%",
+          num: 0,
+          unit: '%',
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
           title: "碳排放总量(tco2e)",
@@ -85,7 +87,8 @@ export default {
     },
     getCoreData() {
       return apiCarbonOverview.getCoreData(this.queryData).then((res) => {
-        this.coreData[0].content = res.list[0].value;
+        this.coreData[0].num = res.list[0].value;
+        //this.coreData[0].historyNum = res.list[0].compare;
         this.coreData[1].num = res.list[1].value;
         this.coreData[1].historyNum = res.list[1].compare;
         this.coreData[2].num = res.list[2].value;
@@ -125,6 +128,7 @@ export default {
               :query-data.sync="queryData"
               :reset="reset"
               :search="search"
+              :company-options="companyOptions"
             ></Query>
           </div>
         </a-col>

src/components/life/healthyHome/lifeHealthyHome.vue

@@ -31,16 +31,16 @@ export default {
           historyNum: 0,
         },
         {
-          title: "亚健康人数(人/月)",
+          title: "体检转化率",
           num: 0,
-          unit: "元",
+          unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },
         {
           type: 1,
           isHighLight: false,
-          title: "最多患病问题",
+          title: "使用最多的服务",
           content: "",
         },
         {

src/components/life/parking/components/lifeParkTrendChart.vue

@@ -61,18 +61,8 @@ export default {
             name: '离开车辆数',
             data: [],
             type: 'line',
-            stack: 'x',
             smooth: true,
             showSymbol:false,
-            areaStyle: {
-              color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                offset: 0,
-                color: '#FFD7AC' // 0% 处的颜色
-              }, {
-                offset: 0.8,
-                color: '#ffffff' // 100% 处的颜色
-              }], false),
-            },
             itemStyle: {
               color: '#FDB456'
             },
@@ -88,18 +78,8 @@ export default {
             name: '进入车辆数',
             data: [],
             type: 'line',
-            stack: 'x',
             smooth: true,
             showSymbol:false,
-            areaStyle: {
-              color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                offset: 0,
-                color: '#B0E5CB' // 0% 处的颜色
-              }, {
-                offset: 0.8,
-                color: '#ffffff' // 100% 处的颜色
-              }], false),
-            },
             lineStyle: {
               color: "#62CC97",
               width: 1,

src/components/life/parking/lifeParking.vue

@@ -40,9 +40,8 @@ export default {
           historyNum: 0,
         },
         {
-          title: "车位使用率",
+          title: "空置车位",
           num: 0,
-          unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },

src/components/life/restaurant/components/LifeRestProfitChart.vue

@@ -27,7 +27,7 @@ export default {
 
             label: {
               show: true,
-              length: 100
+              length: 100,
             },
             emphasis: {
               label: {

src/components/life/restaurant/lifeRestaurant.vue

@@ -30,8 +30,9 @@ export default {
           historyDesc: "同比",
         },
         {
-          title: "当天累计就餐人数(人)",
+          title: "餐厅就餐率",
           num: 0,
+          unit: '%',
           historyDesc: "环比",
           historyNum: 0,
         },
@@ -42,9 +43,9 @@ export default {
           historyNum: 0,
         },
         {
-          title: "订单均价(元)",
+          title: "累计就餐人数（人）",
           num: 0,
-          historyDesc: "同比",
+          historyDesc: "环比",
           historyNum: 0,
         },
         {

src/components/scene/access/sceneAccessAction.vue

@@ -427,7 +427,7 @@ export default {
       this.originalData.forEach(item=>{
         names.push(item.visitor)
       })
-      console.log(names)
+      let hasRepeat = false;
       if (data) {
         data.forEach(item=>{
           let index = names.indexOf(item.name);
@@ -438,10 +438,17 @@ export default {
               visitor_phone: item.phone,
               department: "北京电信规划院",
             });
+          } else {
+            hasRepeat = true;
           }
         })
       }
-      this.groupData[this.tableTitle] = this.originalData
+      this.groupData[this.tableTitle] = this.originalData;
+      let msg = '添加成功'
+      if (hasRepeat) {
+        msg = msg + ',已过滤重复人员'
+      }
+      this.$message.success(msg)
     },
     del(item) {
       console.log(item)

src/components/security/alarm/securityAlarmManage.vue

@@ -102,19 +102,19 @@ export default {
       },
       coreData: [
         {
-          title: "告警事件",
+          title: "告警事件(件)",
           num: 0,
           historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "紧急告警事件",
+          title: "紧急告警事件(件)",
           num: 0,
           historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "已处理事件",
+          title: "已处理事件(件)",
           num: 0,
           historyDesc: "同比",
           hideTrend: true,
@@ -123,8 +123,6 @@ export default {
         {
           title: "告警最多类型",
           num: "",
-          historyDesc: "同比",
-          historyNum: 0,
         },
         {
           type: 1,
@@ -169,7 +167,6 @@ export default {
         this.coreData[2].num = res.list[2].value;
         this.coreData[2].historyNum = res.list[2].compare;
         this.coreData[3].num = res.list[3].value;
-        this.coreData[3].historyNum = res.list[3].compare;
         this.coreData[4].content = res.worthAttention;
       });
     },

src/components/security/person/securityPerson.vue

@@ -12,26 +12,26 @@ export default {
       chartShow: false,
       coreData: [
         {
-          title: '当天入楼人数',
+          title: '当天进入个数(个)',
           num: 0,
           historyDesc: '环比',
           historyNum: 0
         },
         {
-          title: '当前楼内人数',
+          title: '楼内人数(个)',
           num: 0,
           historyDesc: '环比',
           historyNum: 0
         },
         {
-          title: '今日访客预约数',
+          title: '今日访客预约数(个)',
           num: 0,
           historyDesc: '占比',
           hideTrendDesc: true,
           historyNum: 0
         },
         {
-          title: '实际到访人数',
+          title: '实际到访人数(个)',
           num: 0,
           historyDesc: '环比',
           historyNum: 0

src/components/work/meeting/workMeeting.vue

@@ -367,16 +367,15 @@ export default {
           historyNum: 0.4,
         },
         {
-          title: "会议室占用率(天)",
+          title: "会议室占用率",
           num: "",
           unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "会议室占用率",
+          title: "会议室成本(元)",
           num: 0,
-          unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },

src/components/work/print/workPrint.vue

@@ -105,7 +105,7 @@ export default {
       listData: listData,
       coreData: [
         {
-          title: "人均消耗成本(元/天)",
+          title: "文印消耗总成本（元）",
           num: "0",
           historyDesc: "同比",
           historyNum: 0,
@@ -117,7 +117,7 @@ export default {
           historyNum: 0,
         },
         {
-          title: "人均打印碳排放(tco2e)",
+          title: "人均消耗成本（元/人）",
           num: "0",
           historyDesc: "同比",
           historyNum: 0,

src/utils/dataUtil.js

@@ -150,6 +150,8 @@ const circleChartConfig = (option) => {
     let label = {
         show: true,
         avoidLabelOverlap: true,
+        position: 'outer',
+        alignTo: 'labelLine',
         formatter: (params) => {
             const arr = [
                 `{a|${params.name}}`,