diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/router/index.js b/src/router/index.js
index 733af54..57555ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@
     children: [{
       path: 'dashboard',
       name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
+      component: () => import('@/views/dashboard/indexPro'),
       meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
     }]
   }

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/router/index.js b/src/router/index.js
index 733af54..57555ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@
     children: [{
       path: 'dashboard',
       name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
+      component: () => import('@/views/dashboard/indexPro'),
       meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
     }]
   }
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index c474ee1..70c4173 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -64,20 +64,32 @@
           </el-row>
           <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" justify="center">
             <el-col :span="12">
-              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
-                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
-                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="开始日期" prop="breastfeedBeginDate">
                 <el-date-picker
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="默认截止日期为一年后"/>
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="截止日期" prop="breastfeedEndDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedEndDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="截止日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" >
+            <el-col :span="12">
+              <el-form-item label="哺乳假用于" prop="breastfeedType" label-width="100px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -146,6 +158,7 @@
         endDate: '',
         breastfeedType: '',
         breastfeedBeginDate: '',
+        breastfeedEndDate: '',
         other: '',
         onBusiness: ''
       }, // 表单
@@ -155,6 +168,7 @@
         remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
         other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
         endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
@@ -234,6 +248,7 @@
       this.remarksForm.beginDate = this.curDate
       this.remarksForm.endDate = this.curDate
       this.remarksForm.breastfeedBeginDate = this.curDate
+      this.remarksForm.breastfeedEndDate = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -262,8 +277,17 @@
           this.saveBtnDisabeld = true
           // 如果备注为哺乳假，则需要特别处理
           if (this.remarksForm.remarks === '请假-哺乳假') {
+            var startDates = this.remarksForm.breastfeedBeginDate.split('-')
+            var endDates = this.remarksForm.breastfeedEndDate.split('-')
+            var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2])
+            var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2])
+            if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) {
+              this.$message.error('哺乳假时间太长，请选择合理的起止日期')
+              return
+            }// 把相差的毫秒数
             this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
             this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+            this.remarksForm.endDate = this.remarksForm.breastfeedEndDate
           }
           // 如果备注了其他原因
           if (this.remarksForm.remarks === '其他原因') {

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/router/index.js b/src/router/index.js
index 733af54..57555ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@
     children: [{
       path: 'dashboard',
       name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
+      component: () => import('@/views/dashboard/indexPro'),
       meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
     }]
   }
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index c474ee1..70c4173 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -64,20 +64,32 @@
           </el-row>
           <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" justify="center">
             <el-col :span="12">
-              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
-                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
-                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="开始日期" prop="breastfeedBeginDate">
                 <el-date-picker
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="默认截止日期为一年后"/>
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="截止日期" prop="breastfeedEndDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedEndDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="截止日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" >
+            <el-col :span="12">
+              <el-form-item label="哺乳假用于" prop="breastfeedType" label-width="100px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -146,6 +158,7 @@
         endDate: '',
         breastfeedType: '',
         breastfeedBeginDate: '',
+        breastfeedEndDate: '',
         other: '',
         onBusiness: ''
       }, // 表单
@@ -155,6 +168,7 @@
         remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
         other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
         endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
@@ -234,6 +248,7 @@
       this.remarksForm.beginDate = this.curDate
       this.remarksForm.endDate = this.curDate
       this.remarksForm.breastfeedBeginDate = this.curDate
+      this.remarksForm.breastfeedEndDate = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -262,8 +277,17 @@
           this.saveBtnDisabeld = true
           // 如果备注为哺乳假，则需要特别处理
           if (this.remarksForm.remarks === '请假-哺乳假') {
+            var startDates = this.remarksForm.breastfeedBeginDate.split('-')
+            var endDates = this.remarksForm.breastfeedEndDate.split('-')
+            var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2])
+            var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2])
+            if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) {
+              this.$message.error('哺乳假时间太长，请选择合理的起止日期')
+              return
+            }// 把相差的毫秒数
             this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
             this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+            this.remarksForm.endDate = this.remarksForm.breastfeedEndDate
           }
           // 如果备注了其他原因
           if (this.remarksForm.remarks === '其他原因') {
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index fd95101..8e3bd3f 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -6,7 +6,7 @@
         <div :style="tab1Img" class="y_bj">
           <div style="float:left;">
             <div class="tip-div tip1-l-loc">
-              <el-row class="tip-text">当日通行人数：{{ tab1.left.count }}</el-row>
+              <el-row class="tip-text">当日进入人次：{{ tab1.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab1.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab1.left.abnormal }}</el-row>
             </div>
@@ -178,7 +178,7 @@
         this.tab1.right.temp = data[0].temp
         this.tab1.right.normal = data[0].normal
         this.tab1.right.abnormal = data[0].abnormal
-        this.tab1.left.count = data[1].count
+        this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal)
         this.tab1.left.normal = data[1].normal
         this.tab1.left.abnormal = data[1].abnormal
         // 一层

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/router/index.js b/src/router/index.js
index 733af54..57555ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@
     children: [{
       path: 'dashboard',
       name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
+      component: () => import('@/views/dashboard/indexPro'),
       meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
     }]
   }
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index c474ee1..70c4173 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -64,20 +64,32 @@
           </el-row>
           <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" justify="center">
             <el-col :span="12">
-              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
-                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
-                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="开始日期" prop="breastfeedBeginDate">
                 <el-date-picker
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="默认截止日期为一年后"/>
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="截止日期" prop="breastfeedEndDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedEndDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="截止日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" >
+            <el-col :span="12">
+              <el-form-item label="哺乳假用于" prop="breastfeedType" label-width="100px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -146,6 +158,7 @@
         endDate: '',
         breastfeedType: '',
         breastfeedBeginDate: '',
+        breastfeedEndDate: '',
         other: '',
         onBusiness: ''
       }, // 表单
@@ -155,6 +168,7 @@
         remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
         other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
         endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
@@ -234,6 +248,7 @@
       this.remarksForm.beginDate = this.curDate
       this.remarksForm.endDate = this.curDate
       this.remarksForm.breastfeedBeginDate = this.curDate
+      this.remarksForm.breastfeedEndDate = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -262,8 +277,17 @@
           this.saveBtnDisabeld = true
           // 如果备注为哺乳假，则需要特别处理
           if (this.remarksForm.remarks === '请假-哺乳假') {
+            var startDates = this.remarksForm.breastfeedBeginDate.split('-')
+            var endDates = this.remarksForm.breastfeedEndDate.split('-')
+            var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2])
+            var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2])
+            if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) {
+              this.$message.error('哺乳假时间太长，请选择合理的起止日期')
+              return
+            }// 把相差的毫秒数
             this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
             this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+            this.remarksForm.endDate = this.remarksForm.breastfeedEndDate
           }
           // 如果备注了其他原因
           if (this.remarksForm.remarks === '其他原因') {
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index fd95101..8e3bd3f 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -6,7 +6,7 @@
         <div :style="tab1Img" class="y_bj">
           <div style="float:left;">
             <div class="tip-div tip1-l-loc">
-              <el-row class="tip-text">当日通行人数：{{ tab1.left.count }}</el-row>
+              <el-row class="tip-text">当日进入人次：{{ tab1.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab1.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab1.left.abnormal }}</el-row>
             </div>
@@ -178,7 +178,7 @@
         this.tab1.right.temp = data[0].temp
         this.tab1.right.normal = data[0].normal
         this.tab1.right.abnormal = data[0].abnormal
-        this.tab1.left.count = data[1].count
+        this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal)
         this.tab1.left.normal = data[1].normal
         this.tab1.left.abnormal = data[1].abnormal
         // 一层
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 488197e..f0bc3c1 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -78,6 +78,9 @@
       }
       printCountByDept(listQuery).then(response => {
         const data = response.data
+        this.legends.show = true
+        this.tooltip.show = true
+        this.chartSettings.label.normal.show = true
         if (data.length !== 0) {
           if (data.length === 1 && data[0].count === 0) {
             this.legends.show = false

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/router/index.js b/src/router/index.js
index 733af54..57555ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@
     children: [{
       path: 'dashboard',
       name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
+      component: () => import('@/views/dashboard/indexPro'),
       meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
     }]
   }
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index c474ee1..70c4173 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -64,20 +64,32 @@
           </el-row>
           <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" justify="center">
             <el-col :span="12">
-              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
-                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
-                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="开始日期" prop="breastfeedBeginDate">
                 <el-date-picker
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="默认截止日期为一年后"/>
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="截止日期" prop="breastfeedEndDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedEndDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="截止日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" >
+            <el-col :span="12">
+              <el-form-item label="哺乳假用于" prop="breastfeedType" label-width="100px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -146,6 +158,7 @@
         endDate: '',
         breastfeedType: '',
         breastfeedBeginDate: '',
+        breastfeedEndDate: '',
         other: '',
         onBusiness: ''
       }, // 表单
@@ -155,6 +168,7 @@
         remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
         other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
         endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
@@ -234,6 +248,7 @@
       this.remarksForm.beginDate = this.curDate
       this.remarksForm.endDate = this.curDate
       this.remarksForm.breastfeedBeginDate = this.curDate
+      this.remarksForm.breastfeedEndDate = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -262,8 +277,17 @@
           this.saveBtnDisabeld = true
           // 如果备注为哺乳假，则需要特别处理
           if (this.remarksForm.remarks === '请假-哺乳假') {
+            var startDates = this.remarksForm.breastfeedBeginDate.split('-')
+            var endDates = this.remarksForm.breastfeedEndDate.split('-')
+            var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2])
+            var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2])
+            if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) {
+              this.$message.error('哺乳假时间太长，请选择合理的起止日期')
+              return
+            }// 把相差的毫秒数
             this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
             this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+            this.remarksForm.endDate = this.remarksForm.breastfeedEndDate
           }
           // 如果备注了其他原因
           if (this.remarksForm.remarks === '其他原因') {
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index fd95101..8e3bd3f 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -6,7 +6,7 @@
         <div :style="tab1Img" class="y_bj">
           <div style="float:left;">
             <div class="tip-div tip1-l-loc">
-              <el-row class="tip-text">当日通行人数：{{ tab1.left.count }}</el-row>
+              <el-row class="tip-text">当日进入人次：{{ tab1.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab1.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab1.left.abnormal }}</el-row>
             </div>
@@ -178,7 +178,7 @@
         this.tab1.right.temp = data[0].temp
         this.tab1.right.normal = data[0].normal
         this.tab1.right.abnormal = data[0].abnormal
-        this.tab1.left.count = data[1].count
+        this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal)
         this.tab1.left.normal = data[1].normal
         this.tab1.left.abnormal = data[1].abnormal
         // 一层
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 488197e..f0bc3c1 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -78,6 +78,9 @@
       }
       printCountByDept(listQuery).then(response => {
         const data = response.data
+        this.legends.show = true
+        this.tooltip.show = true
+        this.chartSettings.label.normal.show = true
         if (data.length !== 0) {
           if (data.length === 1 && data[0].count === 0) {
             this.legends.show = false
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index dd7ab9b..937d09a 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -160,7 +160,7 @@
             </el-upload>
           </el-row>
           <el-row>
-            <el-button type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
+            <el-button :disabled="readIDCardDisabled" type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
           </el-row>
         </el-col>
       </el-row>
@@ -272,6 +272,7 @@
       }
     }
     return {
+      readIDCardDisabled: false,
       formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
       attendanceEnable: attendanceEnable,
       dialogFormVisible: false, // 对话框是否显示
@@ -437,6 +438,7 @@
       })
     },
     readIDCard() {
+      this.readIDCardDisabled = true
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
@@ -448,9 +450,11 @@
         this.ws.onclose = function() {
           _this.$message.info('与ICS连接断开')
           _this.$root.ws = null
+          _this.readIDCardDisabled = false
         }
         this.ws.onerror = function() {
           _this.$message.error('与ICS通信发生错误')
+          _this.readIDCardDisabled = false
         }
         _this.$root.ws = this.ws
       } else {
@@ -458,7 +462,9 @@
       }
       this.ws.onmessage = function(receiveMsg) {
         var data = JSON.parse(receiveMsg.data)
-        if (data !== '') {
+        if (data.message === 'fail') {
+          _this.$message.warning('读卡失败')
+        } else {
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
@@ -476,9 +482,8 @@
           }
           _this.personForm.ext.certificationUnit = data.Authority
           _this.personForm.ext.address = data.Address
-        } else {
-          _this.$message.warning('读卡失败')
         }
+        _this.readIDCardDisabled = false
       }
     },
     // readIDCard() {

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/router/index.js b/src/router/index.js
index 733af54..57555ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@
     children: [{
       path: 'dashboard',
       name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
+      component: () => import('@/views/dashboard/indexPro'),
       meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
     }]
   }
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index c474ee1..70c4173 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -64,20 +64,32 @@
           </el-row>
           <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" justify="center">
             <el-col :span="12">
-              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
-                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
-                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="开始日期" prop="breastfeedBeginDate">
                 <el-date-picker
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="默认截止日期为一年后"/>
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="截止日期" prop="breastfeedEndDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedEndDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="截止日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" >
+            <el-col :span="12">
+              <el-form-item label="哺乳假用于" prop="breastfeedType" label-width="100px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -146,6 +158,7 @@
         endDate: '',
         breastfeedType: '',
         breastfeedBeginDate: '',
+        breastfeedEndDate: '',
         other: '',
         onBusiness: ''
       }, // 表单
@@ -155,6 +168,7 @@
         remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
         other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
         endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
@@ -234,6 +248,7 @@
       this.remarksForm.beginDate = this.curDate
       this.remarksForm.endDate = this.curDate
       this.remarksForm.breastfeedBeginDate = this.curDate
+      this.remarksForm.breastfeedEndDate = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -262,8 +277,17 @@
           this.saveBtnDisabeld = true
           // 如果备注为哺乳假，则需要特别处理
           if (this.remarksForm.remarks === '请假-哺乳假') {
+            var startDates = this.remarksForm.breastfeedBeginDate.split('-')
+            var endDates = this.remarksForm.breastfeedEndDate.split('-')
+            var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2])
+            var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2])
+            if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) {
+              this.$message.error('哺乳假时间太长，请选择合理的起止日期')
+              return
+            }// 把相差的毫秒数
             this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
             this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+            this.remarksForm.endDate = this.remarksForm.breastfeedEndDate
           }
           // 如果备注了其他原因
           if (this.remarksForm.remarks === '其他原因') {
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index fd95101..8e3bd3f 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -6,7 +6,7 @@
         <div :style="tab1Img" class="y_bj">
           <div style="float:left;">
             <div class="tip-div tip1-l-loc">
-              <el-row class="tip-text">当日通行人数：{{ tab1.left.count }}</el-row>
+              <el-row class="tip-text">当日进入人次：{{ tab1.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab1.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab1.left.abnormal }}</el-row>
             </div>
@@ -178,7 +178,7 @@
         this.tab1.right.temp = data[0].temp
         this.tab1.right.normal = data[0].normal
         this.tab1.right.abnormal = data[0].abnormal
-        this.tab1.left.count = data[1].count
+        this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal)
         this.tab1.left.normal = data[1].normal
         this.tab1.left.abnormal = data[1].abnormal
         // 一层
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 488197e..f0bc3c1 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -78,6 +78,9 @@
       }
       printCountByDept(listQuery).then(response => {
         const data = response.data
+        this.legends.show = true
+        this.tooltip.show = true
+        this.chartSettings.label.normal.show = true
         if (data.length !== 0) {
           if (data.length === 1 && data[0].count === 0) {
             this.legends.show = false
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index dd7ab9b..937d09a 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -160,7 +160,7 @@
             </el-upload>
           </el-row>
           <el-row>
-            <el-button type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
+            <el-button :disabled="readIDCardDisabled" type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
           </el-row>
         </el-col>
       </el-row>
@@ -272,6 +272,7 @@
       }
     }
     return {
+      readIDCardDisabled: false,
       formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
       attendanceEnable: attendanceEnable,
       dialogFormVisible: false, // 对话框是否显示
@@ -437,6 +438,7 @@
       })
     },
     readIDCard() {
+      this.readIDCardDisabled = true
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
@@ -448,9 +450,11 @@
         this.ws.onclose = function() {
           _this.$message.info('与ICS连接断开')
           _this.$root.ws = null
+          _this.readIDCardDisabled = false
         }
         this.ws.onerror = function() {
           _this.$message.error('与ICS通信发生错误')
+          _this.readIDCardDisabled = false
         }
         _this.$root.ws = this.ws
       } else {
@@ -458,7 +462,9 @@
       }
       this.ws.onmessage = function(receiveMsg) {
         var data = JSON.parse(receiveMsg.data)
-        if (data !== '') {
+        if (data.message === 'fail') {
+          _this.$message.warning('读卡失败')
+        } else {
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
@@ -476,9 +482,8 @@
           }
           _this.personForm.ext.certificationUnit = data.Authority
           _this.personForm.ext.address = data.Address
-        } else {
-          _this.$message.warning('读卡失败')
         }
+        _this.readIDCardDisabled = false
       }
     },
     // readIDCard() {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 3c1c0a7..f5a2af9 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -161,7 +161,7 @@
               </el-upload>
             </el-row>
             <el-row>
-              <el-button type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
+              <el-button :disabled="readIDCardDisabled" type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
             </el-row>
           </el-col>
         </el-row>
@@ -291,6 +291,7 @@
       }
     }
     return {
+      readIDCardDisabled: false,
       formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
       attendanceEnable: attendanceEnable, // 读取全局变量，是否启用考勤功能配置
       dialogFormVisible: false, // 对话框是否显示
@@ -477,6 +478,7 @@
       })
     },
     readIDCard() {
+      this.readIDCardDisabled = true
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
@@ -488,21 +490,25 @@
         this.ws.onclose = function() {
           _this.$message.info('与ICS连接断开')
           _this.$root.ws = null
+          _this.readIDCardDisabled = false
         }
         this.ws.onerror = function() {
           _this.$message.error('与ICS通信发生错误')
+          _this.readIDCardDisabled = false
         }
         _this.$root.ws = this.ws
       } else {
         this.ws.send('ReadIdCard')
       }
       this.ws.onmessage = function(receiveMsg) {
+        debugger
         var data = JSON.parse(receiveMsg.data)
-        if (data !== '') {
+        if (data.message === 'fail') {
+          _this.$message.warning('读卡失败')
+        } else {
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          debugger
           _this.personForm.sex = data.Sex
           var birth = data.Birthday
           _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
@@ -510,7 +516,6 @@
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
           for (var item of _this.nationList) {
-            debugger
             if (item.name === nationName) {
               _this.personForm.nation = item.value
               break
@@ -518,9 +523,8 @@
           }
           _this.personForm.ext.certificationUnit = data.Authority
           _this.personForm.ext.address = data.Address
-        } else {
-          _this.$message.warning('读卡失败')
         }
+        _this.readIDCardDisabled = false
       }
     },
     // readIDCard() {

diff --git a/config/dev.env.js b/config/dev.env.js
index 568bd50..22aea85 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,7 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11802"'
-  // BASE_API: '"http://192.168.0.18:8095"'
-  // BASE_API: '"http://192.168.0.166:20005"'
+  // BASE_API: '"http://111.198.10.15:11802"'
+  BASE_API: '"http://127.0.0.1:8095"'
+  // BASE_API: '"http://192.168.0.166:8095"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
index f0df672..e45ec35 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -8,7 +8,7 @@
   return request({
     url: 'makeReport/make',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -27,6 +27,7 @@
   return request({
     url: 'report/list',
     method: 'get',
+    timeout: 180000,
     params
   })
 }
@@ -101,7 +102,7 @@
   return request({
     url: 'report/batchExport',
     method: 'get',
-    timeout: 120000,
+    timeout: 180000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
@@ -146,6 +147,7 @@
   return request({
     url: 'sync/syncAndGenerate',
     method: 'post',
+    timeout: 180000,
     params,
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/router/index.js b/src/router/index.js
index 733af54..57555ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@
     children: [{
       path: 'dashboard',
       name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
+      component: () => import('@/views/dashboard/indexPro'),
       meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
     }]
   }
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index c474ee1..70c4173 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -64,20 +64,32 @@
           </el-row>
           <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" justify="center">
             <el-col :span="12">
-              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
-                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
-                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="开始日期" prop="breastfeedBeginDate">
                 <el-date-picker
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="默认截止日期为一年后"/>
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="截止日期" prop="breastfeedEndDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedEndDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="截止日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" type="flex" >
+            <el-col :span="12">
+              <el-form-item label="哺乳假用于" prop="breastfeedType" label-width="100px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="必填" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -146,6 +158,7 @@
         endDate: '',
         breastfeedType: '',
         breastfeedBeginDate: '',
+        breastfeedEndDate: '',
         other: '',
         onBusiness: ''
       }, // 表单
@@ -155,6 +168,7 @@
         remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
         other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
         endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
@@ -234,6 +248,7 @@
       this.remarksForm.beginDate = this.curDate
       this.remarksForm.endDate = this.curDate
       this.remarksForm.breastfeedBeginDate = this.curDate
+      this.remarksForm.breastfeedEndDate = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -262,8 +277,17 @@
           this.saveBtnDisabeld = true
           // 如果备注为哺乳假，则需要特别处理
           if (this.remarksForm.remarks === '请假-哺乳假') {
+            var startDates = this.remarksForm.breastfeedBeginDate.split('-')
+            var endDates = this.remarksForm.breastfeedEndDate.split('-')
+            var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2])
+            var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2])
+            if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) {
+              this.$message.error('哺乳假时间太长，请选择合理的起止日期')
+              return
+            }// 把相差的毫秒数
             this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
             this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+            this.remarksForm.endDate = this.remarksForm.breastfeedEndDate
           }
           // 如果备注了其他原因
           if (this.remarksForm.remarks === '其他原因') {
diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue
index fd95101..8e3bd3f 100644
--- a/src/views/dashboard/components/mapPicture.vue
+++ b/src/views/dashboard/components/mapPicture.vue
@@ -6,7 +6,7 @@
         <div :style="tab1Img" class="y_bj">
           <div style="float:left;">
             <div class="tip-div tip1-l-loc">
-              <el-row class="tip-text">当日通行人数：{{ tab1.left.count }}</el-row>
+              <el-row class="tip-text">当日进入人次：{{ tab1.left.count }}</el-row>
               <el-row class="tip-text tip-text-margin">体温正常人数：{{ tab1.left.normal }}</el-row>
               <el-row class="tip-text">体温异常人数：{{ tab1.left.abnormal }}</el-row>
             </div>
@@ -178,7 +178,7 @@
         this.tab1.right.temp = data[0].temp
         this.tab1.right.normal = data[0].normal
         this.tab1.right.abnormal = data[0].abnormal
-        this.tab1.left.count = data[1].count
+        this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal)
         this.tab1.left.normal = data[1].normal
         this.tab1.left.abnormal = data[1].abnormal
         // 一层
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 488197e..f0bc3c1 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -78,6 +78,9 @@
       }
       printCountByDept(listQuery).then(response => {
         const data = response.data
+        this.legends.show = true
+        this.tooltip.show = true
+        this.chartSettings.label.normal.show = true
         if (data.length !== 0) {
           if (data.length === 1 && data[0].count === 0) {
             this.legends.show = false
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index dd7ab9b..937d09a 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -160,7 +160,7 @@
             </el-upload>
           </el-row>
           <el-row>
-            <el-button type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
+            <el-button :disabled="readIDCardDisabled" type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
           </el-row>
         </el-col>
       </el-row>
@@ -272,6 +272,7 @@
       }
     }
     return {
+      readIDCardDisabled: false,
       formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
       attendanceEnable: attendanceEnable,
       dialogFormVisible: false, // 对话框是否显示
@@ -437,6 +438,7 @@
       })
     },
     readIDCard() {
+      this.readIDCardDisabled = true
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
@@ -448,9 +450,11 @@
         this.ws.onclose = function() {
           _this.$message.info('与ICS连接断开')
           _this.$root.ws = null
+          _this.readIDCardDisabled = false
         }
         this.ws.onerror = function() {
           _this.$message.error('与ICS通信发生错误')
+          _this.readIDCardDisabled = false
         }
         _this.$root.ws = this.ws
       } else {
@@ -458,7 +462,9 @@
       }
       this.ws.onmessage = function(receiveMsg) {
         var data = JSON.parse(receiveMsg.data)
-        if (data !== '') {
+        if (data.message === 'fail') {
+          _this.$message.warning('读卡失败')
+        } else {
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
@@ -476,9 +482,8 @@
           }
           _this.personForm.ext.certificationUnit = data.Authority
           _this.personForm.ext.address = data.Address
-        } else {
-          _this.$message.warning('读卡失败')
         }
+        _this.readIDCardDisabled = false
       }
     },
     // readIDCard() {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 3c1c0a7..f5a2af9 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -161,7 +161,7 @@
               </el-upload>
             </el-row>
             <el-row>
-              <el-button type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
+              <el-button :disabled="readIDCardDisabled" type="primary" plain class="id-card-btn" @click="readIDCard">读取身份证</el-button>
             </el-row>
           </el-col>
         </el-row>
@@ -291,6 +291,7 @@
       }
     }
     return {
+      readIDCardDisabled: false,
       formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
       attendanceEnable: attendanceEnable, // 读取全局变量，是否启用考勤功能配置
       dialogFormVisible: false, // 对话框是否显示
@@ -477,6 +478,7 @@
       })
     },
     readIDCard() {
+      this.readIDCardDisabled = true
       var _this = this
       this.ws = _this.$root.ws
       if (this.ws === null) {
@@ -488,21 +490,25 @@
         this.ws.onclose = function() {
           _this.$message.info('与ICS连接断开')
           _this.$root.ws = null
+          _this.readIDCardDisabled = false
         }
         this.ws.onerror = function() {
           _this.$message.error('与ICS通信发生错误')
+          _this.readIDCardDisabled = false
         }
         _this.$root.ws = this.ws
       } else {
         this.ws.send('ReadIdCard')
       }
       this.ws.onmessage = function(receiveMsg) {
+        debugger
         var data = JSON.parse(receiveMsg.data)
-        if (data !== '') {
+        if (data.message === 'fail') {
+          _this.$message.warning('读卡失败')
+        } else {
           _this.personForm.idCardNo = data.IdCardNo
           _this.personForm.name = data.Name
           // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' }
-          debugger
           _this.personForm.sex = data.Sex
           var birth = data.Birthday
           _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8)
@@ -510,7 +516,6 @@
           _this.personForm.nation = data.Nation
           var nationName = data.Nation
           for (var item of _this.nationList) {
-            debugger
             if (item.name === nationName) {
               _this.personForm.nation = item.value
               break
@@ -518,9 +523,8 @@
           }
           _this.personForm.ext.certificationUnit = data.Authority
           _this.personForm.ext.address = data.Address
-        } else {
-          _this.$message.warning('读卡失败')
         }
+        _this.readIDCardDisabled = false
       }
     },
     // readIDCard() {
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 77818ed..cd7e6a3 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -47,7 +47,7 @@
           </el-upload>
           <download-template v-if="attendanceEnable" ref="downloadTemplate" :filename="filename" />
           <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-          <el-button class="edit_btn" size="small" @click="updateData">人员数据下发</el-button>
+          <!--<el-button class="edit_btn" size="small" @click="updateData">人员数据下发</el-button>-->
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>