diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/permission.js b/src/permission.js
index 74371d4..7fbdb57 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,26 +40,18 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
-      debugger
       const token = to.query.sid
-      console.log('==============')
-      console.log(to.query.sid)
       // 直接调用登录接口
       store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        console.log(getToken())
-        alert(getToken())
         next({ path: '/' })
-        // next()
       }).catch(() => {
-        Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
       })
       NProgress.done()
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // 结束Progress
 })

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/permission.js b/src/permission.js
index 74371d4..7fbdb57 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,26 +40,18 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
-      debugger
       const token = to.query.sid
-      console.log('==============')
-      console.log(to.query.sid)
       // 直接调用登录接口
       store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        console.log(getToken())
-        alert(getToken())
         next({ path: '/' })
-        // next()
       }).catch(() => {
-        Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
       })
       NProgress.done()
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // 结束Progress
 })
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..4e4b98f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -19,9 +19,10 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
-  deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
-  communications: state => state.user.communications, // 用户支持的通讯方式
+  seat: state => state.user.seat, // 坐席号
+  exten: state => state.user.exten, // 分机号
+  websocket: state => state.user.websocket, // websocket连接状态
+  online: state => state.user.online, // 签入情况
   area: state => state.user.area // 用户所在区域
 }
 export default getters

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/permission.js b/src/permission.js
index 74371d4..7fbdb57 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,26 +40,18 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
-      debugger
       const token = to.query.sid
-      console.log('==============')
-      console.log(to.query.sid)
       // 直接调用登录接口
       store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        console.log(getToken())
-        alert(getToken())
         next({ path: '/' })
-        // next()
       }).catch(() => {
-        Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
       })
       NProgress.done()
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // 结束Progress
 })
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..4e4b98f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -19,9 +19,10 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
-  deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
-  communications: state => state.user.communications, // 用户支持的通讯方式
+  seat: state => state.user.seat, // 坐席号
+  exten: state => state.user.exten, // 分机号
+  websocket: state => state.user.websocket, // websocket连接状态
+  online: state => state.user.online, // 签入情况
   area: state => state.user.area // 用户所在区域
 }
 export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bb8eaa0..8d5e9cb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,6 @@
-import { login, applogin, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken, getSeat, setSeat, removeSeat, getExten, setExten, removeExten } from '@/utils/auth'
+import { getOnline, setOnline, removeOnline } from '@/utils/auth'
 
 const user = {
   state: {
@@ -10,9 +11,10 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
-    deviceTypes: [], // 支持设备类型
-    communications: [], // 支持通讯方式
+    exten: getExten(), // 分机号
+    seat: getSeat(), // 坐席号
+    websocket: '0', // websocket状态，1是已连接，0是未连接
+    online: getOnline(), // 坐席签入状态
     area: '' // 默认地区
   },
   mutations: {
@@ -43,14 +45,28 @@
     SET_DEPTNAME: (state, deptName) => {
       state.deptName = deptName
     },
-    SET_WELLTYPES: (state, wellTypes) => {
-      state.wellTypes = wellTypes
+    SET_EXTEN: (state, exten) => {
+      if (exten) {
+        state.exten = exten
+      } else {
+        state.exten = ''
+      }
+      setExten(state.exten)
     },
-    SET_DEVICETYPES: (state, deviceTypes) => {
-      state.deviceTypes = deviceTypes
+    SET_SEAT: (state, seat) => {
+      if (seat) {
+        state.seat = seat
+      } else {
+        state.seat = '000'
+      }
+      setSeat(state.seat)
     },
-    SET_COMMUNICATIONS: (state, communications) => {
-      state.communications = communications
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_ONLINE: (state, online) => {
+      state.online = online
+      setOnline(online)
     },
     SET_AREA: (state, area) => {
       state.area = area
@@ -78,25 +94,19 @@
     // 登录
     AppLogin({ commit }, token) {
       return new Promise((resolve, reject) => {
+        // 如果token存在直接setToken
         if (token) {
-          debugger
           setToken(token)
           commit('SET_TOKEN', token)
           resolve()
         } else {
-          window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
-          // applogin().then(response => {
-          //   if (response.code === 200) {
-          //     const data = response.data
-          //     setToken(data.token)
-          //     commit('SET_TOKEN', data.token)
-          //     resolve()
-          //   } else {
-          //     reject(response.message)
-          //   }
-          // }).catch(error => {
-          //   reject(error)
-          // })
+          // 判断是开发环境还是生产环境，
+          // 生产环境不存在跳转到公共登陆平台
+          if (process.env.NODE_ENV === 'development') {
+            reject()
+          } else {
+            window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
+          }
         }
       })
     },
@@ -121,6 +131,8 @@
           commit('SET_ID', data.id)
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
+          commit('SET_SEAT', data.seat)
+          commit('SET_EXTEN', data.exten)
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -135,6 +147,9 @@
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           removeToken()
+          removeExten()
+          removeSeat()
+          removeOnline()
           resolve()
         }).catch(error => {
           reject(error)
@@ -147,6 +162,9 @@
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         removeToken()
+        removeExten()
+        removeSeat()
+        removeOnline()
         resolve()
       })
     }

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/permission.js b/src/permission.js
index 74371d4..7fbdb57 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,26 +40,18 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
-      debugger
       const token = to.query.sid
-      console.log('==============')
-      console.log(to.query.sid)
       // 直接调用登录接口
       store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        console.log(getToken())
-        alert(getToken())
         next({ path: '/' })
-        // next()
       }).catch(() => {
-        Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
       })
       NProgress.done()
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // 结束Progress
 })
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..4e4b98f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -19,9 +19,10 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
-  deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
-  communications: state => state.user.communications, // 用户支持的通讯方式
+  seat: state => state.user.seat, // 坐席号
+  exten: state => state.user.exten, // 分机号
+  websocket: state => state.user.websocket, // websocket连接状态
+  online: state => state.user.online, // 签入情况
   area: state => state.user.area // 用户所在区域
 }
 export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bb8eaa0..8d5e9cb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,6 @@
-import { login, applogin, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken, getSeat, setSeat, removeSeat, getExten, setExten, removeExten } from '@/utils/auth'
+import { getOnline, setOnline, removeOnline } from '@/utils/auth'
 
 const user = {
   state: {
@@ -10,9 +11,10 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
-    deviceTypes: [], // 支持设备类型
-    communications: [], // 支持通讯方式
+    exten: getExten(), // 分机号
+    seat: getSeat(), // 坐席号
+    websocket: '0', // websocket状态，1是已连接，0是未连接
+    online: getOnline(), // 坐席签入状态
     area: '' // 默认地区
   },
   mutations: {
@@ -43,14 +45,28 @@
     SET_DEPTNAME: (state, deptName) => {
       state.deptName = deptName
     },
-    SET_WELLTYPES: (state, wellTypes) => {
-      state.wellTypes = wellTypes
+    SET_EXTEN: (state, exten) => {
+      if (exten) {
+        state.exten = exten
+      } else {
+        state.exten = ''
+      }
+      setExten(state.exten)
     },
-    SET_DEVICETYPES: (state, deviceTypes) => {
-      state.deviceTypes = deviceTypes
+    SET_SEAT: (state, seat) => {
+      if (seat) {
+        state.seat = seat
+      } else {
+        state.seat = '000'
+      }
+      setSeat(state.seat)
     },
-    SET_COMMUNICATIONS: (state, communications) => {
-      state.communications = communications
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_ONLINE: (state, online) => {
+      state.online = online
+      setOnline(online)
     },
     SET_AREA: (state, area) => {
       state.area = area
@@ -78,25 +94,19 @@
     // 登录
     AppLogin({ commit }, token) {
       return new Promise((resolve, reject) => {
+        // 如果token存在直接setToken
         if (token) {
-          debugger
           setToken(token)
           commit('SET_TOKEN', token)
           resolve()
         } else {
-          window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
-          // applogin().then(response => {
-          //   if (response.code === 200) {
-          //     const data = response.data
-          //     setToken(data.token)
-          //     commit('SET_TOKEN', data.token)
-          //     resolve()
-          //   } else {
-          //     reject(response.message)
-          //   }
-          // }).catch(error => {
-          //   reject(error)
-          // })
+          // 判断是开发环境还是生产环境，
+          // 生产环境不存在跳转到公共登陆平台
+          if (process.env.NODE_ENV === 'development') {
+            reject()
+          } else {
+            window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
+          }
         }
       })
     },
@@ -121,6 +131,8 @@
           commit('SET_ID', data.id)
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
+          commit('SET_SEAT', data.seat)
+          commit('SET_EXTEN', data.exten)
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -135,6 +147,9 @@
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           removeToken()
+          removeExten()
+          removeSeat()
+          removeOnline()
           resolve()
         }).catch(error => {
           reject(error)
@@ -147,6 +162,9 @@
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         removeToken()
+        removeExten()
+        removeSeat()
+        removeOnline()
         resolve()
       })
     }
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..605f4cd 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,8 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const Seat = 'seat'
+const Exten = 'exten'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +28,40 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+// 保存坐席号
+export function getSeat() {
+  return Cookies.get(Seat)
+}
 
+export function setSeat(seat) {
+  return Cookies.set(Seat, seat)
+}
+
+export function removeSeat() {
+  return Cookies.remove(Seat)
+}
+
+// 保存分机号
+export function getExten() {
+  return Cookies.get(Exten)
+}
+
+export function setExten(exten) {
+  return Cookies.set(Exten, exten)
+}
+
+export function removeExten() {
+  return Cookies.remove(Exten)
+}
+// 坐席签入状态
+export function getOnline() {
+  return window.localStorage.getItem('online')
+}
+
+export function setOnline(online) {
+  return window.localStorage.setItem('online', online)
+}
+
+export function removeOnline() {
+  return window.localStorage.removeItem('online')
+}

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/permission.js b/src/permission.js
index 74371d4..7fbdb57 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,26 +40,18 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
-      debugger
       const token = to.query.sid
-      console.log('==============')
-      console.log(to.query.sid)
       // 直接调用登录接口
       store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        console.log(getToken())
-        alert(getToken())
         next({ path: '/' })
-        // next()
       }).catch(() => {
-        Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
       })
       NProgress.done()
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // 结束Progress
 })
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..4e4b98f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -19,9 +19,10 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
-  deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
-  communications: state => state.user.communications, // 用户支持的通讯方式
+  seat: state => state.user.seat, // 坐席号
+  exten: state => state.user.exten, // 分机号
+  websocket: state => state.user.websocket, // websocket连接状态
+  online: state => state.user.online, // 签入情况
   area: state => state.user.area // 用户所在区域
 }
 export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bb8eaa0..8d5e9cb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,6 @@
-import { login, applogin, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken, getSeat, setSeat, removeSeat, getExten, setExten, removeExten } from '@/utils/auth'
+import { getOnline, setOnline, removeOnline } from '@/utils/auth'
 
 const user = {
   state: {
@@ -10,9 +11,10 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
-    deviceTypes: [], // 支持设备类型
-    communications: [], // 支持通讯方式
+    exten: getExten(), // 分机号
+    seat: getSeat(), // 坐席号
+    websocket: '0', // websocket状态，1是已连接，0是未连接
+    online: getOnline(), // 坐席签入状态
     area: '' // 默认地区
   },
   mutations: {
@@ -43,14 +45,28 @@
     SET_DEPTNAME: (state, deptName) => {
       state.deptName = deptName
     },
-    SET_WELLTYPES: (state, wellTypes) => {
-      state.wellTypes = wellTypes
+    SET_EXTEN: (state, exten) => {
+      if (exten) {
+        state.exten = exten
+      } else {
+        state.exten = ''
+      }
+      setExten(state.exten)
     },
-    SET_DEVICETYPES: (state, deviceTypes) => {
-      state.deviceTypes = deviceTypes
+    SET_SEAT: (state, seat) => {
+      if (seat) {
+        state.seat = seat
+      } else {
+        state.seat = '000'
+      }
+      setSeat(state.seat)
     },
-    SET_COMMUNICATIONS: (state, communications) => {
-      state.communications = communications
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_ONLINE: (state, online) => {
+      state.online = online
+      setOnline(online)
     },
     SET_AREA: (state, area) => {
       state.area = area
@@ -78,25 +94,19 @@
     // 登录
     AppLogin({ commit }, token) {
       return new Promise((resolve, reject) => {
+        // 如果token存在直接setToken
         if (token) {
-          debugger
           setToken(token)
           commit('SET_TOKEN', token)
           resolve()
         } else {
-          window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
-          // applogin().then(response => {
-          //   if (response.code === 200) {
-          //     const data = response.data
-          //     setToken(data.token)
-          //     commit('SET_TOKEN', data.token)
-          //     resolve()
-          //   } else {
-          //     reject(response.message)
-          //   }
-          // }).catch(error => {
-          //   reject(error)
-          // })
+          // 判断是开发环境还是生产环境，
+          // 生产环境不存在跳转到公共登陆平台
+          if (process.env.NODE_ENV === 'development') {
+            reject()
+          } else {
+            window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
+          }
         }
       })
     },
@@ -121,6 +131,8 @@
           commit('SET_ID', data.id)
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
+          commit('SET_SEAT', data.seat)
+          commit('SET_EXTEN', data.exten)
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -135,6 +147,9 @@
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           removeToken()
+          removeExten()
+          removeSeat()
+          removeOnline()
           resolve()
         }).catch(error => {
           reject(error)
@@ -147,6 +162,9 @@
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         removeToken()
+        removeExten()
+        removeSeat()
+        removeOnline()
         resolve()
       })
     }
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..605f4cd 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,8 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const Seat = 'seat'
+const Exten = 'exten'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +28,40 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+// 保存坐席号
+export function getSeat() {
+  return Cookies.get(Seat)
+}
 
+export function setSeat(seat) {
+  return Cookies.set(Seat, seat)
+}
+
+export function removeSeat() {
+  return Cookies.remove(Seat)
+}
+
+// 保存分机号
+export function getExten() {
+  return Cookies.get(Exten)
+}
+
+export function setExten(exten) {
+  return Cookies.set(Exten, exten)
+}
+
+export function removeExten() {
+  return Cookies.remove(Exten)
+}
+// 坐席签入状态
+export function getOnline() {
+  return window.localStorage.getItem('online')
+}
+
+export function setOnline(online) {
+  return window.localStorage.setItem('online', online)
+}
+
+export function removeOnline() {
+  return window.localStorage.removeItem('online')
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 149dc23..30049cc 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,7 @@
 const project = {
-  title: '12345呼叫中心'
+  title: '12345呼叫中心',
+  ws_ip: '124.205.241.254',
+  ws_port: '28081'
 }
 export function getProject() {
   return project

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/permission.js b/src/permission.js
index 74371d4..7fbdb57 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,26 +40,18 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
-      debugger
       const token = to.query.sid
-      console.log('==============')
-      console.log(to.query.sid)
       // 直接调用登录接口
       store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        console.log(getToken())
-        alert(getToken())
         next({ path: '/' })
-        // next()
       }).catch(() => {
-        Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
       })
       NProgress.done()
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // 结束Progress
 })
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..4e4b98f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -19,9 +19,10 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
-  deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
-  communications: state => state.user.communications, // 用户支持的通讯方式
+  seat: state => state.user.seat, // 坐席号
+  exten: state => state.user.exten, // 分机号
+  websocket: state => state.user.websocket, // websocket连接状态
+  online: state => state.user.online, // 签入情况
   area: state => state.user.area // 用户所在区域
 }
 export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bb8eaa0..8d5e9cb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,6 @@
-import { login, applogin, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken, getSeat, setSeat, removeSeat, getExten, setExten, removeExten } from '@/utils/auth'
+import { getOnline, setOnline, removeOnline } from '@/utils/auth'
 
 const user = {
   state: {
@@ -10,9 +11,10 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
-    deviceTypes: [], // 支持设备类型
-    communications: [], // 支持通讯方式
+    exten: getExten(), // 分机号
+    seat: getSeat(), // 坐席号
+    websocket: '0', // websocket状态，1是已连接，0是未连接
+    online: getOnline(), // 坐席签入状态
     area: '' // 默认地区
   },
   mutations: {
@@ -43,14 +45,28 @@
     SET_DEPTNAME: (state, deptName) => {
       state.deptName = deptName
     },
-    SET_WELLTYPES: (state, wellTypes) => {
-      state.wellTypes = wellTypes
+    SET_EXTEN: (state, exten) => {
+      if (exten) {
+        state.exten = exten
+      } else {
+        state.exten = ''
+      }
+      setExten(state.exten)
     },
-    SET_DEVICETYPES: (state, deviceTypes) => {
-      state.deviceTypes = deviceTypes
+    SET_SEAT: (state, seat) => {
+      if (seat) {
+        state.seat = seat
+      } else {
+        state.seat = '000'
+      }
+      setSeat(state.seat)
     },
-    SET_COMMUNICATIONS: (state, communications) => {
-      state.communications = communications
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_ONLINE: (state, online) => {
+      state.online = online
+      setOnline(online)
     },
     SET_AREA: (state, area) => {
       state.area = area
@@ -78,25 +94,19 @@
     // 登录
     AppLogin({ commit }, token) {
       return new Promise((resolve, reject) => {
+        // 如果token存在直接setToken
         if (token) {
-          debugger
           setToken(token)
           commit('SET_TOKEN', token)
           resolve()
         } else {
-          window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
-          // applogin().then(response => {
-          //   if (response.code === 200) {
-          //     const data = response.data
-          //     setToken(data.token)
-          //     commit('SET_TOKEN', data.token)
-          //     resolve()
-          //   } else {
-          //     reject(response.message)
-          //   }
-          // }).catch(error => {
-          //   reject(error)
-          // })
+          // 判断是开发环境还是生产环境，
+          // 生产环境不存在跳转到公共登陆平台
+          if (process.env.NODE_ENV === 'development') {
+            reject()
+          } else {
+            window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
+          }
         }
       })
     },
@@ -121,6 +131,8 @@
           commit('SET_ID', data.id)
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
+          commit('SET_SEAT', data.seat)
+          commit('SET_EXTEN', data.exten)
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -135,6 +147,9 @@
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           removeToken()
+          removeExten()
+          removeSeat()
+          removeOnline()
           resolve()
         }).catch(error => {
           reject(error)
@@ -147,6 +162,9 @@
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         removeToken()
+        removeExten()
+        removeSeat()
+        removeOnline()
         resolve()
       })
     }
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..605f4cd 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,8 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const Seat = 'seat'
+const Exten = 'exten'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +28,40 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+// 保存坐席号
+export function getSeat() {
+  return Cookies.get(Seat)
+}
 
+export function setSeat(seat) {
+  return Cookies.set(Seat, seat)
+}
+
+export function removeSeat() {
+  return Cookies.remove(Seat)
+}
+
+// 保存分机号
+export function getExten() {
+  return Cookies.get(Exten)
+}
+
+export function setExten(exten) {
+  return Cookies.set(Exten, exten)
+}
+
+export function removeExten() {
+  return Cookies.remove(Exten)
+}
+// 坐席签入状态
+export function getOnline() {
+  return window.localStorage.getItem('online')
+}
+
+export function setOnline(online) {
+  return window.localStorage.setItem('online', online)
+}
+
+export function removeOnline() {
+  return window.localStorage.removeItem('online')
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 149dc23..30049cc 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,7 @@
 const project = {
-  title: '12345呼叫中心'
+  title: '12345呼叫中心',
+  ws_ip: '124.205.241.254',
+  ws_port: '28081'
 }
 export function getProject() {
   return project
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8fee27f..7623b5a 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -42,3 +42,10 @@
     return (tip === 'operation' || tip === 'administrator')
   })
 }
+// 判断用户是否为受理员，允许接电话的
+export function isReceiver() {
+  const roleTips = store.getters.roleTips
+  return roleTips.some(tip => { // 遍历tips，找到符合要求的返回true，否则返回false
+    return (tip === 'receiver')
+  })
+}

diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f3f9f87 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,8 +1,33 @@
 const tree = [
   {
-    "id":1,
+    "checked":false,
+    "code":"",
+    "id":"1",
+    "name":"超级管理员",
+    "open":true,
+    "pcodes":"",
     "pid":"0",
-    "name":"超级管理员"
+    "value":""
+  },
+  {
+    "checked":false,
+    "code":"",
+    "id":"1236522124039770114",
+    "name":"Admin",
+    "open":false,
+    "pcodes":"",
+    "pid":"1",
+    "value":""
+  },
+  {
+    "checked":true,
+    "code":"",
+    "id":"0",
+    "name":"顶级",
+    "open":true,
+    "pcodes":"",
+    "pid":"",
+    "value":""
   }
 ]
 const list = [
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index c1cb17e..14e8286 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <IvrBar/>
+    <IvrBar v-if="showIvrBar"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -40,6 +40,7 @@
       title: getProject().title,
       name: this.$store.getters.name,
       showSetPwd: false,
+      showIvrBar: this.isReceiver(), // 判断角色是否为受理员，受理员允许有ivr功能
       headerUrl: require('@/assets/global_images/header.png')// 头部图片
     }
   },
diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ca14a87..b89ad5f 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -83,13 +83,15 @@
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
 import ChooseSeats from './chooseSeats'
+import { getProject } from '@/utils/baseConfig'
+
 export default {
   name: 'IvrBar',
   components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
-      txtPhoneAccount: '', // 分机号
+      txtPhoneAccount: this.$store.getters.exten, // 分机号
       agentName: 'test', // 坐席名
       queue: 'kefu', // 技能组
       staffId: '10101', // 工号
@@ -101,7 +103,9 @@
       domain: '',
       security: '',
       seatsList: [], // 坐席列表
-      hearbeartInterval: 0,
+      heartbeatInterval: 0, // 心跳interval
+      heartbeatCount: 0, // 心跳heartbeat count
+      heartbeatID: 0, // 心跳heartbeat id
       webSocket: {},
       webVariable: {
         web_version: '2.17.0505',
@@ -113,11 +117,11 @@
         web_busyStatue: null,
         web_number: null,
         web_heartbeatCount: 0,
-        web_hearbeartInterval: 0,
-        web_hearbeartID: 0
+        web_heartbeatInterval: 0,
+        web_heartbeatID: 0
       },
       btnStatus: {
-        btnLogin: true, // 签入
+        btnLogin: false, // 签入
         btnLogOut: true, // 签出
         btnHold: true, // 保持
         btnUnhold: true, // 解除保持
@@ -158,8 +162,8 @@
       time: 0, // 来电计时，单位:秒
       timeInterval: null,
       threeWayPhone: '', // 三方通话电话号码
-      ip: '124.205.241.254', // websocket Ip
-      port: '28081', // webSocket Port
+      ip: getProject().ws_ip, // websocket Ip
+      port: getProject().ws_port, // webSocket Port
       showAddCase: false, // 是否显示新建案卷的弹窗
       notify: null // 来电通知
     }
@@ -191,26 +195,31 @@
   methods: {
     // 坐席签入
     login() {
-      // 如果没有分机号，先输入分机号，有分机号直接签入
-      if (!this.txtPhoneAccount) {
-        this.$prompt('请输入分机号', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        }).then(({ value }) => {
-          this.txtPhoneAccount = value
+      // 先判断websocket状态
+      if (this.$store.getters.websocket === '1') {
+        // 如果没有分机号，先输入分机号，有分机号直接签入
+        if (!this.txtPhoneAccount) {
+          this.$prompt('请输入分机号', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(({ value }) => {
+            this.txtPhoneAccount = value
+            this.doLogin()
+          })
+        } else {
           this.doLogin()
-        })
+        }
       } else {
-        this.doLogin()
+        this.$message.error('websocket连接状态异常，请刷新页面')
       }
     },
     // websocket执行签入操作
     doLogin() {
       // 替代sapoOcx.login
-      if (this.hearbeartInterval == null || this.hearbeartInterval <= 0) {
-        this.hearbeartInterval = 0
+      if (this.heartbeatInterval == null || this.heartbeatInterval <= 0) {
+        this.heartbeatInterval = 0
       }
-      this.webVariable.web_hearbeartInterval = this.hearbeartInterval
+      this.webVariable.web_heartbeatInterval = this.heartbeatInterval
       this.webVariable.web_extension = this.txtPhoneAccount
       this.webVariable.web_agentStaffid = this.staffId
       this.webVariable.web_agentName = this.agentName
@@ -253,8 +262,15 @@
         this.call = '空闲'
         // TODO: 通知后台已签入
         // 心跳监测定时器
-        if (this.webVariable.web_hearbeartInterval > 0) {
-          this.webVariable.web_hearbeartID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_hearbeartID * 1000)
+        // if (this.webVariable.web_heartbeatInterval > 0) {
+        //   this.webVariable.web_heartbeatID = setInterval(this.sendHearbeatMessage(), this.webVariable.web_heartbeatID * 1000)
+        // }
+        const that = this
+        if (this.heartbeatInterval > 0) {
+          this.heartbeatID = setInterval(function() {
+            console.log('startheartbeat')
+            that.sendHearbeatMessage()
+          }, that.heartbeatID * 1000)
         }
         if (this.busy === '') {
           // OnFree_cb()
@@ -262,7 +278,7 @@
           // OnBusy_cb(busy)
           // }
         }
-      } else { // 登录失败，显示错误信息
+      } else if (object.resultText) { // 登录失败，显示错误信息
         this.showError(object.resultText)
         if (object.resultText === '座席登录失败, 分机号码错误') {
           this.txtPhoneAccount = ''
@@ -293,7 +309,8 @@
         this.resetWs()
         // TODO: 通知后台已签出
         // 清除定时器
-        clearInterval(this.webVariable.web_hearbeartID)
+        // clearInterval(this.webVariable.web_heartbeatID)
+        clearInterval(this.heartbeatID)
       }
     },
     // 外呼
@@ -436,7 +453,11 @@
       const { ip, port } = this
       sapoOcx.api.setDebugMode()
       // 连接服务器,参数：ip,端口,初始化websocket
-      this.connect(ip, port)
+      if (ip && port) {
+        this.connect(ip, port)
+      } else {
+        this.$message.error('请检查websock连接配置')
+      }
     },
     // 创建连接
     connect: function(server, port) {
@@ -466,13 +487,14 @@
     // webSocket onOpen
     wsOpen(event) {
       this.status = '已连接'
+      this.$store.commit('SET_WEBSOCKET', '1')
       this.btnStatus.btnLogin = false
     },
     // webSocket onClose
     wsClose(event) {
       this.resetWs()
-      clearInterval(this.webVariable.web_hearbeartID)
-      console.log('quit success!')
+      clearInterval(this.webVariable.web_heartbeatID)
+      this.$store.commit('SET_WEBSOCKET', '1')
     },
     // 处理websocket 返回消息
     wsMessage(event) {
@@ -600,6 +622,7 @@
         }
       } else if (messageType === 'heartbeat response') { // 心跳回复
         this.webVariable.web_hearbeatCount = 0
+        this.heartbeatCount = 0
       } else if (messageType === 'command response') { // 命令回复
         const command = object.command
         if (command === 'login') {
@@ -665,11 +688,19 @@
     },
     // 发送心跳，三次没有响应则断开连接
     sendHearbeatMessage() {
-      if (this.webVariable.web_hearbeatCount >= 3) {
+      // if (this.webVariable.web_hearbeatCount >= 3) {
+      //   this.webSocket.close()
+      // } else {
+      //   this.webVariable.web_hearbeatCount += 1
+      //   const strSend = this.createCommand('heartbeat')
+      //   this.webSocket.send(strSend)
+      // }
+      if (this.heartbeatCount >= 3) {
         this.webSocket.close()
       } else {
-        this.webVariable.web_hearbeatCount += 1
+        this.heartbeatCount += 1
         const strSend = this.createCommand('heartbeat')
+        console.log(strSend)
         this.webSocket.send(strSend)
       }
     },
@@ -693,7 +724,7 @@
     },
     // 判断坐席状态
     judgeStatus() {
-      if (this.status == '已签入') {
+      if (this.status === '已签入') {
         return true
       } else {
         this.$message.warning('请先签入呼叫平台')
diff --git a/src/main.js b/src/main.js
index c9df78f..9fd2a57 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,13 +37,14 @@
 // eslint-disable-next-line
 import animate from 'animate.css'
 
-import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation } from './utils/permission'
+import { hasPermission, showWellType, showDeviceType, showIpConfig, isOperation, 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/permission.js b/src/permission.js
index 74371d4..7fbdb57 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,26 +40,18 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
-      debugger
       const token = to.query.sid
-      console.log('==============')
-      console.log(to.query.sid)
       // 直接调用登录接口
       store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        console.log(getToken())
-        alert(getToken())
         next({ path: '/' })
-        // next()
       }).catch(() => {
-        Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
       })
       NProgress.done()
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // 结束Progress
 })
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..4e4b98f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -19,9 +19,10 @@
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
-  deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
-  communications: state => state.user.communications, // 用户支持的通讯方式
+  seat: state => state.user.seat, // 坐席号
+  exten: state => state.user.exten, // 分机号
+  websocket: state => state.user.websocket, // websocket连接状态
+  online: state => state.user.online, // 签入情况
   area: state => state.user.area // 用户所在区域
 }
 export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bb8eaa0..8d5e9cb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,6 @@
-import { login, applogin, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken, getSeat, setSeat, removeSeat, getExten, setExten, removeExten } from '@/utils/auth'
+import { getOnline, setOnline, removeOnline } from '@/utils/auth'
 
 const user = {
   state: {
@@ -10,9 +11,10 @@
     roleList: [], // 角色编号集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持闸井类型
-    deviceTypes: [], // 支持设备类型
-    communications: [], // 支持通讯方式
+    exten: getExten(), // 分机号
+    seat: getSeat(), // 坐席号
+    websocket: '0', // websocket状态，1是已连接，0是未连接
+    online: getOnline(), // 坐席签入状态
     area: '' // 默认地区
   },
   mutations: {
@@ -43,14 +45,28 @@
     SET_DEPTNAME: (state, deptName) => {
       state.deptName = deptName
     },
-    SET_WELLTYPES: (state, wellTypes) => {
-      state.wellTypes = wellTypes
+    SET_EXTEN: (state, exten) => {
+      if (exten) {
+        state.exten = exten
+      } else {
+        state.exten = ''
+      }
+      setExten(state.exten)
     },
-    SET_DEVICETYPES: (state, deviceTypes) => {
-      state.deviceTypes = deviceTypes
+    SET_SEAT: (state, seat) => {
+      if (seat) {
+        state.seat = seat
+      } else {
+        state.seat = '000'
+      }
+      setSeat(state.seat)
     },
-    SET_COMMUNICATIONS: (state, communications) => {
-      state.communications = communications
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_ONLINE: (state, online) => {
+      state.online = online
+      setOnline(online)
     },
     SET_AREA: (state, area) => {
       state.area = area
@@ -78,25 +94,19 @@
     // 登录
     AppLogin({ commit }, token) {
       return new Promise((resolve, reject) => {
+        // 如果token存在直接setToken
         if (token) {
-          debugger
           setToken(token)
           commit('SET_TOKEN', token)
           resolve()
         } else {
-          window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
-          // applogin().then(response => {
-          //   if (response.code === 200) {
-          //     const data = response.data
-          //     setToken(data.token)
-          //     commit('SET_TOKEN', data.token)
-          //     resolve()
-          //   } else {
-          //     reject(response.message)
-          //   }
-          // }).catch(error => {
-          //   reject(error)
-          // })
+          // 判断是开发环境还是生产环境，
+          // 生产环境不存在跳转到公共登陆平台
+          if (process.env.NODE_ENV === 'development') {
+            reject()
+          } else {
+            window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
+          }
         }
       })
     },
@@ -121,6 +131,8 @@
           commit('SET_ID', data.id)
           commit('SET_ACCOUNT', data.account)
           commit('SET_NAME', data.name)
+          commit('SET_SEAT', data.seat)
+          commit('SET_EXTEN', data.exten)
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -135,6 +147,9 @@
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           removeToken()
+          removeExten()
+          removeSeat()
+          removeOnline()
           resolve()
         }).catch(error => {
           reject(error)
@@ -147,6 +162,9 @@
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         removeToken()
+        removeExten()
+        removeSeat()
+        removeOnline()
         resolve()
       })
     }
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..605f4cd 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,8 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const Seat = 'seat'
+const Exten = 'exten'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +28,40 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+// 保存坐席号
+export function getSeat() {
+  return Cookies.get(Seat)
+}
 
+export function setSeat(seat) {
+  return Cookies.set(Seat, seat)
+}
+
+export function removeSeat() {
+  return Cookies.remove(Seat)
+}
+
+// 保存分机号
+export function getExten() {
+  return Cookies.get(Exten)
+}
+
+export function setExten(exten) {
+  return Cookies.set(Exten, exten)
+}
+
+export function removeExten() {
+  return Cookies.remove(Exten)
+}
+// 坐席签入状态
+export function getOnline() {
+  return window.localStorage.getItem('online')
+}
+
+export function setOnline(online) {
+  return window.localStorage.setItem('online', online)
+}
+
+export function removeOnline() {
+  return window.localStorage.removeItem('online')
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 149dc23..30049cc 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,7 @@
 const project = {
-  title: '12345呼叫中心'
+  title: '12345呼叫中心',
+  ws_ip: '124.205.241.254',
+  ws_port: '28081'
 }
 export function getProject() {
   return project
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8fee27f..7623b5a 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -42,3 +42,10 @@
     return (tip === 'operation' || tip === 'administrator')
   })
 }
+// 判断用户是否为受理员，允许接电话的
+export function isReceiver() {
+  const roleTips = store.getters.roleTips
+  return roleTips.some(tip => { // 遍历tips，找到符合要求的返回true，否则返回false
+    return (tip === 'receiver')
+  })
+}
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index 47bc1a2..5239279 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -1,20 +1,21 @@
 <!--补录事件，待创建事件列表-->
 <template>
   <app-container>
-    <search-area :need-clear="true" :need-search-more="false" type="seperate" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="true" :need-search-more="false" :size="size" type="default" search-more-type="default" @search="search" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.callerNumber" placeholder="主叫号码" clearable/>
+        <el-input v-model.trim="listQuery.callerNumber" :size="size" placeholder="主叫号码" clearable/>
       </search-item>
       <search-item/>
       <search-item>
-        <el-select v-model="listQuery.sex" placeholder="性别" clearable>
+        <el-select v-model="listQuery.sex" :size="size" placeholder="性别" clearable>
           <el-option label="男" value="男"/>
         </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
+          :size="size"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -22,7 +23,7 @@
           end-placeholder="创建结束时间"/>
       </search-item>
     </search-area>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :size="size" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
@@ -50,6 +51,7 @@
       title="录音播放"
       width="600px"
       append-to-body
+      custom-class="sound-dialog"
       @close="closeSound">
       <audio-player ref="adplayer" :the-url="sound.url" :the-control-ist="sound.controlList"/>
     </el-dialog>
@@ -141,13 +143,17 @@
         url: '',
         controlList: 'noDownload noSpeed onlyOnePlaying'
       },
+      size: 'small',
       soundShow: false // 显示音频弹窗
     }
   },
   created() {
-    this.fetchData(false)
+    this.search()
   },
   methods: {
+    search() {
+      this.fetchData(false)
+    },
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
@@ -212,6 +218,10 @@
 }
 </script>
 
-<style scoped>
-
+<style rel="stylesheet/scss" lang="scss">
+  .sound-dialog{
+    .el-dialog__body{
+      padding:5px 20px;
+    }
+  }
 </style>