diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;
diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue
index d3282a2..53f737b 100644
--- a/src/views/coorBusiness/completed/index.vue
+++ b/src/views/coorBusiness/completed/index.vue
@@ -6,6 +6,7 @@
       :case-list="caseList"
       :total="total"
       :list-query="listQuery"
+      :table-columns="tableColumns"
       @changeQuery="changeQuery"
       @addDetail="addDetail"/>
   </div>

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;
diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue
index d3282a2..53f737b 100644
--- a/src/views/coorBusiness/completed/index.vue
+++ b/src/views/coorBusiness/completed/index.vue
@@ -6,6 +6,7 @@
       :case-list="caseList"
       :total="total"
       :list-query="listQuery"
+      :table-columns="tableColumns"
       @changeQuery="changeQuery"
       @addDetail="addDetail"/>
   </div>
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index 9e37773..b0d696f 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,6 +44,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import DeptAccessList from './deptAccessList'
 import DeptAccessChart from './deptAccessChart'
 import AccessRule from './accessRule'
@@ -58,9 +56,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -84,14 +110,23 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
-
+    this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD')
+    this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD')
+    this.timeRange = [this.query.beginTime, this.query.endTime]
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -99,6 +134,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;
diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue
index d3282a2..53f737b 100644
--- a/src/views/coorBusiness/completed/index.vue
+++ b/src/views/coorBusiness/completed/index.vue
@@ -6,6 +6,7 @@
       :case-list="caseList"
       :total="total"
       :list-query="listQuery"
+      :table-columns="tableColumns"
       @changeQuery="changeQuery"
       @addDetail="addDetail"/>
   </div>
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index 9e37773..b0d696f 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,6 +44,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import DeptAccessList from './deptAccessList'
 import DeptAccessChart from './deptAccessChart'
 import AccessRule from './accessRule'
@@ -58,9 +56,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -84,14 +110,23 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
-
+    this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD')
+    this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD')
+    this.timeRange = [this.query.beginTime, this.query.endTime]
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -99,6 +134,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index 5098f15..d385f11 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -25,20 +25,20 @@
       radio: 'sumary',
       radioList: [
         {
-          text: '应处置数',
+          text: '总应处置数',
           value: 'totalShouldProcess'
         },
         {
-          text: '处置数',
-          value: 'process'
+          text: '本期应处置数',
+          value: 'CurrentCheckNum'
         },
         {
           text: '返工数',
-          value: 'returnJob'
+          value: 'redoNum'
         },
         {
           text: '综合指标',
-          value: 'sumary'
+          value: 'score'
         }
       ],
       chart: null,

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;
diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue
index d3282a2..53f737b 100644
--- a/src/views/coorBusiness/completed/index.vue
+++ b/src/views/coorBusiness/completed/index.vue
@@ -6,6 +6,7 @@
       :case-list="caseList"
       :total="total"
       :list-query="listQuery"
+      :table-columns="tableColumns"
       @changeQuery="changeQuery"
       @addDetail="addDetail"/>
   </div>
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index 9e37773..b0d696f 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,6 +44,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import DeptAccessList from './deptAccessList'
 import DeptAccessChart from './deptAccessChart'
 import AccessRule from './accessRule'
@@ -58,9 +56,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -84,14 +110,23 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
-
+    this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD')
+    this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD')
+    this.timeRange = [this.query.beginTime, this.query.endTime]
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -99,6 +134,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index 5098f15..d385f11 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -25,20 +25,20 @@
       radio: 'sumary',
       radioList: [
         {
-          text: '应处置数',
+          text: '总应处置数',
           value: 'totalShouldProcess'
         },
         {
-          text: '处置数',
-          value: 'process'
+          text: '本期应处置数',
+          value: 'CurrentCheckNum'
         },
         {
           text: '返工数',
-          value: 'returnJob'
+          value: 'redoNum'
         },
         {
           text: '综合指标',
-          value: 'sumary'
+          value: 'score'
         }
       ],
       chart: null,
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index ebddd79..4122976 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -4,8 +4,8 @@
       <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
     </el-row>
     <el-table ref="table" :data="list" class="table" border>
-      <el-table-column align="center" type="index" />
-      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" align="center">
+      <el-table-column align="center" type="index" width="30"/>
+      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" :width="column.width" align="center">
         <template slot-scope="scope">
           <span v-if="column.type!='button'">{{ scope.row[column.value] }}</span>
           <el-button v-if="column.type=='button'" type="text" @click="showCaseList(scope.row,column.value)">{{ scope.row[column.value] }}</el-button>
@@ -36,13 +36,111 @@
         },
         {
           text: '上期结转数',
-          value: 'lastCarryOver',
+          value: 'lastCheckNum',
+          width: 60,
           type: 'button'
         },
         {
           text: '本期应处置数',
-          value: 'shouldProcess',
+          value: 'CurrentCheckNum',
+          width: 60,
           type: 'button'
+        },
+        {
+          text: '总应处置数',
+          value: 'totalCheckNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量比例',
+          value: 'workRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量调节得分',
+          value: 'workGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '处置数',
+          value: 'checkedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期处置数',
+          value: 'delayCheckedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期未处置数',
+          value: 'delayUncheckNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期总数',
+          value: 'delayTotalNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置率',
+          value: 'delayUnCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期率',
+          value: 'delayCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置扣分',
+          value: 'delayUncheckGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期扣分',
+          value: 'delayGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工率',
+          value: 'redoRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工数',
+          value: 'redoNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '返工扣分',
+          value: 'redoGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '综合指标',
+          value: 'score',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '等级',
+          value: 'grade',
+          width: 60,
+          type: 'text'
         }
       ]
     }

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;
diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue
index d3282a2..53f737b 100644
--- a/src/views/coorBusiness/completed/index.vue
+++ b/src/views/coorBusiness/completed/index.vue
@@ -6,6 +6,7 @@
       :case-list="caseList"
       :total="total"
       :list-query="listQuery"
+      :table-columns="tableColumns"
       @changeQuery="changeQuery"
       @addDetail="addDetail"/>
   </div>
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index 9e37773..b0d696f 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,6 +44,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import DeptAccessList from './deptAccessList'
 import DeptAccessChart from './deptAccessChart'
 import AccessRule from './accessRule'
@@ -58,9 +56,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -84,14 +110,23 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
-
+    this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD')
+    this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD')
+    this.timeRange = [this.query.beginTime, this.query.endTime]
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -99,6 +134,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index 5098f15..d385f11 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -25,20 +25,20 @@
       radio: 'sumary',
       radioList: [
         {
-          text: '应处置数',
+          text: '总应处置数',
           value: 'totalShouldProcess'
         },
         {
-          text: '处置数',
-          value: 'process'
+          text: '本期应处置数',
+          value: 'CurrentCheckNum'
         },
         {
           text: '返工数',
-          value: 'returnJob'
+          value: 'redoNum'
         },
         {
           text: '综合指标',
-          value: 'sumary'
+          value: 'score'
         }
       ],
       chart: null,
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index ebddd79..4122976 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -4,8 +4,8 @@
       <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
     </el-row>
     <el-table ref="table" :data="list" class="table" border>
-      <el-table-column align="center" type="index" />
-      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" align="center">
+      <el-table-column align="center" type="index" width="30"/>
+      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" :width="column.width" align="center">
         <template slot-scope="scope">
           <span v-if="column.type!='button'">{{ scope.row[column.value] }}</span>
           <el-button v-if="column.type=='button'" type="text" @click="showCaseList(scope.row,column.value)">{{ scope.row[column.value] }}</el-button>
@@ -36,13 +36,111 @@
         },
         {
           text: '上期结转数',
-          value: 'lastCarryOver',
+          value: 'lastCheckNum',
+          width: 60,
           type: 'button'
         },
         {
           text: '本期应处置数',
-          value: 'shouldProcess',
+          value: 'CurrentCheckNum',
+          width: 60,
           type: 'button'
+        },
+        {
+          text: '总应处置数',
+          value: 'totalCheckNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量比例',
+          value: 'workRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量调节得分',
+          value: 'workGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '处置数',
+          value: 'checkedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期处置数',
+          value: 'delayCheckedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期未处置数',
+          value: 'delayUncheckNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期总数',
+          value: 'delayTotalNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置率',
+          value: 'delayUnCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期率',
+          value: 'delayCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置扣分',
+          value: 'delayUncheckGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期扣分',
+          value: 'delayGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工率',
+          value: 'redoRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工数',
+          value: 'redoNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '返工扣分',
+          value: 'redoGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '综合指标',
+          value: 'score',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '等级',
+          value: 'grade',
+          width: 60,
+          type: 'text'
         }
       ]
     }
diff --git a/src/views/otherComment/highFreq/highFreq.vue b/src/views/otherComment/highFreq/highFreq.vue
index a79bf77..5e33797 100644
--- a/src/views/otherComment/highFreq/highFreq.vue
+++ b/src/views/otherComment/highFreq/highFreq.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,9 +44,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -76,14 +101,21 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
 
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -91,6 +123,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;
diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue
index d3282a2..53f737b 100644
--- a/src/views/coorBusiness/completed/index.vue
+++ b/src/views/coorBusiness/completed/index.vue
@@ -6,6 +6,7 @@
       :case-list="caseList"
       :total="total"
       :list-query="listQuery"
+      :table-columns="tableColumns"
       @changeQuery="changeQuery"
       @addDetail="addDetail"/>
   </div>
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index 9e37773..b0d696f 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,6 +44,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import DeptAccessList from './deptAccessList'
 import DeptAccessChart from './deptAccessChart'
 import AccessRule from './accessRule'
@@ -58,9 +56,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -84,14 +110,23 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
-
+    this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD')
+    this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD')
+    this.timeRange = [this.query.beginTime, this.query.endTime]
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -99,6 +134,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index 5098f15..d385f11 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -25,20 +25,20 @@
       radio: 'sumary',
       radioList: [
         {
-          text: '应处置数',
+          text: '总应处置数',
           value: 'totalShouldProcess'
         },
         {
-          text: '处置数',
-          value: 'process'
+          text: '本期应处置数',
+          value: 'CurrentCheckNum'
         },
         {
           text: '返工数',
-          value: 'returnJob'
+          value: 'redoNum'
         },
         {
           text: '综合指标',
-          value: 'sumary'
+          value: 'score'
         }
       ],
       chart: null,
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index ebddd79..4122976 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -4,8 +4,8 @@
       <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
     </el-row>
     <el-table ref="table" :data="list" class="table" border>
-      <el-table-column align="center" type="index" />
-      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" align="center">
+      <el-table-column align="center" type="index" width="30"/>
+      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" :width="column.width" align="center">
         <template slot-scope="scope">
           <span v-if="column.type!='button'">{{ scope.row[column.value] }}</span>
           <el-button v-if="column.type=='button'" type="text" @click="showCaseList(scope.row,column.value)">{{ scope.row[column.value] }}</el-button>
@@ -36,13 +36,111 @@
         },
         {
           text: '上期结转数',
-          value: 'lastCarryOver',
+          value: 'lastCheckNum',
+          width: 60,
           type: 'button'
         },
         {
           text: '本期应处置数',
-          value: 'shouldProcess',
+          value: 'CurrentCheckNum',
+          width: 60,
           type: 'button'
+        },
+        {
+          text: '总应处置数',
+          value: 'totalCheckNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量比例',
+          value: 'workRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量调节得分',
+          value: 'workGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '处置数',
+          value: 'checkedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期处置数',
+          value: 'delayCheckedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期未处置数',
+          value: 'delayUncheckNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期总数',
+          value: 'delayTotalNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置率',
+          value: 'delayUnCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期率',
+          value: 'delayCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置扣分',
+          value: 'delayUncheckGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期扣分',
+          value: 'delayGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工率',
+          value: 'redoRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工数',
+          value: 'redoNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '返工扣分',
+          value: 'redoGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '综合指标',
+          value: 'score',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '等级',
+          value: 'grade',
+          width: 60,
+          type: 'text'
         }
       ]
     }
diff --git a/src/views/otherComment/highFreq/highFreq.vue b/src/views/otherComment/highFreq/highFreq.vue
index a79bf77..5e33797 100644
--- a/src/views/otherComment/highFreq/highFreq.vue
+++ b/src/views/otherComment/highFreq/highFreq.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,9 +44,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -76,14 +101,21 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
 
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -91,6 +123,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }
diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue
index 1ec175d..dbb738c 100644
--- a/src/views/otherComment/highFreq/highFreqChart.vue
+++ b/src/views/otherComment/highFreq/highFreqChart.vue
@@ -38,13 +38,22 @@
         tooltip: {
           show: true
         },
-        // color: ['red', 'green', 'yellow', 'blueviolet'],
+        toolbox: {
+          show: true,
+          feature: {
+            saveAsImage: {
+              show: true
+            }
+          }
+        },
+        // color: ['#afa3f5', '#00d488', '#3feed4', '#3bafff', '#f1bb4c', 'rgba(250,250,250,0.5)'],
         series: [{
           name: '高发问题',
           type: 'pie',
           data: this.pieData,
           label: {
-            formatter: '{b} : {d}%'
+            formatter: '{b} : {d}%',
+            color: '#000'
           },
           tooltip: {
             formatter: '{b}<br/>立案数: {d}%'

diff --git a/package-lock.json b/package-lock.json
index 37e8315..7642e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7221,6 +7221,11 @@
         "commander": "*"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9ad3e22..89df510 100644
--- a/package.json
+++ b/package.json
@@ -19,18 +19,19 @@
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
     "element-ui": "2.12.0",
+    "esri-loader": "^2.3.0",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "v-charts": "^1.19.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1",
-    "esri-loader": "^2.3.0"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 1c0f865..712cfc1 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -129,9 +129,9 @@
       <div class="title">案卷图片:</div>
       <!-- 图片展示 -->
       <div class="image-container">
-        <el-image v-for="img in fileIdVerify" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdProcess" :key="img" :src="imgurl+img" fit="contain" class="image"/>
-        <el-image v-for="img in fileIdCheck" :key="img" :src="imgurl+img" fit="contain" class="image"/>
+        <el-image v-for="img in imgList" :key="img" :src="img" :preview-src-list="imgList" fit="contain" class="image"/>
+        <!-- <el-image v-for="img in fileIdProcess" :key="img" :src="img" fit="contain" class="image"/>
+        <el-image v-for="img in fileIdCheck" :key="img" :src="img" fit="contain" class="image"/> -->
       </div>
     </el-row>
     <el-row v-if="showProcess">
@@ -300,6 +300,7 @@
 
 <script>
 import _ from 'lodash'
+import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
@@ -358,8 +359,8 @@
     isNeedVisit: function() {
       return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访'
     },
-    imgurl() {
-      return process.env.BASE_API + '/static/'
+    imgList() {
+      return this.fileIdVerify.concat(this.fileIdProcess).concat(this.fileIdCheck)
     }
   },
   created() {
@@ -375,14 +376,18 @@
       this.caseDetail = resDetail.data[0]
 
       // 解析图片id
+      const imgUrl = process.env.BASE_API + '/static/'
       if (this.caseDetail.fileIdVerify) {
         this.fileIdVerify = this.caseDetail.fileIdVerify.split(',')
+        this.fileIdVerify = this.fileIdVerify.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdProcess) {
         this.fileIdProcess = this.caseDetail.fileIdProcess.split(',')
+        this.fileIdProcess = this.fileIdProcess.map(item => imgUrl + item)
       }
       if (this.caseDetail.fileIdCheck) {
         this.fileIdCheck = this.caseDetail.fileIdCheck.split(',')
+        this.fileIdCheck = this.fileIdCheck.map(item => imgUrl + item)
       }
 
       // 查询常用语列表
@@ -665,6 +670,13 @@
       }).catch(() => {
         // 点击“取消”后的操作
       })
+    },
+    onPreview() {
+      console.log('onPreview')
+      this.showViewer = true
+    },
+    closeViewer() {
+      this.showViewer = false
     }
   }
 }
@@ -721,4 +733,7 @@
     height: 300px;
     margin-right: 20px;
   }
+  /deep/ .gutter{
+    background-color: #f3f3f3;
+  }
 </style>
diff --git a/src/components/Map/arcgisMapRead.vue b/src/components/Map/arcgisMapRead.vue
index ae2058b..1a06ab9 100644
--- a/src/components/Map/arcgisMapRead.vue
+++ b/src/components/Map/arcgisMapRead.vue
@@ -347,17 +347,17 @@
         url: serverConfig.mapUrlBj + '/3',
         id: 'dxbjMph'
       })
-      // this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
-      //   url: serverConfig.mapUrlBase + '/6',
-      //   id: 'gridLayer'
-      // })
+      this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
+        url: serverConfig.mapUrlBase + '/1',
+        id: 'gridLayer'
+      })
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
       this.map.add(this.layers.dxbjLine)
       this.map.add(this.layers.dxbjXqd)
       this.map.add(this.layers.dxbjMph)
-      // this.map.add(this.layers.dx2wGrid)
+      this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
     // queryOnMap: function() {
@@ -528,7 +528,7 @@
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
+  @import 'http://192.168.8.205/arcgis_js_api/library/4.12/esri/css/main.css';
   .baseMap {
     height:60vh;
     width: 100%;
diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue
index d3282a2..53f737b 100644
--- a/src/views/coorBusiness/completed/index.vue
+++ b/src/views/coorBusiness/completed/index.vue
@@ -6,6 +6,7 @@
       :case-list="caseList"
       :total="total"
       :list-query="listQuery"
+      :table-columns="tableColumns"
       @changeQuery="changeQuery"
       @addDetail="addDetail"/>
   </div>
diff --git a/src/views/deptAccess/deptAccess.vue b/src/views/deptAccess/deptAccess.vue
index 9e37773..b0d696f 100644
--- a/src/views/deptAccess/deptAccess.vue
+++ b/src/views/deptAccess/deptAccess.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,6 +44,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import DeptAccessList from './deptAccessList'
 import DeptAccessChart from './deptAccessChart'
 import AccessRule from './accessRule'
@@ -58,9 +56,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -84,14 +110,23 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
-
+    this.query.beginTime = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD')
+    this.query.endTime = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD')
+    this.timeRange = [this.query.beginTime, this.query.endTime]
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -99,6 +134,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }
diff --git a/src/views/deptAccess/deptAccessChart.vue b/src/views/deptAccess/deptAccessChart.vue
index 5098f15..d385f11 100644
--- a/src/views/deptAccess/deptAccessChart.vue
+++ b/src/views/deptAccess/deptAccessChart.vue
@@ -25,20 +25,20 @@
       radio: 'sumary',
       radioList: [
         {
-          text: '应处置数',
+          text: '总应处置数',
           value: 'totalShouldProcess'
         },
         {
-          text: '处置数',
-          value: 'process'
+          text: '本期应处置数',
+          value: 'CurrentCheckNum'
         },
         {
           text: '返工数',
-          value: 'returnJob'
+          value: 'redoNum'
         },
         {
           text: '综合指标',
-          value: 'sumary'
+          value: 'score'
         }
       ],
       chart: null,
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index ebddd79..4122976 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -4,8 +4,8 @@
       <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
     </el-row>
     <el-table ref="table" :data="list" class="table" border>
-      <el-table-column align="center" type="index" />
-      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" align="center">
+      <el-table-column align="center" type="index" width="30"/>
+      <el-table-column v-for="column in tableColumns" :key="column.value" :label="column.text" :width="column.width" align="center">
         <template slot-scope="scope">
           <span v-if="column.type!='button'">{{ scope.row[column.value] }}</span>
           <el-button v-if="column.type=='button'" type="text" @click="showCaseList(scope.row,column.value)">{{ scope.row[column.value] }}</el-button>
@@ -36,13 +36,111 @@
         },
         {
           text: '上期结转数',
-          value: 'lastCarryOver',
+          value: 'lastCheckNum',
+          width: 60,
           type: 'button'
         },
         {
           text: '本期应处置数',
-          value: 'shouldProcess',
+          value: 'CurrentCheckNum',
+          width: 60,
           type: 'button'
+        },
+        {
+          text: '总应处置数',
+          value: 'totalCheckNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量比例',
+          value: 'workRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '工作量调节得分',
+          value: 'workGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '处置数',
+          value: 'checkedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期处置数',
+          value: 'delayCheckedNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期未处置数',
+          value: 'delayUncheckNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '超期总数',
+          value: 'delayTotalNum',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置率',
+          value: 'delayUnCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期率',
+          value: 'delayCheckRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期未处置扣分',
+          value: 'delayUncheckGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '超期扣分',
+          value: 'delayGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工率',
+          value: 'redoRate',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '返工数',
+          value: 'redoNum',
+          width: 60,
+          type: 'button'
+        },
+        {
+          text: '返工扣分',
+          value: 'redoGrade',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '综合指标',
+          value: 'score',
+          width: 60,
+          type: 'text'
+        },
+        {
+          text: '等级',
+          value: 'grade',
+          width: 60,
+          type: 'text'
         }
       ]
     }
diff --git a/src/views/otherComment/highFreq/highFreq.vue b/src/views/otherComment/highFreq/highFreq.vue
index a79bf77..5e33797 100644
--- a/src/views/otherComment/highFreq/highFreq.vue
+++ b/src/views/otherComment/highFreq/highFreq.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,9 +44,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -76,14 +101,21 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
 
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -91,6 +123,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }
diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue
index 1ec175d..dbb738c 100644
--- a/src/views/otherComment/highFreq/highFreqChart.vue
+++ b/src/views/otherComment/highFreq/highFreqChart.vue
@@ -38,13 +38,22 @@
         tooltip: {
           show: true
         },
-        // color: ['red', 'green', 'yellow', 'blueviolet'],
+        toolbox: {
+          show: true,
+          feature: {
+            saveAsImage: {
+              show: true
+            }
+          }
+        },
+        // color: ['#afa3f5', '#00d488', '#3feed4', '#3bafff', '#f1bb4c', 'rgba(250,250,250,0.5)'],
         series: [{
           name: '高发问题',
           type: 'pie',
           data: this.pieData,
           label: {
-            formatter: '{b} : {d}%'
+            formatter: '{b} : {d}%',
+            color: '#000'
           },
           tooltip: {
             formatter: '{b}<br/>立案数: {d}%'
diff --git a/src/views/otherComment/sourceStatis/sourceStatis.vue b/src/views/otherComment/sourceStatis/sourceStatis.vue
index 7b4e346..ffb347a 100644
--- a/src/views/otherComment/sourceStatis/sourceStatis.vue
+++ b/src/views/otherComment/sourceStatis/sourceStatis.vue
@@ -1,26 +1,23 @@
 <template>
   <div class="app-container">
-    <el-row>
-      <el-form :model="query" :inline="true" label-width="auto">
-        <el-form-item label="开始日期">
-          <el-date-picker
-            v-model="query.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始日期"/>
-        </el-form-item>
-        <el-form-item label="结束日期">
-          <el-date-picker
-            v-model="query.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束日期"/>
-        </el-form-item>
-        <el-button type="primary" icon="el-icon-edit">统计</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="clearDate">清空</el-button>
-        <el-button type="primary" icon="el-icon-document">报表</el-button>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="beginDate">
+            <el-date-picker
+              v-model="timeRange"
+              :picker-options="pickerOptions"
+              type="daterange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-data-analysis" @click="search">统计</el-button>
+          <el-button class="filter-item" icon="el-icon-document" @click="exportFile">报表</el-button>
+        </el-row>
       </el-form>
-    </el-row>
+    </div>
     <el-row>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane name="list">
@@ -47,9 +44,37 @@
     return {
       activeName: 'list', // 默认tab
       dialogVisible: false,
+      timeRange: [],
       query: {
-        beginDate: '',
-        endDate: ''
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
       },
       list: [
         {
@@ -73,14 +98,21 @@
       ]
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.query.beginTime = val[0]
+        this.query.endTime = val[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
   mounted() {
 
   },
   methods: {
-    clearDate() {
-      this.query.beginDate = ''
-      this.query.endDate = ''
-    },
     handleClick(tab, event) {
       this.activeName = tab.name
       if (tab.name === 'chart') {
@@ -88,6 +120,12 @@
           tab.$children[0].chart.resize()
         }, 50)
       }
+    },
+    search() {
+
+    },
+    exportFile() {
+
     }
   }
 }