Browse Source

运营,安防图表修改

tianyabing 2 năm trước cách đây
mục cha
commit
77775b2678

+ 8 - 1
src/components/business/analysis/all/businessEnergyChart.vue

@@ -13,7 +13,14 @@ export default {
             '用热(kWh)',
             '用冷(kWh)',
             '光伏(kWh)',
-          ]
+          ],
+          selected: {
+            '用电(kWh)': true,
+            '用水(m³)': true,
+            '用热(kWh)': false,
+            '用冷(kWh)': false,
+            '光伏(kWh)': true,
+          }
         },
         grid: {
           left: '1%', //默认10%

+ 1 - 1
src/components/business/analysis/electric/BusinessElectricDistributeChart.vue

@@ -18,7 +18,7 @@ export default {
           {
             name: '用电量',
             type: 'pie',
-            radius: ['40%', '70%'],
+            radius: ['30%', '45%'],
             center: ['50%','35%'],
             data: [],
             emphasis: {

+ 2 - 2
src/components/business/analysis/hot/BusinessHotChart.vue

@@ -14,7 +14,7 @@ export default {
         color: ['#80D4FF','#A6A6FF','#79F2E8','#FFDF80','#FF7C1F'],
         legend: {
           data: [
-            '用热',
+            '用热',
           ]
         },
         grid: {
@@ -59,7 +59,7 @@ export default {
         },
         series: [
           {
-            name: '用热',
+            name: '用热',
             data: [],
             type: 'bar',
             barWidth: '30%',

+ 1 - 1
src/components/business/analysis/hot/BusinessHotDistributeChart.vue

@@ -18,7 +18,7 @@ export default {
           {
             name: '用热量',
             type: 'pie',
-            radius: ['40%', '70%'],
+            radius: ['30%', '45%'],
             center: ['50%','35%'],
             data: [
             ],

+ 1 - 1
src/components/business/analysis/water/BusinessWaterDistributeChart.vue

@@ -17,7 +17,7 @@ export default {
           {
             name: '用水量',
             type: 'pie',
-            radius: ['40%', '70%'],
+            radius: ['30%', '45%'],
             center: ['50%','35%'],
             data: [
             ],

+ 13 - 4
src/components/business/asset/charts/assetRankChart.vue

@@ -190,10 +190,19 @@ export default {
       return apiOperationMoney.getAssetShareRanking(this.queryData).then(res=>{
         let names = [];
         let values = [];
-        res.forEach(item=>{
-          names.push(item.name);
-          values.push(item.value>100?100:item.value)
-        })
+        if (res) {
+          res.sort((a,b)=>{
+            if (a.value>b.value) {
+              return -1;
+            }
+            return 1;
+          })
+          res.forEach(item=>{
+            names.push(item.name);
+            values.push(item.value>100?100:item.value)
+          })
+        }
+
         this.option.yAxis[0].data = names;
         this.option.yAxis[1].data = values;
         this.option.series[0].data = values;

+ 1 - 0
src/components/business/space/charts/spaceCostChart.vue

@@ -25,6 +25,7 @@ export default {
         yAxis: [
           {
             type: 'value',
+            name: '空间成本(元)',
             nameTextStyle: {
               padding: [10, 0, 10, -12]
             },

+ 2 - 2
src/components/doubleCarbon/car/doubleCarbonCar.vue

@@ -146,7 +146,7 @@ export default {
       <a-row :gutter="[12,12]">
         <a-col :span="18" >
           <div class="ioc-card-content">
-            <Card title="车辆排放分析">
+            <Card title="碳排放量">
               <div class="doubleCarbon-car-analyse">
                 <CarbonCarEmissionChart :call-back-company-option="callBackCompanyOption" ref="CarbonCarEmissionChart" :query-data="queryData" :height="450"/>
               </div>
@@ -156,7 +156,7 @@ export default {
         </a-col>
         <a-col :span="6">
           <div class="ioc-card-content">
-            <Card title="车辆排放排名">
+            <Card title="碳排放分析">
               <div class="doubleCarbon-car-quota">
                 <CarbonCarQuotaChart ref="CarbonCarQuotaChart" :query-data="queryData" :height="450"/>
               </div>

+ 2 - 2
src/components/doubleCarbon/overview/doubleCarbonOverview.vue

@@ -185,7 +185,7 @@ export default {
         </a-col>
         <a-col :span="6">
           <div class="ioc-card-content">
-            <Card title="碳配额构成">
+            <Card title="碳配额">
               <div class="doubleCarbon-overview-quota">
                 <CarbonQuotaChart
                   ref="CarbonQuotaChart"
@@ -212,7 +212,7 @@ export default {
         </a-col>
         <a-col :span="6">
           <div class="ioc-card-content">
-            <Card title="碳排放占比">
+            <Card title="碳排放分类">
               <div class="doubleCarbon-overview-percent">
                 <CarbonOverviewPercent
                   ref="CarbonOverviewPercent"

+ 2 - 2
src/components/doubleCarbon/print/doubleCarbonPrint.vue

@@ -152,7 +152,7 @@ export default {
       <a-row :gutter="[12, 12]">
         <a-col :span="18">
           <div class="ioc-card-content">
-            <Card title="文印排放分析">
+            <Card title="排放分析">
               <div class="doubleCarbon-print-analyse">
                 <CarbonPrintEmissionChart
                   ref="CarbonPrintEmissionChart"
@@ -166,7 +166,7 @@ export default {
         </a-col>
         <a-col :span="6">
           <div class="ioc-card-content">
-            <Card title="文印排放排名">
+            <Card title="碳排放量">
               <div class="doubleCarbon-print-quota">
                 <CarbonPrintQuotaChart
                   ref="CarbonPrintQuotaChart"

+ 1 - 1
src/components/security/alarm/manage/securityAlarmManageCategory.vue

@@ -29,7 +29,7 @@ export default {
         },
         yAxis: [
           {
-            //name: '告警次数',
+            name: '告警次数(次)',
             type: 'value',
             nameTextStyle: {
               padding: [10, 0, 10, 15]

+ 14 - 9
src/components/security/alarm/manage/securityAlarmManageDistributeMap.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%;height: 400px">
     <div style="width: 100%;height: 350px;overflow-y: auto">
-      <ImageMap :markers="devicePositions" :src="areaSrc" style="height: 200px"></ImageMap>
+      <ImageMap :markers="devicePositions" :src="areaSrc" style="height: 100%"></ImageMap>
     </div>
     <div style="width: 100%;height: 50px;margin-top: 5px;text-align: center">
       <a-radio-group style="margin: 0 auto" :options="floorOptions" default-value="1" @change="floorChange" />
@@ -17,15 +17,15 @@ export default {
       areaSrc: 'security/area_1F.png',
       devicePositions: [
         {
-          status: 1,
+          status: 0,
           left: 348,
           top: 27,
         },{
-          status: 1,
+          status: 0,
           left: 373,
           top: 27,
         },{
-          status: 1,
+          status: 0,
           left: 230,
           top: 76,
         },{
@@ -33,7 +33,7 @@ export default {
           left: 260,
           top: 76,
         },{
-          status: 1,
+          status: 0,
           left: 300,
           top: 100,
         },{
@@ -41,21 +41,26 @@ export default {
           left: 325,
           top: 100,
         },{
-          status: 1,
+          status: 0,
           left: 300,
           top: 130,
         },{
-          status: 2,
+          status: 0,
           left: 325,
           top: 130,
         },{
-          status: 1,
+          status: 0,
           left: 430,
           top: 155,
         },{
-          status: 1,
+          status: 0,
           left: 180,
           top: 350
+        },{
+          status: 1,
+          left: 200,
+          top: 230,
+          code: 'a518fd68a2dc42e0ae50f9aacc0c261c'
         }
       ],
       floorOptions: [

+ 1 - 0
src/components/security/alarm/manage/securityAlarmManageOnlineTrend.vue

@@ -24,6 +24,7 @@ export default {
         },
         yAxis: [
           {
+            name: '在线率(%)',
             type: 'value',
             min: 0,
             max: 100,

+ 2 - 2
src/components/security/alarm/manage/securityAlarmManageTrend.vue

@@ -25,10 +25,10 @@ export default {
         },
         yAxis: [
           {
-            name: '次数',
+            name: '次数(次)',
             type: 'value',
             nameTextStyle: {
-              padding: [10, 0, 10, -12]
+              padding: [10, 0, 10, ]
             },
           },
         ],

+ 1 - 1
src/components/security/person/components/securityPersonExistChart.vue

@@ -23,7 +23,7 @@ export default {
         },
         yAxis: [
           {
-            //name: '人数',
+            name: '人数(人)',
             type: 'value',
             nameTextStyle: {
               padding: [0, 0, 0, 0]

+ 5 - 8
src/components/security/person/components/securityPersonGuestChart.vue

@@ -13,8 +13,8 @@ export default {
       option: {
         legend: {
           data: [
-            '自由人员',
-            '其他人员',
+            '出入口1',
+            '出入口2',
           ]
         },
         grid: {
@@ -31,12 +31,9 @@ export default {
         },
         yAxis: [
           {
-            name: '人数',
+            name: '客流量(人)',
             type: 'value',
             position: 'left',
-            axisLine: {
-              show: true,
-            },
             nameTextStyle: {
               padding: [10, 0, 10, 0]
             },
@@ -63,7 +60,7 @@ export default {
         dataZoom: this.$constant.ECHARTS_OPTION_DATAZOOM,
         series: [
           {
-            name: '自由人员',
+            name: '出入口1',
             data: [],
             type: 'bar',
             barWidth: '20%',
@@ -75,7 +72,7 @@ export default {
             }
           },
           {
-            name: '其他人员',
+            name: '出入口2',
             data: [],
             type: 'bar',
             barWidth: '20%',