From 172a419362d86bec6fa62ce61d9830ac7c10b7d8 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 7 Jul 2022 18:30:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/wel.vue                              | 34 ++++++++++++++++++-
 src/views/ReceivingRecords/index.vue          |  4 +--
 src/views/Statistics/ReceptionStatistical.vue |  8 ++---
 src/views/building/index.vue                  |  6 ++++
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/page/wel.vue b/src/page/wel.vue
index a2dfcf6..d626583 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -541,7 +541,7 @@
       <div v-if="role != 2">
         <!-- 卡片部分 -->
         <div class="page-container grid4">
-          <div class="pagechen" @click="toDetail('/building/index', '', '楼盘管理')">
+          <div class="pagechen" @click="toDetail('/building/index', getTimes(), '楼盘管理')">
 
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
@@ -1630,6 +1630,38 @@ export default {
         }
       });
     },
+    // 获取时间段
+    getTimes() {
+      let str = ''
+      let time = new Date().getTime()
+      if (this.TimetoAhoose == 0) {
+        str = `${new Date(time).getFullYear()}-${new Date(time).getMonth()+1}-${new Date(time).getDate()}`
+      }
+      if (this.TimetoAhoose == 1) {
+        let starTime = new Date().getTime() - 24 * 60 * 60 * 1000 * 7;
+        let startDate = `${new Date(starTime).getFullYear()}-${
+          new Date(starTime).getMonth() + 1
+        }-${new Date(starTime).getDate()}`;
+        let endTime = new Date().getTime() - 24 * 60 * 60 * 1000;
+        let endDate = `${new Date(endTime).getFullYear()}-${
+          new Date(endTime).getMonth() + 1
+        }-${new Date(endTime).getDate()}`;
+         str = `${startDate},${endDate}`
+      }
+      if(this.TimetoAhoose == 2) {
+        let starTime = new Date().getTime() - 24 * 60 * 60 * 1000 * 30;
+        let startDate = `${new Date(starTime).getFullYear()}-${
+          new Date(starTime).getMonth() + 1
+        }-${new Date(starTime).getDate()}`;
+        let endTime = new Date().getTime() - 24 * 60 * 60 * 1000;
+        let endDate = `${new Date(endTime).getFullYear()}-${
+          new Date(endTime).getMonth() + 1
+        }-${new Date(endTime).getDate()}`;
+        str = `${startDate},${endDate}`
+      }
+      return str
+    },
+
     jumpto(ind) {
       let num = 24 * 3600 * 1000 * 29;
       let dang = this.getCurrentTime();
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index 6785316..4faa4ed 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -372,11 +372,11 @@
         <!-- <el-table-column prop="address" label="禁忌执行率" align="center">
         </el-table-column> -->
         <!--  scope -->
-        <!-- <el-table-column prop="taboo" label="是否违禁" align="center">
+        <el-table-column prop="taboo" label="是否违禁" align="center">
           <template slot-scope="{ row }">
             {{ row.taboo == 0 ? "否" : "是" }}
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <!-- <el-table-column prop="zfal" label="是否加精" align="center">
           <template slot-scope="{ row }">
             {{ row.zfal == 0 ? "已加精" : "未加精" }}
diff --git a/src/views/Statistics/ReceptionStatistical.vue b/src/views/Statistics/ReceptionStatistical.vue
index 589188b..2a86f17 100644
--- a/src/views/Statistics/ReceptionStatistical.vue
+++ b/src/views/Statistics/ReceptionStatistical.vue
@@ -177,14 +177,14 @@
         >
         </el-table-column>
         <el-table-column
-          prop="sumDuration"
+          prop="sumDurationMinutes"
           label="接待时长(分)"
           align="center"
           sortable
           width="120"
         >
           <template slot-scope="{ row }">
-            {{ Math.floor(row.sumDuration / 60) }}分钟
+            {{ Math.floor(row.sumDurationMinutes) }}分钟
           </template>
         </el-table-column>
         <el-table-column
@@ -273,13 +273,13 @@
           >
           </el-table-column>
           <el-table-column
-            prop="sumDuration"
+            prop="sumDurationMinutes"
             label="接待时长(分)"
             align="center"
             
           >
             <template slot-scope="{ row }">
-              {{ Math.floor(row.sumDuration / 60) }}
+              {{ Math.floor(row.sumDurationMinutes) }}
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 349268f..1ba09ce 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -726,6 +726,12 @@ export default {
       this.searchForm.startWorking = this.starTime[0];
       this.searchForm.endWorking = this.starTime[1];
     }
+    
+    if (this.$route.query.types) {
+      this.starTime = [this.$route.query.types.split(",")[0], this.$route.query.types.split(",")[1]];
+      this.searchForm.startWorking = this.starTime[0];
+      this.searchForm.endWorking = this.starTime[1];
+    }
     this.orgType = localStorage.getItem("orgType");
     // 获取公司列表数据
     this.getOrgList();