Эх сурвалжийг харах

所有筛选框样式调整

Bella 2 жил өмнө
parent
commit
b417efdcca

+ 11 - 16
src/components/business/analysis/analysis.vue

@@ -155,6 +155,13 @@ export default {
         :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>
@@ -241,39 +248,27 @@ export default {
             </card>
             <card :title="'用水分析'" v-else-if="queryData.energy == 'water'">
               <div class="analysis-energy-body-right">
-                <BusinessWaterDetail
-                  ref="anaDetail"
-                  :query-data="queryData"
-                />
+                <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"
-                  />
+                  <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"
-                  />
+                  <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"
-                  />
+                  <BusinessPvDetail ref="anaDetail" :query-data="queryData" />
                 </div>
               </div>
             </card>

+ 76 - 41
src/components/business/asset/asset.vue

@@ -1,30 +1,59 @@
 <template>
   <div>
     <div class="page-query-core">
-      <Query :show="['company', 'time']" :query-data.sync="queryData" :reset="reset" :search="search"></Query>
+      <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>
     </div>
 
-
     <div style="margin-top: 15px">
       <a-row>
         <a-col :span="18">
           <div class="left ioc-card-content">
             <card :title="'资产分析'">
               <div class="dashboardPortrait-select">
-                <a-checkable-tag v-model="tagCheck.invest" color="white" class="dashboardPortrait-select-tag" @change="handleTagSelect('invest')">
+                <a-checkable-tag
+                  v-model="tagCheck.invest"
+                  color="white"
+                  class="dashboardPortrait-select-tag"
+                  @change="handleTagSelect('invest')"
+                >
                   <span class="dashboardPortrait-select-text">投资分析</span>
                 </a-checkable-tag>
-                <a-checkable-tag v-model="tagCheck.year" color="white" class="dashboardPortrait-select-tag" @change="handleTagSelect('year')">
+                <a-checkable-tag
+                  v-model="tagCheck.year"
+                  color="white"
+                  class="dashboardPortrait-select-tag"
+                  @change="handleTagSelect('year')"
+                >
                   <span class="dashboardPortrait-select-text">资产年限</span>
                 </a-checkable-tag>
               </div>
 
               <div class="dashboardPortrait-body" style="padding-bottom: 35px">
-                <InvestDistributeChart ref="investChart" v-if="tagCheck.invest" :height="450" />
-                <InvestYearChart ref="investChart" v-if="tagCheck.year" :height="450" />
+                <InvestDistributeChart
+                  ref="investChart"
+                  v-if="tagCheck.invest"
+                  :height="450"
+                />
+                <InvestYearChart
+                  ref="investChart"
+                  v-if="tagCheck.year"
+                  :height="450"
+                />
               </div>
             </card>
           </div>
@@ -33,19 +62,26 @@
           <div class="right ioc-card-content">
             <card :title="'资产占比排名'">
               <div style="padding: 0 12px">
-                <AssetRankChart ref="AssetRankChart" :query-data="queryData" :height="250" />
+                <AssetRankChart
+                  ref="AssetRankChart"
+                  :query-data="queryData"
+                  :height="250"
+                />
               </div>
             </card>
           </div>
           <div class="right ioc-card-content" :style="{ marginTop: '10px' }">
             <card :title="'报废与维修'">
-              <AssetMoneyRepairChart ref="AssetMoneyRepairChart" :query-data="queryData" :height="220" />
+              <AssetMoneyRepairChart
+                ref="AssetMoneyRepairChart"
+                :query-data="queryData"
+                :height="220"
+              />
             </card>
           </div>
         </a-col>
       </a-row>
     </div>
-
   </div>
 </template>
 <script>
@@ -79,18 +115,18 @@ export default {
     }
     return {
       queryData: {
-        companyId: '0',
-        timeRange: this.$util.dateUtil.getNearlyMonthRange()
+        companyId: "0",
+        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
       tagCheck: {
         invest: false,
         year: false,
       },
       columns: [
-        {title: "序号", dataIndex: "index", key: "1", width: 48},
-        {title: "姓名", dataIndex: "name", key: "2", width: 60},
-        {title: "部门", dataIndex: "department", key: "3", width: 80},
-        {title: "最后进入时间", dataIndex: "time", key: "4", width: 90},
+        { title: "序号", dataIndex: "index", key: "1", width: 48 },
+        { title: "姓名", dataIndex: "name", key: "2", width: 60 },
+        { title: "部门", dataIndex: "department", key: "3", width: 80 },
+        { title: "最后进入时间", dataIndex: "time", key: "4", width: 90 },
       ],
       listData: listData,
       coreData: [
@@ -98,7 +134,7 @@ export default {
           title: "资产总金额(亿元)",
           num: "",
           historyDesc: "同比",
-          historyNum: '',
+          historyNum: "",
         },
         {
           title: "资产总数(项)",
@@ -128,14 +164,14 @@ export default {
     };
   },
   mounted() {
-    this.$nextTick(()=>{
+    this.$nextTick(() => {
       this.init();
-      this.handleTagSelect('invest');
-    })
+      this.handleTagSelect("invest");
+    });
   },
   methods: {
     init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
+      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
     },
     handleTagSelect(item) {
       for (const key in this.tagCheck) {
@@ -147,30 +183,29 @@ export default {
     reset() {},
     search(data) {
       this.$util.asyncPromise(
-          this.getCoreData(),
-          this.$refs.AssetMoneyRepairChart.getData(),
-          this.$refs.investChart.getData(),
-          this.$refs.AssetRankChart.getData(),
-      )
+        this.getCoreData(),
+        this.$refs.AssetMoneyRepairChart.getData(),
+        this.$refs.investChart.getData(),
+        this.$refs.AssetRankChart.getData()
+      );
     },
     getCoreData() {
-      return apiOperationMoney.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
-      })
-    }
+      return apiOperationMoney.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>
 
-
 <style lang="less" scoped>
 .left {
   margin-right: 6px;
@@ -182,7 +217,7 @@ export default {
 .dashboardPortrait-select {
   padding: 8px 15px;
   .dashboardPortrait-select-tag {
-    border: 1px solid #F0F1F2;
+    border: 1px solid #f0f1f2;
     border-radius: 12px;
     padding: 1px 12px;
     margin-right: 16px;
@@ -194,7 +229,7 @@ export default {
     }
   }
   .dashboardPortrait-select-text {
-    color: #B3B3B3;
+    color: #b3b3b3;
   }
   .dashboardPortrait-body {
     padding: 8px 12px;
@@ -202,4 +237,4 @@ export default {
     background-color: #ffffff;
   }
 }
-</style>
+</style>

+ 59 - 34
src/components/business/space/space.vue

@@ -1,7 +1,19 @@
 <template>
   <div>
     <div class="page-query-core">
-      <Query :show="['company', 'time']" :query-data.sync="queryData" :reset="reset" :search="search"></Query>
+      <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>
@@ -10,8 +22,8 @@
       <a-col :span="18">
         <div class="left ioc-card-content">
           <card :title="'空间分析'">
-            <div style="padding: 8px;" class="space-image">
-              <img :src="requireImg('business/联通img.png')" width="100%">
+            <div style="padding: 8px" class="space-image">
+              <img :src="requireImg('business/联通img.png')" width="100%" />
             </div>
           </card>
         </div>
@@ -20,12 +32,26 @@
         <div class="right ioc-card-content">
           <card :title="'空间成本'">
             <div style="height: 40px">
-              <span style="font-size: 16px; font-weight: 400; color: #B2B2B2; margin-left: 25%">人均空间成本</span>
-              <span style="padding: 0 10%;font-size: 20px;color: #4D4D4D">36</span>
-              <span style="color: #B2B2B2">元/m2/人</span>
+              <span
+                style="
+                  font-size: 16px;
+                  font-weight: 400;
+                  color: #b2b2b2;
+                  margin-left: 25%;
+                "
+                >人均空间成本</span
+              >
+              <span style="padding: 0 10%; font-size: 20px; color: #4d4d4d"
+                >36</span
+              >
+              <span style="color: #b2b2b2">元/m2/人</span>
             </div>
             <div style="padding: 0 15px">
-              <SpaceCostChart ref="SpaceCostChart" :query-data="queryData" :height="540" />
+              <SpaceCostChart
+                ref="SpaceCostChart"
+                :query-data="queryData"
+                :height="540"
+              />
             </div>
           </card>
         </div>
@@ -36,7 +62,7 @@
 <script>
 import query from "@/components/common/query.vue";
 import card from "@/components/common/card.vue";
-import {requireImg} from "@/utils/requireImg";
+import { requireImg } from "@/utils/requireImg";
 import SpaceCostChart from "@/components/business/space/charts/spaceCostChart.vue";
 import apiOperationSpace from "@/api/operation/apiOperationSpace";
 
@@ -58,28 +84,28 @@ export default {
     }
     return {
       queryData: {
-        companyId: '0',
-        timeRange: this.$util.dateUtil.getNearlyMonthRange()
+        companyId: "0",
+        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
       coreData: [
         {
           title: "自用工位分配率",
           num: "",
-          unit: '%',
+          unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },
         {
           title: "会议室使用率",
           num: "",
-          unit: '%',
+          unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },
         {
           title: "流动工位总数",
           num: "",
-          unit: '%',
+          unit: "%",
           historyDesc: "同比",
           historyNum: 0,
         },
@@ -105,19 +131,19 @@ export default {
     };
   },
   mounted() {
-    this.init()
+    this.init();
   },
   methods: {
     requireImg,
     init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
+      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
     },
     reset() {},
     search() {
       this.$util.asyncPromise(
-          this.getCoreData(),
-          this.$refs.SpaceCostChart.getData(),
-      )
+        this.getCoreData(),
+        this.$refs.SpaceCostChart.getData()
+      );
     },
     tabChange(index) {
       let that = this;
@@ -135,25 +161,24 @@ export default {
       }, 100);
     },
     getCoreData() {
-      return apiOperationSpace.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
-      })
-    }
+      return apiOperationSpace.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;
+      });
+    },
   },
 };
 </script>
 
-
 <style lang="less" scoped>
 .space-image {
   //background-image: url("@/assets/images/business/联通img.png");
@@ -177,4 +202,4 @@ export default {
     font-size: 20px;
   }
 }
-</style>
+</style>

+ 70 - 52
src/components/doubleCarbon/PV/doubleCarbonPv.vue

@@ -18,92 +18,103 @@ export default {
   data() {
     return {
       queryData: {
-        companyId: '0',
-        timeRange: this.$util.dateUtil.getNearlyMonthRange()
+        companyId: "0",
+        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
       coreData: [
         {
-          title: '光伏累计减排(tco2e/年内)',
+          title: "光伏累计减排(tco2e/年内)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '光伏发电量(kwh/天)',
+          title: "光伏发电量(kwh/天)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '光伏节约金额(元/天)',
+          title: "光伏节约金额(元/天)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '光伏补贴金额(元/天)',
+          title: "光伏补贴金额(元/天)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
           type: 1,
-          title: '值得关注',
+          title: "值得关注",
           showStar: true,
-          content: '建议扩大光伏 发电面积'
+          content: "建议扩大光伏 发电面积",
         },
       ],
       newsData: [
         {
-          title: 'xxxxxxxxxx',
-          tag: '双碳小知识',
-          author: '张峰',
-          time: '2022-02-02 15:00:00'
-        }
-      ]
-    }
+          title: "xxxxxxxxxx",
+          tag: "双碳小知识",
+          author: "张峰",
+          time: "2022-02-02 15:00:00",
+        },
+      ],
+    };
   },
   mounted() {
     this.init();
   },
   methods: {
     init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
-    },
-    reset() {
+      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
     },
+    reset() {},
     search(data) {
       this.$util.asyncPromise(
-          this.getCoreData(),
-          this.$refs.CarbonPvEmissionChart.getData(),
-          this.$refs.CarbonPvEmissionChart.getData(),
-      )
+        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
-      })
-    }
-  }
-}
+      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;
+      });
+    },
+  },
+};
 </script>
 
 <template>
   <div class="doubleCarbon-pv">
-
     <div class="page-query-core">
       <a-row>
-        <a-col>
+        <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" :reset="reset" :search="search"></Query>
+            <Query
+              :show="['company', 'time']"
+              :query-data.sync="queryData"
+              :reset="reset"
+              :search="search"
+            ></Query>
           </div>
         </a-col>
         <a-col>
@@ -117,12 +128,16 @@ export default {
     </div>
 
     <div style="margin-top: 12px">
-      <a-row :gutter="[12,12]">
+      <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" :height="450"/>
+                <CarbonPvEmissionChart
+                  ref="CarbonPvEmissionChart"
+                  :query-data="queryData"
+                  :height="450"
+                />
               </div>
             </Card>
           </div>
@@ -131,11 +146,14 @@ export default {
           <div class="ioc-card-content">
             <Card title="光伏减排排名">
               <div class="doubleCarbon-pv-quota">
-                <CarbonPvQuotaChart ref="CarbonPvQuotaChart" :query-data="queryData" :height="450"/>
+                <CarbonPvQuotaChart
+                  ref="CarbonPvQuotaChart"
+                  :query-data="queryData"
+                  :height="450"
+                />
               </div>
             </Card>
           </div>
-
         </a-col>
       </a-row>
     </div>
@@ -167,4 +185,4 @@ export default {
     height: 300px;
   }
 }
-</style>
+</style>

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

@@ -101,7 +101,13 @@ export default {
 
     <div class="page-query-core">
       <a-row>
-        <a-col>
+        <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" :reset="reset" :search="search"></Query>
           </div>
@@ -118,7 +124,7 @@ export default {
 
     <div style="margin-top: 12px">
       <a-row :gutter="[12,12]">
-        <a-col :span="18">
+        <a-col :span="18" >
           <div class="ioc-card-content">
             <Card title="车辆排放分析">
               <div class="doubleCarbon-car-analyse">

+ 77 - 60
src/components/doubleCarbon/overview/doubleCarbonOverview.vue

@@ -9,7 +9,6 @@ import DoubleCarbonNews from "@/components/doubleCarbon/overview/charts/doubleCa
 import CarbonOverviewPercent from "@/components/doubleCarbon/overview/charts/carbonOverviewPercent.vue";
 import apiCarbonOverview from "@/api/carbon/apiCarbonOverview";
 
-
 export default {
   components: {
     Card,
@@ -23,102 +22,110 @@ export default {
   data() {
     return {
       queryData: {
-        companyId: '0',
-        timeRange: this.$util.dateUtil.getNearlyMonthRange()
+        companyId: "0",
+        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
       coreData: [
         {
           type: 1,
-          title: '碳配额存量',
+          title: "碳配额存量",
           content: "",
           numDesc: "%",
         },
         {
-          title: '碳排放总量(tco2e)',
+          title: "碳排放总量(tco2e)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '单位面积碳排放(tco2e/m²)',
+          title: "单位面积碳排放(tco2e/m²)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '人均碳排放(tco2e/人)',
+          title: "人均碳排放(tco2e/人)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '光伏减排(tco2e)',
+          title: "光伏减排(tco2e)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
           type: 1,
-          title: '值得关注',
+          title: "值得关注",
           showStar: true,
-          content: ''
+          content: "",
         },
       ],
-      newsData: []
-    }
+      newsData: [],
+    };
   },
   mounted() {
     this.init();
   },
   methods: {
     init() {
-      this.$util.asyncPromise(
-          this.getCoreData(),
-          this.getNewsData()
-      )
-    },
-    reset() {
+      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(),
-      )
+        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].content = res.list[0].value
-        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
-      })
+      return apiCarbonOverview.getCoreData(this.queryData).then((res) => {
+        this.coreData[0].content = res.list[0].value;
+        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() {
-      return apiCarbonOverview.getCarbonNews(this.queryData).then(res=>{
+      return apiCarbonOverview.getCarbonNews(this.queryData).then((res) => {
         this.newsData = res;
       });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <template>
   <div class="doubleCarbon-overview">
-
     <div class="page-query-core">
       <a-row>
-        <a-col>
+        <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" :reset="reset" :search="search"></Query>
+            <Query
+              :show="['company', 'time']"
+              :query-data.sync="queryData"
+              :reset="reset"
+              :search="search"
+            ></Query>
           </div>
         </a-col>
         <a-col>
@@ -132,12 +139,16 @@ export default {
     </div>
 
     <div style="margin-top: 12px">
-      <a-row :gutter="[12,12]">
+      <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" :height="450" />
+                <CarbonEmissionCharts
+                  ref="CarbonEmissionCharts"
+                  :query-data="queryData"
+                  :height="450"
+                />
               </div>
             </Card>
           </div>
@@ -146,17 +157,20 @@ export default {
           <div class="ioc-card-content">
             <Card title="碳配额构成">
               <div class="doubleCarbon-overview-quota">
-                <CarbonQuotaChart ref="CarbonQuotaChart" :query-data="queryData" :height="450" />
+                <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 style="width: 97%; margin: 0 auto">
+                <a-divider style="margin: 0; padding: 0"></a-divider>
               </div>
               <div class="doubleCarbon-overview-news">
                 <DoubleCarbonNews :data="newsData" />
@@ -168,11 +182,14 @@ export default {
           <div class="ioc-card-content">
             <Card title="碳排放占比">
               <div class="doubleCarbon-overview-percent">
-                <CarbonOverviewPercent ref="CarbonOverviewPercent" :query-data="queryData" :height="300" />
+                <CarbonOverviewPercent
+                  ref="CarbonOverviewPercent"
+                  :query-data="queryData"
+                  :height="300"
+                />
               </div>
             </Card>
           </div>
-
         </a-col>
       </a-row>
     </div>
@@ -201,4 +218,4 @@ export default {
     height: 300px;
   }
 }
-</style>
+</style>

+ 82 - 61
src/components/doubleCarbon/print/doubleCarbonPrint.vue

@@ -18,92 +18,103 @@ export default {
   data() {
     return {
       queryData: {
-        companyId: '0',
-        timeRange: this.$util.dateUtil.getNearlyMonthRange()
+        companyId: "0",
+        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
       coreData: [
         {
-          title: '文印累计排放(tco2e/)',
+          title: "文印累计排放(tco2e/)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '文印人均排放(tco2e/天)',
+          title: "文印人均排放(tco2e/天)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '纸张人均消耗(张/天)',
+          title: "纸张人均消耗(张/天)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
-          title: '墨盒人均消耗(kg/天)',
+          title: "墨盒人均消耗(kg/天)",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
+          historyDesc: "同比",
+          historyNum: 0,
         },
         {
           type: 1,
-          title: '值得关注',
+          title: "值得关注",
           showStar: true,
-          content: ''
+          content: "",
         },
       ],
       newsData: [
         {
-          title: 'xxxxxxxxxx',
-          tag: '双碳小知识',
-          author: '张峰',
-          time: '2022-02-02 15:00:00'
-        }
-      ]
-    }
+          title: "xxxxxxxxxx",
+          tag: "双碳小知识",
+          author: "张峰",
+          time: "2022-02-02 15:00:00",
+        },
+      ],
+    };
   },
   mounted() {
     this.init();
   },
   methods: {
     init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
-    },
-    reset() {
+      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
     },
+    reset() {},
     search(data) {
       this.$util.asyncPromise(
-          this.getCoreData(),
-          this.$refs.CarbonPrintEmissionChart.getData(),
-          this.$refs.CarbonPrintQuotaChart.getData(),
-      )
+        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
-      })
-    }
-  }
-}
+      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;
+      });
+    },
+  },
+};
 </script>
 
 <template>
   <div class="doubleCarbon-print">
-
     <div class="page-query-core">
       <a-row>
-        <a-col>
+        <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" :reset="reset" :search="search"></Query>
+            <Query
+              :show="['company', 'time']"
+              :query-data.sync="queryData"
+              :reset="reset"
+              :search="search"
+            ></Query>
           </div>
         </a-col>
         <a-col>
@@ -117,22 +128,32 @@ export default {
     </div>
 
     <div style="margin-top: 12px">
-      <a-row :gutter="[12,12]">
+      <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" :height="450" />
-            </div>
-          </Card></div>
-
+          <div class="ioc-card-content">
+            <Card title="文印排放分析">
+              <div class="doubleCarbon-print-analyse">
+                <CarbonPrintEmissionChart
+                  ref="CarbonPrintEmissionChart"
+                  :query-data="queryData"
+                  :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>
-
+          <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>
@@ -161,4 +182,4 @@ export default {
     height: 300px;
   }
 }
-</style>
+</style>

+ 206 - 142
src/components/scene/access/sceneAccessAction.vue

@@ -1,17 +1,40 @@
 <template>
-  <div class="accessManage ">
-    <div class="page-query-core" style="padding: 30px 15px">
-      <Query :show="[]" :query-data.sync="queryData" :search="search">
+  <div class="accessManage">
+    <div class="page-query-core">
+      <Query
+        :show="[]"
+        :query-data.sync="queryData"
+        :search="search"
+        style="
+          background: #fff;
+          height: 60px;
+          padding: 10px;
+          border-radius: 5px;
+          margin-bottom: 10px;
+        "
+      >
         <template #extraItem>
           <a-form-model-item label="人员姓名" style="margin-left: 45px">
-            <a-input style="width: 250px" v-model="queryData.name" placeholder="请输入姓名"/>
+            <a-input
+              style="width: 250px"
+              v-model="queryData.name"
+              placeholder="请输入姓名"
+            />
           </a-form-model-item>
           <a-form-model-item label="手机号" style="margin-left: 45px">
-            <a-input style="width: 250px" v-model="queryData.phone" placeholder="请输入手机号"/>
+            <a-input
+              style="width: 250px"
+              v-model="queryData.phone"
+              placeholder="请输入手机号"
+            />
           </a-form-model-item>
           <a-form-model-item label="所属公司" style="">
             <a-select v-model="queryData.company" style="width: 250px">
-              <a-select-option v-for="(item,index) in companyOptions" :key="index" :value="item.value">
+              <a-select-option
+                v-for="(item, index) in companyOptions"
+                :key="index"
+                :value="item.value"
+              >
                 {{ item.label }}
               </a-select-option>
             </a-select>
@@ -23,41 +46,50 @@
     <div class="accessManage-body">
       <a-row style="height: 100%">
         <a-col :span="4" style="height: 100%">
-          <SceneSecurityPersonSelect :left-title="'名单'" :tree-data="treeData" :new-person-list="newPersonList"></SceneSecurityPersonSelect>
+          <SceneSecurityPersonSelect
+            :left-title="'名单'"
+            :tree-data="treeData"
+            :new-person-list="newPersonList"
+          ></SceneSecurityPersonSelect>
         </a-col>
         <a-col :span="20">
-          <a-table :columns="tableColumns" :data-source="tableData" :pagination="true"
-                   :scroll="{ y: tableContainerHeight }" bordered>
+          <a-table
+            :columns="tableColumns"
+            :data-source="tableData"
+            :pagination="true"
+            :scroll="{ y: tableContainerHeight }"
+            bordered
+          >
             <template #action="text, record">
-              <a-button type="link" @click="showPeopleBehaviour(record)"> 行为感知 </a-button>
+              <a-button type="link" @click="showPeopleBehaviour(record)">
+                行为感知
+              </a-button>
               <a-button type="link" @click="view(record)"> 查看 </a-button>
               <a-button type="link" @click="del(record)"> 删除 </a-button>
             </template>
-
           </a-table>
         </a-col>
       </a-row>
-
     </div>
 
     <a-modal
-        title="行为感知"
-        v-if="showBehaviour"
-        :visible="showBehaviour"
-        width="65%"
-        @cancel="hideBehaviour"
-        :footer="null"
+      title="行为感知"
+      v-if="showBehaviour"
+      :visible="showBehaviour"
+      width="65%"
+      @cancel="hideBehaviour"
+      :footer="null"
     >
       <SceneAccessBehaviour :item="currItem" />
     </a-modal>
 
     <a-modal
-        title="新建名单"
-        v-if="newPersonListVisible"
-        :visible="newPersonListVisible"
-        width="400px"
-        @cancel="hideNewPersonList"
-        @ok="addNewPersonList"
+      title="新建名单"
+      v-if="newPersonListVisible"
+      :visible="newPersonListVisible"
+      width="400px"
+      @cancel="hideNewPersonList"
+      @ok="addNewPersonList"
     >
       <a-input v-model="personListName" placeholder="请输入名单名称" />
     </a-modal>
@@ -77,98 +109,99 @@ export default {
     return {
       treeData: [
         {
-          title: '重点名单',
-          key: '重点名单'
-        }
+          title: "重点名单",
+          key: "重点名单",
+        },
       ],
-      personListName: '',
+      personListName: "",
       showBehaviour: false,
       newPersonListVisible: false,
       currentPage: 1,
       queryData: {
-        objective: '1',
-        company: '0'
+        objective: "1",
+        company: "0",
       },
-      objectiveMap:new Map(),
+      objectiveMap: new Map(),
       objectiveOptions: [
         {
-          label: '全部',
-          value: '0'
+          label: "全部",
+          value: "0",
         },
         {
-          label: '开会',
-          value: '1'
+          label: "开会",
+          value: "1",
         },
         {
-          label: '交流',
-          value: '2'
+          label: "交流",
+          value: "2",
         },
       ],
-      companyMap:new Map(),
+      companyMap: new Map(),
       companyOptions: [
         {
-          label: '全部',
-          value: '0'
-        },{
-          label: '北京电信规划院',
-          value: '1'
+          label: "全部",
+          value: "0",
+        },
+        {
+          label: "北京电信规划院",
+          value: "1",
         },
       ],
       tableContainerHeight: 500,
       tableColumns: [
         {
-          title: '序号',
-          dataIndex: 'index',
-          key: 'index',
+          title: "序号",
+          dataIndex: "index",
+          key: "index",
           align: "center",
           width: 80,
-          customRender: (text, record, index) => `${index + 1}`
+          customRender: (text, record, index) => `${index + 1}`,
         },
         {
-          title: '姓名',
-          dataIndex: 'visitor',
+          title: "姓名",
+          dataIndex: "visitor",
           width: 150,
-          key: 'visitor',
+          key: "visitor",
         },
         {
-          title: '手机号',
-          dataIndex: 'visitor_phone',
-          key: 'visitor_phone',
+          title: "手机号",
+          dataIndex: "visitor_phone",
+          key: "visitor_phone",
           width: 250,
         },
         {
-          title: '所属公司',
-          dataIndex: 'department',
-          key: 'department',
+          title: "所属公司",
+          dataIndex: "department",
+          key: "department",
         },
         {
-          title: '人脸信息',
-          dataIndex: 'faceInfo',
-          key: 'faceInfo',
+          title: "人脸信息",
+          dataIndex: "faceInfo",
+          key: "faceInfo",
         },
         {
-          title: '操作',
-          key: 'operation',
-          scopedSlots: {customRender: 'action'},
+          title: "操作",
+          key: "operation",
+          scopedSlots: { customRender: "action" },
         },
-
       ],
-      tableData:[],
+      tableData: [],
       currItem: {},
       originalData: [
         {
-          key: '1',
+          key: "1",
           visitor: "潘夏彤",
           visitor_phone: "13038678756",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B3",
-          interviewee: "胡八一", interviewee_phone: "15643567892",
+          interviewee: "胡八一",
+          interviewee_phone: "15643567892",
           directionStatus: "进",
         },
         {
-          key: '2',
+          key: "2",
           visitor: "庞慧",
           visitor_phone: "13038678756",
           department: "北京电信规划院",
@@ -180,204 +213,241 @@ export default {
           directionStatus: "进",
         },
         {
-          key: '3',
+          key: "3",
           visitor: "李天泽",
           visitor_phone: "13038678756",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "张永军", interviewee_phone: "15643563892",
+          interviewee: "张永军",
+          interviewee_phone: "15643563892",
           directionStatus: "进",
         },
         {
-          key: '4',
+          key: "4",
           visitor: "张雪",
           visitor_phone: "1589453012",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15643567892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15643567892",
+          directionStatus: "进",
         },
         {
-          key: '5',
+          key: "5",
           visitor: "王峰",
           visitor_phone: "15638295684",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15643563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15643563892",
+          directionStatus: "进",
         },
         {
-          key: '6',
+          key: "6",
           visitor: "张玉",
           visitor_phone: "17856982569",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15643563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15643563892",
+          directionStatus: "进",
         },
         {
-          key: '7',
+          key: "7",
           visitor: "李天泽",
           visitor_phone: "13032678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '8',
+          key: "8",
           visitor: "李天泽",
           visitor_phone: "13032678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '9',
+          key: "9",
           visitor: "李天泽",
           visitor_phone: "13032678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '10',
+          key: "10",
           visitor: "李天泽",
           visitor_phone: "12232678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '11',
+          key: "11",
           visitor: "李天泽",
           visitor_phone: "12232678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "出去B2",
-          interviewee: "胡八一", interviewee_phone: "15943563892",directionStatus: "出",
+          interviewee: "胡八一",
+          interviewee_phone: "15943563892",
+          directionStatus: "出",
         },
         {
-          key: '12',
+          key: "12",
           visitor: "李天泽",
           visitor_phone: "12232678759",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "出去B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943463892",directionStatus: "出",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943463892",
+          directionStatus: "出",
         },
         {
-          key: '13',
+          key: "13",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2023-03-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '14',
+          key: "14",
           visitor: "李天泽",
           visitor_phone: "15513548214",
           department: "北京电信规划院",
           time: "2023-03-20 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '15',
+          key: "15",
           visitor: "李天泽",
           visitor_phone: "15511548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '16',
+          key: "16",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '17',
+          key: "17",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "13943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "13943563892",
+          directionStatus: "进",
         },
         {
-          key: '18',
+          key: "18",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2023-03-10 12:00:00",
           reason: "开会",
           direction: "出去B1",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "出",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "出",
         },
         {
-          key: '19',
+          key: "19",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "出去B2",
-          interviewee: "钱多多", interviewee_phone: "15942563898",directionStatus: "出",
+          interviewee: "钱多多",
+          interviewee_phone: "15942563898",
+          directionStatus: "出",
         },
         {
-          key: '20',
+          key: "20",
           visitor: "李天泽",
           visitor_phone: "15913548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "钱多多", interviewee_phone: "15942563898",directionStatus: "进",
+          interviewee: "钱多多",
+          interviewee_phone: "15942563898",
+          directionStatus: "进",
         },
         {
-          key: '21',
+          key: "21",
           visitor: "李天泽",
           visitor_phone: "15913548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "钱多多", interviewee_phone: "15942563898",directionStatus: "进",
+          interviewee: "钱多多",
+          interviewee_phone: "15942563898",
+          directionStatus: "进",
         },
-      ]
-    }
+      ],
+    };
   },
   mounted() {
-    this.initData()
+    this.initData();
   },
   methods: {
-    initData(){
+    initData() {
       this.objectiveOptions.forEach((v) => {
         this.objectiveMap.set(v.value, v.label);
       });
@@ -388,20 +458,20 @@ export default {
     },
     showPeopleBehaviour(record) {
       this.showBehaviour = true;
-      this.currItem = record
+      this.currItem = record;
     },
     hideBehaviour() {
       this.showBehaviour = false;
-      this.currItem = {}
+      this.currItem = {};
     },
     showTotal(total, range) {
-      let pageSize = range[1]-range[0]+1;
-      let pages = Math.ceil(total/pageSize);
-      return '共'+total+'条数据,第 '+this.currentPage+'/'+pages+' 页';
-    },
-    onShowSizeChange(val) {
-
+      let pageSize = range[1] - range[0] + 1;
+      let pages = Math.ceil(total / pageSize);
+      return (
+        "共" + total + "条数据,第 " + this.currentPage + "/" + pages + " 页"
+      );
     },
+    onShowSizeChange(val) {},
     newPersonList() {
       this.newPersonListVisible = true;
     },
@@ -413,48 +483,44 @@ export default {
         title: this.personListName,
         key: this.personListName,
       });
-      this.personListName = '';
+      this.personListName = "";
       this.newPersonListVisible = false;
     },
-    search(){
+    search() {
       // this.$util.asyncPromise(this.getGuestData());
-      this.getGuestData()
+      this.getGuestData();
     },
-    getGuestData(){
-      let nameRegex = new RegExp(this.queryData.name)
-      let phoneRegex = new RegExp(this.queryData.phone)
+    getGuestData() {
+      let nameRegex = new RegExp(this.queryData.name);
+      let phoneRegex = new RegExp(this.queryData.phone);
       this.tableData = this.originalData.filter((item) => {
         if (
-            this.queryData.name &&
-            this.queryData.name != "" &&
-            !nameRegex.test(item.visitor)
+          this.queryData.name &&
+          this.queryData.name != "" &&
+          !nameRegex.test(item.visitor)
         ) {
           return false;
         }
         if (
-            this.queryData.phone &&
-            this.queryData.phone != "" &&
-            !phoneRegex.test(item.interviewee)
+          this.queryData.phone &&
+          this.queryData.phone != "" &&
+          !phoneRegex.test(item.interviewee)
         ) {
           return false;
         }
         if (
-            this.queryData.company &&
-            this.queryData.company != "0" &&
-            !(
-                this.companyMap.get(this.queryData.company) ===
-                item.department
-            )
+          this.queryData.company &&
+          this.queryData.company != "0" &&
+          !(this.companyMap.get(this.queryData.company) === item.department)
         ) {
           return false;
         }
 
         return true;
       });
-
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -464,7 +530,6 @@ export default {
 
   .ant-form-inline .ant-form-item {
     margin-right: 60px;
-
   }
 
   .accessManage-body {
@@ -474,6 +539,5 @@ export default {
     padding: 15px;
     height: 650px;
   }
-
 }
-</style>
+</style>

+ 196 - 133
src/components/scene/access/sceneAccessGuestManage.vue

@@ -1,17 +1,40 @@
 <template>
-  <div class="accessManage ">
-    <div class="page-query-core" style="padding: 30px 15px">
-      <Query :show="['time']" :query-data.sync="queryData" :search="search">
+  <div class="accessManage">
+    <div class="page-query-core">
+      <Query
+        :show="['time']"
+        :query-data.sync="queryData"
+        :search="search"
+        style="
+          background: #fff;
+          height: 120px;
+          padding: 10px;
+          border-radius: 5px;
+          margin-bottom: 10px;
+        "
+      >
         <template #extraItem>
           <a-form-model-item label="访客" style="margin-left: 45px">
-            <a-input style="width: 250px" v-model="queryData.guestName" placeholder="请输入姓名/手机号"/>
+            <a-input
+              style="width: 250px"
+              v-model="queryData.guestName"
+              placeholder="请输入姓名/手机号"
+            />
           </a-form-model-item>
           <a-form-model-item label="受访人" style="margin-left: 45px">
-            <a-input style="width: 250px" v-model="queryData.name" placeholder="请输入姓名/手机号"/>
+            <a-input
+              style="width: 250px"
+              v-model="queryData.name"
+              placeholder="请输入姓名/手机号"
+            />
           </a-form-model-item>
           <a-form-model-item label="公司" style="">
             <a-select v-model="queryData.company" style="width: 250px">
-              <a-select-option v-for="(item,index) in companyOptions" :key="index" :value="item.value">
+              <a-select-option
+                v-for="(item, index) in companyOptions"
+                :key="index"
+                :value="item.value"
+              >
                 {{ item.label }}
               </a-select-option>
             </a-select>
@@ -19,7 +42,11 @@
           <div style="height: 20px"></div>
           <a-form-model-item label="访问事由" style="margin-left: 15px">
             <a-select v-model="queryData.objective" style="width: 250px">
-              <a-select-option v-for="(item,index) in objectiveOptions" :key="index" :value="item.value">
+              <a-select-option
+                v-for="(item, index) in objectiveOptions"
+                :key="index"
+                :value="item.value"
+              >
                 {{ item.label }}
               </a-select-option>
             </a-select>
@@ -29,12 +56,16 @@
     </div>
 
     <div class="accessManage-body">
-      <a-table :columns="tableColumns" :data-source="tableData" :pagination="true"
-               :scroll="{ y: tableContainerHeight }" bordered>
+      <a-table
+        :columns="tableColumns"
+        :data-source="tableData"
+        :pagination="true"
+        :scroll="{ y: tableContainerHeight }"
+        bordered
+      >
         <template #action="text, record">
           <a-button type="link" @click="showPeopleBehaviour"> 查看 </a-button>
         </template>
-
       </a-table>
 
       <!--<div style="width: 100%;text-align: right;margin-top: 15px;">-->
@@ -51,12 +82,12 @@
     </div>
 
     <a-modal
-        title="行为感知"
-        v-if="showBehaviour"
-        :visible="showBehaviour"
-        width="65%"
-        @cancel="hideBehaviour"
-        :footer="null"
+      title="行为感知"
+      v-if="showBehaviour"
+      :visible="showBehaviour"
+      width="65%"
+      @cancel="hideBehaviour"
+      :footer="null"
     >
       <SceneAccessBehaviour :item="currItem" />
     </a-modal>
@@ -67,116 +98,117 @@
 import Query from "@/components/common/query.vue";
 export default {
   components: {
-    Query
+    Query,
   },
   data() {
     return {
       showBehaviour: false,
       currentPage: 1,
       queryData: {
-        objective: '1',
-        company: '0'
+        objective: "1",
+        company: "0",
       },
       currItem: {},
-      objectiveMap:new Map(),
+      objectiveMap: new Map(),
       objectiveOptions: [
         {
-          label: '全部',
-          value: '0'
+          label: "全部",
+          value: "0",
         },
         {
-          label: '开会',
-          value: '1'
+          label: "开会",
+          value: "1",
         },
         {
-          label: '交流',
-          value: '2'
+          label: "交流",
+          value: "2",
         },
       ],
-      companyMap:new Map(),
+      companyMap: new Map(),
       companyOptions: [
         {
-          label: '全部',
-          value: '0'
-        },{
-          label: '北京电信规划院',
-          value: '1'
+          label: "全部",
+          value: "0",
+        },
+        {
+          label: "北京电信规划院",
+          value: "1",
         },
       ],
       tableContainerHeight: 500,
       tableColumns: [
         {
-          title: '序号',
-          dataIndex: 'index',
-          key: 'index',
+          title: "序号",
+          dataIndex: "index",
+          key: "index",
           align: "center",
           width: 80,
-          customRender: (text, record, index) => `${index + 1}`
+          customRender: (text, record, index) => `${index + 1}`,
         },
         {
-          title: '访客',
-          dataIndex: 'visitor',
-          key: 'visitor',
+          title: "访客",
+          dataIndex: "visitor",
+          key: "visitor",
         },
         {
-          title: '访客手机号',
-          dataIndex: 'visitor_phone',
-          key: 'visitor_phone',
+          title: "访客手机号",
+          dataIndex: "visitor_phone",
+          key: "visitor_phone",
         },
         {
-          title: '所属公司',
-          dataIndex: 'department',
-          key: 'department',
+          title: "所属公司",
+          dataIndex: "department",
+          key: "department",
         },
         {
-          title: '受访人',
-          dataIndex: 'interviewee',
-          key: 'interviewee',
+          title: "受访人",
+          dataIndex: "interviewee",
+          key: "interviewee",
         },
         {
-          title: '访问事由',
-          dataIndex: 'reason',
-          key: 'reason',
+          title: "访问事由",
+          dataIndex: "reason",
+          key: "reason",
         },
         {
-          title: '受访人手机号',
-          dataIndex: 'interviewee_phone',
-          key: 'interviewee_phone',
+          title: "受访人手机号",
+          dataIndex: "interviewee_phone",
+          key: "interviewee_phone",
         },
         {
-          title: '通行时间',
-          dataIndex: 'time',
-          key: 'time',
+          title: "通行时间",
+          dataIndex: "time",
+          key: "time",
         },
         {
-          title: '通行方向',
-          dataIndex: 'direction',
-          key: 'direction',
+          title: "通行方向",
+          dataIndex: "direction",
+          key: "direction",
         },
         {
-          title: '行为感知',
-          key: 'operation',
-          fixed: 'right',
+          title: "行为感知",
+          key: "operation",
+          fixed: "right",
           width: 100,
-          scopedSlots: {customRender: 'action'},
+          scopedSlots: { customRender: "action" },
         },
-
       ],
-      tableData:[],
+      tableData: [],
       originalData: [
         {
-          key: '1',
+          key: "1",
           visitor: "潘夏彤",
           visitor_phone: "13038678756",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B3",
-          interviewee: "胡八一", interviewee_phone: "15643567892",
+          interviewee: "胡八一",
+          interviewee_phone: "15643567892",
           directionStatus: "进",
         },
         {
-          key: '2',
+          key: "2",
           visitor: "庞慧",
           visitor_phone: "13038678756",
           department: "北京电信规划院",
@@ -188,204 +220,241 @@ export default {
           directionStatus: "进",
         },
         {
-          key: '3',
+          key: "3",
           visitor: "李天泽",
           visitor_phone: "13038678756",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "张永军", interviewee_phone: "15643563892",
+          interviewee: "张永军",
+          interviewee_phone: "15643563892",
           directionStatus: "进",
         },
         {
-          key: '4',
+          key: "4",
           visitor: "李天泽",
           visitor_phone: "13038678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15643567892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15643567892",
+          directionStatus: "进",
         },
         {
-          key: '5',
+          key: "5",
           visitor: "李天泽",
           visitor_phone: "13038678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15643563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15643563892",
+          directionStatus: "进",
         },
         {
-          key: '6',
+          key: "6",
           visitor: "李天泽",
           visitor_phone: "13038678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15643563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15643563892",
+          directionStatus: "进",
         },
         {
-          key: '7',
+          key: "7",
           visitor: "李天泽",
           visitor_phone: "13032678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '8',
+          key: "8",
           visitor: "李天泽",
           visitor_phone: "13032678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '9',
+          key: "9",
           visitor: "李天泽",
           visitor_phone: "13032678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '10',
+          key: "10",
           visitor: "李天泽",
           visitor_phone: "12232678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "进入B2",
-          interviewee: "胡八一", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "胡八一",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '11',
+          key: "11",
           visitor: "李天泽",
           visitor_phone: "12232678754",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "出去B2",
-          interviewee: "胡八一", interviewee_phone: "15943563892",directionStatus: "出",
+          interviewee: "胡八一",
+          interviewee_phone: "15943563892",
+          directionStatus: "出",
         },
         {
-          key: '12',
+          key: "12",
           visitor: "李天泽",
           visitor_phone: "12232678759",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "交流",
           direction: "出去B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943463892",directionStatus: "出",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943463892",
+          directionStatus: "出",
         },
         {
-          key: '13',
+          key: "13",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2023-03-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '14',
+          key: "14",
           visitor: "李天泽",
           visitor_phone: "15513548214",
           department: "北京电信规划院",
           time: "2023-03-20 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '15',
+          key: "15",
           visitor: "李天泽",
           visitor_phone: "15511548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '16',
+          key: "16",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "进",
         },
         {
-          key: '17',
+          key: "17",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "刘一鸣", interviewee_phone: "13943563892",directionStatus: "进",
+          interviewee: "刘一鸣",
+          interviewee_phone: "13943563892",
+          directionStatus: "进",
         },
         {
-          key: '18',
+          key: "18",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2023-03-10 12:00:00",
           reason: "开会",
           direction: "出去B1",
-          interviewee: "刘一鸣", interviewee_phone: "15943563892",directionStatus: "出",
+          interviewee: "刘一鸣",
+          interviewee_phone: "15943563892",
+          directionStatus: "出",
         },
         {
-          key: '19',
+          key: "19",
           visitor: "李天泽",
           visitor_phone: "15513548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "出去B2",
-          interviewee: "钱多多", interviewee_phone: "15942563898",directionStatus: "出",
+          interviewee: "钱多多",
+          interviewee_phone: "15942563898",
+          directionStatus: "出",
         },
         {
-          key: '20',
+          key: "20",
           visitor: "李天泽",
           visitor_phone: "15913548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "钱多多", interviewee_phone: "15942563898",directionStatus: "进",
+          interviewee: "钱多多",
+          interviewee_phone: "15942563898",
+          directionStatus: "进",
         },
         {
-          key: '21',
+          key: "21",
           visitor: "李天泽",
           visitor_phone: "15913548219",
           department: "北京电信规划院",
           time: "2022-08-26 12:00:00",
           reason: "开会",
           direction: "进入B2",
-          interviewee: "钱多多", interviewee_phone: "15942563898",directionStatus: "进",
+          interviewee: "钱多多",
+          interviewee_phone: "15942563898",
+          directionStatus: "进",
         },
-      ]
-    }
+      ],
+    };
   },
   mounted() {
-    this.initData()
+    this.initData();
   },
   methods: {
-    initData(){
+    initData() {
       this.objectiveOptions.forEach((v) => {
         this.objectiveMap.set(v.value, v.label);
       });
@@ -401,20 +470,20 @@ export default {
       this.showBehaviour = false;
     },
     showTotal(total, range) {
-      let pageSize = range[1]-range[0]+1;
-      let pages = Math.ceil(total/pageSize);
-      return '共'+total+'条数据,第 '+this.currentPage+'/'+pages+' 页';
-    },
-    onShowSizeChange(val) {
-
+      let pageSize = range[1] - range[0] + 1;
+      let pages = Math.ceil(total / pageSize);
+      return (
+        "共" + total + "条数据,第 " + this.currentPage + "/" + pages + " 页"
+      );
     },
-    search(){
+    onShowSizeChange(val) {},
+    search() {
       // this.$util.asyncPromise(this.getGuestData());
-      this.getGuestData()
+      this.getGuestData();
     },
-    getGuestData(){
-      let guestRegex = new RegExp(this.queryData.guestName)
-      let intervieweeRegex = new RegExp(this.queryData.name)
+    getGuestData() {
+      let guestRegex = new RegExp(this.queryData.guestName);
+      let intervieweeRegex = new RegExp(this.queryData.name);
       let startDate;
       let endDate;
       if (this.queryData.timeRange) {
@@ -446,10 +515,7 @@ export default {
         if (
           this.queryData.company &&
           this.queryData.company != "0" &&
-          !(
-            this.companyMap.get(this.queryData.company) ===
-            item.department
-          )
+          !(this.companyMap.get(this.queryData.company) === item.department)
         ) {
           return false;
         }
@@ -467,10 +533,9 @@ export default {
 
         return true;
       });
-
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -480,7 +545,6 @@ export default {
 
   .ant-form-inline .ant-form-item {
     margin-right: 60px;
-
   }
 
   .accessManage-body {
@@ -489,6 +553,5 @@ export default {
     margin-top: 12px;
     padding: 15px;
   }
-
 }
-</style>
+</style>

+ 27 - 15
src/components/scene/access/sceneAccessManage.vue

@@ -1,7 +1,18 @@
 <template>
   <div class="accessManage">
-    <div class="page-query-core" style="padding: 30px 15px">
-      <Query :show="['time']" :query-data.sync="queryData" :search="search">
+    <div class="page-query-core">
+      <Query
+        :show="['time']"
+        :query-data.sync="queryData"
+        :search="search"
+        style="
+          background: #fff;
+          height: 120px;
+          padding: 10px;
+          border-radius: 5px;
+          margin-bottom: 10px;
+        "
+      >
         <template #extraItem>
           <a-form-model-item label="员工姓名" style="margin-left: 45px">
             <a-input
@@ -16,7 +27,7 @@
               placeholder="请输入设备名称"
             />
           </a-form-model-item>
-          <a-form-model-item label="人员类型" >
+          <a-form-model-item label="人员类型">
             <a-select v-model="queryData.people" style="width: 250px">
               <a-select-option
                 v-for="(item, index) in peopleOptions"
@@ -61,7 +72,9 @@
         bordered
       >
         <template #action="text, record">
-          <a-button type="link" @click="showPeopleBehaviour(record)"> 查看 </a-button>
+          <a-button type="link" @click="showPeopleBehaviour(record)">
+            查看
+          </a-button>
         </template>
       </a-table>
       <!--<div style="width: 100%; text-align: right; margin-top: 15px">-->
@@ -78,16 +91,15 @@
       <!--</div>-->
     </div>
     <a-modal
-        title="行为感知"
-        v-if="showBehaviour"
-        :visible="showBehaviour"
-        width="65%"
-        @cancel="hideBehaviour"
-        :footer="null"
+      title="行为感知"
+      v-if="showBehaviour"
+      :visible="showBehaviour"
+      width="65%"
+      @cancel="hideBehaviour"
+      :footer="null"
     >
       <SceneAccessBehaviour :item="currItem" />
     </a-modal>
-
   </div>
 </template>
 
@@ -208,11 +220,11 @@ export default {
           align: "center",
         },
         {
-          title: '行为感知',
-          key: 'operation',
-          fixed: 'right',
+          title: "行为感知",
+          key: "operation",
+          fixed: "right",
           width: 100,
-          scopedSlots: {customRender: 'action'},
+          scopedSlots: { customRender: "action" },
         },
       ],
       originalData: [

+ 156 - 126
src/components/scene/access/sceneAccessParkManage.vue

@@ -1,22 +1,45 @@
 <template>
   <div class="accessManage">
-    <div class="page-query-core" style="padding: 30px 15px">
-      <Query :show="['time']" :query-data.sync="queryData" :search="search">
+    <div class="page-query-core">
+      <Query
+        :show="['time']"
+        :query-data.sync="queryData"
+        :search="search"
+        style="
+          background: #fff;
+          height: 60px;
+          padding: 10px;
+          border-radius: 5px;
+          margin-bottom: 10px;
+        "
+      >
         <template #extraItem>
           <a-form-model-item label="车牌号" style="margin-left: 45px">
-            <a-input style="width: 200px" v-model="queryData.guestName" placeholder="请输入车牌号"/>
+            <a-input
+              style="width: 200px"
+              v-model="queryData.guestName"
+              placeholder="请输入车牌号"
+            />
           </a-form-model-item>
-          
+
           <a-form-model-item label="订单状态" style="margin-left: 15px">
             <a-select v-model="queryData.status" style="width: 150px">
-              <a-select-option v-for="(item,index) in statusOptions" :key="index" :value="item.value">
+              <a-select-option
+                v-for="(item, index) in statusOptions"
+                :key="index"
+                :value="item.value"
+              >
                 {{ item.label }}
               </a-select-option>
             </a-select>
           </a-form-model-item>
           <a-form-model-item label="支付方式" style="margin-left: 15px">
             <a-select v-model="queryData.method" style="width: 150px">
-              <a-select-option v-for="(item,index) in methodOptions" :key="index" :value="item.value">
+              <a-select-option
+                v-for="(item, index) in methodOptions"
+                :key="index"
+                :value="item.value"
+              >
                 {{ item.label }}
               </a-select-option>
             </a-select>
@@ -29,12 +52,24 @@
       </Query>
     </div>
 
-
     <div class="accessManage-body">
-
-      <a-table :columns="tableColumns" :data-source="tableData" :pagination="true"
-               :scroll="{ y: tableContainerHeight }" bordered>
-        <a-button slot="action" slot-scope="text" type="link" @click="()=>{showDetail=true}">
+      <a-table
+        :columns="tableColumns"
+        :data-source="tableData"
+        :pagination="true"
+        :scroll="{ y: tableContainerHeight }"
+        bordered
+      >
+        <a-button
+          slot="action"
+          slot-scope="text"
+          type="link"
+          @click="
+            () => {
+              showDetail = true;
+            }
+          "
+        >
           查看
         </a-button>
       </a-table>
@@ -52,102 +87,100 @@
       <!--</div>-->
     </div>
 
-
-    <a-modal class="securityPersonMoreDetail" v-if="showDetail"
-             :visible.sync="showDetail"
-             :width="800"
-             :title="'停车详情'"
-             :footer="null"
-             @cancel="handleCancel"
+    <a-modal
+      class="securityPersonMoreDetail"
+      v-if="showDetail"
+      :visible.sync="showDetail"
+      :width="800"
+      :title="'停车详情'"
+      :footer="null"
+      @cancel="handleCancel"
     >
       <a-descriptions :column="2">
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">车牌号</span>
           </template>
-
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">所属人员</span>
           </template>
           沪B53467
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">固定车位</span>
           </template>
           B101
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">停车时长</span>
           </template>
           2h
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">停车费用</span>
           </template>
           30元
         </a-descriptions-item>
 
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">实收金额</span>
           </template>
           30元
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">订单状态</span>
           </template>
           已支付
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">支付方式</span>
           </template>
           微信
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">入场时间</span>
           </template>
           2023/03/20 09:36:52
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">出场时间</span>
           </template>
           2023/03/20 11:15:36
         </a-descriptions-item>
-
       </a-descriptions>
 
-
       <div style="margin: 12px 0">详细信息</div>
 
       <a-descriptions :column="2" bordered>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">入场通道</span>
           </template>
           B1
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">出场通道</span>
           </template>
           B2
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">入场收费员</span>
           </template>
           张雪
         </a-descriptions-item>
-        <a-descriptions-item >
+        <a-descriptions-item>
           <template #label>
             <span class="descriptions-item-label">出场收费员</span>
           </template>
@@ -164,7 +197,6 @@
         <!--    <span class="descriptions-item-label">出场照片</span>-->
         <!--  </template>-->
         <!--</a-descriptions-item>-->
-
       </a-descriptions>
     </a-modal>
   </div>
@@ -181,95 +213,96 @@ export default {
       showDetail: false,
       currentPage: 1,
       queryData: {
-        status: '0',
-        method: '0'
+        status: "0",
+        method: "0",
       },
-      statusMap:new Map(),
+      statusMap: new Map(),
       statusOptions: [
         {
-          value: '0',
-          label: '全部'
+          value: "0",
+          label: "全部",
+        },
+        {
+          value: "1",
+          label: "待支付",
         },
         {
-          value: '1',
-          label: '待支付'
-        },{
-          value: '2',
-          label: '已支付'
+          value: "2",
+          label: "已支付",
         },
       ],
-      methodMap:new Map(),
+      methodMap: new Map(),
       methodOptions: [
         {
-          value: '0',
-          label: '全部'
+          value: "0",
+          label: "全部",
         },
         {
-          value: '1',
-          label: '手机支付'
+          value: "1",
+          label: "手机支付",
         },
         {
-          value: '2',
-          label: '人工'
+          value: "2",
+          label: "人工",
         },
         {
-          value: '3',
-          label: '年卡'
+          value: "3",
+          label: "年卡",
         },
       ],
       tableContainerHeight: 500,
       tableColumns: [
         {
-          title: '序号',
-          dataIndex: 'index',
-          key: 'index',
+          title: "序号",
+          dataIndex: "index",
+          key: "index",
           align: "center",
           width: 80,
-          customRender: (text, record, index) => `${index + 1}`
+          customRender: (text, record, index) => `${index + 1}`,
         },
         {
-          title: '车牌号',
-          dataIndex: 'name',
-          key: 'name',
+          title: "车牌号",
+          dataIndex: "name",
+          key: "name",
         },
         {
-          title: '订单状态',
-          dataIndex: 'paymentstatus',
-          key: 'paymentstatus',
+          title: "订单状态",
+          dataIndex: "paymentstatus",
+          key: "paymentstatus",
         },
         {
-          title: '支付方式',
-          dataIndex: 'paymentway',
-          key: 'paymentway',
+          title: "支付方式",
+          dataIndex: "paymentway",
+          key: "paymentway",
         },
         {
-          title: '实收金额(¥)',
-          dataIndex: 'money',
-          key: 'money',
+          title: "实收金额(¥)",
+          dataIndex: "money",
+          key: "money",
         },
         {
-          title: '入场时间',
-          dataIndex: 'time',
-          key: 'time',
+          title: "入场时间",
+          dataIndex: "time",
+          key: "time",
         },
         {
-          title: '出场时间',
-          dataIndex: 'outtime',
-          key: 'outtime',
+          title: "出场时间",
+          dataIndex: "outtime",
+          key: "outtime",
         },
         {
-          title: '操作',
-          key: 'operation',
-          fixed: 'right',
-          align: 'center',
+          title: "操作",
+          key: "operation",
+          fixed: "right",
+          align: "center",
           width: 100,
-          scopedSlots: {customRender: 'action'},
+          scopedSlots: { customRender: "action" },
         },
       ],
-      tableData:[],
+      tableData: [],
       originalData: [
         {
-          key: '1',
+          key: "1",
           name: "沪B53467",
           paymentstatus: "待支付",
           paymentway: "年卡",
@@ -280,7 +313,7 @@ export default {
           behavior: "",
         },
         {
-          key: '2',
+          key: "2",
           name: "沪B53467",
           paymentstatus: "待支付",
           paymentway: "人工",
@@ -291,7 +324,7 @@ export default {
           behavior: "",
         },
         {
-          key: '3',
+          key: "3",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -302,7 +335,7 @@ export default {
           behavior: "",
         },
         {
-          key: '4',
+          key: "4",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -313,7 +346,7 @@ export default {
           behavior: "",
         },
         {
-          key: '5',
+          key: "5",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -324,7 +357,7 @@ export default {
           behavior: "",
         },
         {
-          key: '6',
+          key: "6",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -335,7 +368,7 @@ export default {
           behavior: "",
         },
         {
-          key: '7',
+          key: "7",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -346,7 +379,7 @@ export default {
           behavior: "",
         },
         {
-          key: '8',
+          key: "8",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -357,7 +390,7 @@ export default {
           behavior: "",
         },
         {
-          key: '9',
+          key: "9",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -368,7 +401,7 @@ export default {
           behavior: "",
         },
         {
-          key: '10',
+          key: "10",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -379,7 +412,7 @@ export default {
           behavior: "",
         },
         {
-          key: '11',
+          key: "11",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -390,7 +423,7 @@ export default {
           behavior: "",
         },
         {
-          key: '12',
+          key: "12",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -401,7 +434,7 @@ export default {
           behavior: "",
         },
         {
-          key: '13',
+          key: "13",
           name: "沪A88888",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -412,7 +445,7 @@ export default {
           behavior: "",
         },
         {
-          key: '14',
+          key: "14",
           name: "沪B88888",
           paymentstatus: "已支付",
           paymentway: "人工",
@@ -423,7 +456,7 @@ export default {
           behavior: "",
         },
         {
-          key: '15',
+          key: "15",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "人工",
@@ -434,7 +467,7 @@ export default {
           behavior: "",
         },
         {
-          key: '16',
+          key: "16",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "人工",
@@ -445,7 +478,7 @@ export default {
           behavior: "",
         },
         {
-          key: '17',
+          key: "17",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "人工",
@@ -456,7 +489,7 @@ export default {
           behavior: "",
         },
         {
-          key: '18',
+          key: "18",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "人工",
@@ -467,7 +500,7 @@ export default {
           behavior: "",
         },
         {
-          key: '19',
+          key: "19",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -478,7 +511,7 @@ export default {
           behavior: "",
         },
         {
-          key: '20',
+          key: "20",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -489,7 +522,7 @@ export default {
           behavior: "",
         },
         {
-          key: '21',
+          key: "21",
           name: "沪A12345",
           paymentstatus: "已支付",
           paymentway: "手机支付",
@@ -499,14 +532,14 @@ export default {
           direction: "进入B2",
           behavior: "",
         },
-      ]
-    }
+      ],
+    };
   },
   mounted() {
-    this.initData()
+    this.initData();
   },
   methods: {
-    initData(){
+    initData() {
       this.methodOptions.forEach((v) => {
         this.methodMap.set(v.value, v.label);
       });
@@ -516,21 +549,22 @@ export default {
       this.tableData = this.originalData;
     },
     showTotal(total, range) {
-      let pageSize = range[1]-range[0]+1;
-      let pages = Math.ceil(total/pageSize);
-      return '共'+total+'条数据,第 '+this.currentPage+'/'+pages+' 页';
-    },
-    onShowSizeChange(val) {
+      let pageSize = range[1] - range[0] + 1;
+      let pages = Math.ceil(total / pageSize);
+      return (
+        "共" + total + "条数据,第 " + this.currentPage + "/" + pages + " 页"
+      );
     },
+    onShowSizeChange(val) {},
     handleCancel() {
-      this.showDetail = false
+      this.showDetail = false;
     },
     search() {
       // this.$util.asyncPromise(this.getParkingData());
-      this.getParkingData()
+      this.getParkingData();
     },
-    getParkingData(){
-      let cardRegex = new RegExp(this.queryData.guestName)
+    getParkingData() {
+      let cardRegex = new RegExp(this.queryData.guestName);
       let startDate;
       let endDate;
       if (this.queryData.timeRange) {
@@ -555,10 +589,7 @@ export default {
         if (
           this.queryData.status &&
           this.queryData.status != "0" &&
-          !(
-            this.statusMap.get(this.queryData.status) ===
-            item.paymentstatus
-          )
+          !(this.statusMap.get(this.queryData.status) === item.paymentstatus)
         ) {
           return false;
         }
@@ -576,9 +607,9 @@ export default {
 
         return true;
       });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -588,7 +619,6 @@ export default {
 
   .ant-form-inline .ant-form-item {
     margin-right: 60px;
-
   }
 
   .accessManage-body {
@@ -603,4 +633,4 @@ export default {
     width: 100%;
   }
 }
-</style>
+</style>

+ 88 - 47
src/components/scene/meeting/sceneMeetingOverview.vue

@@ -1,25 +1,58 @@
 <template>
   <div class="meeting-overview">
     <div class="page-query-core">
-      <Query :show="['time']" :query-data.sync="queryData" />
+      <Query
+        :show="['time']"
+        :query-data.sync="queryData"
+        style="
+          background: #fff;
+          height: 60px;
+          padding: 10px;
+          border-radius: 5px;
+          margin-bottom: 10px;
+        "
+      />
     </div>
     <div class="meeting-overview-total">
       <Card title="会议总数">
         <div style="padding: 12px 15px 20px">
           <a-row :gutter="12">
-            <a-col :span="8" v-for="(item,index) in totalData" :key="index">
-              <div style="background-color: #f7fbff;height: 100px;margin: 0 6%">
-                <div style="width: 43%;display: inline-block">
-                  <div class="meeting-overview-total-title">{{ item.totalTitle }}</div>
-                  <div class="meeting-overview-total-num">{{ item.totalNum }}</div>
+            <a-col :span="8" v-for="(item, index) in totalData" :key="index">
+              <div
+                style="background-color: #f7fbff; height: 100px; margin: 0 6%"
+              >
+                <div style="width: 43%; display: inline-block">
+                  <div class="meeting-overview-total-title">
+                    {{ item.totalTitle }}
+                  </div>
+                  <div class="meeting-overview-total-num">
+                    {{ item.totalNum }}
+                  </div>
                 </div>
-                <div style="width: 14%;display: inline-block;vertical-align: top">
-                  <div style="margin-top: 30px;background-color: #3AA7E6;width: 40px;height: 40px;border-radius: 50%;text-align: center">
-                    <a-avatar style="margin-top: 9px" :size="22" :src="requireImg('scene/meetingCompare.png')" />
+                <div
+                  style="width: 14%; display: inline-block; vertical-align: top"
+                >
+                  <div
+                    style="
+                      margin-top: 30px;
+                      background-color: #3aa7e6;
+                      width: 40px;
+                      height: 40px;
+                      border-radius: 50%;
+                      text-align: center;
+                    "
+                  >
+                    <a-avatar
+                      style="margin-top: 9px"
+                      :size="22"
+                      :src="requireImg('scene/meetingCompare.png')"
+                    />
                   </div>
                 </div>
-                <div style="width: 43%;display: inline-block">
-                  <div class="meeting-overview-total-title">{{ item.title }}</div>
+                <div style="width: 43%; display: inline-block">
+                  <div class="meeting-overview-total-title">
+                    {{ item.title }}
+                  </div>
                   <div class="meeting-overview-total-num">{{ item.num }}</div>
                 </div>
               </div>
@@ -29,15 +62,24 @@
       </Card>
     </div>
     <div class="meeting-overview-summary">
-      <a-tabs default-active-key="1" >
+      <a-tabs default-active-key="1">
         <a-tab-pane key="1" tab="会议总次数">
-          <MeetingTimesCharts :query-data="queryData" :height="300"></MeetingTimesCharts>
+          <MeetingTimesCharts
+            :query-data="queryData"
+            :height="300"
+          ></MeetingTimesCharts>
         </a-tab-pane>
         <a-tab-pane key="2" tab="会议总人次" force-render>
-          <MeetingPersonCharts :query-data="queryData" :height="300"></MeetingPersonCharts>
+          <MeetingPersonCharts
+            :query-data="queryData"
+            :height="300"
+          ></MeetingPersonCharts>
         </a-tab-pane>
         <a-tab-pane key="3" tab="会议总时长">
-          <MeetingTimeCharts :query-data="queryData" :height="300"></MeetingTimeCharts>
+          <MeetingTimeCharts
+            :query-data="queryData"
+            :height="300"
+          ></MeetingTimeCharts>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -46,7 +88,7 @@
         <a-row :gutter="12">
           <a-col :span="12">
             <div class="meeting-overview-distribute-time">
-              <MeetingTimeDistributeChart :height="300"/>
+              <MeetingTimeDistributeChart :height="300" />
             </div>
           </a-col>
           <a-col :span="12">
@@ -68,36 +110,36 @@ import MeetingTimeCharts from "@/components/scene/meeting/chart/meetingTimeChart
 import MeetingTimeDistributeChart from "@/components/scene/meeting/chart/meetingTimeDistributeChart.vue";
 import MeetingPersonDistributeChart from "@/components/scene/meeting/chart/meetingPersonDistributeChart.vue";
 import Query from "@/components/common/query.vue";
-import {requireImg} from "@/utils/requireImg";
+import { requireImg } from "@/utils/requireImg";
 import apiSceneMeeting from "@/api/scene/meeting/apiSceneMeeting";
 export default {
   data() {
-    let timeRange = this.$util.dateUtil.getNearlyMonthRange()
+    let timeRange = this.$util.dateUtil.getNearlyMonthRange();
     return {
       queryData: {
-        timeRange: timeRange
+        timeRange: timeRange,
       },
       totalData: [
         {
-          totalTitle: '总会议次数(次)',
+          totalTitle: "总会议次数(次)",
           totalNum: 2361,
-          title: '日均会议数(次)',
-          num: 76
+          title: "日均会议数(次)",
+          num: 76,
         },
         {
-          totalTitle: '会议总人次(人/次)',
+          totalTitle: "会议总人次(人/次)",
           totalNum: 19472,
-          title: '平均参会人次(人/次)',
-          num: 7.6
+          title: "平均参会人次(人/次)",
+          num: 7.6,
         },
         {
-          totalTitle: '会议总时长(分钟)',
+          totalTitle: "会议总时长(分钟)",
           totalNum: 86843,
-          title: '平均会议时间(分钟)',
-          num: 8
+          title: "平均会议时间(分钟)",
+          num: 8,
         },
-      ]
-    }
+      ],
+    };
   },
   components: {
     Query,
@@ -109,26 +151,26 @@ export default {
     MeetingPersonDistributeChart,
   },
   mounted() {
-    this.getMeetingTotal()
+    this.getMeetingTotal();
   },
   methods: {
     requireImg,
     getMeetingTotal() {
       let params = this.$util.dateUtil.getNearlyMonthRange();
       if (this.queryData.timeRange) {
-        params = this.queryData.timeRange
+        params = this.queryData.timeRange;
       }
-      apiSceneMeeting.getMeetingTotal(params).then(res=>{
-        this.totalData[0].totalNum = res.list[0].value
-        this.totalData[0].num = res.list[1].value
-        this.totalData[1].totalNum = res.list[2].value
-        this.totalData[1].num = res.list[3].value
-        this.totalData[2].totalNum = res.list[4].value
-        this.totalData[2].num = res.list[5].value
-      })
-    }
-  }
-}
+      apiSceneMeeting.getMeetingTotal(params).then((res) => {
+        this.totalData[0].totalNum = res.list[0].value;
+        this.totalData[0].num = res.list[1].value;
+        this.totalData[1].totalNum = res.list[2].value;
+        this.totalData[1].num = res.list[3].value;
+        this.totalData[2].totalNum = res.list[4].value;
+        this.totalData[2].num = res.list[5].value;
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -145,7 +187,7 @@ export default {
       font-size: 14px;
       margin-top: 20px;
       margin-left: 20px;
-      color: #B2B2B2;
+      color: #b2b2b2;
     }
     .meeting-overview-total-num {
       font-size: 20px;
@@ -177,7 +219,7 @@ export default {
     visibility: hidden;
   }
   .ant-tabs-nav {
-    color: #B3B3B3;
+    color: #b3b3b3;
     margin-right: 5px !important;
   }
   .ant-tabs-nav .ant-tabs-tab {
@@ -188,6 +230,5 @@ export default {
   .ant-tabs-nav .ant-tabs-tab-active {
     color: #333333;
   }
-
 }
-</style>
+</style>

+ 85 - 59
src/components/security/alarm/securityAlarmManage.vue

@@ -1,17 +1,27 @@
 <template>
   <div class="securityAlarmManage">
     <div class="page-query-core">
-      <Query :show="['floor', 'time']" :query-data.sync="queryData" :reset="reset" :search="search"></Query>
+      <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-row :gutter="[12, 12]">
         <a-col :span="16">
-
           <div class="securityAlarmManage-distributeMap">
             <Card title="告警分布">
               <SecurityAlarmManageDistributeMap></SecurityAlarmManageDistributeMap>
@@ -22,7 +32,11 @@
           <div class="securityAlarmManage-trend">
             <Card title="告警趋势">
               <div style="padding: 0 15px 8px">
-                <SecurityAlarmManageTrend ref="SecurityAlarmManageTrend" :query-data="queryData" :height="400"></SecurityAlarmManageTrend>
+                <SecurityAlarmManageTrend
+                  ref="SecurityAlarmManageTrend"
+                  :query-data="queryData"
+                  :height="400"
+                ></SecurityAlarmManageTrend>
               </div>
             </Card>
           </div>
@@ -30,7 +44,11 @@
         <a-col :span="8">
           <div class="securityAlarmManage-distribute">
             <Card title="楼层告警分布">
-              <SecurityAlarmManageDistribute ref="SecurityAlarmManageDistribute" :query-data="queryData" :height="300"></SecurityAlarmManageDistribute>
+              <SecurityAlarmManageDistribute
+                ref="SecurityAlarmManageDistribute"
+                :query-data="queryData"
+                :height="300"
+              ></SecurityAlarmManageDistribute>
             </Card>
           </div>
         </a-col>
@@ -38,7 +56,11 @@
           <div class="securityAlarmManage-onlineTrend">
             <Card title="设备在线趋势">
               <div style="padding: 0 15px 10px">
-                <SecurityAlarmManageOnlineTrend ref="SecurityAlarmManageOnlineTrend" :query-data="queryData" :height="290"></SecurityAlarmManageOnlineTrend>
+                <SecurityAlarmManageOnlineTrend
+                  ref="SecurityAlarmManageOnlineTrend"
+                  :query-data="queryData"
+                  :height="290"
+                ></SecurityAlarmManageOnlineTrend>
               </div>
             </Card>
           </div>
@@ -46,13 +68,16 @@
         <a-col :span="8">
           <div class="securityAlarmManage-category">
             <Card title="告警分类">
-              <SecurityAlarmManageCategory ref="SecurityAlarmManageCategory" :query-data="queryData" :height="300"></SecurityAlarmManageCategory>
+              <SecurityAlarmManageCategory
+                ref="SecurityAlarmManageCategory"
+                :query-data="queryData"
+                :height="300"
+              ></SecurityAlarmManageCategory>
             </Card>
           </div>
         </a-col>
       </a-row>
     </div>
-
   </div>
 </template>
 
@@ -72,37 +97,41 @@ export default {
   data() {
     return {
       queryData: {
-        floorId: '0',
-        timeRange: this.$util.dateUtil.getNearlyMonthRange()
+        floorId: "0",
+        timeRange: this.$util.dateUtil.getNearlyMonthRange(),
       },
       coreData: [
         {
-          title: '告警事件',
+          title: "告警事件",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
-        }, {
-          title: '紧急告警事件',
+          historyDesc: "同比",
+          historyNum: 0,
+        },
+        {
+          title: "紧急告警事件",
           num: 0,
-          historyDesc: '同比',
-          historyNum: 0
-        }, {
-          title: '已处理事件',
+          historyDesc: "同比",
+          historyNum: 0,
+        },
+        {
+          title: "已处理事件",
           num: 0,
-          historyDesc: '同比',
+          historyDesc: "同比",
           hideTrend: true,
-          historyNum: 0
-        }, {
-          title: '告警最多类型',
-          num: '',
-          historyDesc: '同比',
-          historyNum: 0
-        }, {
+          historyNum: 0,
+        },
+        {
+          title: "告警最多类型",
+          num: "",
+          historyDesc: "同比",
+          historyNum: 0,
+        },
+        {
           type: 1,
-          title: '值得关注',
-        }
-      ]
-    }
+          title: "值得关注",
+        },
+      ],
+    };
   },
   components: {
     Card,
@@ -115,39 +144,37 @@ export default {
     SecurityAlarmManageCategory,
   },
   mounted() {
-    this.init()
+    this.init();
   },
   methods: {
     init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
-    },
-    reset() {
-
+      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()
-      )
+        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[3].historyNum = res.list[3].compare
-        this.coreData[4].content = res.worthAttention
-      })
-    }
-  }
-}
+      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[3].historyNum = res.list[3].compare;
+        this.coreData[4].content = res.worthAttention;
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -165,7 +192,6 @@ export default {
   }
 
   .securityAlarmManage-distribute {
-
   }
 }
-</style>
+</style>

+ 47 - 31
src/components/work/bus/workBus.vue

@@ -1,7 +1,19 @@
 <template>
   <div>
     <div class="page-query-core">
-      <query :show="['company', 'time']" :query-data.sync="queryData"  :reset="reset" :search="search"></query>
+      <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>
@@ -10,7 +22,11 @@
       <a-col :span="18">
         <div class="left ioc-card-content">
           <card :title="'公车管理'">
-            <WorkBusChart ref="WorkBusChart" :query-data="queryData" :height="450" />
+            <WorkBusChart
+              ref="WorkBusChart"
+              :query-data="queryData"
+              :height="450"
+            />
           </card>
         </div>
       </a-col>
@@ -18,7 +34,11 @@
         <div class="right ioc-card-content">
           <card :title="'成本趋势'">
             <div style="padding: 0 15px">
-              <WorkBusTrend ref="WorkBusTrend" :query-data="queryData" :height="450" />
+              <WorkBusTrend
+                ref="WorkBusTrend"
+                :query-data="queryData"
+                :height="450"
+              />
             </div>
           </card>
         </div>
@@ -54,14 +74,14 @@ export default {
     let timeRange = this.$util.dateUtil.getNearlyMonthRange();
     return {
       queryData: {
-        companyId: '0',
+        companyId: "0",
         timeRange: timeRange,
       },
       columns: [
-        {title: "序号", dataIndex: "index", key: "1", width: 48},
-        {title: "姓名", dataIndex: "name", key: "2", width: 60},
-        {title: "部门", dataIndex: "department", key: "3", width: 80},
-        {title: "最后进入时间", dataIndex: "time", key: "4", width: 90},
+        { title: "序号", dataIndex: "index", key: "1", width: 48 },
+        { title: "姓名", dataIndex: "name", key: "2", width: 60 },
+        { title: "部门", dataIndex: "department", key: "3", width: 80 },
+        { title: "最后进入时间", dataIndex: "time", key: "4", width: 90 },
       ],
       listData: listData,
       coreData: [
@@ -103,36 +123,33 @@ export default {
   },
   methods: {
     init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
-    },
-    reset() {
-
+      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
     },
+    reset() {},
     search() {
       this.$util.asyncPromise(
-          this.getCoreData(),
-          this.$refs.WorkBusChart.getData(),
-          this.$refs.WorkBusTrend.getData(),
-      )
+        this.getCoreData(),
+        this.$refs.WorkBusChart.getData(),
+        this.$refs.WorkBusTrend.getData()
+      );
     },
     getCoreData() {
-      return ApiWorkBus.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
-      })
-    }
+      return ApiWorkBus.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>
 
-
 <style lang="less" scoped>
 .left {
   margin-right: 6px;
@@ -144,5 +161,4 @@ export default {
   background-color: #ffffff;
   padding-bottom: 15px;
 }
-
-</style>
+</style>

+ 146 - 70
src/components/work/meeting/workMeeting.vue

@@ -7,6 +7,13 @@
         :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>
@@ -28,13 +35,15 @@
                   >
                     <!-- style="width: 100px" -->
                     <!-- :open-keys.sync="openKeys" -->
-                    <template v-for="(value,key) in roomInfo">
-                      <a-menu-item v-for="item in value" :key="item.value" v-if="key==queryData.floorId"
+                    <template v-for="(value, key) in roomInfo">
+                      <a-menu-item
+                        v-for="item in value"
+                        :key="item.value"
+                        v-if="key == queryData.floorId"
                       >
                         {{ item.value }}
                       </a-menu-item>
                     </template>
-
                   </a-menu>
                 </a-col>
                 <a-col :span="3">
@@ -44,7 +53,8 @@
                   </div>
                 </a-col>
                 <a-col :span="19">
-                  <timeline v-if="showMeetingLine"
+                  <timeline
+                    v-if="showMeetingLine"
                     v-for="(value, key, index) in meetingInfo"
                     :key="index"
                     :select="currCheckMeeting"
@@ -75,7 +85,10 @@
                         >会议配置:</span
                       >
                     </template>
-                    <div class="workMeeting-left-detail-content" v-if="currMeeting.subject">
+                    <div
+                      class="workMeeting-left-detail-content"
+                      v-if="currMeeting.subject"
+                    >
                       智慧场景策略配置
                     </div>
                   </a-descriptions-item>
@@ -97,7 +110,8 @@
                     </template>
                     <div
                       class="workMeeting-left-detail-content"
-                      style="background-color: #ffffff" v-if="currMeeting.subject"
+                      style="background-color: #ffffff"
+                      v-if="currMeeting.subject"
                     >
                       30元/小时
                     </div>
@@ -108,12 +122,70 @@
                         >参会人员:</span
                       >
                     </template>
-                    <div style="width: 100%; vertical-align: top" v-if="currMeeting.subject">
-                      <div style=" display: inline-block; vertical-align: top; margin: 1px 3px;"><a-avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"/><div>张三</div></div>
-                      <div style=" display: inline-block; vertical-align: top; margin: 1px 3px;"><a-avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"/><div>张雪峰</div></div>
-                      <div style=" display: inline-block; vertical-align: top; margin: 1px 3px;"><a-avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"/><div>张明</div></div>
-                      <div style=" display: inline-block; vertical-align: top; margin: 1px 3px;"><a-avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"/><div>李阳</div></div>
-                      <div style=" display: inline-block; vertical-align: top; margin: 1px 3px;"><a-avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"/><div>王佳佳</div></div>
+                    <div
+                      style="width: 100%; vertical-align: top"
+                      v-if="currMeeting.subject"
+                    >
+                      <div
+                        style="
+                          display: inline-block;
+                          vertical-align: top;
+                          margin: 1px 3px;
+                        "
+                      >
+                        <a-avatar
+                          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                        />
+                        <div>张三</div>
+                      </div>
+                      <div
+                        style="
+                          display: inline-block;
+                          vertical-align: top;
+                          margin: 1px 3px;
+                        "
+                      >
+                        <a-avatar
+                          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                        />
+                        <div>张雪峰</div>
+                      </div>
+                      <div
+                        style="
+                          display: inline-block;
+                          vertical-align: top;
+                          margin: 1px 3px;
+                        "
+                      >
+                        <a-avatar
+                          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                        />
+                        <div>张明</div>
+                      </div>
+                      <div
+                        style="
+                          display: inline-block;
+                          vertical-align: top;
+                          margin: 1px 3px;
+                        "
+                      >
+                        <a-avatar
+                          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                        />
+                        <div>李阳</div>
+                      </div>
+                      <div
+                        style="
+                          display: inline-block;
+                          vertical-align: top;
+                          margin: 1px 3px;
+                        "
+                      >
+                        <a-avatar
+                          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                        />
+                        <div>王佳佳</div>
+                      </div>
                     </div>
                   </a-descriptions-item>
                   <a-descriptions-item>
@@ -124,7 +196,8 @@
                     </template>
                     <div
                       class="workMeeting-left-detail-content"
-                      style="background-color: #ffffff" v-if="currMeeting.subject"
+                      style="background-color: #ffffff"
+                      v-if="currMeeting.subject"
                     >
                       35元/小时
                     </div>
@@ -153,7 +226,10 @@
           </div>
         </a-col>
         <a-col :span="18">
-          <div class="workMeeting-left ioc-card-content" style="margin-bottom: 15px">
+          <div
+            class="workMeeting-left ioc-card-content"
+            style="margin-bottom: 15px"
+          >
             <card title="会议室时长">
               <MeetingTimeCharts :height="300"></MeetingTimeCharts>
             </card>
@@ -212,28 +288,28 @@ export default {
         },
       ],
       deptData: {
-        "0": '业务一部',
-        "1": '业务二部',
-        "2": '业务三部',
+        0: "业务一部",
+        1: "业务二部",
+        2: "业务三部",
       },
       queryData: {
         companyId: "0",
         floorId: "7",
         timeRange: timeRange,
       },
-      currRoom: '701',
+      currRoom: "701",
       floorOptions: [
         {
-          value: '7',
-          label: "7F"
+          value: "7",
+          label: "7F",
         },
         {
-          value: '8',
-          label: "8F"
+          value: "8",
+          label: "8F",
         },
         {
-          value: '9',
-          label: "9F"
+          value: "9",
+          label: "9F",
         },
         //{
         //  value: '',
@@ -317,56 +393,54 @@ export default {
           content: "",
         },
       ],
-      defaultSelectedKeys: ["701",'801','901'],
+      defaultSelectedKeys: ["701", "801", "901"],
       tabsItemArr: [],
       roomInfo: {
-        "7": [
+        7: [
           {
-            label: '701',
-            value: '701'
+            label: "701",
+            value: "701",
           },
           {
-            label: '702',
-            value: '702'
+            label: "702",
+            value: "702",
           },
           {
-            label: '703',
-            value: '703'
+            label: "703",
+            value: "703",
           },
         ],
-        "8": [
+        8: [
           {
-            label: '801',
-            value: '801'
+            label: "801",
+            value: "801",
           },
           {
-            label: '802',
-            value: '802'
+            label: "802",
+            value: "802",
           },
           {
-            label: '803',
-            value: '803'
+            label: "803",
+            value: "803",
           },
         ],
-        "9": [
+        9: [
           {
-            label: '901',
-            value: '901'
+            label: "901",
+            value: "901",
           },
           {
-            label: '902',
-            value: '902'
+            label: "902",
+            value: "902",
           },
           {
-            label: '903',
-            value: '903'
+            label: "903",
+            value: "903",
           },
-        ]
-      },
-      meetingInfo: {
-
+        ],
       },
-      currMeeting: {}
+      meetingInfo: {},
+      currMeeting: {},
     };
   },
   mounted() {
@@ -402,7 +476,7 @@ export default {
       this.$util.asyncPromise(
         this.getCoreData(),
         this.$refs.WorkMeetingCostTrend.getData(),
-        this.getMeetingRecordData(),
+        this.getMeetingRecordData()
       );
     },
     getMeetingRecordData() {
@@ -412,27 +486,29 @@ export default {
       params.timeRange = this.$util.dateUtil.getCurrWeekRange();
       let resultObj = {};
       let app = this;
-      this.timeArr.forEach(i=>{
-        resultObj[i.date] = []
-      })
-      this.meetingInfo = resultObj
-      return apiWorkMeeting.getMeetingRecords(params).then(res=>{
-        let arr = res.filter(item=>item.room==this.currRoom)
-        for (let i = 0; i < arr.length; i++) {
-          let obj = app.$moment(arr[i].startTime).format('yyyy/MM/DD')
-          resultObj[obj].push(arr[i])
-        }
-        this.meetingInfo = resultObj;
-        this.showMeetingLine = true;
-      }).catch(err=>{
-        this.showMeetingLine = true;
-      })
-
+      this.timeArr.forEach((i) => {
+        resultObj[i.date] = [];
+      });
+      this.meetingInfo = resultObj;
+      return apiWorkMeeting
+        .getMeetingRecords(params)
+        .then((res) => {
+          let arr = res.filter((item) => item.room == this.currRoom);
+          for (let i = 0; i < arr.length; i++) {
+            let obj = app.$moment(arr[i].startTime).format("yyyy/MM/DD");
+            resultObj[obj].push(arr[i]);
+          }
+          this.meetingInfo = resultObj;
+          this.showMeetingLine = true;
+        })
+        .catch((err) => {
+          this.showMeetingLine = true;
+        });
     },
     huiyiClick(e) {
       //this.changeTab(e.key);
       this.currRoom = e.key;
-      this.getMeetingRecordData()
+      this.getMeetingRecordData();
     },
     //changeTab(index) {
     //  this.tabsItemArr = this.tabsArr[index].content;
@@ -466,7 +542,7 @@ export default {
         height: 60px;
         width: 100%;
         position: relative;
-        color: rgb(77, 77, 77,0.2);;
+        color: rgb(77, 77, 77, 0.2);
         .week {
           width: 80%;
           height: 50%;

+ 75 - 61
src/components/work/overview/workOverview.vue

@@ -1,7 +1,20 @@
 <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>
+      <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>
@@ -13,10 +26,17 @@
           <div class="workOverview-room ioc-card-content">
             <card :title="'房间分布'">
               <div class="fjfbt" style="overflow-y: auto">
-                <WorkRoomDistribute v-if="showFloorData" :query-data="queryData" />
-                <div style="height: 670px;text-align: center"  v-else>
+                <WorkRoomDistribute
+                  v-if="showFloorData"
+                  :query-data="queryData"
+                />
+                <div style="height: 670px; text-align: center" v-else>
                   <!--<iocThreeFbx  />-->
-                  <img :src="requireImg('security/area_1F.png')" style="border-radius: 12px" height="100%"/>
+                  <img
+                    :src="requireImg('security/area_1F.png')"
+                    style="border-radius: 12px"
+                    height="100%"
+                  />
                 </div>
               </div>
             </card>
@@ -26,17 +46,20 @@
           <div class="workOverview-door ioc-card-content">
             <card>
               <template #title>
-                <div style="color: #333333;display: inline-block;">当日门禁进出人员</div>
+                <div style="color: #333333; display: inline-block">
+                  当日门禁进出人员
+                </div>
               </template>
               <template #title-extra>
                 <div class="total">{{ listData.length }}<span>人</span></div>
               </template>
               <div class="workOverview-door-list">
-                <a-table :rowKey=" (record, index) => index"
-                         :columns="columns"
-                         :data-source="listData"
-                         :pagination="false"
-                         :scroll="{ y: 600 }"
+                <a-table
+                  :rowKey="(record, index) => index"
+                  :columns="columns"
+                  :data-source="listData"
+                  :pagination="false"
+                  :scroll="{ y: 600 }"
                 >
                 </a-table>
               </div>
@@ -53,7 +76,7 @@ import card from "@/components/common/card.vue";
 import WorkRoomDistribute from "@/components/work/overview/component/workRoomDistribute.vue";
 import apiWorkFloor from "@/api/work/apiWorkFloor";
 import iocThreeFbx from "@/components/work/common/iocThreeFbx.vue";
-import {requireImg} from "@/utils/requireImg";
+import { requireImg } from "@/utils/requireImg";
 
 export default {
   components: {
@@ -63,57 +86,57 @@ export default {
     iocThreeFbx,
   },
   data() {
-    let timeRange = this.$util.dateUtil.getNearlyMonthRange()
+    let timeRange = this.$util.dateUtil.getNearlyMonthRange();
     return {
       showFloorData: true,
       queryData: {
-        companyId: '0',
-        floorId: '-99',
-        timeRange: timeRange
+        companyId: "0",
+        floorId: "-99",
+        timeRange: timeRange,
       },
       floorData: [
         {
-          value: '-99',
-          label: "全部"
+          value: "-99",
+          label: "全部",
         },
         {
           value: -3,
-          label: "B3"
+          label: "B3",
         },
         {
           value: -2,
-          label: "B2"
+          label: "B2",
         },
         {
           value: -1,
-          label: "B1"
+          label: "B1",
         },
         {
-          value: '1',
-          label: "1F"
+          value: "1",
+          label: "1F",
         },
         {
           value: 7,
-          label: "7F"
+          label: "7F",
         },
         {
           value: 8,
-          label: "8F"
+          label: "8F",
         },
         {
           value: 9,
-          label: "9F"
+          label: "9F",
         },
         {
           value: 21,
-          label: "21F"
-        }
+          label: "21F",
+        },
       ],
       columns: [
         //{title: "序号", dataIndex: "index", key: "1", width: 48},
-        {title: "姓名", dataIndex: "name", key: "2", width: 70},
-        {title: "部门", dataIndex: "company", key: "3", },
-        {title: "最后进入时间", dataIndex: "endDate", key: "4", },
+        { title: "姓名", dataIndex: "name", key: "2", width: 70 },
+        { title: "部门", dataIndex: "company", key: "3" },
+        { title: "最后进入时间", dataIndex: "endDate", key: "4" },
       ],
       listData: [],
       coreData: [
@@ -157,54 +180,45 @@ export default {
   methods: {
     requireImg,
     init() {
-      this.$util.asyncPromise(
-          this.getCoreData(),
-          this.getDoorEnterPerson()
-      )
-    },
-    reset() {
-
+      this.$util.asyncPromise(this.getCoreData(), this.getDoorEnterPerson());
     },
+    reset() {},
     search() {
-      if (!this.queryData.floorId || this.queryData.floorId == '-99') {
-        this.showFloorData = true
+      if (!this.queryData.floorId || this.queryData.floorId == "-99") {
+        this.showFloorData = true;
       } else {
-        this.showFloorData = false
+        this.showFloorData = false;
       }
-      this.$util.asyncPromise(
-          this.getCoreData(),
-          this.getDoorEnterPerson()
-      )
+      this.$util.asyncPromise(this.getCoreData(), this.getDoorEnterPerson());
       this.$forceUpdate();
     },
     getCoreData() {
       let params = JSON.parse(JSON.stringify(this.queryData));
-      if (params.floorId == '-99') {
+      if (params.floorId == "-99") {
         delete params.floorId;
       }
-      return apiWorkFloor.getCoreData(params).then(res=>{
-        this.coreData[0].content = res.list[0].value
-        this.coreData[1].content = res.list[1].value
-        this.coreData[2].content = res.list[2].value
-        this.coreData[3].content = res.list[3].value
-        this.coreData[4].content = res.list[4].value
-        this.coreData[5].content = res.list[5].value
-      })
+      return apiWorkFloor.getCoreData(params).then((res) => {
+        this.coreData[0].content = res.list[0].value;
+        this.coreData[1].content = res.list[1].value;
+        this.coreData[2].content = res.list[2].value;
+        this.coreData[3].content = res.list[3].value;
+        this.coreData[4].content = res.list[4].value;
+        this.coreData[5].content = res.list[5].value;
+      });
     },
     getDoorEnterPerson() {
       let params = JSON.parse(JSON.stringify(this.queryData));
-      if (params.floorId == '-99') {
+      if (params.floorId == "-99") {
         delete params.floorId;
       }
-      return apiWorkFloor.getAccessPersonnel(params).then(res=>{
-        this.listData = res
-      })
-    }
+      return apiWorkFloor.getAccessPersonnel(params).then((res) => {
+        this.listData = res;
+      });
+    },
   },
 };
 </script>
 
-
 <style lang="less" scoped>
 .workOverview {
   width: 100%;
@@ -214,7 +228,7 @@ export default {
   .total {
     font-size: 20px;
     span {
-      color: #B2B2B2;
+      color: #b2b2b2;
       font-size: 14px;
       display: inline-block;
       margin-left: 30px;
@@ -254,4 +268,4 @@ export default {
 
 //.drmj_list {
 //}
-</style>
+</style>

+ 57 - 40
src/components/work/print/workPrint.vue

@@ -1,7 +1,20 @@
 <template>
   <div>
     <div class="page-query-core">
-      <query :show="['company', 'floor', 'time']" :floor-options="floorData" :query-data.sync="queryData" :reset="reset" :search="search"></query>
+      <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>
@@ -10,7 +23,11 @@
       <a-col :span="18">
         <div class="left ioc-card-content">
           <card :title="'文印管理'">
-            <WorkPrintChart ref="WorkPrintChart" :query-data="queryData" :height="450" />
+            <WorkPrintChart
+              ref="WorkPrintChart"
+              :query-data="queryData"
+              :height="450"
+            />
           </card>
         </div>
       </a-col>
@@ -18,7 +35,11 @@
         <div class="right ioc-card-content">
           <card :title="'成本趋势'">
             <div style="padding: 0 15px">
-              <WorkPrintTrend ref="WorkPrintTrend" :query-data="queryData" :height="450" />
+              <WorkPrintTrend
+                ref="WorkPrintTrend"
+                :query-data="queryData"
+                :height="450"
+              />
             </div>
           </card>
         </div>
@@ -53,33 +74,33 @@ export default {
     let timeRange = this.$util.dateUtil.getNearlyMonthRange();
     return {
       queryData: {
-        companyId: '0',
-        floorId: '16',
+        companyId: "0",
+        floorId: "16",
         timeRange: timeRange,
       },
       floorData: [
         {
-          value: '16',
-          label: "16F"
+          value: "16",
+          label: "16F",
         },
         {
-          value: '17',
-          label: "17F"
+          value: "17",
+          label: "17F",
         },
         {
-          value: '18',
-          label: "18F"
+          value: "18",
+          label: "18F",
         },
         {
-          value: '19',
-          label: "19F"
+          value: "19",
+          label: "19F",
         },
       ],
       columns: [
-        {title: "序号", dataIndex: "index", key: "1", width: 48},
-        {title: "姓名", dataIndex: "name", key: "2", width: 60},
-        {title: "部门", dataIndex: "department", key: "3", width: 80},
-        {title: "最后进入时间", dataIndex: "time", key: "4", width: 90},
+        { title: "序号", dataIndex: "index", key: "1", width: 48 },
+        { title: "姓名", dataIndex: "name", key: "2", width: 60 },
+        { title: "部门", dataIndex: "department", key: "3", width: 80 },
+        { title: "最后进入时间", dataIndex: "time", key: "4", width: 90 },
       ],
       listData: listData,
       coreData: [
@@ -121,36 +142,33 @@ export default {
   },
   methods: {
     init() {
-      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000)
-    },
-    reset() {
-
+      this.$store.loadingStore().loadingWithApi(this.getCoreData(), 2000);
     },
+    reset() {},
     search() {
       this.$util.asyncPromise(
-          this.getCoreData(),
-          this.$refs.WorkPrintChart.getData(),
-          this.$refs.WorkPrintTrend.getData(),
-      )
+        this.getCoreData(),
+        this.$refs.WorkPrintChart.getData(),
+        this.$refs.WorkPrintTrend.getData()
+      );
     },
     getCoreData() {
-      return apiWorkPrint.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
-      })
-    }
+      return apiWorkPrint.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>
 
-
 <style lang="less" scoped>
 .left {
   margin-right: 6px;
@@ -162,5 +180,4 @@ export default {
   margin-left: 6px;
   padding-bottom: 15px;
 }
-
-</style>
+</style>