diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 56518e6..e7a8100 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 待办监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -17,14 +17,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body>
       <el-form ref="monitorForm" :model="monitorForm" :rules="monitorRules" label-width="auto">
         <el-form-item label="监察结果" prop="superviseResult">
           <el-input v-model="monitorForm.superviseResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 56518e6..e7a8100 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 待办监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -17,14 +17,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body>
       <el-form ref="monitorForm" :model="monitorForm" :rules="monitorRules" label-width="auto">
         <el-form-item label="监察结果" prop="superviseResult">
           <el-input v-model="monitorForm.superviseResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/phoneManage/bindSeats.vue b/src/views/phoneManage/bindSeats.vue
index bffcb93..dad3fa9 100644
--- a/src/views/phoneManage/bindSeats.vue
+++ b/src/views/phoneManage/bindSeats.vue
@@ -59,7 +59,10 @@
       this.loading = true
       this.extensionPhoneId = row.id
       this.extensionPhoneName = row.phonenumber
-      const checked = row.seatsIds.split(',')
+      let checked = []
+      if (row.seatsIds) {
+        checked = row.seatsIds.split(',')
+      }
       this.defaultChecked = checked
       this.dialogFormVisible = dialogFormVisible
       this.fetchUserList()
@@ -80,7 +83,7 @@
       this.ids = this.$refs.tree.getCheckedKeys()
       bindSeats(this.extensionPhoneId, this.ids).then(response => {
         if (response.code === 200) {
-          this.$message.success('角色分配成功')
+          this.$message.success('坐席绑定成功')
           this.dialogFormVisible = false
           this.$emit('watchChild')
         }

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 56518e6..e7a8100 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 待办监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -17,14 +17,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body>
       <el-form ref="monitorForm" :model="monitorForm" :rules="monitorRules" label-width="auto">
         <el-form-item label="监察结果" prop="superviseResult">
           <el-input v-model="monitorForm.superviseResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/phoneManage/bindSeats.vue b/src/views/phoneManage/bindSeats.vue
index bffcb93..dad3fa9 100644
--- a/src/views/phoneManage/bindSeats.vue
+++ b/src/views/phoneManage/bindSeats.vue
@@ -59,7 +59,10 @@
       this.loading = true
       this.extensionPhoneId = row.id
       this.extensionPhoneName = row.phonenumber
-      const checked = row.seatsIds.split(',')
+      let checked = []
+      if (row.seatsIds) {
+        checked = row.seatsIds.split(',')
+      }
       this.defaultChecked = checked
       this.dialogFormVisible = dialogFormVisible
       this.fetchUserList()
@@ -80,7 +83,7 @@
       this.ids = this.$refs.tree.getCheckedKeys()
       bindSeats(this.extensionPhoneId, this.ids).then(response => {
         if (response.code === 200) {
-          this.$message.success('角色分配成功')
+          this.$message.success('坐席绑定成功')
           this.dialogFormVisible = false
           this.$emit('watchChild')
         }
diff --git a/src/views/phoneManage/phoneManage.vue b/src/views/phoneManage/phoneManage.vue
index b40222a..57c3ea6 100644
--- a/src/views/phoneManage/phoneManage.vue
+++ b/src/views/phoneManage/phoneManage.vue
@@ -6,7 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" :size="size" placeholder="关键字" clearable/>
       </search-item>
       <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-      <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+      <!--<el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>-->
     </search-area>
     <normal-table
       :data="list"
@@ -64,7 +64,7 @@
       columns: [
         {
           text: '分机号',
-          value: 'phoneNumber',
+          value: 'phonenumber',
           align: 'center'
         },
         {
@@ -74,7 +74,7 @@
         },
         {
           text: '备注',
-          value: 'messsage',
+          value: 'message',
           align: 'center'
         }
       ], // 显示列
@@ -146,7 +146,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delPhone(row.secondIndex).then(response => {
+        delPhone(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 56518e6..e7a8100 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 待办监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -17,14 +17,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body>
       <el-form ref="monitorForm" :model="monitorForm" :rules="monitorRules" label-width="auto">
         <el-form-item label="监察结果" prop="superviseResult">
           <el-input v-model="monitorForm.superviseResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/phoneManage/bindSeats.vue b/src/views/phoneManage/bindSeats.vue
index bffcb93..dad3fa9 100644
--- a/src/views/phoneManage/bindSeats.vue
+++ b/src/views/phoneManage/bindSeats.vue
@@ -59,7 +59,10 @@
       this.loading = true
       this.extensionPhoneId = row.id
       this.extensionPhoneName = row.phonenumber
-      const checked = row.seatsIds.split(',')
+      let checked = []
+      if (row.seatsIds) {
+        checked = row.seatsIds.split(',')
+      }
       this.defaultChecked = checked
       this.dialogFormVisible = dialogFormVisible
       this.fetchUserList()
@@ -80,7 +83,7 @@
       this.ids = this.$refs.tree.getCheckedKeys()
       bindSeats(this.extensionPhoneId, this.ids).then(response => {
         if (response.code === 200) {
-          this.$message.success('角色分配成功')
+          this.$message.success('坐席绑定成功')
           this.dialogFormVisible = false
           this.$emit('watchChild')
         }
diff --git a/src/views/phoneManage/phoneManage.vue b/src/views/phoneManage/phoneManage.vue
index b40222a..57c3ea6 100644
--- a/src/views/phoneManage/phoneManage.vue
+++ b/src/views/phoneManage/phoneManage.vue
@@ -6,7 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" :size="size" placeholder="关键字" clearable/>
       </search-item>
       <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-      <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+      <!--<el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>-->
     </search-area>
     <normal-table
       :data="list"
@@ -64,7 +64,7 @@
       columns: [
         {
           text: '分机号',
-          value: 'phoneNumber',
+          value: 'phonenumber',
           align: 'center'
         },
         {
@@ -74,7 +74,7 @@
         },
         {
           text: '备注',
-          value: 'messsage',
+          value: 'message',
           align: 'center'
         }
       ], // 显示列
@@ -146,7 +146,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delPhone(row.secondIndex).then(response => {
+        delPhone(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue
index 904e71c..d684781 100644
--- a/src/views/superviseManage/searchSupervise.vue
+++ b/src/views/superviseManage/searchSupervise.vue
@@ -53,7 +53,7 @@
       listLoading: true, // 列表加载动画
       listQuery: {
         urgeContent: '', // 事件标题
-        checkStatus:'',
+        checkStatus: '',
         startTime: '',
         endTime: '',
         offset: 1,

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 56518e6..e7a8100 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 待办监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -17,14 +17,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body>
       <el-form ref="monitorForm" :model="monitorForm" :rules="monitorRules" label-width="auto">
         <el-form-item label="监察结果" prop="superviseResult">
           <el-input v-model="monitorForm.superviseResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/phoneManage/bindSeats.vue b/src/views/phoneManage/bindSeats.vue
index bffcb93..dad3fa9 100644
--- a/src/views/phoneManage/bindSeats.vue
+++ b/src/views/phoneManage/bindSeats.vue
@@ -59,7 +59,10 @@
       this.loading = true
       this.extensionPhoneId = row.id
       this.extensionPhoneName = row.phonenumber
-      const checked = row.seatsIds.split(',')
+      let checked = []
+      if (row.seatsIds) {
+        checked = row.seatsIds.split(',')
+      }
       this.defaultChecked = checked
       this.dialogFormVisible = dialogFormVisible
       this.fetchUserList()
@@ -80,7 +83,7 @@
       this.ids = this.$refs.tree.getCheckedKeys()
       bindSeats(this.extensionPhoneId, this.ids).then(response => {
         if (response.code === 200) {
-          this.$message.success('角色分配成功')
+          this.$message.success('坐席绑定成功')
           this.dialogFormVisible = false
           this.$emit('watchChild')
         }
diff --git a/src/views/phoneManage/phoneManage.vue b/src/views/phoneManage/phoneManage.vue
index b40222a..57c3ea6 100644
--- a/src/views/phoneManage/phoneManage.vue
+++ b/src/views/phoneManage/phoneManage.vue
@@ -6,7 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" :size="size" placeholder="关键字" clearable/>
       </search-item>
       <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-      <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+      <!--<el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>-->
     </search-area>
     <normal-table
       :data="list"
@@ -64,7 +64,7 @@
       columns: [
         {
           text: '分机号',
-          value: 'phoneNumber',
+          value: 'phonenumber',
           align: 'center'
         },
         {
@@ -74,7 +74,7 @@
         },
         {
           text: '备注',
-          value: 'messsage',
+          value: 'message',
           align: 'center'
         }
       ], // 显示列
@@ -146,7 +146,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delPhone(row.secondIndex).then(response => {
+        delPhone(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue
index 904e71c..d684781 100644
--- a/src/views/superviseManage/searchSupervise.vue
+++ b/src/views/superviseManage/searchSupervise.vue
@@ -53,7 +53,7 @@
       listLoading: true, // 列表加载动画
       listQuery: {
         urgeContent: '', // 事件标题
-        checkStatus:'',
+        checkStatus: '',
         startTime: '',
         endTime: '',
         offset: 1,
diff --git a/src/views/superviseManage/waitCheckSupervise.vue b/src/views/superviseManage/waitCheckSupervise.vue
index 3489a6b..ca88e42 100644
--- a/src/views/superviseManage/waitCheckSupervise.vue
+++ b/src/views/superviseManage/waitCheckSupervise.vue
@@ -1,7 +1,7 @@
  <!-- 审核督办 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.urgeContent" :size="size" placeholder="督办内容" clearable/>

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 56518e6..e7a8100 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 待办监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -17,14 +17,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body>
       <el-form ref="monitorForm" :model="monitorForm" :rules="monitorRules" label-width="auto">
         <el-form-item label="监察结果" prop="superviseResult">
           <el-input v-model="monitorForm.superviseResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/phoneManage/bindSeats.vue b/src/views/phoneManage/bindSeats.vue
index bffcb93..dad3fa9 100644
--- a/src/views/phoneManage/bindSeats.vue
+++ b/src/views/phoneManage/bindSeats.vue
@@ -59,7 +59,10 @@
       this.loading = true
       this.extensionPhoneId = row.id
       this.extensionPhoneName = row.phonenumber
-      const checked = row.seatsIds.split(',')
+      let checked = []
+      if (row.seatsIds) {
+        checked = row.seatsIds.split(',')
+      }
       this.defaultChecked = checked
       this.dialogFormVisible = dialogFormVisible
       this.fetchUserList()
@@ -80,7 +83,7 @@
       this.ids = this.$refs.tree.getCheckedKeys()
       bindSeats(this.extensionPhoneId, this.ids).then(response => {
         if (response.code === 200) {
-          this.$message.success('角色分配成功')
+          this.$message.success('坐席绑定成功')
           this.dialogFormVisible = false
           this.$emit('watchChild')
         }
diff --git a/src/views/phoneManage/phoneManage.vue b/src/views/phoneManage/phoneManage.vue
index b40222a..57c3ea6 100644
--- a/src/views/phoneManage/phoneManage.vue
+++ b/src/views/phoneManage/phoneManage.vue
@@ -6,7 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" :size="size" placeholder="关键字" clearable/>
       </search-item>
       <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-      <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+      <!--<el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>-->
     </search-area>
     <normal-table
       :data="list"
@@ -64,7 +64,7 @@
       columns: [
         {
           text: '分机号',
-          value: 'phoneNumber',
+          value: 'phonenumber',
           align: 'center'
         },
         {
@@ -74,7 +74,7 @@
         },
         {
           text: '备注',
-          value: 'messsage',
+          value: 'message',
           align: 'center'
         }
       ], // 显示列
@@ -146,7 +146,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delPhone(row.secondIndex).then(response => {
+        delPhone(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue
index 904e71c..d684781 100644
--- a/src/views/superviseManage/searchSupervise.vue
+++ b/src/views/superviseManage/searchSupervise.vue
@@ -53,7 +53,7 @@
       listLoading: true, // 列表加载动画
       listQuery: {
         urgeContent: '', // 事件标题
-        checkStatus:'',
+        checkStatus: '',
         startTime: '',
         endTime: '',
         offset: 1,
diff --git a/src/views/superviseManage/waitCheckSupervise.vue b/src/views/superviseManage/waitCheckSupervise.vue
index 3489a6b..ca88e42 100644
--- a/src/views/superviseManage/waitCheckSupervise.vue
+++ b/src/views/superviseManage/waitCheckSupervise.vue
@@ -1,7 +1,7 @@
  <!-- 审核督办 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.urgeContent" :size="size" placeholder="督办内容" clearable/>
diff --git a/src/views/superviseManage/waitForSupervise.vue b/src/views/superviseManage/waitForSupervise.vue
index 25a031f..1af624d 100644
--- a/src/views/superviseManage/waitForSupervise.vue
+++ b/src/views/superviseManage/waitForSupervise.vue
@@ -1,7 +1,7 @@
  <!-- 待办督办 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -19,14 +19,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="superviseDialogVisible" :close-on-click-modal="false" title="督办" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="superviseDialogVisible" :close-on-click-modal="false" title="督办" append-to-body>
       <el-form ref="superviseForm" :model="superviseForm" :rules="superviseRules" label-width="auto">
         <el-form-item label="督办结果" prop="urgeResult">
           <el-input v-model="superviseForm.urgeResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
@@ -98,11 +98,6 @@
           text: '督办状态',
           value: 'urgeStatus',
           align: 'center'
-        },
-        {
-          text: '督办结果',
-          value: 'urgeResult',
-          align: 'center'
         }
       ], // 显示列
       superviseDialogVisible: false,

diff --git a/config/dev.env.js b/config/dev.env.js
index 9b23a72..fcc970d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,8 +9,10 @@
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
   // 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:20005"'
-  // BASE_API: '"http://192.168.0.225:8083"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
+  // 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/index.js b/config/index.js
index e4f27b9..e2feec2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@
     // },
     // after: require('./../mock/mock-server.js'),
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3fa0587..9ba8ed4 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8083/callcenter/api"'
+  // BASE_API: '"http://10.18.0.23:8084/callcenter/api"'
+  BASE_API: '"http://139.198.16.38:20007"'
   // BASE_API: '"http://192.168.8.201:8083"'
 }
diff --git a/src/api/call.js b/src/api/call.js
index 3aba9ab..c12d0db 100644
--- a/src/api/call.js
+++ b/src/api/call.js
@@ -3,7 +3,7 @@
 // 座席状态上报
 export function seatReport(type, recordName) {
   return request({
-    url: 'case/workList',
+    url: '/seats/report',
     method: 'post',
     params: {
       type: type,
diff --git a/src/api/callCase.js b/src/api/callCase.js
index 4bbd433..b8eff49 100644
--- a/src/api/callCase.js
+++ b/src/api/callCase.js
@@ -111,7 +111,7 @@
 // 获取工单提醒
 export function caseRemind(params) {
   return request({
-    url: 'case/workList',
+    url: '/case/remindAll',
     method: 'get',
     params
   })
@@ -119,7 +119,7 @@
 // 获取指定类型工单统计数量
 export function getCount(type) {
   return request({
-    url: 'case/workList',
+    url: '/case/getCount',
     method: 'get',
     params: {
       type: type
diff --git a/src/api/phone.js b/src/api/phone.js
index 9dee42c..d91e090 100644
--- a/src/api/phone.js
+++ b/src/api/phone.js
@@ -1,5 +1,6 @@
 // 分机管理接口
 import request from '@/utils/request'
+import qs from 'qs'
 
 // 分机列表
 export function phoneList(params) {
@@ -26,11 +27,27 @@
     params
   })
 }
+// 删除分机
+export function delPhone(id) {
+  return request({
+    url: '/extensionPhone/delete',
+    method: 'post',
+    params: {
+      extensionPhoneId: id
+    }
+  })
+}
 // 绑定座席
-export function bindSeats(params) {
+export function bindSeats(phoneid, users) {
   return request({
     url: '/extensionPhone/bindUsers',
     method: 'post',
-    params
+    params: {
+      extensionPhoneId: phoneid,
+      users: users
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png
new file mode 100644
index 0000000..9926c89
--- /dev/null
+++ b/src/assets/global_images/appLogo.png
Binary files differ
diff --git a/src/components/AudioPlayer/AudioPlayer.vue b/src/components/AudioPlayer/AudioPlayer.vue
index c82ec13..8bc9184 100644
--- a/src/components/AudioPlayer/AudioPlayer.vue
+++ b/src/components/AudioPlayer/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="audio.waiting" class="di main-wrap">
+  <div class="di main-wrap">
     <!-- 这里设置了ref属性后，在vue组件中，就可以用this.$refs.audio来访问该dom元素 -->
     <audio
       ref="audio"
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 37fbcfa..40a1802 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,5 +1,6 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
+    <img src="../../assets/global_images/appLogo.png" style="display: inline-block;float: left;margin-left: 10px; margin-top: 10px; width:37px;height:40px;"/>
     <h3>{{ title }}</h3>
     <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +88,7 @@
     color:white;
   }
   h3{
-    margin-left:40px;
+    margin-left:10px;
     display: inline-block;
     float:left;
   }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index 5bd4260..0fd4401 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -30,10 +30,10 @@
   },
   created() {
     // 如果需要提醒
-    // if (this.meta.remind) {
-    //   this.getRealtimeData()
-    //   this.clock()
-    // }
+    if (this.meta && this.meta.remind) {
+      this.getRealtimeData() // 获取实时数量
+      this.clock()
+    }
   },
   methods: {
     clock() {
@@ -45,8 +45,8 @@
     getRealtimeData() {
       getCount(this.meta.type).then(response => {
         if (response.code === 200) {
-          response.count = 2
-          this.count = response.count
+          // response.count = 2
+          this.count = response.data
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 9fd2a57..ee2c003 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,9 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, isReceiver } from './utils/permission'
+import { hasPermission, isReceiver } from './utils/permission'
 
 Vue.prototype.hasPerm = hasPermission
-Vue.prototype.showWellType = showWellType
-Vue.prototype.showDeviceType = showDeviceType
-Vue.prototype.showIpConfig = showIpConfig
-Vue.prototype.isOperation = isOperation
 Vue.prototype.isReceiver = isReceiver
 // 引入Element-ui
 Vue.use(ElementUI, { locale })
diff --git a/src/router/index.js b/src/router/index.js
index bcaea68..ac7440b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true }
     }]
   }
 ]
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 04baa0d..630bb54 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -8,40 +8,7 @@
     return btn.url === permission
   })
 }
-// 根据用户权限判断是否要显示井类型下拉框
-export function showWellType() {
-  console.log('是否显示井类型下拉')
-  const wellTypes = store.getters.wellTypes
-  if (wellTypes.length > 1) return true
-  else return false
-}
 
-// 根据用户权限判断是否要显示设备类型下拉框
-export function showDeviceType() {
-  const deviceTypes = store.getters.deviceTypes
-  if (deviceTypes.length > 1) return true
-  else return false
-}
-// 根据用户权限判断是否要显示IP配置项，集中器不显示ip
-export function showIpConfig() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要没有1(集中器)就是返回true
-    return communication !== '1'
-  })
-}
-export function notContainConcentrator() {
-  const communications = store.getters.communications
-  return communications.some(communication => { // 遍历通讯方式，只要有1(集中器)就是返回true
-    return communication === '1'
-  })
-}
-// 判断用户是否为运维人员或其他管理员
-export function isOperation() {
-  const roleTips = store.getters.roleTips
-  return roleTips.some(tip => { // 遍历btns，查找btn.url是否有匹配的permission，有则返回true，否则返回false
-    return (tip === 'operation' || tip === 'administrator')
-  })
-}
 // 判断用户是否为受理员，允许接电话的
 export function isReceiver() {
   const roleTips = store.getters.roleTips
diff --git a/src/utils/request.js b/src/utils/request.js
index 1177be7..517107c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,9 +13,9 @@
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      console.log('request.js  gettoken')
+      // console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue
index 8ed5b0a..2b66bfe 100644
--- a/src/views/caseManage/caseCommon/caseRecord.vue
+++ b/src/views/caseManage/caseCommon/caseRecord.vue
@@ -272,11 +272,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '督办内容',
           value: 'urgeContent',
           align: 'center'
@@ -341,11 +336,6 @@
           align: 'center'
         },
         {
-          text: '处理状态',
-          value: 'caseStatus',
-          align: 'center'
-        },
-        {
           text: '监察内容',
           value: 'superviseContent',
           align: 'center'
@@ -399,6 +389,8 @@
     this.fetchDelayRecords()
     this.fetchUrgeRecords()
     this.fetchReportRecords()
+    this.fetchSuperviseRecords()
+    this.fetchMonitorecords()
   },
   methods: {
     fetchProcessRecords() {
diff --git a/src/views/caseManage/components/knowledgeDetail.vue b/src/views/caseManage/components/knowledgeDetail.vue
index 89061ee..f0c48db 100644
--- a/src/views/caseManage/components/knowledgeDetail.vue
+++ b/src/views/caseManage/components/knowledgeDetail.vue
@@ -10,8 +10,8 @@
       </div>
       <div class="k-subtitle">
         <div>所属类别:{{ knowledge.kTypeName }}</div>
-        <div>发布人:{{ knowledge.kUserName }}</div>
-        <div>发布时间:{{ knowledge.kTime }}</div>
+        <div>发布人:{{ knowledge.publisherName }}</div>
+        <div>发布时间:{{ knowledge.publishTime }}</div>
       </div>
       <el-scrollbar class="k-content">
         <div>
@@ -31,9 +31,9 @@
       knowledge: {
         kName: '',
         kTypeName: '',
-        kUserName: '',
+        publisherName: '',
         kInfo: '',
-        kTime: ''
+        publishTime: ''
       },
       dialogShow: false
     }
@@ -46,21 +46,18 @@
     },
     // 请求详情
     fetchKnowledge(id) {
-      // const params = {
-      //   kId: id
+      knowledgeDetail(id).then(response => {
+        if (response.code === 200) {
+          this.knowledge = response.data
+        }
+      })
+      // this.knowledge = {
+      //   kName: '特困人员救助供养标准是什么？',
+      //   kTypeName: '州民政局',
+      //   kUserName: '周海瑞',
+      //   kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
+      //   publishTime: '2019-10-18 15:55:35'
       // }
-      // knowledgeDetail(params).then(response => {
-      //   if (response.code === 200) {
-      //     this.knowledge = response.data
-      //   }
-      // })
-      this.knowledge = {
-        kName: '特困人员救助供养标准是什么？',
-        kTypeName: '州民政局',
-        kUserName: '周海瑞',
-        kInfo: '2019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：62145022019年1月起，城市特困供养基本生活年标准9110元/人，各县8252元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。农村特困供养基本生活年标准5226元/人。照料护理补贴年标准分为自理1200元/人，半失能2400元/人，失能3600元/人。--咨询电话：6214502',
-        kTime: '2019-10-18 15:55:35'
-      }
     }
   }
 }
@@ -77,7 +74,7 @@
   }
   .k-subtitle{
     margin-top: 15px;
-    line-height: 17px;
+    line-height: 1.5;
   }
   .k-content{
     text-align: justify;
diff --git a/src/views/caseManage/components/knowledgeSearch.vue b/src/views/caseManage/components/knowledgeSearch.vue
index 3aaffee..1d95a4d 100644
--- a/src/views/caseManage/components/knowledgeSearch.vue
+++ b/src/views/caseManage/components/knowledgeSearch.vue
@@ -2,20 +2,22 @@
 <template>
   <div class="knowledge">
     <div class="search-div">
-      <el-input v-model="keywords" :size="size" placeholder="关键字" class="search-input"/>
+      <el-input v-model="listQuery.keywords" :size="size" placeholder="关键字" class="search-input" clearable/>
       <el-button :size="size" type="primary" class="search-btn" @click="search">知识查找</el-button>
     </div>
     <div class="answer-div">
-      <el-scrollbar class="knowledge-scrollbar">
-        <ul style="list-style-type:none;padding: 0px;margin: 0px;">
-          <li v-for="item in list" class="answer-item">
-            <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
-              <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
-              <div class="answer-info">{{ item.kInfo }}</div>
-            </el-card>
-          </li>
-        </ul>
-      </el-scrollbar>
+      <!--<el-scrollbar class="knowledge-scrollbar">-->
+      <ul v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="infinite-list">
+        <li v-for="item in list" :key="item.kId" class="answer-item">
+          <el-card body-style="{padding:5px;}" shadow="hover" @click.native="showKnoledgeDetail(item)">
+            <div class="answer-title">{{ item.kName }} _知识库_ {{ item.kTypeName }}</div>
+            <div class="answer-info">{{ item.kInfo }}</div>
+          </el-card>
+        </li>
+        <li v-if="loading" class="tip">加载中...</li>
+        <!--<li v-if="noMore" class="tip">没有更多了</li>-->
+      </ul>
+      <!--</el-scrollbar>-->
     </div>
     <knowledge-detail ref="kdetail"/>
   </div>
@@ -23,34 +25,72 @@
 
 <script>
 import KnowledgeDetail from './knowledgeDetail'
+import { searchKnowledge } from '@/api/knowledge'
 export default {
   name: 'KnowledgeSearch',
   components: { KnowledgeDetail },
   data() {
     return {
-      keywords: '', // 关键字
+      listQuery: {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      },
+      loading: false,
+      noMore: false,
       list: [], // 检索结果列表
       total: 0, // 总数
       size: 'small' // 输入框大小
     }
   },
+  computed: {
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
   created() {
-    this.search()
+    this.search(true)
   },
   methods: {
-    search() {
-      const params = { keywords: this.keywords }
-      this.list = [
-        { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
-        { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
-        { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
-        { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
-        { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
-      ]
+    search(init = false) {
+      if (init) {
+        this.listQuery.offset = 1
+        this.list = []
+      }
+      searchKnowledge(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          if (response.data.rows.length === 0) {
+            this.noMore = true
+          } else {
+            this.list = this.list.concat(response.data.rows)
+          }
+        }
+      })
+      // this.list = [
+      //   { kName: '搬迁协议签订后家庭成员发生变化应如何处理？', kTypeName: '纳税服务中心', kInfo: '建档立卡户搬迁对象以签订搬迁协议时当地扶贫部门核定的家庭人口为准，安置住房建设（分配）面积和建房补助资金也应按签订协议时的家庭人口关系和人数核定。协议签订后，户籍人口因新生、死亡、婚姻、就学、兵役等原因发生增减变化时，要及时调整建档立卡户人员信息，但无论户籍登记是否变更，仍按协议确定人口数为准。（发改振兴[2019]1068号《关于印发新时期异地扶贫搬迁工作百问百答的通知》）--咨询电话：6210746' },
+      //   { kName: '纳税人为非雇员（如客户、邀请讲课专家等存在业务合作关系的人员）支付的旅客运输费用，能否抵扣进项税额', kTypeName: '纳税服务中心', kInfo: '财政部税务总局海关总署关于深化增值税改革有关政策的公告》（财政部税务总局海关总署公告2019年第39号）规定，增值税一般纳税人购进国内旅客运输服务，其进项税额允许从销项税额中抵扣。这里指的是与本单位' },
+      //   { kName: '企业预缴时享受了小型微利企业所得税优惠，汇算清缴时发现不符合小型微利企业条件的怎么办？', kTypeName: '纳税服务中心', kInfo: '国家税务总局关于实施小型微利企业普惠性所得税减免政策有关问题的公告》（国家税务总局公告2019年第2号）已经做出了明确规定，只要企业在预缴时符合小型微利企业条件，预缴时均可以预先享受优惠政策。但是，... ...' },
+      //   { kName: '特困人员救助供养对象是?', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' },
+      //   { kName: '特困人员救助供养标准是什么？', kTypeName: '临夏州民政局', kInfo: '无劳动能力、无生活来源且无法定赡养、抚养、扶养义务人，或者其法定赡养、抚养、扶养义务人无赡养、抚养、扶养能力的老年人、残疾人以及未满十六周岁的未成年人。特困人员救助供养主要包括：提供基本生活条件；对生活不能自理的给予照料；提供疾病治疗；办理丧葬事宜。特困人员救助供养形式分为在家分散供养和在当地供养服务机构集中供养。--咨询电话：6214502' }
+      // ]
+    },
+    load() {
+      this.listQuery.offset += 1
+      this.loading = true
+      this.search()
     },
     // 显示知识详情
     showKnoledgeDetail(obj) {
       this.$refs.kdetail.initDialog(obj)
+    },
+    // 清除数据
+    clearData(){
+      this.listQuery = {
+        keywords: '',
+        limit: 5,
+        offset: 1
+      }
     }
   }
 }
@@ -78,6 +118,20 @@
         .el-scrollbar__wrap {
           overflow-x: hidden;
         }
+
+      }
+      .infinite-list{
+        height: 456px;
+        list-style-type:none;
+        padding: 0px;
+        margin: 0px;
+        overflow:auto;
+        .tip{
+          text-align: center;
+          line-height: 2;
+          margin-top: 10px;
+          margin-bottom: 10px;
+        }
       }
       .answer-item{
         /*background-color: #ffffff;*/
diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue
index 8b2c131..5b43d63 100644
--- a/src/views/caseManage/createCase.vue
+++ b/src/views/caseManage/createCase.vue
@@ -104,7 +104,7 @@
           <el-row :gutter="20">
             <el-col :span="16">
               <el-form-item label="事件标题" prop="title">
-                <el-input v-model="form.title"/>
+                <el-input v-model="form.title" maxlength="100"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,6 +123,7 @@
                   v-model="form.description"
                   :autosize="{ minRows: 2, maxRows: 4}"
                   type="textarea"
+                  maxlength="255"
                   placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
@@ -252,6 +253,7 @@
         type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }],
         caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }],
         description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }],
+        title: [{ required: true, message: '事件标题不能为空', trigger: ['blur','change'] }],
         address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }],
         processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }]
       } // 表单验证
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 6b1dd24..1c52350 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -177,10 +177,10 @@
       const that = this
       setTimeout(function() {
         that.list = [
-          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '王晓颖', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
-          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '李文豪', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
+          { callid: '122fse223f2122', callerNumber: '15652360420', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-15 09:00:20', bridgeStamp: 61, statusName: '未接听' },
+          { callid: '122fse223f2123', callerNumber: '18600202639', agentUserName: '受理员', isp: '北京联通', dialStartStamp: '2020-04-04 09:02:01', bridgeStamp: 61, statusName: '未接听' }
         ]
-        that.total = 200
+        that.total = 2
         that.listLoading = false
       }, 2000)
     },
diff --git a/src/views/customerManage/customerList.vue b/src/views/customerManage/customerList.vue
index d2712b0..878fa29 100644
--- a/src/views/customerManage/customerList.vue
+++ b/src/views/customerManage/customerList.vue
@@ -31,7 +31,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>-->
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/dashboard/components/waitCard.vue b/src/views/dashboard/components/waitCard.vue
index 7d63ffc..b6c2bb5 100644
--- a/src/views/dashboard/components/waitCard.vue
+++ b/src/views/dashboard/components/waitCard.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <el-badge :value="list.length" :hidden="list.length==0" class="item"	>
+        <el-badge :value="total" :hidden="list.length==0" class="item"	>
           <div class="card-title">{{ title }}</div>
         </el-badge>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="goDetail">更多</el-button>
       </div>
-      <div v-loading="loading" v-for="(item,index) in list" :key="index" class="text-item">
-        <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+      <div v-loading="loading">
+        <div v-for="(item,index) in list" :key="index" class="text-item">
+          <span class="index">{{ index+1 }}</span><span>{{ item[column] }}</span>
+        </div>
       </div>
       <div v-if="list.length==0">
         {{ emptyText }}
@@ -30,6 +33,10 @@
         return []
       }
     },
+    total:{
+      type:Number,
+      default:0
+    },
     emptyText: {
       type: String,
       default: '没有待办事件'
@@ -42,6 +49,11 @@
       type: String,
       default: 'title'
     }
+  },
+  methods: {
+    goDetail() {
+      this.$emit('detail')
+    }
   }
 }
 </script>
diff --git a/src/views/dashboard/components/waitHandle.vue b/src/views/dashboard/components/waitHandle.vue
index 5ed9318..05c7300 100644
--- a/src/views/dashboard/components/waitHandle.vue
+++ b/src/views/dashboard/components/waitHandle.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <wait-card :list="list" :loading="listLoading" title="待办事件"/>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办事件" @detail="goDetail"/>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   components: { WaitCard },
   data() {
     return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
       listLoading: false,
       total: 4,
       list: [],
@@ -22,13 +26,20 @@
   created() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.listLoading = true
       workList(this.listQuery).then(response => {
         this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
+    },
+    goDetail() {
+      this.$emit('detail')
     }
   }
 }
diff --git a/src/views/dashboard/components/waitMonitor.vue b/src/views/dashboard/components/waitMonitor.vue
new file mode 100644
index 0000000..400ce05
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitor.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitor',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitMonitorCheck.vue b/src/views/dashboard/components/waitMonitorCheck.vue
new file mode 100644
index 0000000..32272db
--- /dev/null
+++ b/src/views/dashboard/components/waitMonitorCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核监察" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckMonitorList } from '@/api/caseMonitor'
+
+export default {
+  name: 'WaitMonitorCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckMonitorList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSupervise.vue b/src/views/dashboard/components/waitSupervise.vue
new file mode 100644
index 0000000..975ab59
--- /dev/null
+++ b/src/views/dashboard/components/waitSupervise.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待办督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSupervise',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/components/waitSuperviseCheck.vue b/src/views/dashboard/components/waitSuperviseCheck.vue
new file mode 100644
index 0000000..bf38360
--- /dev/null
+++ b/src/views/dashboard/components/waitSuperviseCheck.vue
@@ -0,0 +1,50 @@
+<template>
+  <div style="margin-right:20px;height: 100%;">
+    <wait-card :list="list" :total="total" :loading="listLoading" title="待审核督办" @detail="goDetail"/>
+  </div>
+</template>
+
+<script>
+import WaitCard from './waitCard'
+import { getCheckSuperviseList } from '@/api/caseSupervise'
+
+export default {
+  name: 'WaitSuperviseCheck',
+  components: { WaitCard },
+  data() {
+    return {
+      listQuery: {
+        limit: 10,
+        offset: 1
+      },
+      listLoading: false,
+      total: 4,
+      list: [],
+      column: 'title'
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCheckSuperviseList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    goDetail() {
+      this.$emit('detail')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 237b2b3..998ef1a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,8 +2,20 @@
   <div class="dashboard-container">
     <!--<div class="dashboard-text">欢迎您，{{ name }}</div>-->
     <el-row>
-      <el-col :span="8">
-        <wait-handle/>
+      <el-col v-if="hasPerm('/case/workList')" :span="8">
+        <wait-handle style="height:100%" @detail="goWaitHandle"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workSuperviseList')" :span="8">
+        <wait-supervise style="height:100%" @detail="goWaitSupervise"/>
+      </el-col>
+      <el-col v-if="hasPerm('/workMonitorList')" :span="8">
+        <wait-monitor style="height:100%" @detail="goWaitMonitor"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkSuperviseList')" :span="8">
+        <wait-supervise-check style="height:100%" @detail="goWaitSuperviseCheck"/>
+      </el-col>
+      <el-col v-if="hasPerm('/checkMonitorList')" :span="8">
+        <wait-monitor-check style="height:100%" @detail="goWaitMonitorCheck"/>
       </el-col>
     </el-row>
   </div>
@@ -13,36 +25,33 @@
 import { mapGetters } from 'vuex'
 import WaitHandle from './components/waitHandle'
 import { caseRemind } from '@/api/callCase'
+import WaitSupervise from './components/waitSupervise'
+import WaitMonitor from './components/waitMonitor'
+import WaitSuperviseCheck from './components/waitSuperviseCheck'
+import WaitMonitorCheck from './components/waitMonitorCheck'
 
 export default {
   name: 'Dashboard',
-  components: { WaitHandle },
+  components: { WaitMonitorCheck, WaitSuperviseCheck, WaitMonitor, WaitSupervise, WaitHandle },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
       'area'
     ])
   },
   mounted() {
     this.fetchCaseRemind()
   },
+  activated() {
+    console.log('actived')
+  },
   methods: {
     // 工单提醒
     fetchCaseRemind() {
       caseRemind().then(response => {
         if (response.code === 200) {
-          response.data = [{
-            'type': '待办事件',
-            'num': 1
-          }, {
-            'type': '待办督办',
-            'num': 1
-          }]
           if (response.data.length > 0) {
             let message = ''
             for (const item of response.data) {
@@ -58,7 +67,23 @@
           }
         }
       })
+    },
+    goWaitHandle() {
+      this.$router.push('/waitForHandle')
+    },
+    goWaitSupervise() {
+      this.$router.push('/workSuperviseList')
+    },
+    goWaitSuperviseCheck() {
+      this.$router.push('/checkSuperviseList')
+    },
+    goWaitMonitor() {
+      this.$router.push('/workMonitorList')
+    },
+    goWaitMonitorCheck() {
+      this.$router.push('/checkMonitorList')
     }
+
   }
 }
 </script>
diff --git a/src/views/knowledgeManage/components/setTimeDialog.vue b/src/views/knowledgeManage/components/setTimeDialog.vue
index f7d4438..c33fa38 100644
--- a/src/views/knowledgeManage/components/setTimeDialog.vue
+++ b/src/views/knowledgeManage/components/setTimeDialog.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :model="form" :size="size" label-position="right" label-width="120px">
       <el-row type="flex" justify="center">
         <el-col :span="16">
-          <el-form-item label="请选择有效期限" prop="txt">
+          <el-form-item label="请选择有效时限" prop="txt">
             <el-date-picker
               v-model="form.txt"
               value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/knowledgeManage/editKType.vue b/src/views/knowledgeManage/editKType.vue
index 6f73f7d..74fb51b 100644
--- a/src/views/knowledgeManage/editKType.vue
+++ b/src/views/knowledgeManage/editKType.vue
@@ -93,7 +93,7 @@
         // ]
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
+          // console.log(this.typeTreeList)
         }
       })
     },
@@ -116,7 +116,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.typeForm)
         if (valid) {
           this.btnLoading = true
           addType(this.typeForm).then(response => {
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index c0dcfcc..c220924 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -4,14 +4,14 @@
       <el-row type="flex" justify="center">
         <el-col :span="24">
           <el-form-item label="标题" prop="name">
-            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.name" type="text" placeholder="必填" maxlength="100"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="12">
           <el-form-item label="关键词" prop="keywords">
-            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填"/>
+            <el-input v-model.trim="knowledgeForm.keywords" type="text" placeholder="必填" maxlength="99"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -116,7 +116,6 @@
       getTypeList().then(response => {
         if (response.data) {
           this.typeTreeList = toTreeList(response.data, '-1')
-          console.log(this.typeTreeList)
         }
       })
     },
@@ -139,7 +138,7 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.knowledgeForm)
+        // console.log(this.knowledgeForm)
         if (valid) {
           this.btnLoading = true
           addKnowledge(this.knowledgeForm).then(response => {
@@ -156,7 +155,7 @@
                   this.fetchTypeTree()
                 })
               }).catch(() => {
-                this.$emit('watchChild')
+                this.$emit('refresh')
                 this.dialogFormVisible = false
               })
             }
@@ -173,8 +172,8 @@
           this.btnLoading = true
           updateKnowledge(this.knowledgeForm).then(response => {
             if (response.code === 200) {
+              this.$emit('refresh')
               this.$message.success('修改成功')
-              this.$emit('watchChild')
               this.dialogFormVisible = false
             }
           }).catch(_ => { // 异常情况，loading置为false
diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue
index 54ae36e..d434cf0 100644
--- a/src/views/knowledgeManage/knowledgeCheck.vue
+++ b/src/views/knowledgeManage/knowledgeCheck.vue
@@ -88,7 +88,7 @@
       listQuery: {
         keywords: '', // 关键字
         type: '', // 类别
-        checkStatus: '0', // 审核状态
+        checkStatus: '', // 审核状态
         groundingStatus: '', // 上架状态
         valid: '', // 可用状态
         offset: 1,
@@ -229,6 +229,7 @@
       groundingKnowledge('1', list.join(','), val).then(response => {
         if (response.code === 200) {
           this.$message.success('上架成功')
+          this.fetchData()
         }
       })
     },
@@ -248,6 +249,7 @@
           groundingKnowledge('2', list.join(',')).then(response => {
             if (response.code === 200) {
               this.$message.success('下架成功')
+              this.fetchData()
             }
           })
         })
diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue
index 9151116..c714456 100644
--- a/src/views/knowledgeManage/knowledgeManage.vue
+++ b/src/views/knowledgeManage/knowledgeManage.vue
@@ -37,14 +37,14 @@
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-                <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.checkStatus!=='1'" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
           </template>
         </case-list-table>
       </el-col>
     </el-row>
-    <edit-knowledge ref="editdialog" @watchChild="fetchData"/>
+    <edit-knowledge ref="editdialog" @refresh="fetchData"/>
     <knowledge-detail ref="kdetail"/>
   </app-container>
 </template>
diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue
index 9a401db..e991fbc 100644
--- a/src/views/monitorManage/waitCheckMonitor.vue
+++ b/src/views/monitorManage/waitCheckMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 审核监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.superviseContent" :size="size" placeholder="监察内容" clearable/>
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 56518e6..e7a8100 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -1,7 +1,7 @@
  <!-- 待办监察 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -17,14 +17,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="monitorDialogVisible" :close-on-click-modal="false" title="监察" append-to-body>
       <el-form ref="monitorForm" :model="monitorForm" :rules="monitorRules" label-width="auto">
         <el-form-item label="监察结果" prop="superviseResult">
           <el-input v-model="monitorForm.superviseResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/phoneManage/bindSeats.vue b/src/views/phoneManage/bindSeats.vue
index bffcb93..dad3fa9 100644
--- a/src/views/phoneManage/bindSeats.vue
+++ b/src/views/phoneManage/bindSeats.vue
@@ -59,7 +59,10 @@
       this.loading = true
       this.extensionPhoneId = row.id
       this.extensionPhoneName = row.phonenumber
-      const checked = row.seatsIds.split(',')
+      let checked = []
+      if (row.seatsIds) {
+        checked = row.seatsIds.split(',')
+      }
       this.defaultChecked = checked
       this.dialogFormVisible = dialogFormVisible
       this.fetchUserList()
@@ -80,7 +83,7 @@
       this.ids = this.$refs.tree.getCheckedKeys()
       bindSeats(this.extensionPhoneId, this.ids).then(response => {
         if (response.code === 200) {
-          this.$message.success('角色分配成功')
+          this.$message.success('坐席绑定成功')
           this.dialogFormVisible = false
           this.$emit('watchChild')
         }
diff --git a/src/views/phoneManage/phoneManage.vue b/src/views/phoneManage/phoneManage.vue
index b40222a..57c3ea6 100644
--- a/src/views/phoneManage/phoneManage.vue
+++ b/src/views/phoneManage/phoneManage.vue
@@ -6,7 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" :size="size" placeholder="关键字" clearable/>
       </search-item>
       <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-      <el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+      <!--<el-button slot="btns" class="filter-item" style="" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>-->
     </search-area>
     <normal-table
       :data="list"
@@ -64,7 +64,7 @@
       columns: [
         {
           text: '分机号',
-          value: 'phoneNumber',
+          value: 'phonenumber',
           align: 'center'
         },
         {
@@ -74,7 +74,7 @@
         },
         {
           text: '备注',
-          value: 'messsage',
+          value: 'message',
           align: 'center'
         }
       ], // 显示列
@@ -146,7 +146,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delPhone(row.secondIndex).then(response => {
+        delPhone(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue
index 904e71c..d684781 100644
--- a/src/views/superviseManage/searchSupervise.vue
+++ b/src/views/superviseManage/searchSupervise.vue
@@ -53,7 +53,7 @@
       listLoading: true, // 列表加载动画
       listQuery: {
         urgeContent: '', // 事件标题
-        checkStatus:'',
+        checkStatus: '',
         startTime: '',
         endTime: '',
         offset: 1,
diff --git a/src/views/superviseManage/waitCheckSupervise.vue b/src/views/superviseManage/waitCheckSupervise.vue
index 3489a6b..ca88e42 100644
--- a/src/views/superviseManage/waitCheckSupervise.vue
+++ b/src/views/superviseManage/waitCheckSupervise.vue
@@ -1,7 +1,7 @@
  <!-- 审核督办 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.urgeContent" :size="size" placeholder="督办内容" clearable/>
diff --git a/src/views/superviseManage/waitForSupervise.vue b/src/views/superviseManage/waitForSupervise.vue
index 25a031f..1af624d 100644
--- a/src/views/superviseManage/waitForSupervise.vue
+++ b/src/views/superviseManage/waitForSupervise.vue
@@ -1,7 +1,7 @@
  <!-- 待办督办 -->
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.title" :size="size" placeholder="事件标题" clearable/>
@@ -19,14 +19,14 @@
         </el-table-column>
       </template>
     </case-list-table>
-    <el-dialog :visible.sync="superviseDialogVisible" :close-on-click-modal="false" title="督办" append-to-body @close="cancelSupervise">
+    <el-dialog :visible.sync="superviseDialogVisible" :close-on-click-modal="false" title="督办" append-to-body>
       <el-form ref="superviseForm" :model="superviseForm" :rules="superviseRules" label-width="auto">
         <el-form-item label="督办结果" prop="urgeResult">
           <el-input v-model="superviseForm.urgeResult" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelSupervise">取消</el-button>
+        <el-button @click="cancelDialog">取消</el-button>
         <el-button type="primary" @click="submitSupervise">确定</el-button>
       </div>
     </el-dialog>
@@ -98,11 +98,6 @@
           text: '督办状态',
           value: 'urgeStatus',
           align: 'center'
-        },
-        {
-          text: '督办结果',
-          value: 'urgeResult',
-          align: 'center'
         }
       ], // 显示列
       superviseDialogVisible: false,
diff --git a/static/ivr/index.js b/static/ivr/index.js
index da068a9..d4283ea 100644
--- a/static/ivr/index.js
+++ b/static/ivr/index.js
@@ -191,7 +191,7 @@
   showCallStatusTitle('通话状态[' + call + ']，对方号码[' + number + ']')
 }
 function OnQueueStatusChanged_cb(idle, agent, guest, queue) {
-  showQueueStatusTitle('队列:' + queue + ';坐席数:' + agent + ';空闲坐席数:' + idle + ';队列排队数' + guest)
+  showQueueStatusTitle('队列:' + queue + ';座席数:' + agent + ';空闲座席数:' + idle + ';队列排队数' + guest)
 }
 
 /**