指标内容同步原型修改

src/components/business/analysis/analysis.vue

@@ -115,7 +115,7 @@ export default {
             } else if ("pv" == type) {
                 // 光伏
                 this.coreData[0].title = "总发电量(kWh)";
-                this.coreData[1].title = "平均发电量量(kWh/台)";
+                this.coreData[1].title = "平均发电量(kWh/台)";
             } else {
                 // 全部
                 this.coreData[0].title = "总用量(kWh)";

src/components/business/asset/asset.vue

@@ -140,27 +140,27 @@ export default {
       listData: listData,
       coreData: [
         {
-          title: "资产总额(亿元)",
+          title: "固定资产总数量(件)",
           num: "",
           historyDesc: "同比",
           historyNum: "",
         },
         {
-          title: "资产总数(项)",
+          title: "固定资产报修总数量(件)",
           num: "0",
           historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "资产占比最高",
+          title: "固定资产维修费用(元)",
           num: "",
-          historyDesc: "占比",
+          historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "重点投资领域",
+          title: "固定资产报废数量(件)",
           num: "",
-          historyDesc: "投资总额占比",
+          historyDesc: "同比",
           historyNum: 0,
         },
         {

src/components/business/space/space.vue

@@ -140,24 +140,24 @@ export default {
           historyNum: 0,
         },
         {
-          title: "流动工位总数",
+          title: "流动工位总数(个)",
           num: "",
           unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "固定工位总数",
-          num: "0",
-          historyDesc: "同比",
-          historyNum: 0,
-        },
-        {
-          title: "休闲/办公面积(m2)",
+          title: "固定工位总数(个)",
           num: "0",
           historyDesc: "同比",
           historyNum: 0,
         },
+        //{
+        //  title: "休闲/办公面积(m2)",
+        //  num: "0",
+        //  historyDesc: "同比",
+        //  historyNum: 0,
+        //},
         {
           type: 1,
           showStar: true,

src/components/dashboard/more/floorOverview.vue

@@ -40,19 +40,19 @@ export default {
       <div style="padding: 15px">
         <a-row :gutter="[12,20]">
           <a-col :span="12">
-            <a-statistic class="overflowItem" title="建筑面积 (m²)" :value="builtArea" />
+            <a-statistic class="overflowItem" title="建筑面积(m²)" :value="builtArea" />
           </a-col>
           <a-col :span="12">
-            <a-statistic class="overflowItem" title="建筑层数" :value="layersInt" />
+            <a-statistic class="overflowItem" title="建筑层数(层)" :value="layersInt" />
           </a-col>
           <a-col :span="12">
-            <a-statistic class="overflowItem" title="已使用年限" :value="serviceLife" />
+            <a-statistic class="overflowItem" title="已使用年限(年)" :value="serviceLife" />
           </a-col>
           <!--<a-col :span="12">-->
-          <!--  <a-statistic class="overflowItem" title="建筑年限" :value="constructionPeriod" />-->
+          <!--  <a-statistic class="overflowItem" title="建筑年限(年)" :value="constructionPeriod" />-->
           <!--</a-col>-->
           <a-col :span="12">
-            <a-statistic class="overflowItem" title="入驻企业数" :value="companyNum" />
+            <a-statistic class="overflowItem" title="入驻企业数(家)" :value="companyNum" />
           </a-col>
         </a-row>
       </div>

src/components/dashboard/portrait/coldPortrait.vue

@@ -22,7 +22,7 @@ export default {
         },
         {
           type: 0,
-          title: '月人均用冷量(kWh)',
+          title: '今日用冷量(kWh)',
           num: 0,
           historyDesc: '同比',
           historyNum: '0'

src/components/dashboard/portrait/electricityPortrait.vue

@@ -37,7 +37,7 @@ export default {
                 },
                 {
                     type: 0,
-                    title: '人均用电成本(元/天)',
+                    title: '月人均用电成本(元/人/天)',
                     num: 0,
                     historyDesc: '同比',
                     historyNum: 0

src/components/dashboard/portrait/hotPortrait.vue

@@ -15,14 +15,14 @@ export default {
       coreData: [
         {
           type: 0,
-          title: '月总用热量(kWh)',
+          title: '月总用热量(焦)',
           num: 0,
           historyDesc: '同比',
           historyNum: '0'
         },
         {
           type: 0,
-          title: '月人均用热量(kWh/天)',
+          title: '今日用热量(焦)',
           num: 0,
           historyDesc: '同比',
           historyNum: '0'
@@ -36,7 +36,7 @@ export default {
         },
         {
           type: 0,
-          title: '人均用热成本(元/人/天)',
+          title: '月人均用热量(焦/人/天)',
           num: 0,
           historyDesc: '同比',
           historyNum: '0'

src/components/dashboard/portrait/money/investCategoryNum.vue

@@ -0,0 +1,107 @@
+<template>
+    <div class="myChart" ref="myChart" :style="{height: height+'px'}">
+
+    </div>
+</template>
+
+<script>
+import apiDashboard from "@/api/dashboard/apiDashboard";
+
+export default {
+    data() {
+        return {
+            option: {
+                color: ['#3AA7E6','#9790F8','#4ACFB8','#F4955F','#F8797E'],
+                legend: {
+                    data: [
+                        '固定资产一级分类',
+                        '平均使用时间',
+                    ],
+                },
+                grid: {
+                    left: '2%', //默认10%
+                    right: '2%', //默认10%
+                    bottom: '0%', //默认60
+                    top: '15%',
+                    containLabel: true
+                    //grid区域是否包含坐标轴的刻度标签
+                },
+                xAxis: {
+                    type: 'category',
+                    data: ['办公室','局房类','个人办公类']
+                },
+                yAxis: [
+                    {
+                        name: '数量(件)',
+                        type: 'value',
+                    },
+                    {
+                        name: '时间(年)',
+                        type: 'value',
+                    },
+                ],
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    },
+                    textStyle: {
+                        color: '#fff',
+                        align: 'left',
+                        fontSize: 14
+                    },
+                    axisLine: {//x坐标轴轴线
+                        show: true,
+                        lineStyle: {//x坐标轴轴线样式
+                            color: '#000',//'#ccc' | 'rgb(128, 128, 128)' | 'rgba(128, 128, 128, 0.5)'，设置标签颜色
+                        }
+                    },
+                    backgroundColor: 'rgba(0,0,0,0.8)',
+                },
+                series: [
+                    {
+                        name: '固定资产一级分类',
+                        data: [5,8,12],
+                        type: 'bar',
+                        yAxisIndex: 0,
+                        stack: 'A',
+                        barWidth: '30px',
+                    },
+                    {
+                        name: '平均使用时间',
+                        data: [2,3,4],
+                        yAxisIndex: 1,
+                        type: 'line',
+                        smooth:true,
+                        showSymbol:false,
+                    },
+                ]
+            }
+        }
+    },
+    props: {
+        height: Number,
+        queryData: Object
+    },
+    mounted() {
+        this.init()
+    },
+    methods: {
+        init() {
+            let chart = this.$echarts.init(this.$refs.myChart);
+            this.chart = chart
+            chart.setOption(this.option);
+            this.getData();
+        },
+        getData() {
+            //return apiDashboard.getMoneyDistributionData(this.queryData).then(res=>{
+            //    let data = this.$util.dataUtil.covertDataToEcharts(res, ['investment1','investment2','investment3','investment4','rateReturn'])
+            //    this.$util.dataUtil.refreshEchartsData(this.chart, this.option, data)
+            //})
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+</style>

src/components/dashboard/portrait/moneyPortrait.vue

@@ -1,109 +1,110 @@
 <script>
 import CoreData from "@/components/common/coreData.vue";
-import InvestDistributeChart from "@/components/dashboard/portrait/money/investDistributeChart.vue";
-import InvestYearChart from "@/components/dashboard/portrait/money/investYearChart.vue";
+import InvestCategoryNum from "@/components/dashboard/portrait/money/investCategoryNum.vue";
 import api from "@/api/dashboard/apiDashboard";
 
 export default {
-  data() {
-    let range = this.$util.dateUtil.getNearlyMonthRange();
-    return {
-      queryData: {
-        companyId: '0',
-        deptId: '0',
-        timeRange: range
-      },
-      coreData: [
-        {
-          type: 0,
-          title: '年度投资总额(万元)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: '0'
-        },
-        {
-          type: 0,
-          title: '资产总额(万元)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: '0'
-        },
-        {
-          type: 0,
-          title: '人均资产总额(万元)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: '0'
-        },
-        {
-          type: 0,
-          title: '资产平均使用年限(年)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: '0'
-        },
-        {
-          type: 1,
-          showStar: true,
-          title: '值得关注',
-          content: ''
-        },
-      ]
-    }
-  },
-  props: {
-    chartHeight: Number
-  },
-  components: {
-    CoreData,
-    InvestDistributeChart,
-    InvestYearChart,
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.getCoreData();
+    data() {
+        let range = this.$util.dateUtil.getNearlyMonthRange();
+        return {
+            queryData: {
+                companyId: '0',
+                deptId: '0',
+                timeRange: range
+            },
+            coreData: [
+                {
+                    type: 0,
+                    title: '固定资产总数量(件)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: '0'
+                },
+                {
+                    type: 0,
+                    title: '今年维修预算(万元)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: '0'
+                },
+                {
+                    type: 0,
+                    title: '今年维修固定资产(件)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: '0'
+                },
+                {
+                    type: 0,
+                    title: '今年报废固定资产(件)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: '0'
+                },
+                {
+                    type: 1,
+                    showStar: true,
+                    title: '值得关注',
+                    content: ''
+                },
+            ]
+        }
     },
-    getCoreData() {
-      api.getMoneyCoreData(this.queryData).then(res => {
-        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
-        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
-      })
+    props: {
+        chartHeight: Number
     },
-    getTrendData() {
+    components: {
+        CoreData,
+        InvestCategoryNum,
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.getCoreData();
+        },
+        getCoreData() {
+            api.getMoneyCoreData(this.queryData).then(res => {
+                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
+                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
+            })
+        },
+        getTrendData() {
 
+        }
     }
-  }
 }
 </script>
 
 <template>
-  <div class="supermarketPortrait">
-    <div class="portrait-coreData">
-      <CoreData :data-list="coreData"></CoreData>
-    </div>
-    <div style="padding: 15px">
-      <a-row>
-        <a-col :span="12">
-          <div class="supermarketPortrait-title">投资分布</div>
-          <InvestDistributeChart :height="chartHeight-50" :query-data="queryData"></InvestDistributeChart>
-        </a-col>
-        <a-col :span="12">
-          <div class="supermarketPortrait-title">资产年限</div>
-          <InvestYearChart :height="chartHeight-50" :query-data="queryData"></InvestYearChart>
-        </a-col>
-      </a-row>
+    <div class="supermarketPortrait">
+        <div class="portrait-coreData">
+            <CoreData :data-list="coreData"></CoreData>
+        </div>
+        <div style="padding: 15px">
+            <a-row>
+                <!--<a-col :span="12">-->
+                <!--  <div class="supermarketPortrait-title">投资分布</div>-->
+                <!--  <InvestDistributeChart :height="chartHeight-50" :query-data="queryData"></InvestDistributeChart>-->
+                <!--</a-col>-->
+                <!--<a-col :span="12">-->
+                <!--  <div class="supermarketPortrait-title">资产年限</div>-->
+                <!--  <InvestYearChart :height="chartHeight-50" :query-data="queryData"></InvestYearChart>-->
+                <!--</a-col>-->
+                <a-col>
+                    <InvestCategoryNum :height="chartHeight" :query-data="queryData" ></InvestCategoryNum>
+                </a-col>
+            </a-row>
+        </div>
     </div>
-  </div>
 </template>
 
 <style lang="less" scoped>

src/components/dashboard/portrait/personPortrait.vue

@@ -16,28 +16,28 @@ export default {
             coreData: [
                 {
                     type: 0,
-                    title: '24h内进入大楼(人)',
+                    title: '今日进入大楼(人)',
                     num: 0,
                     historyDesc: '环比',
                     historyNum: 0
                 },
                 {
                     type: 0,
-                    title: '24h离开大楼(人)',
+                    title: '今日离开大楼(人)',
                     num: 0,
                     historyDesc: '环比',
                     historyNum: 0
                 },
                 {
                     type: 0,
-                    title: '9点前进入大楼(人)',
+                    title: '今日9点前进入大楼(人)',
                     num: 0,
                     historyDesc: '环比',
                     historyNum: 0
                 },
                 {
                     type: 0,
-                    title: '24h人员保有量(人)',
+                    title: '楼内人员数量(人)',
                     num: 0,
                     historyDesc: '环比',
                     historyNum: 0

src/components/dashboard/portrait/restaurantPortrait.vue

@@ -36,7 +36,7 @@ export default {
         },
         {
           type: 0,
-          title: '今日第三方结算费用(元)',
+          title: '第三方结算费用(元)',
           num: 0,
           historyDesc: '环比',
           historyNum: '0'

src/components/doubleCarbon/PV/doubleCarbonPv.vue

@@ -35,19 +35,19 @@ export default {
                     historyNum: 0,
                 },
                 {
-                    title: "光伏发电量(kWh/天)",
+                    title: "光伏累计发电量(kWh)",
                     num: 0,
                     historyDesc: "同比",
                     historyNum: 0,
                 },
                 {
-                    title: "光伏节约金额(元/天)",
+                    title: "光伏人均减排量(tCO₂e/人)",
                     num: 0,
                     historyDesc: "同比",
                     historyNum: 0,
                 },
                 {
-                    title: "光伏补贴金额(元/天)",
+                    title: "光伏平均发电量(kWh/天)",
                     num: 0,
                     historyDesc: "同比",
                     historyNum: 0,

src/components/doubleCarbon/overview/doubleCarbonOverview.vue

@@ -45,12 +45,6 @@ export default {
                     historyDesc: "同比",
                     historyNum: 0,
                 },
-                {
-                    title: "单位面积碳排放(tCO₂e/m²)",
-                    num: 0,
-                    historyDesc: "同比",
-                    historyNum: 0,
-                },
                 {
                     title: "人均碳排放(tCO₂e/人)",
                     num: 0,

src/components/life/healthyHome/lifeHealthyHome.vue

@@ -19,13 +19,13 @@ export default {
       },
       coreData: [
         {
-          title: "累计检查人数(人/月)",
+          title: "累计检查人数(人)",
           num: 0,
           historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "健康人数(人/月)",
+          title: "健康人数(人)",
           num: 0,
           historyDesc: "同比",
           historyNum: 0,

src/components/life/restaurant/lifeRestaurant.vue

@@ -24,7 +24,7 @@ export default {
       },
       coreData: [
         {
-          title: "当天就餐人数预测",
+          title: "当天就餐人数预测(人)",
           num: 0,
           isHighLight: true,
           historyDesc: "同比",

src/components/security/person/securityPerson.vue

@@ -12,26 +12,25 @@ 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,
+          historyDesc: '环比',
           historyNum: 0
         },
         {
-          title: '实际到访人数(个)',
+          title: '实际到访人数(人)',
           num: 0,
           historyDesc: '环比',
           historyNum: 0

src/components/work/meeting/workMeeting.vue

@@ -373,7 +373,7 @@ export default {
       ],
       coreData: [
         {
-          title: "会议室饱和度(月)",
+          title: "会议室饱和度",
           num: "",
           unit: "%",
           historyDesc: "同比",
@@ -393,7 +393,7 @@ export default {
           historyNum: 0,
         },
         {
-          title: "会议室人均成本(元/人/月)",
+          title: "会议室人均成本(元/人)",
           num: 0,
           historyDesc: "同比",
           historyNum: 0,

src/components/work/print/workPrint.vue

@@ -109,13 +109,13 @@ export default {
       listData: listData,
       coreData: [
         {
-          title: "文印消耗总成本（元）",
+          title: "文印消耗总成本(元)",
           num: "0",
           historyDesc: "同比",
           historyNum: 0,
         },
         {
-          title: "人均打印纸张(张/天)",
+          title: "人均打印纸张(张/人)",
           num: "0",
           historyDesc: "同比",
           historyNum: 0,
@@ -127,7 +127,7 @@ export default {
           historyNum: 0,
         },
         {
-          title: "打印人次(人/天)",
+          title: "打印人次(次)",
           num: 0,
           historyDesc: "同比",
           historyNum: 0,