安防、双碳、运营饼图单位

src/components/business/analysis/analysis.vue

@@ -40,6 +40,7 @@ export default {
     return {
       queryData: {
         companyId: "0",
+        floorId: "0",
         energy: "0",
         timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
@@ -159,7 +160,7 @@ export default {
   <div>
     <div class="page-query-core">
       <query
-        :show="['company', 'energy', 'time']"
+        :show="['company', 'floor', 'energy', 'time']"
         :query-data.sync="queryData"
         :reset="reset"
         :search="search"

src/components/business/analysis/electric/BusinessElectricDistributeChart.vue

@@ -14,6 +14,18 @@ export default {
           right: '10%',
           icon: 'circle'
         },
+        title:[
+          {
+            subtext: "单位: kWh", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         series: [
           {
             name: '用电量',

src/components/business/analysis/hot/BusinessHotDistributeChart.vue

@@ -14,6 +14,18 @@ export default {
           right: '10%',
           icon: 'circle'
         },
+        title:[
+          {
+            subtext: "单位: kWh", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         series: [
           {
             name: '用热量',

src/components/business/analysis/water/BusinessWaterDistributeChart.vue

@@ -13,6 +13,18 @@ export default {
           x:'center',
           icon: 'circle'
         },
+        title:[
+          {
+            subtext: "单位: m³", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         series: [
           {
             name: '用水量',

src/components/business/asset/asset.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding-bottom: 15px">
     <div class="page-query-core">
       <Query
         :show="['company', 'time']"
@@ -70,12 +70,18 @@
               </div>
             </card>
           </div>
-          <div class="right ioc-card-content" :style="{ marginTop: '10px' }">
+          <div class="right ioc-card-content" :style="{ marginTop: '10px' }" style="height: 290px">
             <card :title="'报废与维修'">
+              <div style="margin-left: 15px;color:#B2B2B2">
+                共报废
+                <span style="color: #4f4f4f">{{ scrapNum }}</span>
+                件资产
+              </div>
               <AssetMoneyRepairChart
                 ref="AssetMoneyRepairChart"
+                :total.sync="scrapNum"
                 :query-data="queryData"
-                :height="220"
+                :height="225"
               />
             </card>
           </div>
@@ -122,6 +128,7 @@ export default {
         invest: false,
         year: false,
       },
+      scrapNum: 0,
       columns: [
         { title: "序号", dataIndex: "index", key: "1", width: 48 },
         { title: "姓名", dataIndex: "name", key: "2", width: 60 },

src/components/business/asset/charts/assetMoneyRepairChart.vue

@@ -17,11 +17,23 @@ export default {
           left: 'center',
           icon: 'circle'
         },
+        title:[
+          {
+            subtext: "单位: 件", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         series: [
           {
             name: '个数',
             type: 'pie',
-            radius: ['40%', '70%'],
+            radius: ['30%', '45%'],
             center: ['50%','40%'],
             avoidLabelOverlap: false,
             label: {
@@ -50,7 +62,17 @@ export default {
   },
   props: {
     height: Number,
-    queryData: Object
+    queryData: Object,
+    total: Number,
+  },
+  emits: ["update:total"],
+  setup(props, context) {
+    const methods = {
+      updateTotal(val) {
+        context.emit("update:total", val);
+      }
+    };
+    return methods;
   },
   mounted() {
     this.initChart()
@@ -65,8 +87,16 @@ export default {
       this.getData()
     },
     getData() {
+      let app = this;
       return apiOperationMoney.getScrapAndMaintain(this.queryData).then(res=>{
         this.option.series[0].data = res;
+        if (res) {
+          let total = 0;
+          res.forEach(item=>{
+            total = total+item.value;
+          });
+          app.updateTotal(total);
+        }
         this.option = this.$util.dataUtil.circleChartConfig(this.option)
         this.chart.setOption(this.option)
       })

src/components/doubleCarbon/PV/charts/carbonPvQuotaChart.vue

@@ -15,10 +15,22 @@ export default {
         grid: {
           left: '2%', //默认10%
           right: '8%', //默认10%
-          bottom: '2%', //默认60
-          top: '10%',
+          bottom: '30px', //默认60
+          top: '40px',
           containLabel: true
         },
+        title:[
+          {
+            subtext: "单位: tCO2e", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         xAxis: {
           type: 'value',
           nameTextStyle: {
@@ -36,7 +48,19 @@ export default {
           },
           axisLine: {
             show: false
-          }
+          },
+          axisLabel: {
+            margin: 8,
+            formatter: function (params) {
+              var val = "";
+              if (params.length > 4) {
+                val = params.substr(0, 4) + '...';
+                return val;
+              } else {
+                return params;
+              }
+            }
+          },
         },
         tooltip: {
           trigger: 'axis',

src/components/doubleCarbon/car/charts/carbonCarQuotaChart.vue

@@ -14,10 +14,22 @@ export default {
         grid: {
           left: '2%', //默认10%
           right: '8%', //默认10%
-          bottom: '2%', //默认60
-          top: '10%',
+          bottom: '30px', //默认60
+          top: '40px',
           containLabel: true
         },
+        title:[
+          {
+            subtext: "单位: tCO2e", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         xAxis: {
           type: 'value',
           nameTextStyle: {

src/components/doubleCarbon/overview/charts/carbonOverviewPercent.vue

@@ -17,6 +17,18 @@ export default {
           left: 'center',
           icon: 'circle'
         },
+        title:[
+          {
+            subtext: "单位: tCO2e", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "5px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         series: [
           {
             name: '排放量',

src/components/doubleCarbon/overview/charts/carbonQuotaChart.vue

@@ -15,10 +15,22 @@ export default {
         grid: {
           left: '2%', //默认10%
           right: '8%', //默认10%
-          bottom: '2%', //默认60
-          top: '10%',
+          bottom: '30px', //默认60
+          top: '40px',
           containLabel: true
         },
+        title:[
+          {
+            subtext: "单位: tCO2e", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         xAxis: {
           type: 'value',
           nameTextStyle: {
@@ -42,8 +54,8 @@ export default {
             margin: 8,
             formatter: function (params) {
               var val = "";
-              if (params.length > 3) {
-                val = params.substr(0, 3) + '...';
+              if (params.length > 4) {
+                val = params.substr(0, 4) + '...';
                 return val;
               } else {
                 return params;

src/components/doubleCarbon/print/charts/carbonPrintQuotaChart.vue

@@ -15,10 +15,22 @@ export default {
         grid: {
           left: '2%', //默认10%
           right: '8%', //默认10%
-          bottom: '2%', //默认60
-          top: '10%',
+          bottom: '30px', //默认60
+          top: '40px',
           containLabel: true
         },
+        title:[
+          {
+            subtext: "单位: tCO2e", //主标题
+            right: "0%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "0px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         xAxis: {
           type: 'value',
           nameTextStyle: {

src/components/security/alarm/manage/securityAlarmManageDistribute.vue

@@ -12,6 +12,18 @@ export default {
           bottom: '10%',
           icon: 'circle'
         },
+        title:[
+          {
+            subtext: "单位: 次", //主标题
+            right: "1%", //标题的位置 默认是left，其余还有center、right属性
+            bottom: "5px",
+            subtextStyle: {
+              color: "rgb(160,160,160)",
+              fontSize: 14,
+              fontWeight: "normal",
+            },
+          },
+        ],
         series: [
           {
             name: '告警次数',

src/components/security/person/components/securityPersonExistChart.vue

@@ -59,20 +59,10 @@ export default {
             smooth: true,
             showSymbol:false,
             lineStyle: {
-              color: "#62CC97",
               width: 1,
             },
-            itemStyle: {
-              color: '#62CC97'
-            },
             areaStyle: {
-              color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                offset: 0,
-                color: '#B0E5CB' // 0% 处的颜色
-              },{
-                offset: 0.8,
-                color: 'rgb(255,255,255,0.1)'
-              }], false),
+              color: {},
             },
             emphasis: {
               scale:1.5

src/components/work/overview/workOverview.vue

@@ -127,6 +127,10 @@ export default {
           value: 20,
           label: "20F",
         },
+        {
+          value: 21,
+          label: "21F",
+        },
       ],
       columns: [
         //{title: "序号", dataIndex: "index", key: "1", width: 48},