diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index b669b3a..3c1c0a7 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -502,9 +502,10 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          debugger
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index b669b3a..3c1c0a7 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -502,9 +502,10 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          debugger
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 39b03dc..be5ad57 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -3,26 +3,26 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <!--<el-row>-->
-          <el-form-item prop="resourceName">
-            <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item">-->
-          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-          <!--<el-option-->
-          <!--v-for="item in doorList"-->
-          <!--:key="item.id"-->
-          <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
+        <el-form-item prop="resourceName">
+          <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
+        </el-form-item>
         <el-form-item>
-        <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
-        </el-select>
-      </el-form-item>
+          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+        </el-form-item>
+        <!--<el-form-item class="selectForm-container-item">-->
+        <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in doorList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.doorName"-->
+        <!--:value="item.doorCode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
             <el-option
@@ -75,7 +75,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index b669b3a..3c1c0a7 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -502,9 +502,10 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          debugger
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 39b03dc..be5ad57 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -3,26 +3,26 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <!--<el-row>-->
-          <el-form-item prop="resourceName">
-            <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item">-->
-          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-          <!--<el-option-->
-          <!--v-for="item in doorList"-->
-          <!--:key="item.id"-->
-          <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
+        <el-form-item prop="resourceName">
+          <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
+        </el-form-item>
         <el-form-item>
-        <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
-        </el-select>
-      </el-form-item>
+          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+        </el-form-item>
+        <!--<el-form-item class="selectForm-container-item">-->
+        <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in doorList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.doorName"-->
+        <!--:value="item.doorCode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
             <el-option
@@ -75,7 +75,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index aefd005..033712f 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -56,7 +56,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index b669b3a..3c1c0a7 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -502,9 +502,10 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          debugger
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 39b03dc..be5ad57 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -3,26 +3,26 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <!--<el-row>-->
-          <el-form-item prop="resourceName">
-            <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item">-->
-          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-          <!--<el-option-->
-          <!--v-for="item in doorList"-->
-          <!--:key="item.id"-->
-          <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
+        <el-form-item prop="resourceName">
+          <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
+        </el-form-item>
         <el-form-item>
-        <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
-        </el-select>
-      </el-form-item>
+          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+        </el-form-item>
+        <!--<el-form-item class="selectForm-container-item">-->
+        <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in doorList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.doorName"-->
+        <!--:value="item.doorCode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
             <el-option
@@ -75,7 +75,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index aefd005..033712f 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -56,7 +56,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 99afceb..d452eb0 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -53,7 +53,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index b669b3a..3c1c0a7 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -502,9 +502,10 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          debugger
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 39b03dc..be5ad57 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -3,26 +3,26 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <!--<el-row>-->
-          <el-form-item prop="resourceName">
-            <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item">-->
-          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-          <!--<el-option-->
-          <!--v-for="item in doorList"-->
-          <!--:key="item.id"-->
-          <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
+        <el-form-item prop="resourceName">
+          <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
+        </el-form-item>
         <el-form-item>
-        <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
-        </el-select>
-      </el-form-item>
+          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+        </el-form-item>
+        <!--<el-form-item class="selectForm-container-item">-->
+        <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in doorList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.doorName"-->
+        <!--:value="item.doorCode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
             <el-option
@@ -75,7 +75,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index aefd005..033712f 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -56,7 +56,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 99afceb..d452eb0 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -53,7 +53,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index ef8cde3..a905f23 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :settings="chartSettings"/>
+  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
 </template>
 
 <script>
@@ -15,25 +15,34 @@
   },
   data() {
     this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-        // label: { show: true, position: 'right' }
-      }
+      // series: {
+      //   label: {
+      //     normarl: { show: true, position: 'outside' }
+      //   }
+      //   // label: { show: true, position: 'right' }
+      // }
     }
     this.legend = {
       bottom: '10px'
     }
+    this.tooltip = {
+      show: true
+    }
     this.chartSettings = {
       limitShowNum: 5,
-      labelMap: {
-        'deptName': '单位/部门',
-        'num': '记录数'
-      },
-      dimension: ['deptName'],
-      metrics: ['num']
+      label: {
+        normal: {
+          show: true
+        }
+      }
+      // labelMap: {
+      //   'deptName': '单位/部门',
+      //   'num': '记录数'
+      // },
+      // dimension: ['deptName'],
+      // metrics: ['num']
     }
     return {
-      rawData: '',
       chartData: {
         columns: ['deptName', 'num'],
         rows: []
@@ -42,9 +51,6 @@
   },
   watch: {
     list(val) {
-      for (var i = 0; i < val.length; i++) {
-        val[i].num = parseInt(val[i].num)
-      }
       this.chartData.rows = val
     }
   }

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index b669b3a..3c1c0a7 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -502,9 +502,10 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          debugger
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 39b03dc..be5ad57 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -3,26 +3,26 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <!--<el-row>-->
-          <el-form-item prop="resourceName">
-            <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item">-->
-          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-          <!--<el-option-->
-          <!--v-for="item in doorList"-->
-          <!--:key="item.id"-->
-          <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
+        <el-form-item prop="resourceName">
+          <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
+        </el-form-item>
         <el-form-item>
-        <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
-        </el-select>
-      </el-form-item>
+          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+        </el-form-item>
+        <!--<el-form-item class="selectForm-container-item">-->
+        <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in doorList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.doorName"-->
+        <!--:value="item.doorCode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
             <el-option
@@ -75,7 +75,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index aefd005..033712f 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -56,7 +56,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 99afceb..d452eb0 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -53,7 +53,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index ef8cde3..a905f23 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :settings="chartSettings"/>
+  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
 </template>
 
 <script>
@@ -15,25 +15,34 @@
   },
   data() {
     this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-        // label: { show: true, position: 'right' }
-      }
+      // series: {
+      //   label: {
+      //     normarl: { show: true, position: 'outside' }
+      //   }
+      //   // label: { show: true, position: 'right' }
+      // }
     }
     this.legend = {
       bottom: '10px'
     }
+    this.tooltip = {
+      show: true
+    }
     this.chartSettings = {
       limitShowNum: 5,
-      labelMap: {
-        'deptName': '单位/部门',
-        'num': '记录数'
-      },
-      dimension: ['deptName'],
-      metrics: ['num']
+      label: {
+        normal: {
+          show: true
+        }
+      }
+      // labelMap: {
+      //   'deptName': '单位/部门',
+      //   'num': '记录数'
+      // },
+      // dimension: ['deptName'],
+      // metrics: ['num']
     }
     return {
-      rawData: '',
       chartData: {
         columns: ['deptName', 'num'],
         rows: []
@@ -42,9 +51,6 @@
   },
   watch: {
     list(val) {
-      for (var i = 0; i < val.length; i++) {
-        val[i].num = parseInt(val[i].num)
-      }
       this.chartData.rows = val
     }
   }
diff --git a/src/views/statistics/statistics.vue b/src/views/statistics/statistics.vue
index d37b8cd..e63408c 100644
--- a/src/views/statistics/statistics.vue
+++ b/src/views/statistics/statistics.vue
@@ -190,6 +190,7 @@
     },
     // 获取部门统计结果
     fetchDeptStatistic() {
+      debugger
       const query1 = {
         doorCode: this.listQuery.doorCode, // 门禁编号
         beginTime: this.listQuery.beginTime, // 开始时间
@@ -198,8 +199,11 @@
       }
       this.loading1 = true
       getStatisticByDept(query1).then(response => {
-        console.log('dept', response.data)
-        this.chartList = response.data
+        var data = response.data
+        for (var i = 0; i < data.length; i++) {
+          data[i].num = parseInt(data[i].num)
+        }
+        this.chartList = data
         this.loading1 = false
       })
     },

diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 563610f..7ce5362 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -21,9 +21,10 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index e2a4d11..6b71b5a 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -18,8 +18,9 @@
       <el-table v-loading="listLoading" :data="list" size="small" max-height="200" class="table" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"/>
         <el-table-column align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -147,6 +148,14 @@
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 25b9526..a168bb9 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -26,9 +26,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -216,6 +217,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index ddda124..1ce508c 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -23,9 +23,10 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
+            <span v-else-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showStrategyDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
@@ -206,6 +207,14 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 身份证号加密
+    encrypIdCardNo(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
     }
   }
 }
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index 1ad0949..fd95101 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -25,9 +25,9 @@
       <!--一层-->
       <el-tab-pane label="一层" name="second" class="tab-pane">
         <div :style="tab2Img" class="y_bj">
-          <div style="float:left;">
+          <div style="float:left">
             <div class="tip-div tip2-l-loc">
-              <el-row class="tip-text">当日测温人数：{{ tab2.left.temp }}</el-row>
+              <el-row class="tip-text">当日通行人数：{{ tab2.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab2.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab2.left.abnormal }}</el-row>
             </div>
@@ -129,7 +129,7 @@
       },
       tab2: {
         left: {
-          temp: '0',
+          count: '0',
           normal: '0',
           abnormal: '0'
         },
@@ -203,7 +203,7 @@
         startTime: startTime1,
         endTime: endTime1
       }
-      // 获取当日数据
+      // 获取七日数据
       countbyLocation(listQuery1).then(response => {
         var data = response.data
         // 四层
@@ -238,40 +238,33 @@
   }
   .tip-div {
     border: 1pt solid lime;
-    z-index: 9999;
     position: relative;
     background-color: #304156;
     padding: 10px;
-    /*float:left;*/
-    /*clear:both;*/
-    display: inline-block;
     width: 135px;
   }
-  .tip1-l-loc { margin-top: 155%; margin-left: 60%; }
-  .tip1-r-loc { margin-top: -5%; margin-left: 185%; }
-  .tip2-l-loc { margin-top: 155%; margin-left: 255%; }
-  .tip2-r-loc { margin-top: -3%; margin-left: 315%; }
-  .tip3-l-loc { margin-top: -3%; margin-left: 67%; }
-  .tip3-r-loc { margin-top: -3%; margin-left: 310%; }
-  .tip4-loc { margin-top: 150%; margin-left: 402%; }
+  .tip1-l-loc { margin-top: 235px; margin-left: 90px; }
+  .tip1-r-loc { margin-left: 205px; }
+  .tip2-l-loc { margin-top: 238px; margin-left: 385px; }
+  .tip2-r-loc { margin-left: 315px; }
+  .tip3-l-loc { margin-left: 98px; }
+  .tip3-r-loc { margin-left: 387px; }
+  .tip4-loc { margin-top: 230px; margin-left: 607px; }
   .point {
     width: 12px;
     height: 12px;
     background-color: lime;
     border-radius: 50%;
-    z-index:9999;
     position: relative;
-    display: inline-block;
-    /*float:left;*/
-    /*clear:both;*/
+    /*display: inline-block;*/
   }
-  .point-tab1-l-loc { margin-left: 16%;}
-  .point-tab1-r-loc { margin-top: 120%; margin-left: 176%; }
-  .point-tab2-l-loc { margin-left: 340%; }
-  .point-tab2-r-loc { margin-top: 70%; margin-left: 309%; }
-  .point-tab3-l-loc { margin-top: 182%; margin-left: 33%; }
-  .point-tab3-r-loc { margin-top: 180%; margin-left: 303%; }
-  .point-tab4-loc { margin-left: 488%; }
+  .point-tab1-l-loc { margin-left: 82px;}
+  .point-tab1-r-loc { margin-top: 182px; margin-left: 196px; }
+  .point-tab2-l-loc { margin-left: 516px; }
+  .point-tab2-r-loc { margin-top: 70%; margin-left: 300%; }
+  .point-tab3-l-loc { margin-top: 276px; margin-left: 90px; }
+  .point-tab3-r-loc { margin-top: 270px; margin-left: 378px; }
+  .point-tab4-loc { margin-left: 738px; }
   /* 设置动画前颜色 */
   .point-flicker:after {
     background-color: chartreuse;
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 74923e5..ad0d1d2 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -80,11 +80,17 @@
         endTime: endTime
       }
       peopleCountByDept(listQuery).then(response => {
-        const data = response.data
-        // const data = [
+        var data = response.data
+        // data = [
         //   { 'deptId': 'ww9', 'deptName': 'ww', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww2', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww3', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww11', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww12', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww13', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww21', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
+        //   { 'deptId': 'ww9', 'deptName': 'ww33', 'count': '27' },
         //   { 'deptId': 'ww9', 'deptName': 'ww4', 'count': '28' }
         // ]
         if (data.length !== 0) {
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 8d02422..5152ca1 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -76,7 +76,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 8875f5a..019d103 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -49,7 +49,7 @@
       xAxis: {
         axisLabel: {
           interval: 0,
-          rotate: 45 // 代表逆时针旋转45度
+          rotate: 25 // 代表逆时针旋转45度
         }
       },
       yAxis: {
@@ -140,7 +140,7 @@
           data0['temp3'] = 0
           data0['temp4'] = 0
           data.push(data0)
-          this.chartExtends.yAxis.max = 10
+          // this.chartExtends.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index a53b5a5..35e9ed7 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -79,7 +79,7 @@
           }
         }
         if (!hasData) {
-          this.chartExtend.yAxis.max = 10
+          // this.chartExtend.yAxis.max = 10
         }
         this.chartData.rows = data
       })
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index a931668..63b45bf 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -107,8 +107,8 @@
     },
     // 保存数据
     saveData: function() {
-      if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){
-        this.$message.warning("生效时间必须小于失效时间")
+      if (this.doorForm.openStatus !== '2' && this.doorForm.beginDateTime >= this.doorForm.endDateTime) {
+        this.$message.warning('生效时间必须小于失效时间')
         return
       }
       this.updateData()
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 07cd00e..dd7ab9b 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -462,9 +462,9 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index b669b3a..3c1c0a7 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -502,9 +502,10 @@
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          _this.personForm.sex = parseInt(data.Sex)
+          debugger
+          _this.personForm.sex = data.Sex
           var birth = data.Birthday
-          _this.personForm.birthday = birth.substring(0, 3) + '-' + birth.substring(4, 5) + '-' + birth.substring(6, 7)
+          _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
           _this.photo = data.Photo
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 39b03dc..be5ad57 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -3,26 +3,26 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <!--<el-row>-->
-          <el-form-item prop="resourceName">
-            <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item">-->
-          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-          <!--<el-option-->
-          <!--v-for="item in doorList"-->
-          <!--:key="item.id"-->
-          <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
+        <el-form-item prop="resourceName">
+          <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
+        </el-form-item>
         <el-form-item>
-        <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
-        </el-select>
-      </el-form-item>
+          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+        </el-form-item>
+        <!--<el-form-item class="selectForm-container-item">-->
+        <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in doorList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.doorName"-->
+        <!--:value="item.doorCode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
             <el-option
@@ -75,7 +75,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index aefd005..033712f 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -56,7 +56,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 99afceb..d452eb0 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -53,7 +53,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
           <template slot-scope="scope">
             <span v-if="column.value === 'idCard'">{{ encrypIdCardNo(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index ef8cde3..a905f23 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :settings="chartSettings"/>
+  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
 </template>
 
 <script>
@@ -15,25 +15,34 @@
   },
   data() {
     this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-        // label: { show: true, position: 'right' }
-      }
+      // series: {
+      //   label: {
+      //     normarl: { show: true, position: 'outside' }
+      //   }
+      //   // label: { show: true, position: 'right' }
+      // }
     }
     this.legend = {
       bottom: '10px'
     }
+    this.tooltip = {
+      show: true
+    }
     this.chartSettings = {
       limitShowNum: 5,
-      labelMap: {
-        'deptName': '单位/部门',
-        'num': '记录数'
-      },
-      dimension: ['deptName'],
-      metrics: ['num']
+      label: {
+        normal: {
+          show: true
+        }
+      }
+      // labelMap: {
+      //   'deptName': '单位/部门',
+      //   'num': '记录数'
+      // },
+      // dimension: ['deptName'],
+      // metrics: ['num']
     }
     return {
-      rawData: '',
       chartData: {
         columns: ['deptName', 'num'],
         rows: []
@@ -42,9 +51,6 @@
   },
   watch: {
     list(val) {
-      for (var i = 0; i < val.length; i++) {
-        val[i].num = parseInt(val[i].num)
-      }
       this.chartData.rows = val
     }
   }
diff --git a/src/views/statistics/statistics.vue b/src/views/statistics/statistics.vue
index d37b8cd..e63408c 100644
--- a/src/views/statistics/statistics.vue
+++ b/src/views/statistics/statistics.vue
@@ -190,6 +190,7 @@
     },
     // 获取部门统计结果
     fetchDeptStatistic() {
+      debugger
       const query1 = {
         doorCode: this.listQuery.doorCode, // 门禁编号
         beginTime: this.listQuery.beginTime, // 开始时间
@@ -198,8 +199,11 @@
       }
       this.loading1 = true
       getStatisticByDept(query1).then(response => {
-        console.log('dept', response.data)
-        this.chartList = response.data
+        var data = response.data
+        for (var i = 0; i < data.length; i++) {
+          data[i].num = parseInt(data[i].num)
+        }
+        this.chartList = data
         this.loading1 = false
       })
     },
diff --git a/src/views/statistics/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
index 442f53b..2c48fe0 100644
--- a/src/views/statistics/statisticsChart.vue
+++ b/src/views/statistics/statisticsChart.vue
@@ -40,33 +40,33 @@
     initChart() {
       this.chart = echarts.init(this.$refs.chart)
       this.chart.setOption({
-        tooltip: {
-          show: true
-        },
-        color: [
-          '#19d4ae', '#5ab1ef', '#fa6e86',
-          '#ffb980', '#0067a6', '#c4b4e4',
-          '#d87a80', '#9cbbff', '#d9d0c7',
-          '#87a997', '#d49ea2', '#5b4947',
-          '#7ba3a8'
-        ],
-        legend: {
-          orient: 'vertical',
-          right: 0,
-          data: this.pieData.map(item => item.name)
-        },
-        series: [{
-          name: '进出记录',
-          type: 'pie',
-          data: this.pieData,
-          label: {
-            show: true,
-            formatter: '{b}记录数:{c}条'
-          },
-          tooltip: {
-            formatter: '{b}<br/>记录数: {d}%,{c}条'
-          }
-        }]
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
       })
       this.chart.resize()
     }