diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }
diff --git a/src/api/assessRules.js b/src/api/assessRules.js
index e94abfd..bd8e870 100644
--- a/src/api/assessRules.js
+++ b/src/api/assessRules.js
@@ -68,3 +68,11 @@
   })
 }
 
+// 部门考核统计数据时间筛选
+export function searchStatistics(startTime, endTime) {
+  return request({
+    url: 'checkMenu/detailList' + '?startTime=' + startTime + '&endTime=' + endTime,
+    method: 'get'
+  })
+}
+

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }
diff --git a/src/api/assessRules.js b/src/api/assessRules.js
index e94abfd..bd8e870 100644
--- a/src/api/assessRules.js
+++ b/src/api/assessRules.js
@@ -68,3 +68,11 @@
   })
 }
 
+// 部门考核统计数据时间筛选
+export function searchStatistics(startTime, endTime) {
+  return request({
+    url: 'checkMenu/detailList' + '?startTime=' + startTime + '&endTime=' + endTime,
+    method: 'get'
+  })
+}
+
diff --git a/src/views/assessResult/components/chartDeptResult.vue b/src/views/assessResult/components/chartDeptResult.vue
index f63a666..6d15bd3 100644
--- a/src/views/assessResult/components/chartDeptResult.vue
+++ b/src/views/assessResult/components/chartDeptResult.vue
@@ -81,11 +81,13 @@
   methods: {
     // 获取数据
     fetchData() {
-      var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-      var endTime = new Date()
-      this.dateRange = [beginTime, endTime]
-      this.listQuery.startTime = beginTime
-      this.listQuery.endTime = endTime
+      // var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+      // var endTime = new Date()
+      // this.dateRange = [beginTime, endTime]
+      // this.listQuery.startTime = beginTime
+      // this.listQuery.endTime = endTime
+      this.listQuery.startTime = this.dateRange[0]
+      this.listQuery.endTime = this.dateRange[1]
       getStatistics(this.listQuery).then(response => {
         // this.$message.success('2222')
         this.chartData.rows = response.data

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }
diff --git a/src/api/assessRules.js b/src/api/assessRules.js
index e94abfd..bd8e870 100644
--- a/src/api/assessRules.js
+++ b/src/api/assessRules.js
@@ -68,3 +68,11 @@
   })
 }
 
+// 部门考核统计数据时间筛选
+export function searchStatistics(startTime, endTime) {
+  return request({
+    url: 'checkMenu/detailList' + '?startTime=' + startTime + '&endTime=' + endTime,
+    method: 'get'
+  })
+}
+
diff --git a/src/views/assessResult/components/chartDeptResult.vue b/src/views/assessResult/components/chartDeptResult.vue
index f63a666..6d15bd3 100644
--- a/src/views/assessResult/components/chartDeptResult.vue
+++ b/src/views/assessResult/components/chartDeptResult.vue
@@ -81,11 +81,13 @@
   methods: {
     // 获取数据
     fetchData() {
-      var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-      var endTime = new Date()
-      this.dateRange = [beginTime, endTime]
-      this.listQuery.startTime = beginTime
-      this.listQuery.endTime = endTime
+      // var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+      // var endTime = new Date()
+      // this.dateRange = [beginTime, endTime]
+      // this.listQuery.startTime = beginTime
+      // this.listQuery.endTime = endTime
+      this.listQuery.startTime = this.dateRange[0]
+      this.listQuery.endTime = this.dateRange[1]
       getStatistics(this.listQuery).then(response => {
         // this.$message.success('2222')
         this.chartData.rows = response.data
diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue
index 3adf422..6d012a3 100644
--- a/src/views/assessResult/components/listDeptResult.vue
+++ b/src/views/assessResult/components/listDeptResult.vue
@@ -118,6 +118,12 @@
           value: 'rank',
           align: 'center',
           width: 100
+        },
+        {
+          text: '时间',
+          value: 'ts',
+          align: 'center',
+          width: 120
         }
       ], // 显示列
       dateRange: [],

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }
diff --git a/src/api/assessRules.js b/src/api/assessRules.js
index e94abfd..bd8e870 100644
--- a/src/api/assessRules.js
+++ b/src/api/assessRules.js
@@ -68,3 +68,11 @@
   })
 }
 
+// 部门考核统计数据时间筛选
+export function searchStatistics(startTime, endTime) {
+  return request({
+    url: 'checkMenu/detailList' + '?startTime=' + startTime + '&endTime=' + endTime,
+    method: 'get'
+  })
+}
+
diff --git a/src/views/assessResult/components/chartDeptResult.vue b/src/views/assessResult/components/chartDeptResult.vue
index f63a666..6d15bd3 100644
--- a/src/views/assessResult/components/chartDeptResult.vue
+++ b/src/views/assessResult/components/chartDeptResult.vue
@@ -81,11 +81,13 @@
   methods: {
     // 获取数据
     fetchData() {
-      var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-      var endTime = new Date()
-      this.dateRange = [beginTime, endTime]
-      this.listQuery.startTime = beginTime
-      this.listQuery.endTime = endTime
+      // var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+      // var endTime = new Date()
+      // this.dateRange = [beginTime, endTime]
+      // this.listQuery.startTime = beginTime
+      // this.listQuery.endTime = endTime
+      this.listQuery.startTime = this.dateRange[0]
+      this.listQuery.endTime = this.dateRange[1]
       getStatistics(this.listQuery).then(response => {
         // this.$message.success('2222')
         this.chartData.rows = response.data
diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue
index 3adf422..6d012a3 100644
--- a/src/views/assessResult/components/listDeptResult.vue
+++ b/src/views/assessResult/components/listDeptResult.vue
@@ -118,6 +118,12 @@
           value: 'rank',
           align: 'center',
           width: 100
+        },
+        {
+          text: '时间',
+          value: 'ts',
+          align: 'center',
+          width: 120
         }
       ], // 显示列
       dateRange: [],
diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue
index b8612c9..59330a5 100644
--- a/src/views/assessResult/components/listDeptResultDetail.vue
+++ b/src/views/assessResult/components/listDeptResultDetail.vue
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="时间" >
-            <el-input v-model.trim="form.time" disabled type="text" />
+            <el-input v-model.trim="form.ts" disabled type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -89,7 +89,7 @@
       this.form.totalscore = row.totalscore
       this.form.score = row.score
       this.form.rank = row.rank
-      this.form.time = row.time
+      this.form.ts = row.ts
     }
   }
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }
diff --git a/src/api/assessRules.js b/src/api/assessRules.js
index e94abfd..bd8e870 100644
--- a/src/api/assessRules.js
+++ b/src/api/assessRules.js
@@ -68,3 +68,11 @@
   })
 }
 
+// 部门考核统计数据时间筛选
+export function searchStatistics(startTime, endTime) {
+  return request({
+    url: 'checkMenu/detailList' + '?startTime=' + startTime + '&endTime=' + endTime,
+    method: 'get'
+  })
+}
+
diff --git a/src/views/assessResult/components/chartDeptResult.vue b/src/views/assessResult/components/chartDeptResult.vue
index f63a666..6d15bd3 100644
--- a/src/views/assessResult/components/chartDeptResult.vue
+++ b/src/views/assessResult/components/chartDeptResult.vue
@@ -81,11 +81,13 @@
   methods: {
     // 获取数据
     fetchData() {
-      var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-      var endTime = new Date()
-      this.dateRange = [beginTime, endTime]
-      this.listQuery.startTime = beginTime
-      this.listQuery.endTime = endTime
+      // var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+      // var endTime = new Date()
+      // this.dateRange = [beginTime, endTime]
+      // this.listQuery.startTime = beginTime
+      // this.listQuery.endTime = endTime
+      this.listQuery.startTime = this.dateRange[0]
+      this.listQuery.endTime = this.dateRange[1]
       getStatistics(this.listQuery).then(response => {
         // this.$message.success('2222')
         this.chartData.rows = response.data
diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue
index 3adf422..6d012a3 100644
--- a/src/views/assessResult/components/listDeptResult.vue
+++ b/src/views/assessResult/components/listDeptResult.vue
@@ -118,6 +118,12 @@
           value: 'rank',
           align: 'center',
           width: 100
+        },
+        {
+          text: '时间',
+          value: 'ts',
+          align: 'center',
+          width: 120
         }
       ], // 显示列
       dateRange: [],
diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue
index b8612c9..59330a5 100644
--- a/src/views/assessResult/components/listDeptResultDetail.vue
+++ b/src/views/assessResult/components/listDeptResultDetail.vue
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="时间" >
-            <el-input v-model.trim="form.time" disabled type="text" />
+            <el-input v-model.trim="form.ts" disabled type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -89,7 +89,7 @@
       this.form.totalscore = row.totalscore
       this.form.score = row.score
       this.form.rank = row.rank
-      this.form.time = row.time
+      this.form.ts = row.ts
     }
   }
 }
diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue
index 0026cdb..b5ceab9 100644
--- a/src/views/assessRules/deptStatistics.vue
+++ b/src/views/assessRules/deptStatistics.vue
@@ -44,7 +44,7 @@
 <script>
 // import { addDevice, updateDevice, getDeviceType, getDeviceModel, getDetail, getWellDetail, getNetType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
-import { getStatistics } from '@/api/assessRules'
+import { getStatistics, searchStatistics } from '@/api/assessRules'
 export default {
   name: 'DeptStatistics',
   data() {
@@ -107,7 +107,8 @@
       textMap: '', // 表头显示标题
       isEditMode: false, // 编辑模式
       isDetailMode: false, // 详情模式
-      dateRange: []
+      dateRange: [],
+      projectId: ''
     }
   },
   watch: {
@@ -133,11 +134,25 @@
       this.listQuery.endDate = new Date()
       this.dateRange = [this.listQuery.beginDate, this.listQuery.endDate]
       const projectId = row.id
+      this.projectId = row.id
       this.fetchData(projectId)
     },
+    search() {
+      // this.fetchData(this.projectId)
+      searchStatistics(this.listQuery.beginDate, this.listQuery.endDate).then(response => {
+        var cols = response.data.nameList
+        if (cols) {
+          for (var i = 0; i < cols.length; i++) {
+            cols[i].align = 'center'
+          }
+        }
+        this.columns = cols
+        this.list = response.data.valueList
+      })
+    },
     fetchData(projectId) {
       // debugger
-      getStatistics(projectId).then(response => {
+      getStatistics(projectId, this.listQuery.beginDate, this.listQuery.endDate).then(response => {
         var cols = response.data.nameList
         if (cols) {
           for (var i = 0; i < cols.length; i++) {

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }
diff --git a/src/api/assessRules.js b/src/api/assessRules.js
index e94abfd..bd8e870 100644
--- a/src/api/assessRules.js
+++ b/src/api/assessRules.js
@@ -68,3 +68,11 @@
   })
 }
 
+// 部门考核统计数据时间筛选
+export function searchStatistics(startTime, endTime) {
+  return request({
+    url: 'checkMenu/detailList' + '?startTime=' + startTime + '&endTime=' + endTime,
+    method: 'get'
+  })
+}
+
diff --git a/src/views/assessResult/components/chartDeptResult.vue b/src/views/assessResult/components/chartDeptResult.vue
index f63a666..6d15bd3 100644
--- a/src/views/assessResult/components/chartDeptResult.vue
+++ b/src/views/assessResult/components/chartDeptResult.vue
@@ -81,11 +81,13 @@
   methods: {
     // 获取数据
     fetchData() {
-      var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-      var endTime = new Date()
-      this.dateRange = [beginTime, endTime]
-      this.listQuery.startTime = beginTime
-      this.listQuery.endTime = endTime
+      // var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+      // var endTime = new Date()
+      // this.dateRange = [beginTime, endTime]
+      // this.listQuery.startTime = beginTime
+      // this.listQuery.endTime = endTime
+      this.listQuery.startTime = this.dateRange[0]
+      this.listQuery.endTime = this.dateRange[1]
       getStatistics(this.listQuery).then(response => {
         // this.$message.success('2222')
         this.chartData.rows = response.data
diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue
index 3adf422..6d012a3 100644
--- a/src/views/assessResult/components/listDeptResult.vue
+++ b/src/views/assessResult/components/listDeptResult.vue
@@ -118,6 +118,12 @@
           value: 'rank',
           align: 'center',
           width: 100
+        },
+        {
+          text: '时间',
+          value: 'ts',
+          align: 'center',
+          width: 120
         }
       ], // 显示列
       dateRange: [],
diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue
index b8612c9..59330a5 100644
--- a/src/views/assessResult/components/listDeptResultDetail.vue
+++ b/src/views/assessResult/components/listDeptResultDetail.vue
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="时间" >
-            <el-input v-model.trim="form.time" disabled type="text" />
+            <el-input v-model.trim="form.ts" disabled type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -89,7 +89,7 @@
       this.form.totalscore = row.totalscore
       this.form.score = row.score
       this.form.rank = row.rank
-      this.form.time = row.time
+      this.form.ts = row.ts
     }
   }
 }
diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue
index 0026cdb..b5ceab9 100644
--- a/src/views/assessRules/deptStatistics.vue
+++ b/src/views/assessRules/deptStatistics.vue
@@ -44,7 +44,7 @@
 <script>
 // import { addDevice, updateDevice, getDeviceType, getDeviceModel, getDetail, getWellDetail, getNetType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
-import { getStatistics } from '@/api/assessRules'
+import { getStatistics, searchStatistics } from '@/api/assessRules'
 export default {
   name: 'DeptStatistics',
   data() {
@@ -107,7 +107,8 @@
       textMap: '', // 表头显示标题
       isEditMode: false, // 编辑模式
       isDetailMode: false, // 详情模式
-      dateRange: []
+      dateRange: [],
+      projectId: ''
     }
   },
   watch: {
@@ -133,11 +134,25 @@
       this.listQuery.endDate = new Date()
       this.dateRange = [this.listQuery.beginDate, this.listQuery.endDate]
       const projectId = row.id
+      this.projectId = row.id
       this.fetchData(projectId)
     },
+    search() {
+      // this.fetchData(this.projectId)
+      searchStatistics(this.listQuery.beginDate, this.listQuery.endDate).then(response => {
+        var cols = response.data.nameList
+        if (cols) {
+          for (var i = 0; i < cols.length; i++) {
+            cols[i].align = 'center'
+          }
+        }
+        this.columns = cols
+        this.list = response.data.valueList
+      })
+    },
     fetchData(projectId) {
       // debugger
-      getStatistics(projectId).then(response => {
+      getStatistics(projectId, this.listQuery.beginDate, this.listQuery.endDate).then(response => {
         var cols = response.data.nameList
         if (cols) {
           for (var i = 0; i < cols.length; i++) {
diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue
index 6d49e37..ce335cf 100644
--- a/src/views/assessRules/listDeptRules.vue
+++ b/src/views/assessRules/listDeptRules.vue
@@ -187,6 +187,7 @@
     },
     changeDept() {
       if (this.listQuery.keyword1) {
+        this.listQuery.keyword2 = '' //考核部门改变，下属部门要清空
         getDeptList(this.listQuery.keyword1).then(response => {
           this.subDeptList = response.data
           if(!this.subDeptList.length) { // 下属部门无数据不展示

diff --git a/config/dev.env.js b/config/dev.env.js
index c8a486f..e3a40a0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -11,10 +11,13 @@
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
-  BASE_API: '"http://111.198.10.15:11407"'
-  // BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11407"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.0.123:20007"'
   // BASE_API: '"http://192.168.2.107:20007"'
   // BASE_API: '"http://192.170.1.102:8093"'
   // BASE_API: '"http://127.0.0.1:8083"'
+
+
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2d35f60..ec1f271 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -6,6 +6,8 @@
   // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
   // BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://111.198.10.15:11407"'
-  BASE_API: '"http://111.198.10.15:11408"'
+  // BASE_API: '"http://111.198.10.15:11408"'
   // BASE_API: '"http://192.168.8.201:8083"'
+  // BASE_API: '"http://11.100.6.142:8082/xzwx"'
+  BASE_API: '"http://111.198.10.15:11408"'
 }
diff --git a/src/api/assessRules.js b/src/api/assessRules.js
index e94abfd..bd8e870 100644
--- a/src/api/assessRules.js
+++ b/src/api/assessRules.js
@@ -68,3 +68,11 @@
   })
 }
 
+// 部门考核统计数据时间筛选
+export function searchStatistics(startTime, endTime) {
+  return request({
+    url: 'checkMenu/detailList' + '?startTime=' + startTime + '&endTime=' + endTime,
+    method: 'get'
+  })
+}
+
diff --git a/src/views/assessResult/components/chartDeptResult.vue b/src/views/assessResult/components/chartDeptResult.vue
index f63a666..6d15bd3 100644
--- a/src/views/assessResult/components/chartDeptResult.vue
+++ b/src/views/assessResult/components/chartDeptResult.vue
@@ -81,11 +81,13 @@
   methods: {
     // 获取数据
     fetchData() {
-      var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-      var endTime = new Date()
-      this.dateRange = [beginTime, endTime]
-      this.listQuery.startTime = beginTime
-      this.listQuery.endTime = endTime
+      // var beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+      // var endTime = new Date()
+      // this.dateRange = [beginTime, endTime]
+      // this.listQuery.startTime = beginTime
+      // this.listQuery.endTime = endTime
+      this.listQuery.startTime = this.dateRange[0]
+      this.listQuery.endTime = this.dateRange[1]
       getStatistics(this.listQuery).then(response => {
         // this.$message.success('2222')
         this.chartData.rows = response.data
diff --git a/src/views/assessResult/components/listDeptResult.vue b/src/views/assessResult/components/listDeptResult.vue
index 3adf422..6d012a3 100644
--- a/src/views/assessResult/components/listDeptResult.vue
+++ b/src/views/assessResult/components/listDeptResult.vue
@@ -118,6 +118,12 @@
           value: 'rank',
           align: 'center',
           width: 100
+        },
+        {
+          text: '时间',
+          value: 'ts',
+          align: 'center',
+          width: 120
         }
       ], // 显示列
       dateRange: [],
diff --git a/src/views/assessResult/components/listDeptResultDetail.vue b/src/views/assessResult/components/listDeptResultDetail.vue
index b8612c9..59330a5 100644
--- a/src/views/assessResult/components/listDeptResultDetail.vue
+++ b/src/views/assessResult/components/listDeptResultDetail.vue
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="时间" >
-            <el-input v-model.trim="form.time" disabled type="text" />
+            <el-input v-model.trim="form.ts" disabled type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -89,7 +89,7 @@
       this.form.totalscore = row.totalscore
       this.form.score = row.score
       this.form.rank = row.rank
-      this.form.time = row.time
+      this.form.ts = row.ts
     }
   }
 }
diff --git a/src/views/assessRules/deptStatistics.vue b/src/views/assessRules/deptStatistics.vue
index 0026cdb..b5ceab9 100644
--- a/src/views/assessRules/deptStatistics.vue
+++ b/src/views/assessRules/deptStatistics.vue
@@ -44,7 +44,7 @@
 <script>
 // import { addDevice, updateDevice, getDeviceType, getDeviceModel, getDetail, getWellDetail, getNetType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
-import { getStatistics } from '@/api/assessRules'
+import { getStatistics, searchStatistics } from '@/api/assessRules'
 export default {
   name: 'DeptStatistics',
   data() {
@@ -107,7 +107,8 @@
       textMap: '', // 表头显示标题
       isEditMode: false, // 编辑模式
       isDetailMode: false, // 详情模式
-      dateRange: []
+      dateRange: [],
+      projectId: ''
     }
   },
   watch: {
@@ -133,11 +134,25 @@
       this.listQuery.endDate = new Date()
       this.dateRange = [this.listQuery.beginDate, this.listQuery.endDate]
       const projectId = row.id
+      this.projectId = row.id
       this.fetchData(projectId)
     },
+    search() {
+      // this.fetchData(this.projectId)
+      searchStatistics(this.listQuery.beginDate, this.listQuery.endDate).then(response => {
+        var cols = response.data.nameList
+        if (cols) {
+          for (var i = 0; i < cols.length; i++) {
+            cols[i].align = 'center'
+          }
+        }
+        this.columns = cols
+        this.list = response.data.valueList
+      })
+    },
     fetchData(projectId) {
       // debugger
-      getStatistics(projectId).then(response => {
+      getStatistics(projectId, this.listQuery.beginDate, this.listQuery.endDate).then(response => {
         var cols = response.data.nameList
         if (cols) {
           for (var i = 0; i < cols.length; i++) {
diff --git a/src/views/assessRules/listDeptRules.vue b/src/views/assessRules/listDeptRules.vue
index 6d49e37..ce335cf 100644
--- a/src/views/assessRules/listDeptRules.vue
+++ b/src/views/assessRules/listDeptRules.vue
@@ -187,6 +187,7 @@
     },
     changeDept() {
       if (this.listQuery.keyword1) {
+        this.listQuery.keyword2 = '' //考核部门改变，下属部门要清空
         getDeptList(this.listQuery.keyword1).then(response => {
           this.subDeptList = response.data
           if(!this.subDeptList.length) { // 下属部门无数据不展示
diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue
index 1d2fbd8..8edb407 100644
--- a/src/views/assessRules/listOverview.vue
+++ b/src/views/assessRules/listOverview.vue
@@ -134,6 +134,7 @@
       this.fetchData(false)
     },
     data(row) {
+      console.log('点击统计数据')
       this.dialogFormVisible = true
       this.editShow = true
       this.$refs.deptstatistics.initDialog(this.dialogFormVisible, row)