查询核心指标代码微调

src/components/business/analysis/analysis.vue

@@ -18,293 +18,292 @@ import BusinessPvDetail from "@/components/business/analysis/pv/BusinessPvDetail
 import apiOperationAnalysis from "@/api/operation/apiOperationAnalysis";
 
 export default {
-  components: {
-    query,
-    card,
+    components: {
+        query,
+        card,
 
-    BusinessEnergyChart,
-    BusinessElectricChart,
-    BusinessWaterChart,
-    BusinessHotChart,
-    BusinessColdChart,
-    BusinessPvChart,
+        BusinessEnergyChart,
+        BusinessElectricChart,
+        BusinessWaterChart,
+        BusinessHotChart,
+        BusinessColdChart,
+        BusinessPvChart,
 
-    BusinessEnergyDetail,
-    BusinessElectricDetail,
-    BusinessWaterDetail,
-    BusinessHotDetail,
-    BusinessColdDetail,
-    BusinessPvDetail,
-  },
-  data() {
-    return {
-      queryData: {
-        companyId: "0",
-        floorId: "0",
-        energy: "0",
-        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
-      },
-      oriCoreData: [],
-      coreData: [
-        {
-          title: "总用电量(kWh)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        BusinessEnergyDetail,
+        BusinessElectricDetail,
+        BusinessWaterDetail,
+        BusinessHotDetail,
+        BusinessColdDetail,
+        BusinessPvDetail,
+    },
+    data() {
+        return {
+            queryData: {
+                companyId: "0",
+                floorId: "0",
+                energy: "0",
+                timeRange: this.$util.dateUtil.getNearlyMonthRange(),
+            },
+            oriCoreData: [],
+            coreData: [
+                {
+                    title: "总用电量(kWh)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "总用水量(㎡)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "总能耗成本(元)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "人均能耗成本(元/人)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    type: 1,
+                    title: "值得关注",
+                    showStar: true,
+                    content: "",
+                },
+            ],
+        };
+    },
+    watch: {
+        "queryData.energy": function (val) {
+            this.handleTypeChange(val);
         },
-        {
-          title: "总用水量(㎡)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+    },
+    created() {
+        this.oriCoreData = JSON.parse(JSON.stringify(this.coreData));
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
         },
-        {
-          title: "总能耗成本(元)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        handleTypeChange(type) {
+            this.coreData = JSON.parse(JSON.stringify(this.oriCoreData));
+            if ("electric" == type) {
+                // 用电
+                this.coreData[0].title = "总用电量(kWh)";
+                this.coreData[1].title = "人均用电量(kWh/人)";
+            } else if ("water" == type) {
+                // 用水
+                this.coreData[0].title = "总用水量(m³)";
+                this.coreData[1].title = "人均用水量(m³/人)";
+            } else if ("hot" == type) {
+                // 用热
+                this.coreData[0].title = "总用热量(焦)";
+                this.coreData[1].title = "人均用热量(焦)";
+            } else if ("cold" == type) {
+                // 用冷
+                this.coreData[0].title = "总用冷量(kWh)";
+                this.coreData[1].title = "人均用冷量(kWh/人)";
+            } else if ("pv" == type) {
+                // 光伏
+                this.coreData[0].title = "总发电量(kWh)";
+                this.coreData[1].title = "平均发电量量(kWh/台)";
+            } else {
+                // 全部
+                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();
         },
-        {
-          title: "人均能耗成本(元/人)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        reset() {
         },
-        {
-          type: 1,
-          title: "值得关注",
-          showStar: true,
-          content: "",
+        search() {
+            this.$util.asyncPromise(
+                this.getCoreData(),
+                this.$refs.anaChart.getData()
+            );
+            this.$refs.anaDetail.refresh();
+        },
+        getCoreData() {
+            return apiOperationAnalysis.getCoreData(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;
+            });
         },
-      ],
-    };
-  },
-  watch: {
-    "queryData.energy": function (val) {
-      this.handleTypeChange(val);
-    },
-  },
-  created() {
-    this.oriCoreData = JSON.parse(JSON.stringify(this.coreData));
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
-    },
-    handleTypeChange(type) {
-      this.coreData = JSON.parse(JSON.stringify(this.oriCoreData));
-      if ("electric" == type) {
-        // 用电
-        this.coreData[0].title = "总用电量(kWh)";
-        this.coreData[1].title = "人均用电量(kWh/人)";
-      } else if ("water" == type) {
-        // 用水
-        this.coreData[0].title = "总用水量(m³)";
-        this.coreData[1].title = "人均用水量(m³/人)";
-      } else if ("hot" == type) {
-        // 用热
-        this.coreData[0].title = "总用热量(焦)";
-        this.coreData[1].title = "人均用热量(焦)";
-      } else if ("cold" == type) {
-        // 用冷
-        this.coreData[0].title = "总用冷量(kWh)";
-        this.coreData[1].title = "人均用冷量(kWh/人)";
-      } else if ("pv" == type) {
-        // 光伏
-        this.coreData[0].title = "总发电量(kWh)";
-        this.coreData[1].title = "平均发电量量(kWh/台)";
-      } else {
-        // 全部
-        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() {},
-    search() {
-      this.$util.asyncPromise(
-        this.getCoreData(),
-        this.$refs.anaChart.getData()
-      );
-      this.$refs.anaDetail.refresh();
-    },
-    getCoreData() {
-      return apiOperationAnalysis.getCoreData(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;
-      });
     },
-  },
 };
 </script>
 
 <template>
-  <div>
-    <div class="page-query-core">
-      <query
-        :show="['company', 'energy', 'time']"
-        :query-data.sync="queryData"
-        :reset="reset"
-        :search="search"
-        style="
-          background: #fff;
-          height: 60px;
-          padding: 10px;
-          border-radius: 5px;
-          margin-bottom: 10px;
-        "
-      ></query>
-      <card :title="'核心指标'">
-        <CoreData :data-list="coreData"></CoreData>
-      </card>
-    </div>
+    <div>
+        <div class="page-query-core">
+            <query
+                    :show="['company', 'energy', 'time']"
+                    :query-data.sync="queryData"
+                    :reset="reset"
+                    :search="search"
+            ></query>
+        </div>
 
-    <div class="analysis-energy-body">
-      <a-row :gutter="[12, 12]">
-        <a-col :span="18">
-          <div class="ioc-card-content">
-            <card :title="'用电趋势'" v-if="queryData.energy == 'electric'">
-              <div class="analysis-energy-body-left">
-                <BusinessElectricChart
-                  ref="anaChart"
-                  :query-data="queryData"
-                  :height="430"
-                ></BusinessElectricChart>
-              </div>
-            </card>
-            <card :title="'用水趋势'" v-else-if="queryData.energy == 'water'">
-              <div class="analysis-energy-body-left">
-                <BusinessWaterChart
-                  ref="anaChart"
-                  :query-data="queryData"
-                  :height="430"
-                ></BusinessWaterChart>
-              </div>
+        <div class="page-query-core">
+            <card :title="'核心指标'">
+                <CoreData :data-list="coreData"></CoreData>
             </card>
-            <card :title="'用热趋势'" v-else-if="queryData.energy == 'hot'">
-              <div class="analysis-energy-body-left">
-                <div style="margin-top: 15px">
-                  <BusinessHotChart
-                    ref="anaChart"
-                    :query-data="queryData"
-                    :height="450"
-                  ></BusinessHotChart>
-                </div>
-              </div>
-            </card>
-            <card :title="'用冷趋势'" v-else-if="queryData.energy == 'cold'">
-              <div class="analysis-energy-body-left">
-                <div style="margin-top: 15px">
-                  <BusinessColdChart
-                    ref="anaChart"
-                    :query-data="queryData"
-                    :height="450"
-                  ></BusinessColdChart>
-                </div>
-              </div>
-            </card>
-            <card :title="'光伏趋势'" v-else-if="queryData.energy == 'pv'">
-              <div class="analysis-energy-body-left">
-                <div style="margin-top: 15px">
-                  <BusinessPvChart
-                    ref="anaChart"
-                    :query-data="queryData"
-                    :height="450"
-                  ></BusinessPvChart>
-                </div>
-              </div>
-            </card>
-            <card :title="'能源趋势'" v-else-if="queryData.energy == '0'">
-              <div class="analysis-energy-body-left">
-                <div style="margin-top: 15px">
-                  <BusinessEnergyChart
-                    ref="anaChart"
-                    :query-data="queryData"
-                    :height="450"
-                  ></BusinessEnergyChart>
-                </div>
-              </div>
-            </card>
-          </div>
-        </a-col>
-        <a-col :span="6">
-          <div class="ioc-card-content">
-            <card :title="'用电分析'" v-if="queryData.energy == 'electric'">
-              <div class="analysis-energy-body-right">
-                <BusinessElectricDetail
-                  ref="anaDetail"
-                  :query-data="queryData"
-                />
-              </div>
-            </card>
-            <card :title="'用水分析'" v-else-if="queryData.energy == 'water'">
-              <div class="analysis-energy-body-right">
-                <BusinessWaterDetail ref="anaDetail" :query-data="queryData" />
-              </div>
-            </card>
-            <card :title="'用热分析'" v-else-if="queryData.energy == 'hot'">
-              <div class="analysis-energy-body-right">
-                <div style="margin-top: 15px">
-                  <BusinessHotDetail ref="anaDetail" :query-data="queryData" />
-                </div>
-              </div>
-            </card>
-            <card :title="'用冷分析'" v-else-if="queryData.energy == 'cold'">
-              <div class="analysis-energy-body-right">
-                <div style="margin-top: 15px">
-                  <BusinessColdDetail ref="anaDetail" :query-data="queryData" />
-                </div>
-              </div>
-            </card>
-            <card :title="'光伏分析'" v-else-if="queryData.energy == 'pv'">
-              <div class="analysis-energy-body-right">
-                <div style="margin-top: 15px">
-                  <BusinessPvDetail ref="anaDetail" :query-data="queryData" />
-                </div>
-              </div>
-            </card>
-            <card :title="'能源分析'" v-else-if="queryData.energy == '0'">
-              <div class="analysis-energy-body-right">
-                <div style="margin-top: 15px">
-                  <BusinessEnergyDetail
-                    ref="anaDetail"
-                    :query-data="queryData"
-                  />
-                </div>
-              </div>
-            </card>
-          </div>
-        </a-col>
-      </a-row>
+        </div>
+
+        <div class="analysis-energy-body">
+            <a-row :gutter="[12, 12]">
+                <a-col :span="18">
+                    <div class="ioc-card-content">
+                        <card :title="'用电趋势'" v-if="queryData.energy == 'electric'">
+                            <div class="analysis-energy-body-left">
+                                <BusinessElectricChart
+                                        ref="anaChart"
+                                        :query-data="queryData"
+                                        :height="430"
+                                ></BusinessElectricChart>
+                            </div>
+                        </card>
+                        <card :title="'用水趋势'" v-else-if="queryData.energy == 'water'">
+                            <div class="analysis-energy-body-left">
+                                <BusinessWaterChart
+                                        ref="anaChart"
+                                        :query-data="queryData"
+                                        :height="430"
+                                ></BusinessWaterChart>
+                            </div>
+                        </card>
+                        <card :title="'用热趋势'" v-else-if="queryData.energy == 'hot'">
+                            <div class="analysis-energy-body-left">
+                                <div style="margin-top: 15px">
+                                    <BusinessHotChart
+                                            ref="anaChart"
+                                            :query-data="queryData"
+                                            :height="450"
+                                    ></BusinessHotChart>
+                                </div>
+                            </div>
+                        </card>
+                        <card :title="'用冷趋势'" v-else-if="queryData.energy == 'cold'">
+                            <div class="analysis-energy-body-left">
+                                <div style="margin-top: 15px">
+                                    <BusinessColdChart
+                                            ref="anaChart"
+                                            :query-data="queryData"
+                                            :height="450"
+                                    ></BusinessColdChart>
+                                </div>
+                            </div>
+                        </card>
+                        <card :title="'光伏趋势'" v-else-if="queryData.energy == 'pv'">
+                            <div class="analysis-energy-body-left">
+                                <div style="margin-top: 15px">
+                                    <BusinessPvChart
+                                            ref="anaChart"
+                                            :query-data="queryData"
+                                            :height="450"
+                                    ></BusinessPvChart>
+                                </div>
+                            </div>
+                        </card>
+                        <card :title="'能源趋势'" v-else-if="queryData.energy == '0'">
+                            <div class="analysis-energy-body-left">
+                                <div style="margin-top: 15px">
+                                    <BusinessEnergyChart
+                                            ref="anaChart"
+                                            :query-data="queryData"
+                                            :height="450"
+                                    ></BusinessEnergyChart>
+                                </div>
+                            </div>
+                        </card>
+                    </div>
+                </a-col>
+                <a-col :span="6">
+                    <div class="ioc-card-content">
+                        <card :title="'用电分析'" v-if="queryData.energy == 'electric'">
+                            <div class="analysis-energy-body-right">
+                                <BusinessElectricDetail
+                                        ref="anaDetail"
+                                        :query-data="queryData"
+                                />
+                            </div>
+                        </card>
+                        <card :title="'用水分析'" v-else-if="queryData.energy == 'water'">
+                            <div class="analysis-energy-body-right">
+                                <BusinessWaterDetail ref="anaDetail" :query-data="queryData"/>
+                            </div>
+                        </card>
+                        <card :title="'用热分析'" v-else-if="queryData.energy == 'hot'">
+                            <div class="analysis-energy-body-right">
+                                <div style="margin-top: 15px">
+                                    <BusinessHotDetail ref="anaDetail" :query-data="queryData"/>
+                                </div>
+                            </div>
+                        </card>
+                        <card :title="'用冷分析'" v-else-if="queryData.energy == 'cold'">
+                            <div class="analysis-energy-body-right">
+                                <div style="margin-top: 15px">
+                                    <BusinessColdDetail ref="anaDetail" :query-data="queryData"/>
+                                </div>
+                            </div>
+                        </card>
+                        <card :title="'光伏分析'" v-else-if="queryData.energy == 'pv'">
+                            <div class="analysis-energy-body-right">
+                                <div style="margin-top: 15px">
+                                    <BusinessPvDetail ref="anaDetail" :query-data="queryData"/>
+                                </div>
+                            </div>
+                        </card>
+                        <card :title="'能源分析'" v-else-if="queryData.energy == '0'">
+                            <div class="analysis-energy-body-right">
+                                <div style="margin-top: 15px">
+                                    <BusinessEnergyDetail
+                                            ref="anaDetail"
+                                            :query-data="queryData"
+                                    />
+                                </div>
+                            </div>
+                        </card>
+                    </div>
+                </a-col>
+            </a-row>
+        </div>
     </div>
-  </div>
 </template>
 
 <style lang="less" scoped>
 .analysis-energy-body {
   margin-top: 12px;
+
   .analysis-energy-body-left {
     height: 480px;
     overflow: hidden;
   }
+
   .analysis-energy-body-right {
     height: 480px;
     overflow: hidden;

src/components/business/asset/asset.vue

@@ -14,10 +14,12 @@
           margin-bottom: 10px;
         "
       ></Query>
-      <card :title="'核心指标'">
-        <CoreData :data-list="coreData"></CoreData>
-      </card>
     </div>
+      <div class="page-query-core">
+          <card :title="'核心指标'">
+              <CoreData :data-list="coreData"></CoreData>
+          </card>
+      </div>
 
     <div style="margin-top: 15px">
       <a-row>

src/components/business/space/space.vue

@@ -14,10 +14,12 @@
           margin-bottom: 10px;
         "
       ></Query>
-      <card :title="'核心指标'">
-        <CoreData :data-list="coreData"></CoreData>
-      </card>
     </div>
+      <div class="page-query-core">
+          <card :title="'核心指标'">
+              <CoreData :data-list="coreData"></CoreData>
+          </card>
+      </div>
     <a-row style="margin-top: 12px" :gutter="[12,12]">
       <a-col :span="24">
         <div class="left ioc-card-content">

src/components/common/query.vue

@@ -221,6 +221,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.ioc-query-form {
+  background: #fff;
+  height: 60px;
+  padding: 10px 0;
+  border-radius: 5px;
+  margin-bottom: 10px;
+}
 .formItem {
   margin: 0px 15px;
 }

src/components/doubleCarbon/PV/doubleCarbonPv.vue

@@ -8,178 +8,163 @@ import CarbonPvQuotaChart from "@/components/doubleCarbon/PV/charts/carbonPvQuot
 import apiCarbonPv from "@/api/carbon/apiCarbonPv";
 
 export default {
-  components: {
-    Card,
-    CoreData,
-    Query,
-    CarbonPvEmissionChart,
-    CarbonPvQuotaChart,
-  },
-  data() {
-    return {
-      queryData: {
-        companyId: "0",
-        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
-      },
-      companyOptions: [
-        {
-          label: '全部',
-          value: '0'
-        }
-      ],
-      coreData: [
-        {
-          title: "光伏累计减排(tCO₂e)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
-        },
-        {
-          title: "光伏发电量(kWh/天)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+    components: {
+        Card,
+        CoreData,
+        Query,
+        CarbonPvEmissionChart,
+        CarbonPvQuotaChart,
+    },
+    data() {
+        return {
+            queryData: {
+                companyId: "0",
+                timeRange: this.$util.dateUtil.getNearlyMonthRange(),
+            },
+            companyOptions: [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ],
+            coreData: [
+                {
+                    title: "光伏累计减排(tCO₂e)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "光伏发电量(kWh/天)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "光伏节约金额(元/天)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "光伏补贴金额(元/天)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    type: 1,
+                    title: "值得关注",
+                    showStar: true,
+                    content: "建议扩大光伏 发电面积",
+                },
+            ],
+            newsData: [
+                {
+                    title: "xxxxxxxxxx",
+                    tag: "双碳小知识",
+                    author: "张峰",
+                    time: "2022-02-02 15:00:00",
+                },
+            ],
+        };
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
         },
-        {
-          title: "光伏节约金额(元/天)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        reset() {
         },
-        {
-          title: "光伏补贴金额(元/天)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        search(data) {
+            this.$util.asyncPromise(
+                this.getCoreData(),
+                this.$refs.CarbonPvEmissionChart.getData(),
+                this.$refs.CarbonPvEmissionChart.getData()
+            );
         },
-        {
-          type: 1,
-          title: "值得关注",
-          showStar: true,
-          content: "建议扩大光伏 发电面积",
+        getCoreData() {
+            return apiCarbonPv.getCoreData(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;
+            });
         },
-      ],
-      newsData: [
-        {
-          title: "xxxxxxxxxx",
-          tag: "双碳小知识",
-          author: "张峰",
-          time: "2022-02-02 15:00:00",
+        callBackCompanyOption(options) {
+            this.companyOptions = [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ]
+            if (options) {
+                options.forEach(item => {
+                    this.companyOptions.push(item);
+                })
+            }
+            this.$forceUpdate()
         },
-      ],
-    };
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
-    },
-    reset() {},
-    search(data) {
-      this.$util.asyncPromise(
-        this.getCoreData(),
-        this.$refs.CarbonPvEmissionChart.getData(),
-        this.$refs.CarbonPvEmissionChart.getData()
-      );
     },
-    getCoreData() {
-      return apiCarbonPv.getCoreData(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;
-      });
-    },
-    callBackCompanyOption(options) {
-      this.companyOptions = [
-        {
-          label: '全部',
-          value: '0'
-        }
-      ]
-      if (options) {
-        options.forEach(item=>{
-          this.companyOptions.push(item);
-        })
-      }
-      this.$forceUpdate()
-    },
-  },
 };
 </script>
 
 <template>
-  <div class="doubleCarbon-pv">
-    <div class="page-query-core">
-      <a-row>
-        <a-col
-          style="
-            background: #fff;
-            height: 60px;
-            padding: 10px;
-            border-radius: 5px;
-            margin-bottom: 10px;
-          "
-        >
-          <div style="width: 100%">
+    <div class="doubleCarbon-pv">
+        <div class="page-query-core">
             <Query
-              :show="['company', 'time']"
-              :query-data.sync="queryData"
-              :reset="reset"
-              :search="search"
-              :company-options="companyOptions"
+                    :show="['company', 'time']"
+                    :query-data.sync="queryData"
+                    :reset="reset"
+                    :search="search"
+                    :company-options="companyOptions"
             ></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div style="width: 100%">
+        </div>
+        <div class="page-query-core">
             <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
+                <CoreData :data-list="coreData"></CoreData>
             </Card>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
+        </div>
 
-    <div style="margin-top: 12px">
-      <a-row :gutter="[12, 12]">
-        <a-col :span="18">
-          <div class="ioc-card-content">
-            <Card title="光伏减排分析">
-              <div class="doubleCarbon-pv-analyse">
-                <CarbonPvEmissionChart
-                  ref="CarbonPvEmissionChart"
-                  :query-data="queryData"
-                  :callBackCompanyOption="callBackCompanyOption"
-                  :height="450"
-                />
-              </div>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="6">
-          <div class="ioc-card-content">
-            <Card title="光伏减排排名">
-              <div class="doubleCarbon-pv-quota">
-                <CarbonPvQuotaChart
-                  ref="CarbonPvQuotaChart"
-                  :query-data="queryData"
-                  :height="450"
-                />
-              </div>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
+        <div style="margin-top: 12px">
+            <a-row :gutter="[12, 12]">
+                <a-col :span="18">
+                    <div class="ioc-card-content">
+                        <Card title="光伏减排分析">
+                            <div class="doubleCarbon-pv-analyse">
+                                <CarbonPvEmissionChart
+                                        ref="CarbonPvEmissionChart"
+                                        :query-data="queryData"
+                                        :callBackCompanyOption="callBackCompanyOption"
+                                        :height="450"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="6">
+                    <div class="ioc-card-content">
+                        <Card title="光伏减排排名">
+                            <div class="doubleCarbon-pv-quota">
+                                <CarbonPvQuotaChart
+                                        ref="CarbonPvQuotaChart"
+                                        :query-data="queryData"
+                                        :height="450"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+            </a-row>
+        </div>
     </div>
-  </div>
 </template>
 
 <style lang="less" scoped>

src/components/doubleCarbon/car/doubleCarbonCar.vue

@@ -8,165 +8,153 @@ import CarbonCarQuotaChart from "@/components/doubleCarbon/car/charts/carbonCarQ
 import apiCarbonCar from "@/api/carbon/apiCarbonCar";
 
 export default {
-  components: {
-    Card,
-    CoreData,
-    Query,
-    CarbonCarEmissionChart,
-    CarbonCarQuotaChart,
-  },
-  data() {
-    return {
-      queryData: {
-        companyId: '0',
-        timeRange: this.$util.dateUtil.getNearlyMonthRange()
-      },
-      companyOptions: [
-        {
-          label: '全部',
-          value: '0'
+    components: {
+        Card,
+        CoreData,
+        Query,
+        CarbonCarEmissionChart,
+        CarbonCarQuotaChart,
+    },
+    data() {
+        return {
+            queryData: {
+                companyId: '0',
+                timeRange: this.$util.dateUtil.getNearlyMonthRange()
+            },
+            companyOptions: [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ],
+            coreData: [
+                {
+                    title: '车辆累计排放(tCO₂e)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: 0
+                },
+                {
+                    title: '车辆总里程(KM)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: 0
+                },
+                {
+                    title: '车辆平均里程(KM/辆)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: 0
+                },
+                {
+                    title: '车辆平均碳排放(tCO₂e/辆/天)',
+                    num: 0,
+                    historyDesc: '同比',
+                    historyNum: 0
+                },
+                {
+                    type: 1,
+                    title: '值得关注',
+                    showStar: true,
+                    content: ''
+                },
+            ],
+            newsData: [
+                {
+                    title: 'xxxxxxxxxx',
+                    tag: '双碳小知识',
+                    author: '张峰',
+                    time: '2022-02-02 15:00:00'
+                }
+            ]
         }
-      ],
-      coreData: [
-        {
-          title: '车辆累计排放(tCO₂e)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
         },
-        {
-          title: '车辆总里程(KM)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+        reset() {
         },
-        {
-          title: '车辆平均里程(KM/辆)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+        search(data) {
+            this.$util.asyncPromise(
+                this.getCoreData(),
+                this.$refs.CarbonCarEmissionChart.getData(),
+                this.$refs.CarbonCarQuotaChart.getData(),
+            )
         },
-        {
-          title: '车辆平均碳排放(tCO₂e/辆/天)',
-          num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+        getCoreData() {
+            return apiCarbonCar.getCoreData(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
+            })
         },
-        {
-          type: 1,
-          title: '值得关注',
-          showStar: true,
-          content: ''
+        callBackCompanyOption(options) {
+            this.companyOptions = [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ]
+            if (options) {
+                options.forEach(item => {
+                    this.companyOptions.push(item);
+                })
+            }
+            this.$forceUpdate()
         },
-      ],
-      newsData: [
-        {
-          title: 'xxxxxxxxxx',
-          tag: '双碳小知识',
-          author: '张峰',
-          time: '2022-02-02 15:00:00'
-        }
-      ]
     }
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
-    },
-    reset() {
-    },
-    search(data) {
-      this.$util.asyncPromise(
-          this.getCoreData(),
-          this.$refs.CarbonCarEmissionChart.getData(),
-          this.$refs.CarbonCarQuotaChart.getData(),
-      )
-    },
-    getCoreData() {
-      return apiCarbonCar.getCoreData(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
-      })
-    },
-    callBackCompanyOption(options) {
-      this.companyOptions = [
-        {
-          label: '全部',
-          value: '0'
-        }
-      ]
-      if (options) {
-        options.forEach(item=>{
-          this.companyOptions.push(item);
-        })
-      }
-      this.$forceUpdate()
-    },
-  }
 }
 </script>
 
 <template>
-  <div class="doubleCarbon-car">
-
-    <div class="page-query-core">
-      <a-row>
-        <a-col style="
-            background: #fff;
-            height: 60px;
-            padding: 10px;
-            border-radius: 5px;
-            margin-bottom: 10px;
-          ">
-          <div style="width: 100%">
-            <Query :show="['company', 'time']" :query-data.sync="queryData" :company-options="companyOptions" :reset="reset" :search="search"></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div style="width: 100%">
+    <div class="doubleCarbon-car">
+        <div class="page-query-core">
+            <Query :show="['company', 'time']" :query-data.sync="queryData" :company-options="companyOptions"
+                   :reset="reset" :search="search"></Query>
+        </div>
+        <div class="page-query-core">
             <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
+                <CoreData :data-list="coreData"></CoreData>
             </Card>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
+        </div>
 
-    <div style="margin-top: 12px">
-      <a-row :gutter="[12,12]">
-        <a-col :span="18" >
-          <div class="ioc-card-content">
-            <Card title="车辆排放分析">
-              <div class="doubleCarbon-car-analyse">
-                <CarbonCarEmissionChart :call-back-company-option="callBackCompanyOption" ref="CarbonCarEmissionChart" :query-data="queryData" :height="450"/>
-              </div>
-            </Card>
-          </div>
+        <div style="margin-top: 12px">
+            <a-row :gutter="[12,12]">
+                <a-col :span="18">
+                    <div class="ioc-card-content">
+                        <Card title="车辆排放分析">
+                            <div class="doubleCarbon-car-analyse">
+                                <CarbonCarEmissionChart :call-back-company-option="callBackCompanyOption"
+                                                        ref="CarbonCarEmissionChart" :query-data="queryData"
+                                                        :height="450"/>
+                            </div>
+                        </Card>
+                    </div>
 
-        </a-col>
-        <a-col :span="6">
-          <div class="ioc-card-content">
-            <Card title="车辆排放排名">
-              <div class="doubleCarbon-car-quota">
-                <CarbonCarQuotaChart ref="CarbonCarQuotaChart" :query-data="queryData" :height="450"/>
-              </div>
-            </Card>
-          </div>
+                </a-col>
+                <a-col :span="6">
+                    <div class="ioc-card-content">
+                        <Card title="车辆排放排名">
+                            <div class="doubleCarbon-car-quota">
+                                <CarbonCarQuotaChart ref="CarbonCarQuotaChart" :query-data="queryData" :height="450"/>
+                            </div>
+                        </Card>
+                    </div>
 
-        </a-col>
-      </a-row>
+                </a-col>
+            </a-row>
+        </div>
     </div>
-  </div>
 </template>
 
 <style lang="less" scoped>

src/components/doubleCarbon/overview/doubleCarbonOverview.vue

@@ -10,222 +10,207 @@ import CarbonOverviewPercent from "@/components/doubleCarbon/overview/charts/car
 import apiCarbonOverview from "@/api/carbon/apiCarbonOverview";
 
 export default {
-  components: {
-    Card,
-    CoreData,
-    Query,
-    CarbonEmissionCharts,
-    CarbonQuotaChart,
-    DoubleCarbonNews,
-    CarbonOverviewPercent,
-  },
-  data() {
-    return {
-      queryData: {
-        companyId: "0",
-        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
-      },
-      companyOptions: [
-        {
-          label: '全部',
-          value: '0'
-        }
-      ],
-      coreData: [
-        {
-          title: "碳配额存量",
-          num: 0,
-          unit: '%',
-          historyDesc: "同比",
-          historyNum: 0,
+    components: {
+        Card,
+        CoreData,
+        Query,
+        CarbonEmissionCharts,
+        CarbonQuotaChart,
+        DoubleCarbonNews,
+        CarbonOverviewPercent,
+    },
+    data() {
+        return {
+            queryData: {
+                companyId: "0",
+                timeRange: this.$util.dateUtil.getNearlyMonthRange(),
+            },
+            companyOptions: [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ],
+            coreData: [
+                {
+                    title: "碳配额存量",
+                    num: 0,
+                    unit: '%',
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "碳排放总量(tCO₂e)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "单位面积碳排放(tCO₂e/m²)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "人均碳排放(tCO₂e/人)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "新能源减排(tCO₂e)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    type: 1,
+                    title: "值得关注",
+                    showStar: true,
+                    content: "",
+                },
+            ],
+            newsData: [],
+        };
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$util.asyncPromise(this.getCoreData(), this.getNewsData());
         },
-        {
-          title: "碳排放总量(tCO₂e)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        reset() {
         },
-        {
-          title: "单位面积碳排放(tCO₂e/m²)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        search(data) {
+            this.$util.asyncPromise(
+                this.getCoreData(),
+                this.getNewsData(),
+                this.$refs.CarbonEmissionCharts.getData(),
+                this.$refs.CarbonQuotaChart.getData(),
+                this.$refs.CarbonOverviewPercent.getData()
+            );
         },
-        {
-          title: "人均碳排放(tCO₂e/人)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        getCoreData() {
+            return apiCarbonOverview.getCoreData(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].num = res.list[4].value;
+                this.coreData[4].historyNum = res.list[4].compare;
+                this.coreData[5].content = res.worthAttention;
+            });
         },
-        {
-          title: "新能源减排(tCO₂e)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        getNewsData() {
+            let params = {
+                timeRange: {
+                    startDate: '2022/04/25',
+                    endDate: '2022/06/07'
+                }
+            }
+            return apiCarbonOverview.getCarbonNews(params).then((res) => {
+                this.newsData = res;
+            });
         },
-        {
-          type: 1,
-          title: "值得关注",
-          showStar: true,
-          content: "",
+        callBackCompanyOption(options) {
+            this.companyOptions = [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ]
+            if (options) {
+                options.forEach(item => {
+                    this.companyOptions.push(item);
+                })
+            }
+            this.$forceUpdate()
         },
-      ],
-      newsData: [],
-    };
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$util.asyncPromise(this.getCoreData(), this.getNewsData());
-    },
-    reset() {},
-    search(data) {
-      this.$util.asyncPromise(
-        this.getCoreData(),
-        this.getNewsData(),
-        this.$refs.CarbonEmissionCharts.getData(),
-        this.$refs.CarbonQuotaChart.getData(),
-        this.$refs.CarbonOverviewPercent.getData()
-      );
     },
-    getCoreData() {
-      return apiCarbonOverview.getCoreData(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].num = res.list[4].value;
-        this.coreData[4].historyNum = res.list[4].compare;
-        this.coreData[5].content = res.worthAttention;
-      });
-    },
-    getNewsData() {
-      let params = {
-        timeRange: {
-          startDate: '2022/04/25',
-          endDate: '2022/06/07'
-        }
-      }
-      return apiCarbonOverview.getCarbonNews(params).then((res) => {
-        this.newsData = res;
-      });
-    },
-    callBackCompanyOption(options) {
-      this.companyOptions = [
-        {
-          label: '全部',
-          value: '0'
-        }
-      ]
-      if (options) {
-        options.forEach(item=>{
-          this.companyOptions.push(item);
-        })
-      }
-      this.$forceUpdate()
-    },
-  },
 };
 </script>
 
 <template>
-  <div class="doubleCarbon-overview">
-    <div class="page-query-core">
-      <a-row>
-        <a-col
-          style="
-            background: #fff;
-            height: 60px;
-            padding: 10px;
-            border-radius: 5px;
-            margin-bottom: 10px;
-          "
-        >
-          <div style="width: 100%">
+    <div class="doubleCarbon-overview">
+        <div class="page-query-core">
             <Query
-              :show="['company', 'time']"
-              :query-data.sync="queryData"
-              :reset="reset"
-              :search="search"
-              :company-options="companyOptions"
+                    :show="['company', 'time']"
+                    :query-data.sync="queryData"
+                    :reset="reset"
+                    :search="search"
+                    :company-options="companyOptions"
             ></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div style="width: 100%">
+        </div>
+        <div class="page-query-core">
             <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
+                <CoreData :data-list="coreData"></CoreData>
             </Card>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
+        </div>
 
-    <div style="margin-top: 12px">
-      <a-row :gutter="[12, 12]">
-        <a-col :span="18">
-          <div class="ioc-card-content">
-            <Card title="碳排放分析">
-              <div class="doubleCarbon-overview-analyse">
-                <CarbonEmissionCharts
-                  ref="CarbonEmissionCharts"
-                  :query-data="queryData"
-                  :callBackCompanyOption="callBackCompanyOption"
-                  :height="450"
-                />
-              </div>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="6">
-          <div class="ioc-card-content">
-            <Card title="碳配额">
-              <div class="doubleCarbon-overview-quota">
-                <CarbonQuotaChart
-                  ref="CarbonQuotaChart"
-                  :query-data="queryData"
-                  :height="450"
-                />
-              </div>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="18">
-          <div class="ioc-card-content">
-            <Card title="双碳新闻">
-              <div style="width: 97%; margin: 0 auto">
-                <a-divider style="margin: 0; padding: 0"></a-divider>
-              </div>
-              <div class="doubleCarbon-overview-news">
-                <div style="height: 280px;overflow-y: auto">
-                  <DoubleCarbonNews :data="newsData" />
-                </div>
-              </div>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="6">
-          <div class="ioc-card-content">
-            <Card title="碳排放分类">
-              <div class="doubleCarbon-overview-percent">
-                <CarbonOverviewPercent
-                  ref="CarbonOverviewPercent"
-                  :query-data="queryData"
-                  :height="300"
-                />
-              </div>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
+        <div style="margin-top: 12px">
+            <a-row :gutter="[12, 12]">
+                <a-col :span="18">
+                    <div class="ioc-card-content">
+                        <Card title="碳排放分析">
+                            <div class="doubleCarbon-overview-analyse">
+                                <CarbonEmissionCharts
+                                        ref="CarbonEmissionCharts"
+                                        :query-data="queryData"
+                                        :callBackCompanyOption="callBackCompanyOption"
+                                        :height="450"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="6">
+                    <div class="ioc-card-content">
+                        <Card title="碳配额">
+                            <div class="doubleCarbon-overview-quota">
+                                <CarbonQuotaChart
+                                        ref="CarbonQuotaChart"
+                                        :query-data="queryData"
+                                        :height="450"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="18">
+                    <div class="ioc-card-content">
+                        <Card title="双碳新闻">
+                            <div style="width: 97%; margin: 0 auto">
+                                <a-divider style="margin: 0; padding: 0"></a-divider>
+                            </div>
+                            <div class="doubleCarbon-overview-news">
+                                <div style="height: 280px;overflow-y: auto">
+                                    <DoubleCarbonNews :data="newsData"/>
+                                </div>
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="6">
+                    <div class="ioc-card-content">
+                        <Card title="碳排放分类">
+                            <div class="doubleCarbon-overview-percent">
+                                <CarbonOverviewPercent
+                                        ref="CarbonOverviewPercent"
+                                        :query-data="queryData"
+                                        :height="300"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+            </a-row>
+        </div>
     </div>
-  </div>
 </template>
 
 <style lang="less" scoped>
@@ -238,13 +223,16 @@ export default {
   .doubleCarbon-overview-analyse {
     padding: 12px;
   }
+
   .doubleCarbon-overview-quota {
     padding: 12px;
   }
+
   .doubleCarbon-overview-news {
     padding: 0 12px;
     height: 300px;
   }
+
   .doubleCarbon-overview-percent {
     padding: 0 12px;
     height: 300px;

src/components/doubleCarbon/print/doubleCarbonPrint.vue

@@ -8,178 +8,163 @@ import CarbonPrintQuotaChart from "@/components/doubleCarbon/print/charts/carbon
 import apiCarbonPrint from "@/api/carbon/apiCarbonPrint";
 
 export default {
-  components: {
-    Card,
-    CoreData,
-    Query,
-    CarbonPrintEmissionChart,
-    CarbonPrintQuotaChart,
-  },
-  data() {
-    return {
-      queryData: {
-        companyId: "0",
-        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
-      },
-      companyOptions: [
-        {
-          label: '全部',
-          value: '0'
-        }
-      ],
-      coreData: [
-        {
-          title: "文印累计排放(tCO₂e)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
-        },
-        {
-          title: "文印人均排放(tCO₂e/天)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+    components: {
+        Card,
+        CoreData,
+        Query,
+        CarbonPrintEmissionChart,
+        CarbonPrintQuotaChart,
+    },
+    data() {
+        return {
+            queryData: {
+                companyId: "0",
+                timeRange: this.$util.dateUtil.getNearlyMonthRange(),
+            },
+            companyOptions: [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ],
+            coreData: [
+                {
+                    title: "文印累计排放(tCO₂e)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "文印人均排放(tCO₂e/天)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "纸张累计排放(tCO₂e)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "墨盒累计排放(tCO₂e)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    type: 1,
+                    title: "值得关注",
+                    showStar: true,
+                    content: "",
+                },
+            ],
+            newsData: [
+                {
+                    title: "xxxxxxxxxx",
+                    tag: "双碳小知识",
+                    author: "张峰",
+                    time: "2022-02-02 15:00:00",
+                },
+            ],
+        };
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
         },
-        {
-          title: "纸张累计排放(tCO₂e)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        reset() {
         },
-        {
-          title: "墨盒累计排放(tCO₂e)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+        search(data) {
+            this.$util.asyncPromise(
+                this.getCoreData(),
+                this.$refs.CarbonPrintEmissionChart.getData(),
+                this.$refs.CarbonPrintQuotaChart.getData()
+            );
         },
-        {
-          type: 1,
-          title: "值得关注",
-          showStar: true,
-          content: "",
+        getCoreData() {
+            return apiCarbonPrint.getCoreData(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;
+            });
         },
-      ],
-      newsData: [
-        {
-          title: "xxxxxxxxxx",
-          tag: "双碳小知识",
-          author: "张峰",
-          time: "2022-02-02 15:00:00",
+        callBackCompanyOption(options) {
+            this.companyOptions = [
+                {
+                    label: '全部',
+                    value: '0'
+                }
+            ]
+            if (options) {
+                options.forEach(item => {
+                    this.companyOptions.push(item);
+                })
+            }
+            this.$forceUpdate()
         },
-      ],
-    };
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
-    },
-    reset() {},
-    search(data) {
-      this.$util.asyncPromise(
-        this.getCoreData(),
-        this.$refs.CarbonPrintEmissionChart.getData(),
-        this.$refs.CarbonPrintQuotaChart.getData()
-      );
-    },
-    getCoreData() {
-      return apiCarbonPrint.getCoreData(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;
-      });
-    },
-    callBackCompanyOption(options) {
-      this.companyOptions = [
-        {
-          label: '全部',
-          value: '0'
-        }
-      ]
-      if (options) {
-        options.forEach(item=>{
-          this.companyOptions.push(item);
-        })
-      }
-      this.$forceUpdate()
     },
-  },
 };
 </script>
 
 <template>
-  <div class="doubleCarbon-print">
-    <div class="page-query-core">
-      <a-row>
-        <a-col
-          style="
-            background: #fff;
-            height: 60px;
-            padding: 10px;
-            border-radius: 5px;
-            margin-bottom: 10px;
-          "
-        >
-          <div style="width: 100%">
+    <div class="doubleCarbon-print">
+        <div class="page-query-core">
             <Query
-              :show="['company', 'time']"
-              :query-data.sync="queryData"
-              :company-options="companyOptions"
-              :reset="reset"
-              :search="search"
+                    :show="['company', 'time']"
+                    :query-data.sync="queryData"
+                    :company-options="companyOptions"
+                    :reset="reset"
+                    :search="search"
             ></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div style="width: 100%">
+        </div>
+        <div class="page-query-core">
             <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
+                <CoreData :data-list="coreData"></CoreData>
             </Card>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
+        </div>
 
-    <div style="margin-top: 12px">
-      <a-row :gutter="[12, 12]">
-        <a-col :span="18">
-          <div class="ioc-card-content">
-            <Card title="文印排放分析">
-              <div class="doubleCarbon-print-analyse">
-                <CarbonPrintEmissionChart
-                  ref="CarbonPrintEmissionChart"
-                  :query-data="queryData"
-                  :callBackCompanyOption="callBackCompanyOption"
-                  :height="450"
-                />
-              </div>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="6">
-          <div class="ioc-card-content">
-            <Card title="文印排放排名">
-              <div class="doubleCarbon-print-quota">
-                <CarbonPrintQuotaChart
-                  ref="CarbonPrintQuotaChart"
-                  :query-data="queryData"
-                  :height="450"
-                />
-              </div>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
+        <div style="margin-top: 12px">
+            <a-row :gutter="[12, 12]">
+                <a-col :span="18">
+                    <div class="ioc-card-content">
+                        <Card title="文印排放分析">
+                            <div class="doubleCarbon-print-analyse">
+                                <CarbonPrintEmissionChart
+                                        ref="CarbonPrintEmissionChart"
+                                        :query-data="queryData"
+                                        :callBackCompanyOption="callBackCompanyOption"
+                                        :height="450"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="6">
+                    <div class="ioc-card-content">
+                        <Card title="文印排放排名">
+                            <div class="doubleCarbon-print-quota">
+                                <CarbonPrintQuotaChart
+                                        ref="CarbonPrintQuotaChart"
+                                        :query-data="queryData"
+                                        :height="450"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+            </a-row>
+        </div>
     </div>
-  </div>
 </template>
 
 <style lang="less" scoped>
@@ -192,13 +177,16 @@ export default {
   .doubleCarbon-print-analyse {
     padding: 12px;
   }
+
   .doubleCarbon-print-quota {
     padding: 12px;
   }
+
   .doubleCarbon-print-news {
     padding: 0 12px;
     height: 300px;
   }
+
   .doubleCarbon-print-percent {
     padding: 0 12px;
     height: 300px;

src/components/life/healthyHome/lifeHealthyHome.vue

@@ -121,26 +121,18 @@ export default {
 <template>
   <div class="lifeHealthyHome">
     <div class="page-query-core">
-      <a-row>
-        <a-col style="margin-bottom: 10px">
-          <div class="lifeHealthyHome-query">
-            <Query
-              :query-data.sync="queryData"
-              :show="['company', 'dept', 'time']"
-              :reset="reset"
-              :search="search"
-            ></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div class="lifeHealthyHome-core">
-            <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
+        <Query
+                :query-data.sync="queryData"
+                :show="['company', 'dept', 'time']"
+                :reset="reset"
+                :search="search"
+        ></Query>
     </div>
+      <div class="page-query-core">
+          <Card title="核心指标">
+              <CoreData :data-list="coreData"></CoreData>
+          </Card>
+      </div>
     <a-row>
       <a-col :span="18">
         <div class="lifeHealthyHome-left">

src/components/life/parking/lifeParking.vue

@@ -125,26 +125,18 @@ export default {
 <template>
   <div class="lifeParking">
     <div class="page-query-core">
-      <a-row>
-        <a-col style="margin-bottom: 10px">
-          <div class="lifeParking-query">
-            <Query
-              :query-data.sync="queryData"
-              :show="['company', 'dept', 'time']"
-              :reset="reset"
-              :search="search"
-            ></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div class="lifeParking-core">
-            <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
+        <Query
+                :query-data.sync="queryData"
+                :show="['company', 'dept', 'time']"
+                :reset="reset"
+                :search="search"
+        ></Query>
     </div>
+      <div class="page-query-core">
+          <Card title="核心指标">
+              <CoreData :data-list="coreData"></CoreData>
+          </Card>
+      </div>
     <div style="margin-top: 12px">
       <a-row :gutter="[12, 12]">
         <a-col :span="18">

src/components/life/restaurant/lifeRestaurant.vue

@@ -148,26 +148,18 @@ export default {
 <template>
   <div class="lifeRestaurant">
     <div class="page-query-core">
-      <a-row>
-        <a-col style="margin-bottom: 10px">
-          <div class="lifeRestaurant-query">
-            <Query
-              :query-data.sync="queryData"
-              :show="['company', 'dept', 'time']"
-              :reset="reset"
-              :search="search"
-            ></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div class="lifeRestaurant-core">
-            <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
+        <Query
+                :query-data.sync="queryData"
+                :show="['company', 'dept', 'time']"
+                :reset="reset"
+                :search="search"
+        ></Query>
     </div>
+      <div class="page-query-core">
+          <Card title="核心指标">
+              <CoreData :data-list="coreData"></CoreData>
+          </Card>
+      </div>
     <a-row>
       <a-col :span="18">
         <div class="lifeRestaurant-left">

src/components/life/supermarket/lifeSupermarket.vue

@@ -7,179 +7,173 @@ import LifeSupermarketTopTable from "@/components/life/supermarket/components/li
 import apiLifeSupermarket from "@/api/life/apiLifeSupermarket";
 
 export default {
-  data() {
-    let range = this.$util.dateUtil.getNearlyMonthRange();
-    return {
-      orderSelect: "desc",
-      queryData: {
-        companyId: "0",
-        deptId: "0",
-        timeRange: range,
-      },
-      productRanks: [],
-      coreData: [
-        {
-          type: 0,
-          title: "消费总额(元)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: "0",
+    data() {
+        let range = this.$util.dateUtil.getNearlyMonthRange();
+        return {
+            orderSelect: "desc",
+            queryData: {
+                companyId: "0",
+                deptId: "0",
+                timeRange: range,
+            },
+            productRanks: [],
+            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,
+                    title: "值得关注",
+                    showStar: true,
+                    content: "",
+                },
+            ],
+        };
+    },
+    components: {
+        Query,
+        Card,
+        CoreData,
+        LifeSupermarketAnalysisChart,
+        LifeSupermarketTopTable,
+    },
+    created() {
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$util.asyncPromise(this.getCoreData(), this.getProductRanking());
         },
-        {
-          type: 0,
-          title: "交易单数(单)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: "0",
+        reset() {
         },
-        {
-          type: 0,
-          title: "人均消费金额(元/人)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: "0",
+        search(data) {
+            this.$util.asyncPromise(
+                this.getCoreData(),
+                this.$refs.LifeSupermarketAnalysisChart.getData(),
+                this.getProductRanking()
+            );
+            this.$forceUpdate();
         },
-        {
-          type: 0,
-          title: "平均单价(元/单)",
-          num: 0,
-          historyDesc: "环比",
-          historyNum: "0",
+        getCoreData() {
+            return apiLifeSupermarket.getCoreData(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;
+            });
         },
-        {
-          type: 1,
-          title: "值得关注",
-          showStar: true,
-          content: "",
+        getProductRanking() {
+            return apiLifeSupermarket
+                .getProductRanking(this.queryData)
+                .then((res) => {
+                    this.productRanks = res;
+                    this.handleRankOrder();
+                });
+        },
+        handleRankOrder() {
+            if (this.orderSelect == "asc") {
+                this.productRanks = this.productRanks.sort((a, b) => {
+                    return Number(a.salesvolume) - Number(b.salesvolume);
+                });
+            } else {
+                this.productRanks = this.productRanks.sort((a, b) => {
+                    return Number(b.salesvolume) - Number(a.salesvolume);
+                });
+            }
         },
-      ],
-    };
-  },
-  components: {
-    Query,
-    Card,
-    CoreData,
-    LifeSupermarketAnalysisChart,
-    LifeSupermarketTopTable,
-  },
-  created() {},
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$util.asyncPromise(this.getCoreData(), this.getProductRanking());
-    },
-    reset() {},
-    search(data) {
-      this.$util.asyncPromise(
-        this.getCoreData(),
-        this.$refs.LifeSupermarketAnalysisChart.getData(),
-        this.getProductRanking()
-      );
-      this.$forceUpdate();
-    },
-    getCoreData() {
-      return apiLifeSupermarket.getCoreData(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;
-      });
-    },
-    getProductRanking() {
-      return apiLifeSupermarket
-        .getProductRanking(this.queryData)
-        .then((res) => {
-          this.productRanks = res;
-          this.handleRankOrder();
-        });
-    },
-    handleRankOrder() {
-      if (this.orderSelect == "asc") {
-        this.productRanks = this.productRanks.sort((a, b) => {
-          return Number(a.salesvolume) - Number(b.salesvolume);
-        });
-      } else {
-        this.productRanks = this.productRanks.sort((a, b) => {
-          return Number(b.salesvolume) - Number(a.salesvolume);
-        });
-      }
     },
-  },
 };
 </script>
 
 <template>
-  <div class="lifeSupermarket">
-    <div class="page-query-core">
-      <a-row>
-        <a-col style="margin-bottom: 10px">
-          <div class="lifeSupermarket-query">
+    <div class="lifeSupermarket">
+        <div class="page-query-core">
             <Query
-              :query-data.sync="queryData"
-              :show="['company', 'dept', 'time']"
-              :reset="reset"
-              :search="search"
+                    :query-data.sync="queryData"
+                    :show="['company', 'dept', 'time']"
+                    :reset="reset"
+                    :search="search"
             ></Query>
-          </div>
-        </a-col>
-        <a-col>
-          <div class="lifeSupermarket-core">
-            <Card title="核心指标">
-              <CoreData :data-list="coreData"></CoreData>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
-    <a-row>
-      <a-col :span="18">
-        <div class="lifeSupermarket-left">
-          <div class="lifeSupermarket-detail ioc-card-content">
-            <Card title="商超分析">
-              <LifeSupermarketAnalysisChart
-                ref="LifeSupermarketAnalysisChart"
-                :query-data="queryData"
-                :height="430"
-              ></LifeSupermarketAnalysisChart>
-            </Card>
-          </div>
         </div>
-      </a-col>
-      <a-col :span="6">
-        <div class="lifeSupermarket-right">
-          <div class="lifeSupermarket-top ioc-card-content">
-            <Card title="商品排行">
-              <div style="height: 440px; overflow-y: auto">
-                <LifeSupermarketTopTable
-                  :tableData="productRanks"
-                  style="padding: 0 8px"
-                ></LifeSupermarketTopTable>
-              </div>
-              <template #title-extra>
-                <a-select
-                  v-model="orderSelect"
-                  default-value="5"
-                  style="width: 100px"
-                  size="small"
-                  @change="handleRankOrder"
-                >
-                  <a-select-option value="asc">正序</a-select-option>
-                  <a-select-option value="desc">倒序</a-select-option>
-                </a-select>
-              </template>
+        <div class="page-query-core">
+            <Card title="核心指标">
+                <CoreData :data-list="coreData"></CoreData>
             </Card>
-          </div>
         </div>
-      </a-col>
-    </a-row>
-  </div>
+        <a-row>
+            <a-col :span="18">
+                <div class="lifeSupermarket-left">
+                    <div class="lifeSupermarket-detail ioc-card-content">
+                        <Card title="商超分析">
+                            <LifeSupermarketAnalysisChart
+                                    ref="LifeSupermarketAnalysisChart"
+                                    :query-data="queryData"
+                                    :height="430"
+                            ></LifeSupermarketAnalysisChart>
+                        </Card>
+                    </div>
+                </div>
+            </a-col>
+            <a-col :span="6">
+                <div class="lifeSupermarket-right">
+                    <div class="lifeSupermarket-top ioc-card-content">
+                        <Card title="商品排行">
+                            <div style="height: 440px; overflow-y: auto">
+                                <LifeSupermarketTopTable
+                                        :tableData="productRanks"
+                                        style="padding: 0 8px"
+                                ></LifeSupermarketTopTable>
+                            </div>
+                            <template #title-extra>
+                                <a-select
+                                        v-model="orderSelect"
+                                        default-value="5"
+                                        style="width: 100px"
+                                        size="small"
+                                        @change="handleRankOrder"
+                                >
+                                    <a-select-option value="asc">正序</a-select-option>
+                                    <a-select-option value="desc">倒序</a-select-option>
+                                </a-select>
+                            </template>
+                        </Card>
+                    </div>
+                </div>
+            </a-col>
+        </a-row>
+    </div>
 </template>
 
 <style lang="less" scoped>
@@ -189,16 +183,7 @@ export default {
   display: inline-block;
   vertical-align: top;
   padding-bottom: 12px;
-  .lifeSupermarket-query {
-    width: 100%;
-    background: #fff;
-    height: 60px;
-    padding: 10px;
-    border-radius: 5px;
-  }
-  .lifeSupermarket-core {
-    width: 100%;
-  }
+
   .lifeSupermarket-left {
     margin-top: 12px;
     margin-right: 6px;
@@ -207,6 +192,7 @@ export default {
     height: 490px;
     overflow: hidden;
   }
+
   .lifeSupermarket-right {
     margin-top: 12px;
     margin-left: 6px;
@@ -214,11 +200,13 @@ export default {
     border-radius: 4px;
     height: 490px;
     overflow: hidden;
+
     > div {
       border-radius: 4px;
     }
   }
 }
+
 .lifeSupermarket-top {
   overflow-y: hidden;
 }

src/components/report/table/reportTableCustom.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="reportTable-custom">
-    <div class="report-query">
+    <div class="page-query-core">
       <Query :show="['time']" :query-data.sync="queryData" :search="search">
         <template #extraItem>
           <a-form-model-item label="统计维度: ">

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

@@ -14,7 +14,7 @@ import ImageMap from "@/components/security/alarm/map/imageMap.vue";
 export default {
   data() {
     return {
-      areaSrc: 'security/area_1F.png',
+      areaSrc: 'security/platImg/p_area_1F.png',
       devicePositions: [
         {
           status: 0,

src/components/security/alarm/securityAlarmManage.vue

@@ -1,84 +1,79 @@
 <template>
-  <div class="securityAlarmManage">
-    <div class="page-query-core">
-      <Query
-        :show="['floor', 'time']"
-        :query-data.sync="queryData"
-        :reset="reset"
-        :search="search"
-        style="
-          background: #fff;
-          height: 60px;
-          padding: 10px;
-          border-radius: 5px;
-          margin-bottom: 10px;
-        "
-      ></Query>
-      <Card title="核心指标">
-        <CoreData :data-list="coreData"></CoreData>
-      </Card>
-    </div>
-
-    <div style="margin-top: 12px">
-      <a-row :gutter="[12, 12]">
-        <a-col :span="16">
-          <div class="securityAlarmManage-distributeMap">
-            <Card title="告警分布">
-              <SecurityAlarmManageDistributeMap></SecurityAlarmManageDistributeMap>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="8">
-          <div class="securityAlarmManage-trend">
-            <Card title="告警趋势">
-              <div style="padding: 0 15px 8px">
-                <SecurityAlarmManageTrend
-                  ref="SecurityAlarmManageTrend"
-                  :query-data="queryData"
-                  :height="400"
-                ></SecurityAlarmManageTrend>
-              </div>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="8">
-          <div class="securityAlarmManage-distribute">
-            <Card title="楼层告警分布">
-              <SecurityAlarmManageDistribute
-                ref="SecurityAlarmManageDistribute"
-                :query-data="queryData"
-                :height="300"
-              ></SecurityAlarmManageDistribute>
+    <div class="securityAlarmManage">
+        <div class="page-query-core">
+            <Query
+                    :show="['floor', 'time']"
+                    :query-data.sync="queryData"
+                    :reset="reset"
+                    :search="search"
+            ></Query>
+        </div>
+        <div class="page-query-core">
+            <Card title="核心指标">
+                <CoreData :data-list="coreData"></CoreData>
             </Card>
-          </div>
-        </a-col>
-        <a-col :span="8">
-          <div class="securityAlarmManage-onlineTrend">
-            <Card title="设备在线趋势">
-              <div style="padding: 0 15px 10px">
-                <SecurityAlarmManageOnlineTrend
-                  ref="SecurityAlarmManageOnlineTrend"
-                  :query-data="queryData"
-                  :height="290"
-                ></SecurityAlarmManageOnlineTrend>
-              </div>
-            </Card>
-          </div>
-        </a-col>
-        <a-col :span="8">
-          <div class="securityAlarmManage-category">
-            <Card title="告警分类">
-              <SecurityAlarmManageCategory
-                ref="SecurityAlarmManageCategory"
-                :query-data="queryData"
-                :height="300"
-              ></SecurityAlarmManageCategory>
-            </Card>
-          </div>
-        </a-col>
-      </a-row>
+        </div>
+
+        <div style="margin-top: 12px">
+            <a-row :gutter="[12, 12]">
+                <a-col :span="16">
+                    <div class="securityAlarmManage-distributeMap">
+                        <Card title="告警分布">
+                            <SecurityAlarmManageDistributeMap></SecurityAlarmManageDistributeMap>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="8">
+                    <div class="securityAlarmManage-trend">
+                        <Card title="告警趋势">
+                            <div style="padding: 0 15px 8px">
+                                <SecurityAlarmManageTrend
+                                        ref="SecurityAlarmManageTrend"
+                                        :query-data="queryData"
+                                        :height="400"
+                                ></SecurityAlarmManageTrend>
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="8">
+                    <div class="securityAlarmManage-distribute">
+                        <Card title="楼层告警分布">
+                            <SecurityAlarmManageDistribute
+                                    ref="SecurityAlarmManageDistribute"
+                                    :query-data="queryData"
+                                    :height="300"
+                            ></SecurityAlarmManageDistribute>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="8">
+                    <div class="securityAlarmManage-onlineTrend">
+                        <Card title="设备在线趋势">
+                            <div style="padding: 0 15px 10px">
+                                <SecurityAlarmManageOnlineTrend
+                                        ref="SecurityAlarmManageOnlineTrend"
+                                        :query-data="queryData"
+                                        :height="290"
+                                ></SecurityAlarmManageOnlineTrend>
+                            </div>
+                        </Card>
+                    </div>
+                </a-col>
+                <a-col :span="8">
+                    <div class="securityAlarmManage-category">
+                        <Card title="告警分类">
+                            <SecurityAlarmManageCategory
+                                    ref="SecurityAlarmManageCategory"
+                                    :query-data="queryData"
+                                    :height="300"
+                            ></SecurityAlarmManageCategory>
+                        </Card>
+                    </div>
+                </a-col>
+            </a-row>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
@@ -94,83 +89,84 @@ import SecurityAlarmManageCategory from "@/components/security/alarm/manage/secu
 import apiSecurityAlarmMgr from "@/api/security/apiSecurityAlarmMgr";
 
 export default {
-  data() {
-    return {
-      queryData: {
-        floorId: "0",
-        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
-      },
-      coreData: [
-        {
-          title: "告警事件(件)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
-        },
-        {
-          title: "紧急告警事件(件)",
-          num: 0,
-          historyDesc: "同比",
-          historyNum: 0,
+    data() {
+        return {
+            queryData: {
+                floorId: "0",
+                timeRange: this.$util.dateUtil.getNearlyMonthRange(),
+            },
+            coreData: [
+                {
+                    title: "告警事件(件)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "紧急告警事件(件)",
+                    num: 0,
+                    historyDesc: "同比",
+                    historyNum: 0,
+                },
+                {
+                    title: "已处理事件(件)",
+                    num: 0,
+                    historyDesc: "同比",
+                    hideTrend: true,
+                    historyNum: 0,
+                },
+                {
+                    title: "告警最多类型",
+                    num: "",
+                },
+                {
+                    type: 1,
+                    title: "值得关注",
+                },
+            ],
+        };
+    },
+    components: {
+        Card,
+        Query,
+        CoreData,
+        SecurityAlarmManageDistributeMap,
+        SecurityAlarmManageTrend,
+        SecurityAlarmManageDistribute,
+        SecurityAlarmManageOnlineTrend,
+        SecurityAlarmManageCategory,
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
         },
-        {
-          title: "已处理事件(件)",
-          num: 0,
-          historyDesc: "同比",
-          hideTrend: true,
-          historyNum: 0,
+        reset() {
         },
-        {
-          title: "告警最多类型",
-          num: "",
+        search() {
+            this.$util.asyncPromise(
+                this.getCoreData(),
+                this.$refs.SecurityAlarmManageCategory.getData(),
+                this.$refs.SecurityAlarmManageDistribute.getData(),
+                this.$refs.SecurityAlarmManageOnlineTrend.getData(),
+                this.$refs.SecurityAlarmManageTrend.getData()
+            );
         },
-        {
-          type: 1,
-          title: "值得关注",
+        getCoreData() {
+            return apiSecurityAlarmMgr.getCoreData(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[4].content = res.worthAttention;
+            });
         },
-      ],
-    };
-  },
-  components: {
-    Card,
-    Query,
-    CoreData,
-    SecurityAlarmManageDistributeMap,
-    SecurityAlarmManageTrend,
-    SecurityAlarmManageDistribute,
-    SecurityAlarmManageOnlineTrend,
-    SecurityAlarmManageCategory,
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
-    },
-    reset() {},
-    search() {
-      this.$util.asyncPromise(
-        this.getCoreData(),
-        this.$refs.SecurityAlarmManageCategory.getData(),
-        this.$refs.SecurityAlarmManageDistribute.getData(),
-        this.$refs.SecurityAlarmManageOnlineTrend.getData(),
-        this.$refs.SecurityAlarmManageTrend.getData()
-      );
-    },
-    getCoreData() {
-      return apiSecurityAlarmMgr.getCoreData(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[4].content = res.worthAttention;
-      });
     },
-  },
 };
 </script>
 

src/components/security/alarm/securityAlarmMap.vue

@@ -78,7 +78,7 @@ export default {
       currCameraId: '',
       alarmNum: 0,
       floor: '1',
-      areaSrc: 'security/area_1F.png',
+      areaSrc: 'security/platImg/p_area_1F.png',
       showcamera: false,
       deviceNum: {
         online: 1,

src/components/work/bus/workBus.vue

@@ -1,19 +1,14 @@
 <template>
   <div>
+      <div class="page-query-core">
+          <query
+                  :show="['company', 'time']"
+                  :query-data.sync="queryData"
+                  :reset="reset"
+                  :search="search"
+          ></query>
+      </div>
     <div class="page-query-core">
-      <query
-        :show="['company', 'time']"
-        :query-data.sync="queryData"
-        :reset="reset"
-        :search="search"
-        style="
-          background: #fff;
-          height: 60px;
-          padding: 10px;
-          border-radius: 5px;
-          margin-bottom: 10px;
-        "
-      ></query>
       <card :title="'核心指标'">
         <CoreData :data-list="coreData"></CoreData>
       </card>

src/components/work/meeting/workMeeting.vue

@@ -1,20 +1,15 @@
 <template>
   <div class="workMeeting">
+      <div class="page-query-core">
+          <query
+                  :show="['company', 'floor', 'time']"
+                  :query-data.sync="queryData"
+                  :reset="reset"
+                  :floor-options="floorOptions"
+                  :search="search"
+          ></query>
+      </div>
     <div class="page-query-core">
-      <query
-        :show="['company', 'floor', 'time']"
-        :query-data.sync="queryData"
-        :reset="reset"
-        :floor-options="floorOptions"
-        :search="search"
-        style="
-          background: #fff;
-          height: 60px;
-          padding: 10px;
-          border-radius: 5px;
-          margin-bottom: 10px;
-        "
-      ></query>
       <card :title="'核心指标'">
         <CoreData :data-list="coreData"></CoreData>
       </card>
@@ -24,7 +19,7 @@
       <a-row>
         <a-col :span="24">
           <div class="workMeeting-left ioc-card-content">
-            <card title="会议分析" v-show="chartShow.timeline">
+            <card title="会议分析" v-if="chartShow.timeline">
               <a-row>
                 <a-col :span="2">
                   <a-menu
@@ -205,14 +200,14 @@
                 </a-descriptions>
               </div>
             </card>
-            <card v-show="chartShow.usageAllPanel">
+            <card title="会议分析" v-if="chartShow.usageAllPanel">
               <MeetingTimeCharts
                 :height="300"
                 :queryData="queryData"
                 ref="meetingTimeRef"
               ></MeetingTimeCharts>
             </card>
-            <card v-show="chartShow.usageFloorPanel">
+            <card title="会议分析" v-if="chartShow.usageFloorPanel">
               <MeetingTimeFloorCharts
                 :height="300"
                 :queryData="queryData"
@@ -312,7 +307,7 @@ export default {
       },
       queryData: {
         companyId: "0",
-        floorId: "7",
+        floorId: "0",
         timeRange: timeRange,
       },
       currRoom: "701",
@@ -461,7 +456,7 @@ export default {
       chartShow: {
         timeLine: false,
         usageFloorPanel: false,
-        usageAllPanel: false,
+        usageAllPanel: true,
       },
     };
   },

src/components/work/overview/workOverview.vue

@@ -1,20 +1,15 @@
 <template>
   <div class="workOverview">
+      <div class="page-query-core">
+          <query
+                  :show="['company', 'floor']"
+                  :floor-options="floorData"
+                  :query-data.sync="queryData"
+                  :reset="reset"
+                  :search="search"
+          ></query>
+      </div>
     <div class="page-query-core">
-      <query
-        :show="['company', 'floor']"
-        :floor-options="floorData"
-        :query-data.sync="queryData"
-        :reset="reset"
-        :search="search"
-        style="
-          background: #fff;
-          height: 60px;
-          padding: 10px;
-          border-radius: 5px;
-          margin-bottom:10px;
-        "
-      ></query>
       <card :title="'核心指标'">
         <CoreData :data-list="coreData"></CoreData>
       </card>

src/components/work/print/workPrint.vue

@@ -1,20 +1,15 @@
 <template>
   <div>
+      <div class="page-query-core">
+          <query
+                  :show="['company', 'floor', 'time']"
+                  :floor-options="floorData"
+                  :query-data.sync="queryData"
+                  :reset="reset"
+                  :search="search"
+          ></query>
+      </div>
     <div class="page-query-core">
-      <query
-        :show="['company', 'floor', 'time']"
-        :floor-options="floorData"
-        :query-data.sync="queryData"
-        :reset="reset"
-        :search="search"
-        style="
-          background: #fff;
-          height: 60px;
-          padding: 10px;
-          border-radius: 5px;
-          margin-bottom: 10px;
-        "
-      ></query>
       <card :title="'核心指标'">
         <CoreData :data-list="coreData"></CoreData>
       </card>

src/style/common.css

@@ -18,9 +18,10 @@
 }
 
 .page-query-core {
-  /* background-color: #ffffff; */
+   background-color: #ffffff;
   /* border:1px solid red; */
   /* padding: 12px 12px 8px; */
+  padding: 0 12px;
   border-radius: 4px;
 }