BUG修复

CallCenterWeb.UI/RMYY/src/components/context/Dialplate/index.vue

@@ -13,10 +13,18 @@
       <i v-show="isShowDelNum" class="del_num" @click="delNum" />
       <el-row v-for="(item, index) in dialNums" :gutter="20" :key="index">
         <el-col v-for="(tnum, index) in item" :span="8" :key="index">
-          <el-button class="btn_nums" type="info" circle @click="dialNumHandler(tnum)">{{ tnum }}</el-button>
+          <el-button
+            class="btn_nums"
+            type="info"
+            circle
+            @click="dialNumHandler(tnum)"
+            >{{ tnum }}</el-button
+          >
         </el-col>
       </el-row>
-      <el-button v-waves class="btn_call" type="success" round @click="callOut">拨打</el-button>
+      <el-button v-waves class="btn_call" type="success" round @click="callOut"
+        >拨打</el-button
+      >
       <!-- 右侧 通话记录和通讯录  -->
       <!-- <svg-icon v-popover:popover class="btn_yonghu" icon-class="yonghu" />
       <el-popover
@@ -29,346 +37,382 @@
         trigger="click"
         transition="fade-in-linear"
       > -->
-        <div class="popoverClass">
-           <el-tabs v-model="tabActiveName" stretch class="phnoe_tabs" @tab-click="handleClick">
-              <!-- <el-input v-model="s_keywords" size="mini" placeholder="搜索" prefix-icon="el-icon-search" @keyup.enter="serach_btn" /> -->
-              <el-tab-pane label="通讯录" name="first">
-                <el-scrollbar
-                  v-loading="loading2"
-                  element-loading-background="transparent"
-                  style="height: 320px;"
+      <div class="popoverClass">
+        <el-tabs
+          v-model="tabActiveName"
+          stretch
+          class="phnoe_tabs"
+          @tab-click="handleClick"
+        >
+          <!-- <el-input v-model="s_keywords" size="mini" placeholder="搜索" prefix-icon="el-icon-search" @keyup.enter="serach_btn" /> -->
+          <el-tab-pane label="通讯录" name="first">
+            <el-scrollbar
+              v-loading="loading2"
+              element-loading-background="transparent"
+              style="height: 320px"
+            >
+              <ul v-if="phoneLists.length" class="recent_calls_lists">
+                <li
+                  v-for="(item, index) in phoneLists"
+                  :key="index"
+                  class="recent_calls_item clearfix"
                 >
-                  <ul v-if="phoneLists.length" class="recent_calls_lists">
-                    <li
-                      v-for="(item, index) in phoneLists"
-                      :key="index"
-                      class="recent_calls_item clearfix"
-                    >
-                      <div class="recent_calls_item_left" @click="recentCallOut(item.tel)">
-                        <svg-icon icon-class="huchu" />
-                        <p class="recent_calls_item_name">{{ item.name }}</p>
-                        <p class="recent_calls_item_tel">{{ item.tel }}</p>
-                      </div>
-                    </li>
-                  </ul>
-                  <p v-else class="text_center">没有找到数据···</p>
-                </el-scrollbar>
-              </el-tab-pane>
-              <el-tab-pane label="历史记录" name="second">
-                <div class="h_list_title">
-                  <span>最近通话</span>
-                </div>
-                <el-scrollbar
-                  v-loading="loading1"
-                  element-loading-background="transparent"
-                  style="height: 300px;"
+                  <div
+                    class="recent_calls_item_left"
+                    @click="recentCallOut(item.tel)"
+                  >
+                    <svg-icon icon-class="huchu" />
+                    <p class="recent_calls_item_name">{{ item.name }}</p>
+                    <p class="recent_calls_item_tel">{{ item.tel }}</p>
+                  </div>
+                </li>
+              </ul>
+              <p v-else class="text_center">没有找到数据···</p>
+            </el-scrollbar>
+          </el-tab-pane>
+          <el-tab-pane label="历史记录" name="second">
+            <div class="h_list_title">
+              <span>最近通话</span>
+            </div>
+            <el-scrollbar
+              v-loading="loading1"
+              element-loading-background="transparent"
+              style="height: 300px"
+            >
+              <ul v-if="recentCalls.length" class="recent_calls_lists">
+                <li
+                  v-for="item in recentCalls"
+                  :key="item.id"
+                  class="recent_calls_item clearfix"
                 >
-                  <ul v-if="recentCalls.length" class="recent_calls_lists">
-                    <li v-for="item in recentCalls" :key="item.id" class="recent_calls_item clearfix">
-                      <div class="recent_calls_item_left" @click="recentCallOut(item.tel)">
-                        <svg-icon v-show="item.isCallOut" icon-class="huchu" />
-                        <p :class="{ name_state: !item.isConect }" class="recent_calls_item_name">
-                          <span v-if="item.isConect">{{ item.callTimes | secondToDuring }}</span>
-                        </p>
-                        <p class="recent_calls_item_tel">{{ item.tel }}</p>
-                      </div>
-                      <div class="recent_calls_item_right">
-                        <span class="recent_calls_item_time">{{ item.time | timesAgo }}</span>
-                        <el-tooltip
-                          v-show="isShowOrderIcon"
-                          v-if="item.isOrder"
-                          effect="dark"
-                          content="点击查看工单"
-                          placement="right"
-                        >
-                          <svg-icon icon-class="xiangmu1" @click.native="goOrderList(item.tel)" />
-                        </el-tooltip>
-                      </div>
-                    </li>
-                  </ul>
-                  <p v-else class="text_center">没有找到数据···</p>
-                </el-scrollbar>
-              </el-tab-pane>
+                  <div
+                    class="recent_calls_item_left"
+                    @click="recentCallOut(item.tel)"
+                  >
+                    <svg-icon v-show="item.isCallOut" icon-class="huchu" />
+                    <p
+                      :class="{ name_state: !item.isConect }"
+                      class="recent_calls_item_name"
+                    >
+                      <span v-if="item.isConect">{{
+                        item.callTimes | secondToDuring
+                      }}</span>
+                    </p>
+                    <p class="recent_calls_item_tel">{{ item.tel }}</p>
+                  </div>
+                  <div class="recent_calls_item_right">
+                    <span class="recent_calls_item_time">{{
+                      item.time | timesAgo
+                    }}</span>
+                    <el-tooltip
+                      v-show="isShowOrderIcon"
+                      v-if="item.isOrder"
+                      effect="dark"
+                      content="点击查看工单"
+                      placement="right"
+                    >
+                      <svg-icon
+                        icon-class="xiangmu1"
+                        @click.native="goOrderList(item.tel)"
+                      />
+                    </el-tooltip>
+                  </div>
+                </li>
+              </ul>
+              <p v-else class="text_center">没有找到数据···</p>
+            </el-scrollbar>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
 
-            </el-tabs>
-        </div>
-       
-      
       <!-- </el-popover> -->
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 
-import store from '@/store'
-import router from '@/router'
-import { Send } from '@/utils/telWebsocket'
-import { secondToDuring, timesAgo } from '@/filters'
-import { getNowDate, getPreDate } from '@/utils'
+import store from "@/store";
+import router from "@/router";
+import { Send } from "@/utils/telWebsocket";
+import { secondToDuring, timesAgo } from "@/filters";
+import { getNowDate, getPreDate } from "@/utils";
 
-import { getCallOutprefix, getCurentCallRecords, getCusUserList } from '@/api/teloperation'
+import {
+  getCallOutprefix,
+  getCurentCallRecords,
+  getCusUserList,
+} from "@/api/teloperation";
 
 export default {
-  name: 'Dialplate',
+  name: "Dialplate",
   filters: {
     telFilter(val) {
-      if (!val.includes('-')) {
+      if (!val.includes("-")) {
         if (val.length === 12) {
-          val = val.substring(1, 4) + '-' + val.substring(4, 8) + '-' + val.substring(8, 12)
+          val =
+            val.substring(1, 4) +
+            "-" +
+            val.substring(4, 8) +
+            "-" +
+            val.substring(8, 12);
         } else if (val.length === 11) {
-          val = val.substring(0, 3) + '-' + val.substring(3, 7) + '-' + val.substring(7, 11)
+          val =
+            val.substring(0, 3) +
+            "-" +
+            val.substring(3, 7) +
+            "-" +
+            val.substring(7, 11);
         }
       }
-      return val
-    }
+      return val;
+    },
   },
   data() {
     return {
       loading1: false,
       loading2: false,
-      telNumber: '',
-      scoketDatas: '',
+      telNumber: "",
+      scoketDatas: "",
       isShowDelNum: false,
       dialNums: [
-        ['1', '2', '3'],
-        ['4', '5', '6'],
-        ['7', '8', '9'],
-        ['*', '0', '#']
+        ["1", "2", "3"],
+        ["4", "5", "6"],
+        ["7", "8", "9"],
+        ["*", "0", "#"],
       ],
-      tabActiveName: 'first',
+      tabActiveName: "first",
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       isShowOrderIcon: false,
       phoneLists: [],
-      recentCalls: []
-    }
+      recentCalls: [],
+    };
   },
   computed: {
     ...mapGetters([
-      'usercode', // 工号
-      'extension', // 分机号
-      'sidebar',
-      'avatar',
-      'telCallType', // 通话类型
-      'telIsVisCallout' // 外呼面板是否显示
-    ])
+      "usercode", // 工号
+      "extension", // 分机号
+      "sidebar",
+      "avatar",
+      "telCallType", // 通话类型
+      "telIsVisCallout", // 外呼面板是否显示
+    ]),
   },
   watch: {
-    telIsVisCallout: function(newVal, oldVal) {
-      console.log(newVal)
+    telIsVisCallout: function (newVal, oldVal) {
+      console.log(newVal);
       if (newVal) {
-        this.readCardModel()
-        this.tabActiveName = 'first'
-        this.getMailList()
+        this.readCardModel();
+        this.tabActiveName = "first";
+        this.getMailList();
       } else {
-        this.tabActiveName = 'second'
-        this.getTelHisList()
+        this.tabActiveName = "second";
+        this.getTelHisList();
       }
-    }
+    },
   },
   created() {
     // this.tabActiveName = 'first' .$refs['mark']
-    
+
     document.onkeyup = (e) => {
       if (e.keyCode === 13) {
-        if (this.tabActiveName === 'first') {
-          this.getMailList()
-        } else if (this.tabActiveName === 'second') {
-          this.getTelHisList()
+        if (this.tabActiveName === "first") {
+          this.getMailList();
+        } else if (this.tabActiveName === "second") {
+          this.getTelHisList();
         }
       }
-    }
+    };
   },
   methods: {
-
     //
     serach_btn() {
-      if (this.tabActiveName === 'first') {
-        this.getMailList()
-      } else if (this.tabActiveName === 'second') {
-        this.getTelHisList()
+      if (this.tabActiveName === "first") {
+        this.getMailList();
+      } else if (this.tabActiveName === "second") {
+        this.getTelHisList();
       }
     },
 
     readCardModel() {
-      const _this = this
-      setTimeout(function() {
+      const _this = this;
+      setTimeout(function () {
         _this.$refs.inputFocus.focus();
-      }, 100)
+      }, 100);
     },
 
     getTelHisList() {
-      this.loading1 = true
-      const stime = getPreDate(3600 * 1000 * 24 * 7) // 不传参数是30天前
-      const etime = getNowDate()
+      this.loading1 = true;
+      const stime = getPreDate(3600 * 1000 * 24 * 7); // 不传参数是30天前
+      const etime = getNowDate();
       const params = {
         stime, // 开始时间
         etime, // 结束时间
-        phone: this.telNumber //	否	string	模糊查询（呼叫号码）
-      }
-      getCurentCallRecords(params).then(res => {
-        this.loading1 = false
-        this.recentCalls = []
-        if (res.state.toLowerCase() === 'success') {
-          const resItems = res.rows
+        phone: this.telNumber, //	否	string	模糊查询（呼叫号码）
+      };
+      getCurentCallRecords(params).then((res) => {
+        this.loading1 = false;
+        this.recentCalls = [];
+        if (res.state.toLowerCase() === "success") {
+          const resItems = res.rows;
           if (resItems && resItems.length) {
-            resItems.forEach(element => {
+            resItems.forEach((element) => {
               this.recentCalls.push({
                 id: element.id,
                 // name: element.name || '未知', // 姓名 默认 未知
                 tel: element.CallNumber, // '15235457489' 呼叫号码
                 time: element.TalkEndTime, // '16:00' 挂机时间
                 isCallOut: element.CallType === 1, // 是否是呼出  "calltype": 1,//呼叫类型：0呼入，1呼出
-                isOrder: element.existorder !== '无', // 是否有工单
+                isOrder: element.existorder !== "无", // 是否有工单
                 isConect: element.CallState === 1, // 是否正常接通 //呼叫状态：0未接通，1已接通
-                callTimes: element.TalkLongTime// 通话时长
-              })
-            })
+                callTimes: element.TalkLongTime, // 通话时长
+              });
+            });
           }
         }
-      })
+      });
     },
     // 获取通讯录
     getMailList() {
-      console.log(this.telNumber)
-      this.loading2 = true
+      console.log(this.telNumber);
+      this.loading2 = true;
       const params = {
         pageindex: this.pageParams.pageindex, // 第几页
         pagesize: this.pageParams.pagesize, // 每页几条信息
-        keyword: this.telNumber // 否	string	模糊查询（姓名，手机号码，固话）
-      }
-      getCusUserList(params).then(res => {
-        this.loading2 = false
-        this.phoneLists = []
-        if (res.state.toLowerCase() === 'success') {
+        keyword: this.telNumber, // 否	string	模糊查询（姓名，手机号码，固话）
+      };
+      getCusUserList(params).then((res) => {
+        this.loading2 = false;
+        this.phoneLists = [];
+        if (res.state.toLowerCase() === "success") {
           if (res.rows) {
-            this.pageParams.total = res.rows
-            res.rows.forEach(val => {
+            this.pageParams.total = res.rows;
+            res.rows.forEach((val) => {
               this.phoneLists.push({
                 name: val.F_Department,
-                tel: val.F_Telephone
-              })
-            })
+                tel: val.F_Telephone,
+              });
+            });
           }
         }
-      })
+      });
     },
     // 点击拨号键
     dialNumHandler(tnum) {
-      this.isShowDelNum = true
+      this.isShowDelNum = true;
       if (this.telNumber.length === 12) {
         this.$message({
-          message: '电话号码不能超过12位！',
-          type: 'warning'
-        })
-        return
+          message: "电话号码不能超过12位！",
+          type: "warning",
+        });
+        return;
       }
-      this.telNumber += tnum
-      store.dispatch('ChangeCallNum', this.telNumber)
+      this.telNumber += tnum;
+      store.dispatch("ChangeCallNum", this.telNumber);
     },
     callOutInput() {
-      this.isShowDelNum = true
+      this.isShowDelNum = true;
       if (this.telNumber.length === 0) {
-        this.isShowDelNum = false
+        this.isShowDelNum = false;
       }
       if (this.telNumber.length === 12) {
         this.$message({
-          message: '电话号码不能超过12位！',
-          type: 'warning'
-        })
-        return
+          message: "电话号码不能超过12位！",
+          type: "warning",
+        });
+        return;
       }
-      store.dispatch('ChangeCallNum', this.telNumber)
+      store.dispatch("ChangeCallNum", this.telNumber);
     },
     // 删除电话号码
     delNum() {
-      this.telNumber = this.telNumber.substr(0, this.telNumber.length - 1)
+      this.telNumber = this.telNumber.substr(0, this.telNumber.length - 1);
       if (this.telNumber.length === 0) {
-        this.isShowDelNum = false
+        this.isShowDelNum = false;
       }
-      store.dispatch('ChangeCallNum', this.telNumber)
+      store.dispatch("ChangeCallNum", this.telNumber);
     },
     // 外呼
     callOut() {
       if (this.telNumber) {
-        getCallOutprefix(this.telNumber).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            const res = response.data
+        getCallOutprefix(this.telNumber).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            const res = response.data;
             switch (this.telCallType) {
-              case 'MakeCall':
+              case "MakeCall":
                 this.scoketDatas = {
-                  'Type': this.telCallType,
-                  'AgentID': this.usercode,
-                  'AgentExten': this.extension,
-                  'Header': res.fix, // 号码前缀 用于截断前缀得到真实号码
-                  'DestinationNumber': res.phone //
-                }
-                break
-              case 'Meeting':
+                  Type: this.telCallType,
+                  AgentID: this.usercode,
+                  AgentExten: this.extension,
+                  Header: res.fix, // 号码前缀 用于截断前缀得到真实号码
+                  DestinationNumber: res.phone, //
+                };
+                break;
+              case "Meeting":
                 this.scoketDatas = {
-                  'Type': this.telCallType,
-                  'AgentID': this.usercode,
-                  'AgentExten': this.extension,
-                  'DestinationNumber': res.phone // 会议目标号码
-                }
-                break
-              case 'Transfer':
+                  Type: this.telCallType,
+                  AgentID: this.usercode,
+                  AgentExten: this.extension,
+                  DestinationNumber: res.phone, // 会议目标号码
+                };
+                break;
+              case "Transfer":
                 this.scoketDatas = {
-                  'Type': this.telCallType,
-                  'AgentID': this.usercode,
-                  'AgentExten': this.extension,
-                  'DestinationNumber': res.phone // 转移目标号码
-                }
-                break
+                  Type: this.telCallType,
+                  AgentID: this.usercode,
+                  AgentExten: this.extension,
+                  DestinationNumber: res.phone, // 转移目标号码
+                };
+                break;
               default:
-                break
+                break;
             }
-            store.dispatch('ChangeCallNum', this.telNumber)
-            Send(this.scoketDatas)
-            store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)// 关闭外呼面板
-            this.telNumber = ''
+            store.dispatch("ChangeCallNum", this.telNumber);
+            Send(this.scoketDatas);
+            store.dispatch("UpdateCalloutScreen", !this.telIsVisCallout); // 关闭外呼面板
+            this.telNumber = "";
           }
-        })
+        });
       } else {
         this.$message({
-          message: '请先输入电话号码！',
-          type: 'warning'
-        })
+          message: "请先输入电话号码！",
+          type: "warning",
+        });
       }
     },
     // tab切换
     handleClick(tab, event) {
-      if (tab.name === 'first') {
-        this.getMailList()
-      } else if (tab.name === 'second') {
-        this.getTelHisList()
+      if (tab.name === "first") {
+        this.getMailList();
+      } else if (tab.name === "second") {
+        this.getTelHisList();
       }
     },
     // 点击历史记录通讯录中的号码 外呼
     recentCallOut(tel) {
       if (tel.length === 12) {
-        tel = tel.substring(1)
+        tel = tel.substring(1);
       }
-      this.telNumber = tel
-      this.callOut()
+      this.telNumber = tel;
+      this.callOut();
     },
     // 展示隐藏工单图标
     showOrderIcon() {
-      this.isShowOrderIcon = !this.isShowOrderIcon
+      this.isShowOrderIcon = !this.isShowOrderIcon;
     },
     // 点击工单图标去 该工单详情页面
     goOrderList(tel) {
-      store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)// 关闭外呼面板
+      store.dispatch("UpdateCalloutScreen", !this.telIsVisCallout); // 关闭外呼面板
       // 带查询参数，变成 /order/orderSearchHY?tel=xxx
-      router.push({ path: '/order/orderSearchHY', query: { tel }})// 工单列表
-    }
-  }
-}
+      router.push({ path: "/order/orderSearchHY", query: { tel } }); // 工单列表
+    },
+  },
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -455,7 +499,7 @@ export default {
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.popoverClass{
+.popoverClass {
   width: 396px;
   position: fixed;
   top: 37px;
@@ -465,7 +509,7 @@ export default {
   margin-left: 13px;
   margin-top: 14px;
 }
-    
+
 .dialplate {
   .plate {
     width: 100%;

CallCenterWeb.UI/RMYY/src/store/getters.js

@@ -48,6 +48,7 @@ const getters = {
   monitorExtenNo: state => state.telWebsocket.monitorExtenNo, // 监控的坐席分机号
   telIsVisTask: state => state.telWebsocket.telIsVisTask, // 任务信息是否显示
   telIsVisTaskFirst: state => state.telWebsocket.telIsVisTaskFirst, // 任务信息是否第一次显示
+  waitcountNumber: state => state.telWebsocket.waitcountNumber, // 是否刷新右上角外呼任务信息/自动外呼监控/外呼分配/我的呼叫任务
   telTaskIsRefresh: state => state.telWebsocket.telTaskIsRefresh, // 是否刷新右上角外呼任务信息/自动外呼监控/外呼分配/我的呼叫任务
 
   permission_routers: state => state.permission.routers,
@@ -67,6 +68,5 @@ const getters = {
   currentName: state => state.lineChatSocket.currentName, // 聊天成员会话name
   chatUserCode: state => state.lineChatSocket.chatUserCode, // 客服code
   collUserCode: state => state.lineChatSocket.collUserCode // 同事code
-
-}
-export default getters
+};
+export default getters;

CallCenterWeb.UI/RMYY/src/store/modules/telWebsocket.js

@@ -1,204 +1,212 @@
-
 const telWebsocket = {
   state: {
     telIsConnected: false, // 链接是否建立
     telMessageData: null, // telWebsocket数据
-    telIsLogin: Number(window.sessionStorage.getItem('telIsLogin')), // 是否签入
+    telIsLogin: Number(window.sessionStorage.getItem("telIsLogin")), // 是否签入
     telSeatState: 2, // 坐席状态 1: 登陆中、2:空闲、3:通话中、4:话后处理、5:小休、6:被请求
     telLineState: 1, // 线路状态 1:空闲、2:摘机等待拨号、3:正在拨号、4:呼出振铃、5:来电振铃、6:通话中 10:通话保持
-    telTopRightState: '未签入', // 右上角 状态提示信息
+    telTopRightState: "未签入", // 右上角 状态提示信息
     telTopRightLamp: false, // 右上角 状态灯(默认 红色)
-    telCallNum: '', // 顶部电话号码
-    screenState: '',
-    telTrunkNumber: '', // 终极号
-    telCallType: 'MakeCall', // 发送的通话类型（默认是外呼）
+    telCallNum: "", // 顶部电话号码
+    waitcountNumber: 0, // 排队数量
+    screenState: "",
+    telTrunkNumber: "", // 终极号
+    telCallType: "MakeCall", // 发送的通话类型（默认是外呼）
     telIsVisCallout: false, // 外呼操作面板是否显示
     telOutboundScreen: true, // 是否显示外呼弹屏
     telIsVisTask: false, // 外呼任务信息是否显示
     telIsVisTaskFirst: true, // 外呼任务信息是否是第一次弹出
     telTaskIsRefresh: false, // 是否刷新右上角外呼任务信息/自动外呼监控/外呼分配/我的呼叫任务
-    telCallTime: { // 通话时间
-      hh: '00',
-      mm: '00',
-      ss: '00'
+    telCallTime: {
+      // 通话时间
+      hh: "00",
+      mm: "00",
+      ss: "00"
     },
     telMonitor: false, // 监听操作是否成功
-    monitorState: '', // 状态监控
-    monitorAgent: '', // 监控的坐席工号
-    monitorExtenNo: '', // 监控坐席分机号
-    monitorExten: ''
+    monitorState: "", // 状态监控
+    monitorAgent: "", // 监控的坐席工号
+    monitorExtenNo: "", // 监控坐席分机号
+    monitorExten: "",
+    waitcountNumber: 0
   },
   mutations: {
     SOCKET_CONNECT(state) {
-      state.telIsConnected = true
+      state.telIsConnected = true;
     },
     SOCKET_DISCONNECT(state) {
-      state.telIsConnected = false
+      state.telIsConnected = false;
     },
     SOCKET_LOGIN(state) {
-      window.sessionStorage.setItem('telIsLogin', 1)
-      state.telIsLogin = Number(window.sessionStorage.getItem('telIsLogin'))
-      state.telIsLogin = 1
+      window.sessionStorage.setItem("telIsLogin", 1);
+      state.telIsLogin = Number(window.sessionStorage.getItem("telIsLogin"));
+      state.telIsLogin = 1;
     },
     SOCKET_LOGOUT(state) {
-      window.sessionStorage.setItem('telIsLogin', 0)
-      state.telIsLogin = Number(window.sessionStorage.getItem('telIsLogin'))
+      window.sessionStorage.setItem("telIsLogin", 0);
+      state.telIsLogin = Number(window.sessionStorage.getItem("telIsLogin"));
     },
     SOCKET_SEATSTATE(state, message) {
-      state.telSeatState = message
+      state.telSeatState = message;
     },
     SOCKET_LINESTATE(state, message) {
-      state.telLineState = message
+      state.telLineState = message;
     },
     SOCKET_TOPRIGHTSTATE(state, message) {
-      state.telTopRightState = message
+      state.telTopRightState = message;
     },
     SOCKET_TOPRIGHTLAMP(state, message) {
-      state.telTopRightLamp = message
+      state.telTopRightLamp = message;
     },
     SOCKET_CALLNUM(state, message) {
-      state.telCallNum = message
+      state.telCallNum = message;
     },
     SOCKET_TRUNKNUMBER(state, message) {
-      state.telTrunkNumber = message
+      state.telTrunkNumber = message;
     },
     SOCKET_CALLTYPE(state, message) {
-      state.telCallType = message
+      state.telCallType = message;
     },
     SOCKET_CALLOUTSCREEN(state, message) {
-      state.telIsVisCallout = message
+      state.telIsVisCallout = message;
     },
     SOCKET_OUTBOUNDSCREEN(state, message) {
-      state.telOutboundScreen = message
+      state.telOutboundScreen = message;
     },
     SOCKET_CALLTELTIME(state, message) {
-      state.telCallTime = message
+      state.telCallTime = message;
     },
     SOCKET_MESSAGE(state, message) {
-      state.telMessageData = message
+      state.telMessageData = message;
     },
     SOCKET_TELMONITOR(state, message) {
-      state.telMonitor = message
+      state.telMonitor = message;
     },
     SOCKET_MONITORSTATE(state, message) {
-      state.monitorState = message
+      state.monitorState = message;
+    },
+    SOCKET_WAITCOUNTNUMBER(state, message) {
+      state.waitcountNumber = message;
     },
     SOCKET_MONITORAGENT(state, message) {
-      state.monitorAgent = message
+      state.monitorAgent = message;
     },
     SOCKET_MONITOREXTENNO(state, message) {
-      state.monitorExtenNo = message
+      state.monitorExtenNo = message;
     },
     SOCKET_MONITOREXTEN(state, message) {
-      state.monitorExten = message
+      state.monitorExten = message;
     },
     SOCKET_TELISVISTASK(state, message) {
-      state.telIsVisTask = message
+      state.telIsVisTask = message;
     },
     SOCKET_TELISVISTASKFIRST(state, message) {
-      state.telIsVisTaskFirst = message
+      state.telIsVisTaskFirst = message;
     },
     SOCKET_TELTASKISREFRESH(state, message) {
-      state.telTaskIsRefresh = message
+      state.telTaskIsRefresh = message;
     },
     SOCKET_SCREENPOPUP(state, message) {
-      state.screenState = message
+      state.screenState = message;
     }
   },
   actions: {
     // 建立连接
     ConnectWs({ commit }, msg) {
-      commit('SOCKET_CONNECT', msg)
+      commit("SOCKET_CONNECT", msg);
     },
     // 连接失败
     DisConnectWs({ commit }, msg) {
-      commit('SOCKET_DISCONNECT', msg)
+      commit("SOCKET_DISCONNECT", msg);
     },
     // 签入
     LoginWs({ commit }, msg) {
-      commit('SOCKET_LOGIN', msg)
+      commit("SOCKET_LOGIN", msg);
     },
     // 签出
     LogoutWs({ commit }, msg) {
-      commit('SOCKET_LOGOUT', msg)
+      commit("SOCKET_LOGOUT", msg);
     },
     // 坐席状态
     ChangeSeatState({ commit }, msg) {
-      commit('SOCKET_SEATSTATE', msg)
+      commit("SOCKET_SEATSTATE", msg);
     },
     // 线路状态
     ChangeLineState({ commit }, msg) {
-      commit('SOCKET_LINESTATE', msg)
+      commit("SOCKET_LINESTATE", msg);
     },
     // 右上角状态
     ChangeTopRightState({ commit }, msg) {
-      commit('SOCKET_TOPRIGHTSTATE', msg[0])
-      commit('SOCKET_TOPRIGHTLAMP', msg[1])
+      commit("SOCKET_TOPRIGHTSTATE", msg[0]);
+      commit("SOCKET_TOPRIGHTLAMP", msg[1]);
     },
     // 顶部电话号码
     ChangeCallNum({ commit }, msg) {
-      commit('SOCKET_CALLNUM', msg)
+      commit("SOCKET_CALLNUM", msg);
     },
     // 顶部电话号码
     screenPopUpBoole({ commit }, msg) {
-      commit('SOCKET_SCREENPOPUP', msg)
+      commit("SOCKET_SCREENPOPUP", msg);
     },
     // 终极好
     ChangeTrunkNumber({ commit }, msg) {
-      commit('SOCKET_TRUNKNUMBER', msg)
+      commit("SOCKET_TRUNKNUMBER", msg);
     },
     // 发送的通话类型
     ChangeCallType({ commit }, msg) {
-      commit('SOCKET_CALLTYPE', msg)
+      commit("SOCKET_CALLTYPE", msg);
     },
     // 外呼操作面板是否显示
     UpdateCalloutScreen({ commit }, msg) {
-      commit('SOCKET_CALLOUTSCREEN', msg)
+      commit("SOCKET_CALLOUTSCREEN", msg);
     },
     // 外呼是否显示外呼弹屏
     UpdateOutboundScreen({ commit }, msg) {
-      commit('SOCKET_OUTBOUNDSCREEN', msg)
+      commit("SOCKET_OUTBOUNDSCREEN", msg);
     },
     // 通话时间
     UpdateCallTime({ commit }, msg) {
-      commit('SOCKET_CALLTELTIME', msg)
+      commit("SOCKET_CALLTELTIME", msg);
     },
     // 修改telWebsocket数据
     ChangeTelWSMsg({ commit }, msg) {
-      commit('SOCKET_MESSAGE', msg)
+      commit("SOCKET_MESSAGE", msg);
     },
     // 修改监听操作是否成功
     ChangeMonitor({ commit }, msg) {
-      commit('SOCKET_TELMONITOR', msg)
+      commit("SOCKET_TELMONITOR", msg);
     },
     // 监控状态
     ChangeMonitorstate({ commit }, msg) {
-      commit('SOCKET_MONITORSTATE', msg)
+      commit("SOCKET_MONITORSTATE", msg);
+    },
+    ChangeWaitcountNumber({ commit }, msg) {
+      commit("SOCKET_WAITCOUNTNUMBER", msg);
     },
     // 监控坐席工号
     ChangeMonitoragent({ commit }, msg) {
-      commit('SOCKET_MONITORAGENT', msg)
+      commit("SOCKET_MONITORAGENT", msg);
     },
     // 监控坐席分机号
     ChangeMonitorExtenNo({ commit }, msg) {
-      commit('SOCKET_MONITOREXTENNO', msg)
+      commit("SOCKET_MONITOREXTENNO", msg);
     },
     ChangeMonitorexten({ commit }, msg) {
-      commit('SOCKET_MONITOREXTEN', msg)
+      commit("SOCKET_MONITOREXTEN", msg);
     },
     // 任务信息是否显示
     ChangeTask({ commit }, msg) {
-      commit('SOCKET_TELISVISTASK', msg)
+      commit("SOCKET_TELISVISTASK", msg);
     },
     // 任务信息是否是第一次弹出
     ChangeTaskFirst({ commit }, msg) {
-      commit('SOCKET_TELISVISTASKFIRST', msg)
+      commit("SOCKET_TELISVISTASKFIRST", msg);
     },
     // 是否刷新右上角外呼任务信息/自动外呼监控/外呼分配/我的呼叫任务
     ChangeTaskInfo({ commit }, msg) {
-      commit('SOCKET_TELTASKISREFRESH', msg)
+      commit("SOCKET_TELTASKISREFRESH", msg);
     }
   }
-}
+};
 
-export default telWebsocket
+export default telWebsocket;

CallCenterWeb.UI/RMYY/src/utils/request.js

@@ -1,11 +1,11 @@
-import axios from 'axios'
-import qs from 'qs' // 引入axios时同时引入qs即可。
-import { Message, MessageBox } from 'element-ui'
-import store from '../store'
-import { getToken } from '@/utils/auth'
+import axios from "axios";
+import qs from "qs"; // 引入axios时同时引入qs即可。
+import { Message, MessageBox } from "element-ui";
+import store from "../store";
+import { getToken } from "@/utils/auth";
 
 // 正在进行中的请求列表
-const reqList = []
+const reqList = [];
 /**
  * 阻止重复请求
  * @param {array} reqList - 请求缓存列表
@@ -14,15 +14,15 @@ const reqList = []
  * @param {string} errorMessage - 请求中断时需要显示的错误信息
  */
 const stopRepeatRequest = function(reqList, url, cancel, errorMessage) {
-  const errorMsg = errorMessage || ''
+  const errorMsg = errorMessage || "";
   for (let i = 0; i < reqList.length; i++) {
     if (reqList[i] === url) {
-      cancel(errorMsg)
-      return
+      cancel(errorMsg);
+      return;
     }
   }
-  reqList.push(url)
-}
+  reqList.push(url);
+};
 
 /**
  * 允许某个请求可以继续进行
@@ -32,11 +32,12 @@ const stopRepeatRequest = function(reqList, url, cancel, errorMessage) {
 const allowRequest = function(reqList, url) {
   for (let i = 0; i < reqList.length; i++) {
     if (reqList[i] === url) {
-      reqList.splice(i, 1)
-      break
+      reqList.splice(i, 1);
+      break;
     }
   }
-}
+  console.log(reqList);
+};
 
 // const baseURL = process.env.BASE_API
 // 创建axios实例
@@ -44,7 +45,7 @@ const service = axios.create({
   // baseURL: baseURL, // api的base_url
   timeout: 30000, // 请求超时时间
   headers: {
-    'Content-Type': 'application/x-www-form-urlencoded'
+    "Content-Type": "application/x-www-form-urlencoded"
   },
   // `transformRequest` 允许在向服务器发送前，修改请求数据
   // 只能用在 'PUT', 'POST' 和 'PATCH' 这几个请求方法
@@ -53,7 +54,7 @@ const service = axios.create({
   transformRequest: [
     function(data) {
       // 对 data 进行任意转换处理
-      return qs.stringify(data)
+      return qs.stringify(data);
     }
   ],
 
@@ -64,33 +65,38 @@ const service = axios.create({
   // return qs.stringify({ids: [1, 2, 3]}, {arrayFormat: 'brackets'})  // 形式：ids[]=1&ids[]=2&ids[]=3
   // return qs.stringify({ids: [1, 2, 3]}, {arrayFormat: 'repeat'})  // 形式： ids=1&ids=2&id=3
   paramsSerializer: function(params) {
-    return qs.stringify(params, { arrayFormat: 'indices' }) // 形式：ids=1&ids=2&id=3
+    return qs.stringify(params, { arrayFormat: "indices" }); // 形式：ids=1&ids=2&id=3
   }
-})
+});
 // request拦截器
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers["Authorization"] = getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    let cancel
-    if (config.method === 'post') {
+    let cancel;
+    if (config.method === "post") {
       // 设置cancelToken对象
       config.cancelToken = new axios.CancelToken(function(c) {
-        cancel = c
-      })
+        cancel = c;
+      });
       // 阻止重复请求。当上个请求未完成时，相同的请求不会进行
-      stopRepeatRequest(reqList, config.url, cancel, `${config.url} 请求被中断`)
+      stopRepeatRequest(
+        reqList,
+        config.url,
+        cancel,
+        `${config.url} 请求被中断`
+      );
       // stopRepeatRequest(reqList, config.url, cancel, `请求被中断`)
     }
 
-    return config
+    return config;
   },
   error => {
     // Do something with request error
-    Promise.reject(error)
+    Promise.reject(error);
   }
-)
+);
 
 // respone拦截器
 service.interceptors.response.use(
@@ -99,120 +105,130 @@ service.interceptors.response.use(
      * state为非"success"时抛错
      */
     // 增加延迟，相同请求不得在短时间内重复发送
-    if (response.config.method === 'post') {
+    if (response.config.method === "post") {
       setTimeout(() => {
-        const replaceList = response.config.url.split('/')
+        const replaceList = response.config.url.split("/");
         const newUrl =
           replaceList[replaceList.length - 2] +
-          '/' +
-          replaceList[replaceList.length - 1]
-        allowRequest(reqList, newUrl)
-      }, 1000)
+          "/" +
+          replaceList[replaceList.length - 1];
+        allowRequest(reqList, newUrl);
+      }, 1000);
     }
-    const res = response.data
-    if (res.state && res.state.toLowerCase() !== 'success') {
+    const res = response.data;
+    if (res.state && res.state.toLowerCase() !== "success") {
       Message({
         message: res.message,
-        type: 'error',
+        type: "error",
         duration: 5 * 1000
-      })
+      });
       // 50008:非法的token; 50012:其他客户端登录了;  "notoken":Token 过期了
       if (
         res.state.toLowerCase() === 50008 ||
         res.state.toLowerCase() === 50012 ||
-        res.state.toLowerCase() === 'notoken'
+        res.state.toLowerCase() === "notoken"
       ) {
         MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
+          "你已被登出，可以取消继续留在该页面，或者重新登录",
+          "确定登出",
           {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
+            confirmButtonText: "重新登录",
+            cancelButtonText: "取消",
+            type: "warning"
           }
         ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+          store.dispatch("FedLogOut").then(() => {
+            location.reload(); // 为了重新实例化vue-router对象 避免bug
+          });
+        });
       }
-      return Promise.reject('error')
+      return Promise.reject("error");
     } else {
-      if (response.config.responseType === 'blob') {
-        return response
+      if (response.config.responseType === "blob") {
+        return response;
       }
-      return response.data
+      return response.data;
     }
   },
   error => {
-    console.log('err:' + error) // for debug
+    if (error.response.config.method === "post") {
+      setTimeout(() => {
+        const replaceList = error.response.config.url.split("/");
+        const newUrl =
+          replaceList[replaceList.length - 2] +
+          "/" +
+          replaceList[replaceList.length - 1];
+        allowRequest(reqList, newUrl);
+      }, 500);
+    }
+    console.log("err:" + error); // for debug
     if (error && error.response) {
       switch (
         error.response.status // 跨域存在获取不到状态码的情况
       ) {
         case 400:
-          error.message = `请求错误(400):${error.response.config.url}`
-          break
+          error.message = `请求错误(400):${error.response.config.url}`;
+          break;
 
         case 401:
-          error.message = `未授权，请登录(401):${error.response.config.url}`
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-          break
+          error.message = `未授权，请登录(401):${error.response.config.url}`;
+          store.dispatch("FedLogOut").then(() => {
+            location.reload(); // 为了重新实例化vue-router对象 避免bug
+          });
+          break;
 
         case 403:
-          error.message = `拒绝访问(403):${error.response.config.url}`
-          break
+          error.message = `拒绝访问(403):${error.response.config.url}`;
+          break;
 
         case 404:
-          error.message = `请求地址出错(404): ${error.response.config.url}`
-          break
+          error.message = `请求地址出错(404): ${error.response.config.url}`;
+          break;
 
         case 408:
-          error.message = `请求超时(408):${error.response.config.url}`
-          break
+          error.message = `请求超时(408):${error.response.config.url}`;
+          break;
 
         case 500:
-          error.message = `服务器内部错误(500):${error.response.config.url}`
-          break
+          error.message = `服务器内部错误(500):${error.response.config.url}`;
+          break;
 
         case 501:
-          error.message = `服务未实现(501):${error.response.config.url}`
-          break
+          error.message = `服务未实现(501):${error.response.config.url}`;
+          break;
 
         case 502:
-          error.message = `网关错误(502):${error.response.config.url}`
-          break
+          error.message = `网关错误(502):${error.response.config.url}`;
+          break;
 
         case 503:
-          error.message = `服务不可用(503):${error.response.config.url}`
-          break
+          error.message = `服务不可用(503):${error.response.config.url}`;
+          break;
 
         case 504:
-          error.message = `网关超时(504):${error.response.config.url}`
-          break
+          error.message = `网关超时(504):${error.response.config.url}`;
+          break;
 
         case 505:
-          error.message = `HTTP版本不受支持(505):${error.response.config.url}`
-          break
+          error.message = `HTTP版本不受支持(505):${error.response.config.url}`;
+          break;
 
         default:
-          error.message = `连接错误:${error.response.status}`
-          break
+          error.message = `连接错误:${error.response.status}`;
+          break;
       }
-    } else if (error.message.indexOf('请求被中断') !== -1) {
-      error.message = '请勿重复请求!'
+    } else if (error.message.indexOf("请求被中断") !== -1) {
+      error.message = "请勿重复请求!";
     } else {
-      error.message = '网络出现问题，请稍后重试!'
+      error.message = "网络出现问题，请稍后重试!";
     }
     Message({
       message: error.message,
-      type: 'error',
+      type: "error",
       duration: 5 * 1000
-    })
-    return Promise.reject(error)
+    });
+    return Promise.reject(error);
   }
-)
+);
 
-export default service
+export default service;

CallCenterWeb.UI/RMYY/src/utils/telWebsocket.js

@@ -3,32 +3,32 @@
  * 签入后心跳开始；签出后心跳结束；
  * 增加心跳 false 处理（签出）
  */
-import {
-  Message,
-  MessageBox,
-  Switch
-} from 'element-ui'
-import store from '@/store'
-import router from '@/router'
-import { Teljournal } from '@/api/commonAPI'
-let ws // websocket 实例
-let cls = 0
-let lockReconnect = false // 避免重复连接
-let websocktTimer // 定时器
-let wsUrl = null
+import { Message, MessageBox, Switch } from "element-ui";
+import store from "@/store";
+import router from "@/router";
+import { Teljournal } from "@/api/commonAPI";
+let ws; // websocket 实例
+let cls = 0;
+let lockReconnect = false; // 避免重复连接
+let websocktTimer; // 定时器
+let wsUrl = null;
 // const wsUrl = 'ws://' + process.env.SOCKET_IP + ':' + process.env.SOCKET_PORT
 // 创建scoket连接
 export function createWebSocket() {
-  wsUrl = 'ws://' + store.getters.serverConfig.SOCKET_IP + ':' + store.getters.serverConfig.SOCKET_PORT // 请求地址
+  wsUrl =
+    "ws://" +
+    store.getters.serverConfig.SOCKET_IP +
+    ":" +
+    store.getters.serverConfig.SOCKET_PORT; // 请求地址
   try {
-    if ('WebSocket' in window) {
-      ws = new WebSocket(wsUrl) // 创建一个websocket实例
-      init()
+    if ("WebSocket" in window) {
+      ws = new WebSocket(wsUrl); // 创建一个websocket实例
+      init();
     } else {
-      Message.error('当前浏览器不支持Websocket!')
+      Message.error("当前浏览器不支持Websocket!");
     }
   } catch (e) {
-    reconnect()
+    reconnect();
   }
 }
 
@@ -36,55 +36,66 @@ export function createWebSocket() {
 function init() {
   ws.onopen = function() {
     // console.groupCollapsed(`telWebsocket:`)
-    console.log(new Date() + '  telWebsocket  ' + '建立连接：' + wsUrl)
+    console.log(new Date() + "  telWebsocket  " + "建立连接：" + wsUrl);
     // signIn()
     // 修改store 中连接状态
-    store.dispatch('ConnectWs', true)
+    store.dispatch("ConnectWs", true);
     // 修改 store 中telwebsocket的数据
-    store.dispatch('ChangeTelWSMsg', {
-      'wsUrl': wsUrl,
-      'operationType': '建立连接'
-    })
-    if (Number(window.sessionStorage.getItem('storageSeatState'))) {
-      signIn()
+    store.dispatch("ChangeTelWSMsg", {
+      wsUrl: wsUrl,
+      operationType: "建立连接"
+    });
+    if (Number(window.sessionStorage.getItem("storageSeatState"))) {
+      signIn();
     }
-    if (Number(window.sessionStorage.getItem('telIsLogin'))) {
+    if (Number(window.sessionStorage.getItem("telIsLogin"))) {
       // heartCheck.reset().start()
       // heartCheck.sendHeart()
     }
-  }
+  };
 
   // 接收到消息的回调方法
   ws.onmessage = function(evt) {
     // 如果获取到消息，心跳检测重置
     // 拿到任何消息都说明当前连接是正常的
     // heartCheck.reset().start()
-    console.log('%c' + new Date() + '%c receive%c telWebsocket %ctype:' + JSON.parse(evt.data)[0].Type + '%c ' + evt
-      .data, 'color: #111', 'color: #67C23A', 'color: #111', 'color: #67C23A', 'color: #111')
-    dealMsg(JSON.parse(evt.data)[0])
+    console.log(
+      "%c" +
+        new Date() +
+        "%c receive%c telWebsocket %ctype:" +
+        JSON.parse(evt.data)[0].Type +
+        "%c " +
+        evt.data,
+      "color: #111",
+      "color: #67C23A",
+      "color: #111",
+      "color: #67C23A",
+      "color: #111"
+    );
+    dealMsg(JSON.parse(evt.data)[0]);
     // 修改 store 中telwebsocket的数据
-    const telWSData = JSON.parse(evt.data)
-    telWSData.operationType = '接收'
-    store.dispatch('ChangeTelWSMsg', telWSData)
-  }
+    const telWSData = JSON.parse(evt.data);
+    telWSData.operationType = "接收";
+    store.dispatch("ChangeTelWSMsg", telWSData);
+  };
 
   // 连接关闭的回调方法
   ws.onclose = function(evt) {
     if (cls === 0) {
-      cls = 1
-      console.log('telWebsocket连接关闭')
+      cls = 1;
+      console.log("telWebsocket连接关闭");
       // console.groupEnd()
       // 修改store 中连接状态
-      store.dispatch('ConnectWs', false)
-      store.dispatch('ChangeLineState', 1)
+      store.dispatch("ConnectWs", false);
+      store.dispatch("ChangeLineState", 1);
       // 修改 store 中telwebsocket的数据
-      store.dispatch('ChangeTelWSMsg', {
-        'wsUrl': wsUrl,
-        'operationType': '连接关闭'
-      })
-      reconnect()
+      store.dispatch("ChangeTelWSMsg", {
+        wsUrl: wsUrl,
+        operationType: "连接关闭"
+      });
+      reconnect();
     }
-  }
+  };
 
   // 连接发生错误的回调方法
   ws.onerror = function(evt) {
@@ -99,40 +110,40 @@ function init() {
     // })
     // console.warn('telWebsocket连接出现异常！')
     // 修改 store 中telwebsocket的数据
-    store.dispatch('ChangeTelWSMsg', {
-      'wsUrl': wsUrl,
-      'operationType': '连接异常'
-    })
+    store.dispatch("ChangeTelWSMsg", {
+      wsUrl: wsUrl,
+      operationType: "连接异常"
+    });
     if (ws == null || ws.readyState !== ws.OPEN) {
-      console.log(new Date() + 'telWebsocket开始重连')
+      console.log(new Date() + "telWebsocket开始重连");
       // 修改 store 中telwebsocket的数据
-      store.dispatch('ChangeTelWSMsg', {
-        'wsUrl': wsUrl,
-        'operationType': '开始重连'
-      })
-      reconnect()
+      store.dispatch("ChangeTelWSMsg", {
+        wsUrl: wsUrl,
+        operationType: "开始重连"
+      });
+      reconnect();
     }
-  }
+  };
 }
 
 /**
  * 重新连接
  */
 function reconnect() {
-  if (lockReconnect) return
-  lockReconnect = true
+  if (lockReconnect) return;
+  lockReconnect = true;
   // 没连接上会一直重连，设置延迟避免请求过多
-  websocktTimer && clearTimeout(websocktTimer)
+  websocktTimer && clearTimeout(websocktTimer);
   websocktTimer = setTimeout(function() {
-    console.log(new Date() + '    ' + 'telWebsocket重连中……')
+    console.log(new Date() + "    " + "telWebsocket重连中……");
     // 修改 store 中telwebsocket的数据
-    store.dispatch('ChangeTelWSMsg', {
-      'wsUrl': wsUrl,
-      'operationType': '重连中……'
-    })
-    createWebSocket()
-    lockReconnect = false
-  }, 2000)
+    store.dispatch("ChangeTelWSMsg", {
+      wsUrl: wsUrl,
+      operationType: "重连中……"
+    });
+    createWebSocket();
+    lockReconnect = false;
+  }, 2000);
 }
 
 /**
@@ -141,15 +152,22 @@ function reconnect() {
  */
 export function Send(scoketDatas) {
   if (ws.readyState !== ws.OPEN) {
-    reconnect()
+    reconnect();
   }
   if (ws.readyState === ws.OPEN) {
-    console.log('%c' + new Date() + '%c  send %c telWebsocket  ' + JSON.stringify(scoketDatas), 'color: #111',
-      'color: #409EFF', 'color: #111')
-    ws.send(JSON.stringify(scoketDatas))
-    scoketDatas.operationType = '发送'
+    console.log(
+      "%c" +
+        new Date() +
+        "%c  send %c telWebsocket  " +
+        JSON.stringify(scoketDatas),
+      "color: #111",
+      "color: #409EFF",
+      "color: #111"
+    );
+    ws.send(JSON.stringify(scoketDatas));
+    scoketDatas.operationType = "发送";
     // 修改 store 中telwebsocket的数据
-    store.dispatch('ChangeTelWSMsg', scoketDatas)
+    store.dispatch("ChangeTelWSMsg", scoketDatas);
   }
 }
 
@@ -159,32 +177,31 @@ const heartCheck = {
   timeoutObj: null,
   serverTimeoutObj: null,
   reset: function() {
-    clearTimeout(this.timeoutObj)
-    clearTimeout(this.serverTimeoutObj)
-    return this
+    clearTimeout(this.timeoutObj);
+    clearTimeout(this.serverTimeoutObj);
+    return this;
   },
 
   start: function() {
-    const _self = this
+    const _self = this;
     this.timeoutObj = setTimeout(function() {
       // 这里发送一个心跳，后端收到后，返回一个心跳消息，
       // onmessage拿到返回的心跳就说明连接正常
-      _self.sendHeart()
-      _self.aa()
-    }, this.timeout)
+      _self.sendHeart();
+      _self.aa();
+    }, this.timeout);
   },
   sendHeart: function() {
     const scoketDatas = {
-      'Type': 'Heart',
-      'Result': true,
-      'AgentID': store.getters.usercode, // 工号
-      'AgentExten': store.getters.extension, // 分机号
-      'AgentGroup': store.getters.groupcode // 坐席组id
-    }
-    Send(scoketDatas)
+      Type: "Heart",
+      Result: true,
+      AgentID: store.getters.usercode, // 工号
+      AgentExten: store.getters.extension, // 分机号
+      AgentGroup: store.getters.groupcode // 坐席组id
+    };
+    Send(scoketDatas);
   }
-
-}
+};
 // 迁入
 function signIn() {
   // if(!this.groupcode){
@@ -205,14 +222,14 @@ function signIn() {
   //   return
   // }
   const scoketDatas = {
-    'Type': 'Login',
-    'AgentID': store.getters.usercode,
-    'AgentExten': store.getters.extension,
-    'AgentGroup': window.localStorage.getItem('groupCode'), // 坐席组id window.localStorage.getItem('groupCode')
-    'AgentType': '0',
-    'DisposeTime': '0' // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
-  }
-  Send(scoketDatas)
+    Type: "Login",
+    AgentID: store.getters.usercode,
+    AgentExten: store.getters.extension,
+    AgentGroup: window.localStorage.getItem("groupCode"), // 坐席组id window.localStorage.getItem('groupCode')
+    AgentType: "0",
+    DisposeTime: "0" // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
+  };
+  Send(scoketDatas);
 }
 /**
  * 处理接收的消息
@@ -220,118 +237,123 @@ function signIn() {
  */
 function dealMsg(msgData) {
   if (msgData) {
-    const rlt = msgData.Result
+    const rlt = msgData.Result;
     if (rlt === true) {
       switch (msgData.Type.toLowerCase()) {
-        case 'login': // 签入
-          LoginBack()
-          break
-        case 'logout': // 签出
-          LogoutBack()
-          break
-        case 'dropcall': // 挂断
-          DropCallBack()
-          break
-        case 'makecall': // 外呼
-          MakeCallBack(msgData)
-          break
-        case 'setstate': // 置忙 置闲
-          SetState(msgData)
-          break // 置忙置闲
-        case 'meeting': // 会议
-          MeetingBack()
-          break
-        case 'transfer': // 转移
-          TransferBack()
-          break
-          // case 'consult': // 协商呼叫
-          //   ConsultBack()
-          //   break
-        case 'hold': // 保持
-          HoldBack(msgData)
-          break
-        case 'retrieve': // 接回
-          RetrieveBack()
-          break
-        case 'incoming': // 来电
-          IncomingBack(msgData)
-          break
-        case 'linestateagent': // 线路状态
-          LineStateAgentBack(msgData)
-          break
-        case 'agentstate': // 线路状态
-          updateSeatMonitorlists(msgData)
-          break
-        case 'getagentlist':
-          getAgentList(msgData)
-          break
+        case "login": // 签入
+          LoginBack();
+          break;
+        case "logout": // 签出
+          LogoutBack();
+          break;
+        case "dropcall": // 挂断
+          DropCallBack();
+          break;
+        case "makecall": // 外呼
+          MakeCallBack(msgData);
+          break;
+        case "setstate": // 置忙 置闲
+          SetState(msgData);
+          break; // 置忙置闲
+        case "meeting": // 会议
+          MeetingBack();
+          break;
+        case "transfer": // 转移
+          TransferBack();
+          break;
+        // case 'consult': // 协商呼叫
+        //   ConsultBack()
+        //   break
+        case "hold": // 保持
+          HoldBack(msgData);
+          break;
+        case "retrieve": // 接回
+          RetrieveBack();
+          break;
+        case "incoming": // 来电
+          IncomingBack(msgData);
+          break;
+        case "linestateagent": // 线路状态
+          LineStateAgentBack(msgData);
+          break;
+        case "agentstate": // 线路状态
+          updateSeatMonitorlists(msgData);
+          break;
+        case "getagentlist":
+          getAgentList(msgData);
+          break;
       }
     } else if (rlt === false) {
       // const errCode = msgData.Error % 10000
       Message({
         dangerouslyUseHTMLString: true,
-        message: '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' +
-          msgData.Type + '</div>',
+        message:
+          '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' +
+          msgData.Type +
+          "</div>",
         offset: 400,
         center: true,
-        type: 'error',
+        type: "error",
         duration: 2 * 1000
-      })
+      });
     } else {
-      if (msgData.Type.toLowerCase() === 'linestateagent') {
-        LineStateAgentBack(msgData)
-      } else if (msgData.Type.toLowerCase() === 'monitor') {
-        updateSeatMonitorlists(msgData)
-      } else if (msgData.Type.toLowerCase() === 'waitcount') {
-        console.log(msgData.Type)
+      if (msgData.Type.toLowerCase() === "linestateagent") {
+        LineStateAgentBack(msgData);
+      } else if (msgData.Type.toLowerCase() === "monitor") {
+        updateSeatMonitorlists(msgData);
+      } else if (msgData.Type.toLowerCase() === "waitcount") {
+        console.log(msgData.Type);
+        store.dispatch("ChangeWaitcountNumber", msgData.WaitCount);
       } else {
         // Message.error(`${rlt} !`)
         Message({
           dangerouslyUseHTMLString: true,
-          message: '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' +
-            rlt + '</div>',
+          message:
+            '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' +
+            rlt +
+            "</div>",
           offset: 400,
           center: true,
-          type: 'error',
+          type: "error",
           duration: 2 * 1000
-        })
+        });
       }
     }
   }
 }
 
 function updateSeatMonitorlists(msgData) {
-  store.dispatch('ChangeMonitor', true) // 修改监听操作的返回值
-  store.dispatch('ChangeMonitorstate', msgData.State) // 监控状态
-  store.dispatch('ChangeMonitoragent', msgData.AgentID) // 监控坐席
-  store.dispatch('ChangeMonitorexten', msgData.ExtenID) // 监控坐席
+  store.dispatch("ChangeMonitor", true); // 修改监听操作的返回值
+  store.dispatch("ChangeMonitorstate", msgData.State); // 监控状态
+  store.dispatch("ChangeMonitoragent", msgData.AgentID); // 监控坐席
+  store.dispatch("ChangeMonitorexten", msgData.ExtenID); // 监控坐席
 }
 // 签入
 function LoginBack(reState) {
   // 心跳检测开始
   // heartCheck.reset().start()
-  cls = 0
-  store.dispatch('LoginWs')
-  store.dispatch('ChangeTopRightState', ['空闲', true])
+  cls = 0;
+  store.dispatch("LoginWs");
+  store.dispatch("ChangeTopRightState", ["空闲", true]);
   // 弹出任务信息
-  store.dispatch('ChangeTask', true)
-  let scoketDatas = {}
-  if (Number(window.sessionStorage.getItem('storageSeatState')) === 2) {
+  store.dispatch("ChangeTask", true);
+  let scoketDatas = {};
+  if (Number(window.sessionStorage.getItem("storageSeatState")) === 2) {
     scoketDatas = {
-      Type: 'SayFree',
-      AgentID: window.localStorage.getItem('storageUsercode'),
-      AgentExten: window.localStorage.getItem('ext')
-    }
-    Send(scoketDatas)
-  } else if (Number(window.sessionStorage.getItem('storageSeatState')) === 5) {
+      Type: "SayFree",
+      AgentID: window.localStorage.getItem("storageUsercode"),
+      AgentExten: window.localStorage.getItem("ext")
+    };
+    Send(scoketDatas);
+  } else if (Number(window.sessionStorage.getItem("storageSeatState")) === 5) {
     scoketDatas = {
-      Type: 'SayBusy',
-      AgentID: window.localStorage.getItem('storageUsercode'),
-      AgentExten: window.localStorage.getItem('ext')
-    }
-    Send(scoketDatas)
+      Type: "SayBusy",
+      AgentID: window.localStorage.getItem("storageUsercode"),
+      AgentExten: window.localStorage.getItem("ext")
+    };
+    Send(scoketDatas);
   } else {
-    window.sessionStorage.setItem('storageSeatState', 2)
+    window.sessionStorage.setItem("storageSeatState", 2);
   }
 }
 
@@ -339,23 +361,23 @@ function LoginBack(reState) {
 function LogoutBack(reState) {
   // 心跳检测关闭
   // heartCheck.reset()
-  store.dispatch('LogoutWs')
-  store.dispatch('ChangeTopRightState', ['已签出', false])
+  store.dispatch("LogoutWs");
+  store.dispatch("ChangeTopRightState", ["已签出", false]);
   // 重置初始化状态
-  resetInitState()
-  window.sessionStorage.setItem('storageSeatState', 0)
-  getOperatonTime('2')
-  console.log('签出2')
+  resetInitState();
+  window.sessionStorage.setItem("storageSeatState", 0);
+  getOperatonTime("2");
+  console.log("签出2");
 }
 
 // 重置初始化状态
 function resetInitState() {
-  store.dispatch('ChangeSeatState', 2) // 坐席状态（空闲）
-  store.dispatch('ChangeLineState', 1) // 线路状态（空闲）
-  store.dispatch('ChangeCallNum', '') // 顶部电话号码（''）
-  store.dispatch('ChangeCallType', 'MakeCall') // 发送的通话类型（默认是外呼）
-  store.dispatch('ChangeTask', false) // 外呼任务信息是否显示
-  store.dispatch('ChangeTaskFirst', true) // 外呼任务信息是否是第一次弹出
+  store.dispatch("ChangeSeatState", 2); // 坐席状态（空闲）
+  store.dispatch("ChangeLineState", 1); // 线路状态（空闲）
+  store.dispatch("ChangeCallNum", ""); // 顶部电话号码（''）
+  store.dispatch("ChangeCallType", "MakeCall"); // 发送的通话类型（默认是外呼）
+  store.dispatch("ChangeTask", false); // 外呼任务信息是否显示
+  store.dispatch("ChangeTaskFirst", true); // 外呼任务信息是否是第一次弹出
 }
 
 /**
@@ -364,17 +386,17 @@ function resetInitState() {
  * */
 function SetState(sayOption) {
   if (sayOption.State === 5) {
-    store.dispatch('ChangeSeatState', 5)
-    window.sessionStorage.setItem('storageSeatState', 5)
-    store.dispatch('ChangeTopRightState', ['忙碌', false])
-    getOperatonTime('3')
-    console.log('置忙3')
+    store.dispatch("ChangeSeatState", 5);
+    window.sessionStorage.setItem("storageSeatState", 5);
+    store.dispatch("ChangeTopRightState", ["忙碌", false]);
+    getOperatonTime("3");
+    console.log("置忙3");
   } else if (sayOption.State === 2) {
-    store.dispatch('ChangeSeatState', 2)
-    window.sessionStorage.setItem('storageSeatState', 2)
-    store.dispatch('ChangeTopRightState', ['空闲', true])
-    getOperatonTime('4')
-    console.log('置闲4')
+    store.dispatch("ChangeSeatState", 2);
+    window.sessionStorage.setItem("storageSeatState", 2);
+    store.dispatch("ChangeTopRightState", ["空闲", true]);
+    getOperatonTime("4");
+    console.log("置闲4");
   }
 }
 
@@ -383,9 +405,9 @@ function SetState(sayOption) {
  * sayOption (点击置忙置闲后的返回值)
  * */
 function SayBusyBack(sayOption) {
-  store.dispatch('ChangeSeatState', 5)
-  if (sayOption.Type === 'SayBusy') {
-    store.dispatch('ChangeTopRightState', ['忙碌', false])
+  store.dispatch("ChangeSeatState", 5);
+  if (sayOption.Type === "SayBusy") {
+    store.dispatch("ChangeTopRightState", ["忙碌", false]);
   }
 }
 /**
@@ -393,9 +415,9 @@ function SayBusyBack(sayOption) {
  * sayOption (点击置忙置闲后的返回值)
  * */
 function SayFreeBack(sayOption) {
-  store.dispatch('ChangeSeatState', 2)
-  if (sayOption.Type === 'SayFree') {
-    store.dispatch('ChangeTopRightState', ['空闲', true])
+  store.dispatch("ChangeSeatState", 2);
+  if (sayOption.Type === "SayFree") {
+    store.dispatch("ChangeTopRightState", ["空闲", true]);
   }
 }
 
@@ -406,100 +428,100 @@ function LineStateAgentBack(linedata) {
   switch (linedata.State) {
     // case '空闲':
     case 1:
-      store.dispatch('ChangeLineState', 1)
-      store.dispatch('ChangeCallNum', '') // 顶部电话号码（''）
-      store.dispatch('ChangeTopRightState', ['空闲', true])
-      break
-      // case '摘机等待拨号':
+      store.dispatch("ChangeLineState", 1);
+      store.dispatch("ChangeCallNum", ""); // 顶部电话号码（''）
+      store.dispatch("ChangeTopRightState", ["空闲", true]);
+      break;
+    // case '摘机等待拨号':
     case 2:
-      store.dispatch('ChangeLineState', 2)
-      store.dispatch('ChangeTopRightState', ['摘机等待拨号', true])
-      break
-      // case '正在拨号':
+      store.dispatch("ChangeLineState", 2);
+      store.dispatch("ChangeTopRightState", ["摘机等待拨号", true]);
+      break;
+    // case '正在拨号':
     case 3:
-      store.dispatch('ChangeLineState', 3)
-      store.dispatch('ChangeTopRightState', ['正在拨号', true])
-      break
-      // case '呼出振铃':
+      store.dispatch("ChangeLineState", 3);
+      store.dispatch("ChangeTopRightState", ["正在拨号", true]);
+      break;
+    // case '呼出振铃':
     case 4:
-      store.dispatch('ChangeLineState', 4)
-      store.dispatch('ChangeTopRightState', ['呼出振铃', true])
-      break
-      // case '来电振铃':
+      store.dispatch("ChangeLineState", 4);
+      store.dispatch("ChangeTopRightState", ["呼出振铃", true]);
+      break;
+    // case '来电振铃':
     case 5:
-      store.dispatch('ChangeLineState', 5)
-      store.dispatch('ChangeTopRightState', ['来电振铃', true])
-      break
-      // case '通话中':
+      store.dispatch("ChangeLineState", 5);
+      store.dispatch("ChangeTopRightState", ["来电振铃", true]);
+      break;
+    // case '通话中':
     case 6:
-      store.dispatch('ChangeLineState', 6)
-      store.dispatch('ChangeTopRightState', ['通话中', true])
-      break
-      // case '播放忙音中':
+      store.dispatch("ChangeLineState", 6);
+      store.dispatch("ChangeTopRightState", ["通话中", true]);
+      break;
+    // case '播放忙音中':
     case 7:
-      store.dispatch('ChangeLineState', 7)
-      store.dispatch('ChangeTopRightState', ['播放忙音中', true])
-      break
-      // case '移除IP分机':
+      store.dispatch("ChangeLineState", 7);
+      store.dispatch("ChangeTopRightState", ["播放忙音中", true]);
+      break;
+    // case '移除IP分机':
     case 8:
-      store.dispatch('ChangeLineState', 8)
-      store.dispatch('ChangeTopRightState', ['移除IP分机', true])
-      break
-      // case '通话保持中':
+      store.dispatch("ChangeLineState", 8);
+      store.dispatch("ChangeTopRightState", ["移除IP分机", true]);
+      break;
+    // case '通话保持中':
     case 10:
-      store.dispatch('ChangeLineState', 10)
-      store.dispatch('ChangeTopRightState', ['通话保持中', true])
-      break
+      store.dispatch("ChangeLineState", 10);
+      store.dispatch("ChangeTopRightState", ["通话保持中", true]);
+      break;
   }
 }
 
 // 来电
 function IncomingBack(inComingData) {
-  const inComingCallId = inComingData.CallID
-  let inComingNumber = inComingData.Number
-  store.dispatch('screenPopUpBoole', 1)
+  const inComingCallId = inComingData.CallID;
+  let inComingNumber = inComingData.Number;
+  store.dispatch("screenPopUpBoole", 1);
   if (inComingNumber.length > 11) {
-    inComingNumber = inComingNumber.substr(1)
+    inComingNumber = inComingNumber.substr(1);
     // console.log(inComingNumber)
   }
-  window.localStorage.setItem('callidSave', inComingData.CallID) // 用户的坐席组code
+  window.localStorage.setItem("callidSave", inComingData.CallID); // 用户的坐席组code
   router.push({
-    name: 'CallScreen',
-    path: '/callScreen',
-    fullPath: '/callScreen',
+    name: "CallScreen",
+    path: "/callScreen",
+    fullPath: "/callScreen",
     params: {
       callid: inComingCallId,
       telInNumber: inComingNumber
     }
-  })
-  store.dispatch('ChangeCallNum', inComingNumber)
+  });
+  store.dispatch("ChangeCallNum", inComingNumber);
 }
 
 // 挂断
 function DropCallBack() {
-  store.dispatch('ChangeCallNum', '') // 顶部电话号码（''）
-  store.dispatch('ChangeCallType', 'MakeCall') // 发送的通话类型（默认是外呼）
-  store.dispatch('screenPopUpBoole', 0)
+  store.dispatch("ChangeCallNum", ""); // 顶部电话号码（''）
+  store.dispatch("ChangeCallType", "MakeCall"); // 发送的通话类型（默认是外呼）
+  store.dispatch("screenPopUpBoole", 0);
   // 当前在坐席监控中需要 更新坐席监控内坐席的状态
-  const curentViews = store.state.tagsView.visitedViews
+  const curentViews = store.state.tagsView.visitedViews;
   for (let i = 0, len = curentViews.length; i < len; i++) {
-    if (curentViews[i].name === 'seatMonitor') {
+    if (curentViews[i].name === "seatMonitor") {
       // updateSeatMonitorlists()
-      return
+      return;
     }
   }
 }
 
 // 转接
 function TransferBack() {
-  store.dispatch('ChangeCallNum', '') // 顶部电话号码（''）
-  store.dispatch('ChangeCallType', 'MakeCall') // 发送的通话类型（默认是外呼）
+  store.dispatch("ChangeCallNum", ""); // 顶部电话号码（''）
+  store.dispatch("ChangeCallType", "MakeCall"); // 发送的通话类型（默认是外呼）
 }
 
 // 外呼 结果 弹出来电弹屏
 function MakeCallBack(callBackData) {
-  const inComingNumber = store.getters.telCallNum
-  const inComingCallId = callBackData.CallID
+  const inComingNumber = store.getters.telCallNum;
+  const inComingCallId = callBackData.CallID;
 }
 
 // 多方通话
@@ -511,7 +533,7 @@ function RecordPathBack() {}
 // 保持
 function HoldBack(holdData) {
   if (holdData.Result === true) {
-    store.dispatch('ChangeLineState', 10)
+    store.dispatch("ChangeLineState", 10);
   }
 }
 
@@ -530,17 +552,15 @@ function RetrieveBack(RetrieveData) {
 
 // 获取当前在线坐席
 function getAgentList(data) {
-  store.dispatch('GetOnlineSeatList', data.AgentList) // 监控坐席
+  store.dispatch("GetOnlineSeatList", data.AgentList); // 监控坐席
 }
 
 function getOperatonTime(state) {
   const params = {
     state: state,
-    token: localStorage.getItem('Admin-Token').split(' ')[1]
-  }
+    token: localStorage.getItem("Admin-Token").split(" ")[1]
+  };
   Teljournal(params)
-    .then((response) => {
-
-    })
-    .catch((result) => {})
+    .then(response => {})
+    .catch(result => {});
 }

CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 首页 -->
   <div class="dashboard app-container">
-    <el-row style="margin-bottom:10px;">
+    <el-row style="margin-bottom: 10px">
       <div class="zx">坐席</div>
       <button class="initBtn" @click="initInfor">刷新</button>
     </el-row>
-    <el-row :gutter="20" style="margin-bottom:30px;">
+    <el-row :gutter="20" style="margin-bottom: 30px">
       <el-col :span="14">
         <div class="bottomLine">
           <span class="line" />
@@ -19,7 +19,7 @@
                 <span>呼入总数：{{ callInTotal }}</span>
               </div>
               <div>
-                <label class="answer">{{ answersNum }}<br>接听数</label>
+                <label class="answer">{{ answersNum }}<br />接听数</label>
               </div>
             </div>
             <div class="telTime">
@@ -34,7 +34,7 @@
                 <span>外呼总数：{{ calOutTotal }}</span>
               </div>
               <div>
-                <label class="answer">{{ ConnectNum }}<br>接通数</label>
+                <label class="answer">{{ ConnectNum }}<br />接通数</label>
               </div>
             </div>
             <div class="telTime">
@@ -50,13 +50,13 @@
           <span>实时统计</span>
         </div>
         <div class="pending">
-          <img src="../../assets/imgs/cl.png" alt="" class="cl">
-          <span>后台排队：10</span>
+          <img src="../../assets/imgs/cl.png" alt="" class="cl" />
+          <span>后台排队：{{ waitcountNumber }}</span>
         </div>
       </el-col>
     </el-row>
 
-    <el-row :gutter="20" style="margin-bottom:30px">
+    <el-row :gutter="20" style="margin-bottom: 30px">
       <el-col :span="14">
         <div class="bLine">
           <span class="line" />
@@ -64,23 +64,23 @@
         </div>
         <ul class="centerPart">
           <li>
-            <img src="../../assets/imgs/pd.png" alt="">
-            <div style="margin:8px 0">待处理</div>
+            <img src="../../assets/imgs/pd.png" alt="" />
+            <div style="margin: 8px 0">待处理</div>
             <div>{{ dealOrder }}</div>
           </li>
           <li>
-            <img src="../../assets/imgs/pd.png" alt="">
-            <div style="margin:8px 0">待派工</div>
+            <img src="../../assets/imgs/pd.png" alt="" />
+            <div style="margin: 8px 0">待派工</div>
             <div>{{ dispatch }}</div>
           </li>
           <li>
-            <img src="../../assets/imgs/pd.png" alt="">
-            <div style="margin:8px 0">待完工</div>
+            <img src="../../assets/imgs/pd.png" alt="" />
+            <div style="margin: 8px 0">待完工</div>
             <div>{{ finish }}</div>
           </li>
           <li>
-            <img src="../../assets/imgs/pd.png" alt="">
-            <div style="margin:8px 0">待评价</div>
+            <img src="../../assets/imgs/pd.png" alt="" />
+            <div style="margin: 8px 0">待评价</div>
             <div>{{ evaluate }}</div>
           </li>
         </ul>
@@ -89,18 +89,28 @@
         <div class="bottomLine">
           <span class="line" />
           <span>公告管理</span>
-          <span style="float: right;color: #4A5064;cursor: pointer;" @click="goseeMore()">查看更多>></span>
+          <span
+            style="float: right; color: #4a5064; cursor: pointer"
+            @click="goseeMore()"
+            >查看更多>></span
+          >
         </div>
         <div class="notices">
-          <p v-for="(item,index) in noticeData" :key="index">
-            <span class="circle"></span><a
-              @click="btn_see(item.F_NoticeId)">{{item.F_Title.length>20?item.F_Title.substring(0,20)+'...':item.F_Title}}</a>
-            <span style="color: #555;font-size: 15px;">{{item.F_CreateOn}}</span>
+          <p v-for="(item, index) in noticeData" :key="index">
+            <span class="circle"></span
+            ><a @click="btn_see(item.F_NoticeId)">{{
+              item.F_Title.length > 20
+                ? item.F_Title.substring(0, 20) + "..."
+                : item.F_Title
+            }}</a>
+            <span style="color: #555; font-size: 15px">{{
+              item.F_CreateOn
+            }}</span>
           </p>
         </div>
       </el-col>
     </el-row>
-    <el-row style="position: relative;">
+    <el-row style="position: relative">
       <div class="bLine">
         <span class="line" />
         <span>完成工单</span>
@@ -118,334 +128,343 @@
       </el-tabs>
       <div class="block">
         <span class="demonstration">选择日期</span>
-        <el-date-picker v-model="timeDate" type="daterange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="initTime" />
+        <el-date-picker
+          v-model="timeDate"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="initTime"
+        />
       </div>
     </el-row>
   </div>
 </template>
 
 <script>
-  import {
-    getOneIndex,
-    getTelCount,
-    GetListTop
-  } from '@/api/dashboard'
-  import FinishOrder from './finishOrder'
-  import NoticeDetail from '../AnnounceManagement/Notice/components/detail.vue'
-  export default {
-    name: 'Dashboard',
-    components: {
-      FinishOrder
+import { mapGetters } from "vuex";
+import { getOneIndex, getTelCount, GetListTop } from "@/api/dashboard";
+import FinishOrder from "./finishOrder";
+import NoticeDetail from "../AnnounceManagement/Notice/components/detail.vue";
+export default {
+  name: "Dashboard",
+  components: {
+    FinishOrder,
+  },
+  data() {
+    return {
+      finishOrder: {
+        jkzxfinishcount: "",
+        wpzjzxcount: "",
+        jtyysmcount: "",
+        jmzgwhcount: "",
+        zhallcount: "",
+        wobxcount: "",
+        sbzldevcount: "",
+        clddcarcount: "",
+      },
+      activeName: "0",
+      timeDate: "",
+      callInTotal: "",
+      answersNum: "",
+      totalCallInTime: "",
+      averageCallInTime: "",
+      calOutTotal: "",
+      ConnectNum: "",
+      totalCallOutTime: "",
+      averageCallOutTime: "",
+      dealOrder: "",
+      dispatch: "",
+      finish: "",
+      evaluate: "",
+      noticeData: [],
+      isNotice: "1",
+    };
+  },
+  computed: {},
+  computed: {
+    ...mapGetters([
+      "waitcountNumber", // 工号
+    ]),
+  },
+  created() {
+    this.getTelInfor();
+    this.getInfor();
+    this.getNotice();
+  },
+  mounted() {},
+  methods: {
+    getNotice() {
+      return new Promise((resolve) => {
+        const params = {
+          top: 4,
+        };
+        GetListTop(params).then((response) => {
+          this.noticeData = response.rows;
+        });
+        resolve();
+      });
     },
-    data() {
-      return {
-        finishOrder: {
-          jkzxfinishcount: '',
-          wpzjzxcount: '',
-          jtyysmcount: '',
-          jmzgwhcount: '',
-          zhallcount: '',
-          wobxcount: '',
-          sbzldevcount: '',
-          clddcarcount: ''
+    btn_see(rowdata) {
+      this.$layer.iframe({
+        content: {
+          content: NoticeDetail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            rowdata: rowdata.toString(),
+          }, // props
         },
-        activeName: '0',
-        timeDate: '',
-        callInTotal: '',
-        answersNum: '',
-        totalCallInTime: '',
-        averageCallInTime: '',
-        calOutTotal: '',
-        ConnectNum: '',
-        totalCallOutTime: '',
-        averageCallOutTime: '',
-        dealOrder: '',
-        dispatch: '',
-        finish: '',
-        evaluate: '',
-        noticeData: [],
-        isNotice:'1'
-      }
+        area: ["70%", "70%"],
+        title: "公告详情",
+      });
     },
-    computed: {},
-    created() {
-      this.getTelInfor()
-      this.getInfor()
-      this.getNotice()
+    goseeMore() {
+      this.$router.push({
+        name: "Notice",
+        params: {
+          isNotice: this.isNotice,
+        },
+      });
     },
-    mounted() {
-
+    initInfor() {
+      this.getTelInfor();
+      this.getInfor();
     },
-    methods: {
-      getNotice() {
-        return new Promise((resolve) => {
-          const params = {
-            top: 4
-          }
-          GetListTop(params).then((response) => {
-            this.noticeData = response.rows
-          })
-          resolve()
-        })
-      },
-      btn_see(rowdata) {
-        this.$layer.iframe({
-          content: {
-            content: NoticeDetail, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: {
-              rowdata: rowdata.toString()
-            } // props
-          },
-          area: ['70%', '70%'],
-          title: '公告详情'
-        })
-      },
-      goseeMore() {
-        this.$router.push({
-          name: 'Notice',
-          params: {
-            isNotice: this.isNotice
-          }
-        })
-      },
-      initInfor() {
-        this.getTelInfor()
-        this.getInfor()
-      },
-      initTime() {
-        console.log(11)
-        this.getInfor()
-      },
-      handleClick(tab) {
-        this.activeName = tab.name
-        this.getInfor()
-      },
-      getInfor() {
-        return new Promise((resolve) => {
-          const params = {
-            isweek: this.activeName,
-            stime: this.timeDate && this.timeDate[0],
-            etime: this.timeDate && this.timeDate[1]
-          }
-          getOneIndex(params).then((response) => {
-            this.dealOrder = response.data.dclallcount
-            this.dispatch = response.data.dpgallcount
-            this.finish = response.data.dwgallcount
-            this.evaluate = response.data.dpjallcount
-            this.finishOrder.jkzxfinishcount = response.data.jkzxfinishcount
-            this.finishOrder.wpzjzxcount = response.data.wpzjzxcount
-            this.finishOrder.jtyysmcount = response.data.jtyysmcount
-            this.finishOrder.jmzgwhcount = response.data.jmzgwhcount
-            this.finishOrder.zhallcount = response.data.zhallcount
-            this.finishOrder.wobxcount = response.data.wobxcount
-            this.finishOrder.sbzldevcount = response.data.sbzldevcount
-            this.finishOrder.clddcarcount = response.data.clddcarcount
-          })
-          resolve()
-        })
-      },
-      getTelInfor() {
-        return new Promise((resolve) => {
-          const params = {}
-          getTelCount(params).then((response) => {
-            this.callInTotal = response.dayin.count
-            this.answersNum = response.jtconin
-            this.totalCallInTime = response.thtimesin
-            this.averageCallInTime = response.pjthtimesin
-            this.calOutTotal = response.dayout.count
-            this.ConnectNum = response.jtconout
-            this.totalCallOutTime = response.thtimesout
-            this.averageCallOutTime = response.pjthtimesout
-          })
-          resolve()
-        })
-      }
-    }
-  }
+    initTime() {
+      console.log(11);
+      this.getInfor();
+    },
+    handleClick(tab) {
+      this.activeName = tab.name;
+      this.getInfor();
+    },
+    getInfor() {
+      return new Promise((resolve) => {
+        const params = {
+          isweek: this.activeName,
+          stime: this.timeDate && this.timeDate[0],
+          etime: this.timeDate && this.timeDate[1],
+        };
+        getOneIndex(params).then((response) => {
+          this.dealOrder = response.data.dclallcount;
+          this.dispatch = response.data.dpgallcount;
+          this.finish = response.data.dwgallcount;
+          this.evaluate = response.data.dpjallcount;
+          this.finishOrder.jkzxfinishcount = response.data.jkzxfinishcount;
+          this.finishOrder.wpzjzxcount = response.data.wpzjzxcount;
+          this.finishOrder.jtyysmcount = response.data.jtyysmcount;
+          this.finishOrder.jmzgwhcount = response.data.jmzgwhcount;
+          this.finishOrder.zhallcount = response.data.zhallcount;
+          this.finishOrder.wobxcount = response.data.wobxcount;
+          this.finishOrder.sbzldevcount = response.data.sbzldevcount;
+          this.finishOrder.clddcarcount = response.data.clddcarcount;
+        });
+        resolve();
+      });
+    },
+    getTelInfor() {
+      return new Promise((resolve) => {
+        const params = {};
+        getTelCount(params).then((response) => {
+          this.callInTotal = response.dayin.count;
+          this.answersNum = response.jtconin;
+          this.totalCallInTime = response.thtimesin;
+          this.averageCallInTime = response.pjthtimesin;
+          this.calOutTotal = response.dayout.count;
+          this.ConnectNum = response.jtconout;
+          this.totalCallOutTime = response.thtimesout;
+          this.averageCallOutTime = response.pjthtimesout;
+        });
+        resolve();
+      });
+    },
+  },
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dashboard {
-    width: 99%;
-    height: 100%;
-    padding: 20px 40px;
-    box-sizing: border-box;
-    background-color: #fff;
-
-    .mb {
-      margin-bottom: 6px;
-    }
-  }
-
-  .block {
-    position: absolute;
-    top: -3px;
-    right: -5px;
+.dashboard {
+  width: 99%;
+  height: 100%;
+  padding: 20px 40px;
+  box-sizing: border-box;
+  background-color: #fff;
+
+  .mb {
+    margin-bottom: 6px;
   }
-
-  .initBtn {
-    float: right;
-    background-color: #fff;
-    border: 1px solid rgb(64, 158, 255);
-    padding: 7px 25px;
-    outline: none;
-    color: rgb(64, 158, 255);
-    border-radius: 5px;
-  }
-
-  .initBtn:hover {
-    background-color: rgb(64, 158, 255);
-    color: #fff;
-  }
-
-  .bg-.bg-purple[data-v-106c86ed] {
-    background-color: chocolate !important;
-  }
-
-  .zx {
-    float: left;
-    color: rgb(102, 102, 102);
-  }
-
-  .line {
-    display: inline-block;
-    width: 5px;
-    height: 18px;
-    background-color: rgb(64, 158, 255);
-    vertical-align: middle;
-    margin-right: 10px;
-  }
-
-  .bottomLine,
-  .bLine {
-    border-bottom: 1px solid rgb(215, 215, 215);
-    padding-bottom: 10px;
-  }
-
-  li {
-    list-style: none;
-    float: left;
-  }
-
-  .topPart li {
-    width: 47%;
-    margin-right: 21px;
-    height: 200px;
-  }
-
-  .callIn {
-    height: 160px;
-    background-color: rgb(40, 155, 217);
-    border-radius: 15px 15px 0 0;
-    font-size: 22px;
-    color: #fff;
-    font-weight: bold;
-  }
-
-  .telTime {
-    height: 40px;
-    background-color: rgb(242, 242, 242);
-    border-radius: 0 0 15px 15px;
-  }
-
-  .callIn div {
-    float: left;
-    width: 50%;
-    padding: 10px 20px;
-  }
-
-  .callIn div span {
-    display: block;
-    height: 70px;
-    line-height: 70px;
-  }
-
-  .answer {
-    width: 89px;
-    display: inline-block;
-    text-align: center;
-    padding: 0 10px;
-    margin-top: 33px;
-    line-height: 29px;
-    margin-left: 57px;
-  }
-
-  .telTime div {
-    float: left;
-    width: 48%;
-    line-height: 40px;
-    padding-left: 20px;
-    font-size: 14px;
-    color: rgb(102, 102, 102);
-  }
-
-  .pending {
-    margin-top: 20px;
-    width: 200px;
-    border: 1px solid rgb(215, 215, 215);
-    padding: 10px;
-    color: rgb(102, 102, 102);
-    margin-left: 20px;
-  }
-
-  .cl {
-    border-style: none;
-    width: 21px;
-    vertical-align: middle;
-    margin-right: 30px;
-  }
-
-  .bLine {
-    width: 150px;
-  }
-
-  .centerPart li {
-    width: 10%;
-    text-align: center;
-    padding: 10px;
-    background-color: rgb(242, 242, 242);
-    margin-right: 10px;
-  }
-
-  .tabs {
-    position: absolute;
-    top: -9px;
-    left: 148px;
-  }
-
-  .circle {
-    display: inline-block;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    border: 1px solid #FF0000;
-    margin-right: 10px;
-  }
-
-  .notices {
-    margin-left: 15px;
-  }
-
-  .notices a {
-    margin-right: 15px;
-  }
-
-  .notices p a:hover {
-    text-decoration: underline;
-    color: rgb(85, 170, 255);
-  }
-
-  /deep/.el-tabs__content {
-    left: -158px !important;
-    width: 152%;
-  }
-
-  /deep/.el-tabs__item {
-    padding: 0 107px !important;
-    font-size: 15px;
-  }
-
-  @media only screen and (min-width: 992px) {}
+}
+
+.block {
+  position: absolute;
+  top: -3px;
+  right: -5px;
+}
+
+.initBtn {
+  float: right;
+  background-color: #fff;
+  border: 1px solid rgb(64, 158, 255);
+  padding: 7px 25px;
+  outline: none;
+  color: rgb(64, 158, 255);
+  border-radius: 5px;
+}
+
+.initBtn:hover {
+  background-color: rgb(64, 158, 255);
+  color: #fff;
+}
+
+.bg-.bg-purple[data-v-106c86ed] {
+  background-color: chocolate !important;
+}
+
+.zx {
+  float: left;
+  color: rgb(102, 102, 102);
+}
+
+.line {
+  display: inline-block;
+  width: 5px;
+  height: 18px;
+  background-color: rgb(64, 158, 255);
+  vertical-align: middle;
+  margin-right: 10px;
+}
+
+.bottomLine,
+.bLine {
+  border-bottom: 1px solid rgb(215, 215, 215);
+  padding-bottom: 10px;
+}
+
+li {
+  list-style: none;
+  float: left;
+}
+
+.topPart li {
+  width: 47%;
+  margin-right: 21px;
+  height: 200px;
+}
+
+.callIn {
+  height: 160px;
+  background-color: rgb(40, 155, 217);
+  border-radius: 15px 15px 0 0;
+  font-size: 22px;
+  color: #fff;
+  font-weight: bold;
+}
+
+.telTime {
+  height: 40px;
+  background-color: rgb(242, 242, 242);
+  border-radius: 0 0 15px 15px;
+}
+
+.callIn div {
+  float: left;
+  width: 50%;
+  padding: 10px 20px;
+}
+
+.callIn div span {
+  display: block;
+  height: 70px;
+  line-height: 70px;
+}
+
+.answer {
+  width: 89px;
+  display: inline-block;
+  text-align: center;
+  padding: 0 10px;
+  margin-top: 33px;
+  line-height: 29px;
+  margin-left: 57px;
+}
+
+.telTime div {
+  float: left;
+  width: 48%;
+  line-height: 40px;
+  padding-left: 20px;
+  font-size: 14px;
+  color: rgb(102, 102, 102);
+}
+
+.pending {
+  margin-top: 20px;
+  width: 200px;
+  border: 1px solid rgb(215, 215, 215);
+  padding: 10px;
+  color: rgb(102, 102, 102);
+  margin-left: 20px;
+}
+
+.cl {
+  border-style: none;
+  width: 21px;
+  vertical-align: middle;
+  margin-right: 30px;
+}
+
+.bLine {
+  width: 150px;
+}
+
+.centerPart li {
+  width: 10%;
+  text-align: center;
+  padding: 10px;
+  background-color: rgb(242, 242, 242);
+  margin-right: 10px;
+}
+
+.tabs {
+  position: absolute;
+  top: -9px;
+  left: 148px;
+}
+
+.circle {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  border: 1px solid #ff0000;
+  margin-right: 10px;
+}
+
+.notices {
+  margin-left: 15px;
+}
+
+.notices a {
+  margin-right: 15px;
+}
+
+.notices p a:hover {
+  text-decoration: underline;
+  color: rgb(85, 170, 255);
+}
+
+/deep/.el-tabs__content {
+  left: -158px !important;
+  width: 152%;
+}
+
+/deep/.el-tabs__item {
+  padding: 0 107px !important;
+  font-size: 15px;
+}
+
+@media only screen and (min-width: 992px) {
+}
 </style>