diff --git a/src/App.vue b/src/App.vue
index 7374bbc..1ef5284 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
 import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
 let sp = document.createElement('script')
-sp.src = '//at.alicdn.com/t/c/font_3135652_u9fzguyh9n.js'
+sp.src = '//at.alicdn.com/t/c/font_3135652_vgfhlnrtoao.js'
 document.body.appendChild(sp)
 export default {
   provide() {
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index b850b5e..288c01f 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -10,48 +10,43 @@
       <a-breadcrumb-item>团队成员</a-breadcrumb-item>
     </a-breadcrumb>
     <div class="contentbody bodyContainer">
-      <div class="leftContainer br1">
+      <div class="leftContainer pb24">
         <div class="searchbox pb12 ml12 mr12">
           <div class="searchinput">
-            <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" enter-button allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch"></a-input-search>
+            <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
+              <a-icon slot="prefix" type="search" class="cccc" />
+              <a-button slot="enterButton" class="cblue">搜索</a-button>
+            </a-input-search>
           </div>
           <!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> -->
         </div>
 
         <a-radio-group v-model="menuType" class="pl12 pr12 tac" style="width:100%" :style="{ marginBottom: '8px' }">
-          <a-radio-button value="role" class="changeGroup" style="width:50%">按角色</a-radio-button>
           <a-radio-button value="group" class="changeGroup" style="width:50%">按部门</a-radio-button>
+          <a-radio-button value="role" class="changeGroup" style="width:50%">按角色</a-radio-button>
         </a-radio-group>
         <div v-if="menuType == 'role'">
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">全部角色</a-menu-item>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt8 mb12" style="wdith:calc(100% - 24px)"></div>
+          <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
           <div class="f12 c9 ml24 mb8">默认角色（11人）</div>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <template v-for="(item, index) in groupList">
-              <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
-                {{item.teamName}}
-                <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                  <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
-                  <div class="groupdropdownbox backTable" slot="overlay">
-                    <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
-                    <div @click="delGroup(item)">删除</div>
-                    <div>上移</div>
-                    <div>下移</div>
-                  </div>
-                </a-dropdown>
+            <template v-for="(item, index) in ['创建人(1人)','管理员(3人)','成员(12人)']">
+              <a-menu-item :key="item" class="fsa showdot" @click="selectGroup(item)">
+                {{item}}
+              
               </a-menu-item>
             </template>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt8 mb12" style="wdith:calc(100% - 24px)"></div>
+          <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
           <div class="f12 c9 ml24 mb8">自定义角色（8人）</div>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <!-- <template v-for="(item, index) in groupList"> -->
             <a-menu-item key="角色1" class="fsa showdot" @click="selectGroup('角色1')">
               {{'角色1'}}
-              <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
+              <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
+                <i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
                 <div class="groupdropdownbox backTable" slot="overlay">
                   <div>修改名称</div>
                   <div>删除</div>
@@ -62,8 +57,8 @@
             </a-menu-item>
             <a-menu-item key="角色2" class="fsa showdot" @click="selectGroup('角色2')">
               {{'角色2'}}
-              <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
+              <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
+                <i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
                 <div class="groupdropdownbox backTable" slot="overlay">
                   <div>修改名称</div>
                   <div>删除</div>
@@ -77,15 +72,15 @@
         </div>
         <div v-else>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">全部角色</a-menu-item>
+            <a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">全部部门</a-menu-item>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt8 mb12" style="wdith:calc(100% - 24px)"></div>
+          <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <template v-for="(item, index) in groupList">
               <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
                 {{item.teamName}}
-                <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                  <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
+                <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
+                  <i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
                   <div class="groupdropdownbox backTable" slot="overlay">
                     <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
                     <div @click="delGroup(item)">删除</div>
@@ -96,7 +91,7 @@
               </a-menu-item>
             </template>
           </a-menu>
-          <div class="pt12 ml12 mr12 mt16 bt1">
+          <div class="pt12 ml12 mr12 mt4 bt1">
             <a-button type="dashed" class="setMiddle" icon="plus" @click="[addGroupShow = true,isEdit = false]">
               <!-- <i class="iconfont icon-fangda c6 f12 mr8" style="line-height:32px"></i> -->
               添加部门
@@ -104,9 +99,9 @@
           </div>
         </div>
       </div>
-      <div class="rightContainer">
+      <div class="rightContainer mb24">
         <div class="fsa pb14 bb1 mb24">
-          <div class="f20 fw500">{{modalTitle ? modalTitle : "部门1（16人）"}}</div>
+          <div class="f16 fw500">{{modalTitle ? modalTitle : selectedKeys[0] == 'all' ? '全部成员':selectedKeys[0] }}</div>
           <!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> -->
           <a-button class="addmemeber f14" v-if="modalTitle == ''" @click="showDetail('add')">
             <i class="iconfont icon-fangda"></i> 添加成员
@@ -115,7 +110,7 @@
         </div>
         <!-- :expanded-row-keys.sync="expandedRowKeys" -->
         <!-- v-if="modalTitle == ''" -->
-        <div>
+        <div class>
           <a-table :columns="columns" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id" :locale="tablenodata">
             <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
             <span slot="nickName" slot-scope="text, record">
@@ -143,7 +138,7 @@
             </div>
           </a-table>
           <div class="pagecontainer mt16">
-            <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
+            <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="20" :total="pagination.total" @change="onChange" />
             <div class="ant-pagination-options-quick-jumper f14 ml12">
               <span>共{{ pagination.total }}条，</span>跳至
               <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
@@ -358,7 +353,7 @@ export default {
       form: this.$form.createForm(this),
       pagination: {
         pageNum: 1,
-        pageSize: 8,
+        pageSize: 20,
         total: null, //分页配置
         status: 0,
         keys: null,
@@ -392,8 +387,8 @@ export default {
       groupName: '', // 部门名称
       loading: false,
       isEdit: false, // 编辑部门名称的判断
-      selectedKeys: ['待部门'],
-      menuType: 'role',
+      selectedKeys: ['all'],
+      menuType: 'group',
     }
   },
   // 计算属性
@@ -487,7 +482,7 @@ export default {
 
           // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
           // ellipsis: true,
-          width: 84,
+          width: 90,
         },
       ]
       return columns
@@ -576,6 +571,9 @@ export default {
               item.permission = getAgencyPermissionNameById(item.agencyPermissions)
               // })
             })
+            this.memberList.sort((a, b) => {
+              return a.agencyRole - b.agencyRole
+            })
             this.pagination.total = data.data.recordCount
           }
         })
@@ -721,7 +719,7 @@ export default {
             aliasName: this.currentMember.aliasName,
             tel: this.currentMember.tel,
             group: this.currentMember.group,
-            agencyTeamId: this.currentMember.agencyTeamId,
+            agencyTeamId: this.currentMember.teamName,
           })
         }, 200)
       } else if (type == 'detail') {
@@ -762,11 +760,17 @@ export default {
     selectGroup(item) {
       console.log(item)
       this.selectedKeys = [item.teamName || item]
+      if (typeof item != 'object') {
+        this.pagination.agencyTeamIds = ''
+      } else {
+        this.pagination.agencyTeamIds = item.id + ''
+      }
+      this.getMemberList()
     },
     modalCancel() {
       // console.log(this);
       this.modalTitle = ''
-      // this.visible = false
+      this.visible = false
       // this.permission = getAgencyPermissionsByRole()
       // this.permissionName = getAgencyPermissionNameById(this.permission)
     },
@@ -964,9 +968,11 @@ export default {
   padding-left: 0;
   padding-bottom: 0px;
   // overflow: hidden;
-  height: calc(100vh - 105px);
+  // min-height: calc(100vh - 105px);
+  // height: calc(100vh - 105px);
   .leftContainer {
     width: 260px;
+    min-width: 220px;
     height: 100%;
     overflow: hidden;
     /deep/ .searchbox {
@@ -993,6 +999,17 @@ export default {
     flex: 1;
     padding-left: 16px;
     overflow: hidden;
+    position: relative;
+    min-width: 1020px;
+    &::before {
+      position: absolute;
+      content: '';
+      width: 1px;
+      height: calc(100% - 16px);
+      left: 0;
+      top: 0;
+      background: #eee;
+    }
     .addmemeber {
       border: 0;
       padding: 0 12px;
@@ -1033,42 +1050,47 @@ export default {
       // transform: translateY(-50%);
     }
   }
-  /deep/ .ant-table-content {
-    .ant-table-body {
-      .ant-table-thead {
-        th {
-          padding: 12px 0;
-          div {
-            padding: 0px 8px;
-          }
-          &:not(:first-child) {
-            > span {
-              //  line-height: 22px;
-              > div {
-                //  line-height: 1;
-                border-left: 1px solid #ddd;
-                padding-left: 12px;
+  /deep/.ant-table {
+    .ant-table-content {
+      .ant-table-body {
+        .ant-table-thead {
+          th {
+            padding: 12px 0;
+            div {
+              padding: 0px 8px;
+            }
+            &:not(:first-child) {
+              > span {
+                //  line-height: 22px;
+                > div {
+                  //  line-height: 1;
+                  border-left: 1px solid #ddd;
+                  padding-left: 12px;
+                }
               }
             }
           }
+          .ant-table-row-cell-break-word {
+            font-size: 14px !important;
+            font-weight: bold;
+          }
+          .ant-table-row-cell-ellipsis {
+            font-size: 14px !important;
+            font-weight: bold;
+          }
         }
-        .ant-table-row-cell-break-word {
-          font-weight: bold;
-        }
-        .ant-table-row-cell-ellipsis {
-          font-weight: bold;
-        }
-      }
-      .ant-table-tbody {
-        .ant-table-row-cell-ellipsis {
-          padding: 12px 14px;
-        }
-        .ant-table-row-expand-icon {
-          // color: #000;
-          padding: 0;
-        }
-        .ant-table-row-indent {
-          display: none !important;
+        .ant-table-tbody {
+          .ant-table-row-cell-ellipsis {
+            font-size: 14px !important;
+            padding: 12px 14px;
+          }
+          .ant-table-row-expand-icon {
+            // color: #000;
+            padding: 0;
+          }
+          .ant-table-row-indent {
+            display: none !important;
+          }
         }
       }
     }
@@ -1085,8 +1107,8 @@ export default {
   .delete {
     // border-left: 1px solid #979797;
     border-right: 1px solid #979797;
-    padding: 0 9px 0 0;
-    margin: 0 9px 0 0;
+    padding: 0 6px 0 0;
+    margin: 0 6px 0 0;
   }
 }
 // /deep/ .ant-table-row-cell-break-word {
@@ -1199,11 +1221,12 @@ export default {
     overflow: hidden;
     background-color: #fff;
     border-radius: 4px;
-    text-align: center;
+    text-align: left;
     box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4);
     padding: 8px 0;
     > div {
       height: 32px;
+      padding: 0 12px;
       line-height: 32px;
       cursor: pointer;
       &:hover {
@@ -1213,6 +1236,4 @@ export default {
     }
   }
 }
-.changeGroup {
-}
 </style>
diff --git a/src/components/merchantManagement/roleManagement.vue b/src/components/merchantManagement/roleManagement.vue
index 727b4dd..d2df67e 100644
--- a/src/components/merchantManagement/roleManagement.vue
+++ b/src/components/merchantManagement/roleManagement.vue
@@ -121,456 +121,456 @@ export default {
         // searchTag: 1,
       },
       isspinning: false,
-      roleList: [
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-10-20 14:27:17',
-          classify: 0,
-          aliasName: '',
-          userNum: 21,
-          labelId: 672,
-          pName: '',
-          roleId: 145,
-          roleName: '稻田内测用户',
-          sort: 1,
-          roleType: 1,
-          labelName: '稻田内测用户',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-10-12 09:34:33',
-          classify: 0,
-          aliasName: '',
-          userNum: 2,
-          labelId: 670,
-          pName: '工厂职位，工单列表',
-          roleId: 144,
-          roleName: '询单客服',
-          sort: 2,
-          roleType: 1,
-          labelName: '询单客服',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-09-22 11:46:25',
-          classify: 1,
-          aliasName: '',
-          userNum: 2,
-          labelId: 667,
-          pName: '',
-          roleId: 143,
-          roleName: '管理角色',
-          sort: 3,
-          roleType: 1,
-          labelName: '管理角色',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-09-06 20:05:46',
-          classify: 1,
-          aliasName: '',
-          userNum: 1,
-          labelId: 662,
-          pName: '品牌列表，职位要求，职位特色，企业列表，总包列表，工单列表，工厂职位，工单列表，项目相册，更新助手，职位分类，逾期工单，热推职位',
-          roleId: 142,
-          roleName: '跟单客服',
-          sort: 4,
-          roleType: 1,
-          labelName: '跟单客服',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-08-19 18:30:20',
-          classify: 1,
-          aliasName: '',
-          userNum: 0,
-          labelId: 658,
-          pName: '品牌列表，职位要求，职位特色，工作台，分析页，龙虎榜，用户列表，企业列表，总包列表，后台内容，代理列表，代理线索，矩阵官网，伯才官网，一手单官网，工单列表，工厂职位，老乡列表，项目页，工厂职位，代理列表，工单列表，项目通告，项目通知，位置管理，项目相册，官网表单，账单管理，数据大屏，更新助手，项目概况，职位分类，内容管理，呼叫数据，逾期工单，热推职位，频道管理，轮播配置，活动页面，图片模板，图片模板',
-          roleId: 141,
-          roleName: '新管理员',
-          sort: 5,
-          roleType: 1,
-          labelName: '新管理员',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-08-11 10:48:15',
-          classify: 1,
-          aliasName: '',
-          userNum: 0,
-          labelId: 656,
-          pName: '品牌列表，职位要求，职位特色，工作台，企业列表，总包列表，后台内容，代理列表，代理线索，矩阵官网，伯才官网，一手单官网，工单列表，工厂职位，工单列表，项目相册，官网表单，数据看板，更新助手，项目概况，职位分类，内容管理，呼叫数据，逾期工单，热推职位，频道管理，轮播配置，活动页面，图片模板，图片模板',
-          roleId: 140,
-          roleName: '开发测试',
-          sort: 6,
-          roleType: 1,
-          labelName: '开发测试',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-07-31 16:03:23',
-          classify: 0,
-          aliasName: '',
-          userNum: 8,
-          labelId: 655,
-          pName: '代理列表',
-          roleId: 139,
-          roleName: '电话客服',
-          sort: 7,
-          roleType: 1,
-          labelName: '渠道拓展',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2023-01-29 13:53:17',
-          classify: 0,
-          aliasName: '',
-          userNum: 18,
-          labelId: 636,
-          pName: '',
-          roleId: 138,
-          roleName: '成员通用',
-          sort: 8,
-          roleType: 1,
-          labelName: '成员通用',
-        },
-        {
-          roleDesp: '交付中心主管',
-          roleCreateTime: '2020-06-09 16:26:25',
-          classify: 1,
-          aliasName: '',
-          userNum: 6,
-          labelId: 408,
-          pName: '品牌列表，职位要求，职位特色，工作台，分析页，龙虎榜，企业列表，总包列表，代理列表，工单列表，工厂职位，老乡列表，项目页，工厂职位，代理列表，工单列表，项目通告，项目通知，位置管理，项目相册，数据看板，数据大屏，更新助手，项目概况，职位分类，热推职位',
-          roleId: 106,
-          roleName: '项目主管',
-          sort: 9,
-          roleType: 1,
-          labelName: '项目主管',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2022-04-27 10:40:43',
-          classify: 1,
-          aliasName: '',
-          userNum: 5,
-          labelId: 616,
-          pName: '代理列表，工单列表，平台数据，渠道运营，代理数据，数据看板',
-          roleId: 136,
-          roleName: '渠道主管',
-          sort: 10,
-          roleType: 1,
-          labelName: '渠道主管',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2022-02-24 19:58:45',
-          classify: 0,
-          aliasName: '',
-          userNum: 12,
-          labelId: 612,
-          pName: '工厂职位，代理列表，工单列表',
-          roleId: 135,
-          roleName: '客户经理',
-          sort: 11,
-          roleType: 1,
-          labelName: '客户经理',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2020-08-30 10:12:30',
-          classify: 1,
-          aliasName: '',
-          userNum: 1,
-          labelId: 452,
-          pName: '品牌列表，职位要求，职位特色，劳动合同，业务合同，合同模板，合同企业，工资条，工作台，分析页，龙虎榜，复盘，用户列表，成员列表，企业列表，总包列表，代理列表，代理线索，工单列表，工厂职位，老乡列表，代理列表，项目相册，账单管理，数据看板，数据大屏，更新助手，内容管理，呼叫数据，逾期工单',
-          roleId: 117,
-          roleName: '财务',
-          sort: 12,
-          roleType: 1,
-          labelName: '财务',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2022-06-10 14:12:00',
-          classify: 0,
-          aliasName: '',
-          userNum: 0,
-          labelId: 622,
-          pName: '短信验证码，修改用户操作次数，校验姓名、身份证号，校验姓名、银行卡号',
-          roleId: 137,
-          roleName: '开发角色01',
-          sort: 13,
-          roleType: 1,
-          labelName: '开发角色01',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2021-12-27 19:36:07',
-          classify: 0,
-          aliasName: '',
-          userNum: 1,
-          labelId: 607,
-          pName: '品牌列表，工作台，项目列表【旧】，工单管理-襄县，渠道管理，代理列表1.0，推广明细，企业列表，总包列表，代理入口',
-          roleId: 133,
-          roleName: '门店店长',
-          sort: 14,
-          roleType: 1,
-          labelName: '门店店长',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2021-10-26 13:56:05',
-          classify: 0,
-          aliasName: '',
-          userNum: 10,
-          labelId: 588,
-          pName: '品牌列表，职位要求，职位特色，企业列表，总包列表，工厂职位，工单列表，项目相册，更新助手，职位分类',
-          roleId: 132,
-          roleName: '项目经理',
-          sort: 15,
-          roleType: 1,
-          labelName: '项目经理',
-        },
-        {
-          roleDesp: '安置专员角色',
-          roleCreateTime: '2021-10-14 09:37:00',
-          classify: 0,
-          aliasName: '',
-          userNum: 2,
-          labelId: 586,
-          pName: '',
-          roleId: 130,
-          roleName: '安置专员',
-          sort: 16,
-          roleType: 1,
-          labelName: '安置专员',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2021-10-13 16:20:01',
-          classify: 0,
-          aliasName: '',
-          userNum: 2,
-          labelId: 585,
-          pName: '简历采集，推荐工作，跟进入职，跟进离职，需求维护，需求列表，需求地图，品牌列表，职位要求，职位特色，工作台，在职维护，项目列表【旧】，企业列表，总包列表，后台内容，代理列表，工单列表，工厂职位',
-          roleId: 129,
-          roleName: '产品经理',
-          sort: 17,
-          roleType: 1,
-          labelName: '产品经理',
-        },
-        {
-          roleDesp: '白名单的角色，扫码、报名后，只要绑定了代理一定会触发推广事件和佣金，且佣金免审核自动发送到余额',
-          roleCreateTime: '2021-10-07 17:20:01',
-          classify: 0,
-          aliasName: '',
-          userNum: 3,
-          labelId: 584,
-          pName: '',
-          roleId: 128,
-          roleName: '代理佣金白名单',
-          sort: 18,
-          roleType: 1,
-          labelName: '代理佣金白名单',
-        },
-        {
-          roleDesp: '线下代理点拓展',
-          roleCreateTime: '2021-08-31 15:23:45',
-          classify: 0,
-          aliasName: '',
-          userNum: 2,
-          labelId: 582,
-          pName: '工作台，项目列表【旧】，渠道管理，代理列表1.0，推广明细，企业列表，代理入口',
-          roleId: 126,
-          roleName: '招工经理',
-          sort: 19,
-          roleType: 1,
-          labelName: '招工经理',
-        },
-        {
-          roleDesp: '设计',
-          roleCreateTime: '2021-08-18 18:00:44',
-          classify: 1,
-          aliasName: '',
-          userNum: 3,
-          labelId: 580,
-          pName: '品牌列表，工作台，企业列表，项目相册，更新助手',
-          roleId: 125,
-          roleName: '平面设计',
-          sort: 20,
-          roleType: 1,
-          labelName: '平面设计',
-        },
-        {
-          roleDesp: '试用期',
-          roleCreateTime: '2021-05-12 10:27:09',
-          classify: 0,
-          aliasName: '',
-          userNum: 0,
-          labelId: 561,
-          pName: '工厂职位',
-          roleId: 124,
-          roleName: '试用',
-          sort: 21,
-          roleType: 1,
-          labelName: '试用',
-        },
-        {
-          roleDesp: '注册用户，无后台权限',
-          roleCreateTime: '2017-04-18 14:16:41',
-          classify: 0,
-          aliasName: '',
-          userNum: 7225,
-          labelId: 1,
-          pName: '',
-          roleId: 45,
-          roleName: 'A',
-          sort: 22,
-          roleType: 1,
-          labelName: 'A',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2020-11-18 20:12:40',
-          classify: 0,
-          aliasName: '',
-          userNum: 3,
-          labelId: 479,
-          pName: '工作台',
-          roleId: 122,
-          roleName: '新人',
-          sort: 23,
-          roleType: 1,
-          labelName: '新人',
-        },
-        {
-          roleDesp: '原”在线客服“、”流量专员“',
-          roleCreateTime: '2019-11-15 18:04:13',
-          classify: 0,
-          aliasName: '简历专员',
-          userNum: 4,
-          labelId: 433,
-          pName: '简历采集，需求列表，需求地图，复盘',
-          roleId: 102,
-          roleName: '简历专员',
-          sort: 24,
-          roleType: 1,
-          labelName: '简历专员',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2018-02-03 10:10:05',
-          classify: 0,
-          aliasName: '',
-          userNum: 7,
-          labelId: 207,
-          pName: '推荐工作，需求列表，需求地图，我的统计，复盘',
-          roleId: 87,
-          roleName: '职业顾问',
-          sort: 25,
-          roleType: 1,
-          labelName: '职业顾问',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2017-10-27 22:08:21',
-          classify: 0,
-          aliasName: '',
-          userNum: 5,
-          labelId: 165,
-          pName: '跟进入职，旧在职维护，跟进离职，需求维护，需求列表，需求地图，工资核对，品牌列表，劳动合同，服务交付，工作台，在职维护，复盘，项目列表【旧】',
-          roleId: 84,
-          roleName: '项目执行',
-          sort: 26,
-          roleType: 1,
-          labelName: '项目执行',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2020-11-03 18:25:54',
-          classify: 0,
-          aliasName: '',
-          userNum: 3,
-          labelId: 468,
-          pName: '劳动合同，工资条，服务交付，工作台，在职维护，在职维护',
-          roleId: 119,
-          roleName: '服务专员',
-          sort: 27,
-          roleType: 1,
-          labelName: '服务专员',
-        },
-        {
-          roleDesp: 'BD，负责商务拓展',
-          roleCreateTime: '2017-04-15 22:01:27',
-          classify: 0,
-          aliasName: '',
-          userNum: 5,
-          labelId: 27,
-          pName: '工单列表，更新助手，项目概况',
-          roleId: 41,
-          roleName: '项目客服',
-          sort: 28,
-          roleType: 1,
-          labelName: '项目客服',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2020-03-12 10:13:18',
-          classify: 0,
-          aliasName: '',
-          userNum: 1,
-          labelId: 355,
-          pName: '需求列表，需求地图，业务管理，分发管理，业务日历，简历中心，渠道来源1.0，简历生产，服务交付，工作台，龙虎榜，简历公海，在职维护，匹配失败，旧服务工单，复盘，工单时间，服务工单，等待分发，彩蛋配置',
-          roleId: 104,
-          roleName: '平台运营',
-          sort: 29,
-          roleType: 1,
-          labelName: '平台运营',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2020-11-16 19:39:20',
-          classify: 1,
-          aliasName: '',
-          userNum: 2,
-          labelId: 477,
-          pName: '品牌列表，职位要求，职位特色，企业列表，工厂职位，项目相册，更新助手，职位分类，内容管理，热推职位，频道管理，轮播配置，活动页面，图片模板',
-          roleId: 121,
-          roleName: '内容运营',
-          sort: 30,
-          roleType: 1,
-          labelName: '内容运营',
-        },
-        {
-          roleDesp: '',
-          roleCreateTime: '2020-09-14 18:34:47',
-          classify: 0,
-          aliasName: '',
-          userNum: 4,
-          labelId: 458,
-          pName: '用户列表，成员列表，后台内容',
-          roleId: 118,
-          roleName: '公司人事',
-          sort: 31,
-          roleType: 1,
-          labelName: '公司人事',
-        },
-        {
-          roleDesp: '超级管理员',
-          roleCreateTime: '2017-04-13 15:27:02',
-          classify: 1,
-          aliasName: '',
-          userNum: 10,
-          labelId: 12,
-          pName: '简历采集，推荐工作，跟进入职，旧在职维护，跟进离职，需求维护，需求列表，需求地图，工资核对，我的统计，业务管理，分发管理，业务日历，跟进入职，在职管理，离职管理，简历中心，渠道来源1.0，简历生产，角色管理（菜单），品牌列表，职位要求，职位特色，劳动合同，业务合同，合同模板，合同企业，工资条，职业顾问提成，来源列表，系统操作日志，短信验证码，修改用户操作次数，校验姓名、身份证号，校验姓名、银行卡号，修改用户身份证照片，修改用户OpenID，修改模板对应的企业，修改人员对应的企业，合同生成PDF测试，服务交付，工作台，龙虎榜，简历公海，在职维护，匹配失败，旧服务工单，复盘，线索管理，线索挖掘，休眠线索，工单时间，在职维护，旧需求列表，服务工单，等待分发，彩蛋配置，项目收款结算，花名库配置，项',
-          roleId: 11,
-          roleName: 'admin',
-          sort: 32,
-          roleType: 0,
-          labelName: 'admin',
-        },
-      ],
+      // roleList: [
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-10-20 14:27:17',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 21,
+      //     labelId: 672,
+      //     pName: '',
+      //     roleId: 145,
+      //     roleName: '稻田内测用户',
+      //     sort: 1,
+      //     roleType: 1,
+      //     labelName: '稻田内测用户',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-10-12 09:34:33',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 2,
+      //     labelId: 670,
+      //     pName: '工厂职位，工单列表',
+      //     roleId: 144,
+      //     roleName: '询单客服',
+      //     sort: 2,
+      //     roleType: 1,
+      //     labelName: '询单客服',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-09-22 11:46:25',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 2,
+      //     labelId: 667,
+      //     pName: '',
+      //     roleId: 143,
+      //     roleName: '管理角色',
+      //     sort: 3,
+      //     roleType: 1,
+      //     labelName: '管理角色',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-09-06 20:05:46',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 1,
+      //     labelId: 662,
+      //     pName: '品牌列表，职位要求，职位特色，企业列表，总包列表，工单列表，工厂职位，工单列表，项目相册，更新助手，职位分类，逾期工单，热推职位',
+      //     roleId: 142,
+      //     roleName: '跟单客服',
+      //     sort: 4,
+      //     roleType: 1,
+      //     labelName: '跟单客服',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-08-19 18:30:20',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 0,
+      //     labelId: 658,
+      //     pName: '品牌列表，职位要求，职位特色，工作台，分析页，龙虎榜，用户列表，企业列表，总包列表，后台内容，代理列表，代理线索，矩阵官网，伯才官网，一手单官网，工单列表，工厂职位，老乡列表，项目页，工厂职位，代理列表，工单列表，项目通告，项目通知，位置管理，项目相册，官网表单，账单管理，数据大屏，更新助手，项目概况，职位分类，内容管理，呼叫数据，逾期工单，热推职位，频道管理，轮播配置，活动页面，图片模板，图片模板',
+      //     roleId: 141,
+      //     roleName: '新管理员',
+      //     sort: 5,
+      //     roleType: 1,
+      //     labelName: '新管理员',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-08-11 10:48:15',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 0,
+      //     labelId: 656,
+      //     pName: '品牌列表，职位要求，职位特色，工作台，企业列表，总包列表，后台内容，代理列表，代理线索，矩阵官网，伯才官网，一手单官网，工单列表，工厂职位，工单列表，项目相册，官网表单，数据看板，更新助手，项目概况，职位分类，内容管理，呼叫数据，逾期工单，热推职位，频道管理，轮播配置，活动页面，图片模板，图片模板',
+      //     roleId: 140,
+      //     roleName: '开发测试',
+      //     sort: 6,
+      //     roleType: 1,
+      //     labelName: '开发测试',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-07-31 16:03:23',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 8,
+      //     labelId: 655,
+      //     pName: '代理列表',
+      //     roleId: 139,
+      //     roleName: '电话客服',
+      //     sort: 7,
+      //     roleType: 1,
+      //     labelName: '渠道拓展',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2023-01-29 13:53:17',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 18,
+      //     labelId: 636,
+      //     pName: '',
+      //     roleId: 138,
+      //     roleName: '成员通用',
+      //     sort: 8,
+      //     roleType: 1,
+      //     labelName: '成员通用',
+      //   },
+      //   {
+      //     roleDesp: '交付中心主管',
+      //     roleCreateTime: '2020-06-09 16:26:25',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 6,
+      //     labelId: 408,
+      //     pName: '品牌列表，职位要求，职位特色，工作台，分析页，龙虎榜，企业列表，总包列表，代理列表，工单列表，工厂职位，老乡列表，项目页，工厂职位，代理列表，工单列表，项目通告，项目通知，位置管理，项目相册，数据看板，数据大屏，更新助手，项目概况，职位分类，热推职位',
+      //     roleId: 106,
+      //     roleName: '项目主管',
+      //     sort: 9,
+      //     roleType: 1,
+      //     labelName: '项目主管',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2022-04-27 10:40:43',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 5,
+      //     labelId: 616,
+      //     pName: '代理列表，工单列表，平台数据，渠道运营，代理数据，数据看板',
+      //     roleId: 136,
+      //     roleName: '渠道主管',
+      //     sort: 10,
+      //     roleType: 1,
+      //     labelName: '渠道主管',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2022-02-24 19:58:45',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 12,
+      //     labelId: 612,
+      //     pName: '工厂职位，代理列表，工单列表',
+      //     roleId: 135,
+      //     roleName: '客户经理',
+      //     sort: 11,
+      //     roleType: 1,
+      //     labelName: '客户经理',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2020-08-30 10:12:30',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 1,
+      //     labelId: 452,
+      //     pName: '品牌列表，职位要求，职位特色，劳动合同，业务合同，合同模板，合同企业，工资条，工作台，分析页，龙虎榜，复盘，用户列表，成员列表，企业列表，总包列表，代理列表，代理线索，工单列表，工厂职位，老乡列表，代理列表，项目相册，账单管理，数据看板，数据大屏，更新助手，内容管理，呼叫数据，逾期工单',
+      //     roleId: 117,
+      //     roleName: '财务',
+      //     sort: 12,
+      //     roleType: 1,
+      //     labelName: '财务',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2022-06-10 14:12:00',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 0,
+      //     labelId: 622,
+      //     pName: '短信验证码，修改用户操作次数，校验姓名、身份证号，校验姓名、银行卡号',
+      //     roleId: 137,
+      //     roleName: '开发角色01',
+      //     sort: 13,
+      //     roleType: 1,
+      //     labelName: '开发角色01',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2021-12-27 19:36:07',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 1,
+      //     labelId: 607,
+      //     pName: '品牌列表，工作台，项目列表【旧】，工单管理-襄县，渠道管理，代理列表1.0，推广明细，企业列表，总包列表，代理入口',
+      //     roleId: 133,
+      //     roleName: '门店店长',
+      //     sort: 14,
+      //     roleType: 1,
+      //     labelName: '门店店长',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2021-10-26 13:56:05',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 10,
+      //     labelId: 588,
+      //     pName: '品牌列表，职位要求，职位特色，企业列表，总包列表，工厂职位，工单列表，项目相册，更新助手，职位分类',
+      //     roleId: 132,
+      //     roleName: '项目经理',
+      //     sort: 15,
+      //     roleType: 1,
+      //     labelName: '项目经理',
+      //   },
+      //   {
+      //     roleDesp: '安置专员角色',
+      //     roleCreateTime: '2021-10-14 09:37:00',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 2,
+      //     labelId: 586,
+      //     pName: '',
+      //     roleId: 130,
+      //     roleName: '安置专员',
+      //     sort: 16,
+      //     roleType: 1,
+      //     labelName: '安置专员',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2021-10-13 16:20:01',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 2,
+      //     labelId: 585,
+      //     pName: '简历采集，推荐工作，跟进入职，跟进离职，需求维护，需求列表，需求地图，品牌列表，职位要求，职位特色，工作台，在职维护，项目列表【旧】，企业列表，总包列表，后台内容，代理列表，工单列表，工厂职位',
+      //     roleId: 129,
+      //     roleName: '产品经理',
+      //     sort: 17,
+      //     roleType: 1,
+      //     labelName: '产品经理',
+      //   },
+      //   {
+      //     roleDesp: '白名单的角色，扫码、报名后，只要绑定了代理一定会触发推广事件和佣金，且佣金免审核自动发送到余额',
+      //     roleCreateTime: '2021-10-07 17:20:01',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 3,
+      //     labelId: 584,
+      //     pName: '',
+      //     roleId: 128,
+      //     roleName: '代理佣金白名单',
+      //     sort: 18,
+      //     roleType: 1,
+      //     labelName: '代理佣金白名单',
+      //   },
+      //   {
+      //     roleDesp: '线下代理点拓展',
+      //     roleCreateTime: '2021-08-31 15:23:45',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 2,
+      //     labelId: 582,
+      //     pName: '工作台，项目列表【旧】，渠道管理，代理列表1.0，推广明细，企业列表，代理入口',
+      //     roleId: 126,
+      //     roleName: '招工经理',
+      //     sort: 19,
+      //     roleType: 1,
+      //     labelName: '招工经理',
+      //   },
+      //   {
+      //     roleDesp: '设计',
+      //     roleCreateTime: '2021-08-18 18:00:44',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 3,
+      //     labelId: 580,
+      //     pName: '品牌列表，工作台，企业列表，项目相册，更新助手',
+      //     roleId: 125,
+      //     roleName: '平面设计',
+      //     sort: 20,
+      //     roleType: 1,
+      //     labelName: '平面设计',
+      //   },
+      //   {
+      //     roleDesp: '试用期',
+      //     roleCreateTime: '2021-05-12 10:27:09',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 0,
+      //     labelId: 561,
+      //     pName: '工厂职位',
+      //     roleId: 124,
+      //     roleName: '试用',
+      //     sort: 21,
+      //     roleType: 1,
+      //     labelName: '试用',
+      //   },
+      //   {
+      //     roleDesp: '注册用户，无后台权限',
+      //     roleCreateTime: '2017-04-18 14:16:41',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 7225,
+      //     labelId: 1,
+      //     pName: '',
+      //     roleId: 45,
+      //     roleName: 'A',
+      //     sort: 22,
+      //     roleType: 1,
+      //     labelName: 'A',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2020-11-18 20:12:40',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 3,
+      //     labelId: 479,
+      //     pName: '工作台',
+      //     roleId: 122,
+      //     roleName: '新人',
+      //     sort: 23,
+      //     roleType: 1,
+      //     labelName: '新人',
+      //   },
+      //   {
+      //     roleDesp: '原”在线客服“、”流量专员“',
+      //     roleCreateTime: '2019-11-15 18:04:13',
+      //     classify: 0,
+      //     aliasName: '简历专员',
+      //     userNum: 4,
+      //     labelId: 433,
+      //     pName: '简历采集，需求列表，需求地图，复盘',
+      //     roleId: 102,
+      //     roleName: '简历专员',
+      //     sort: 24,
+      //     roleType: 1,
+      //     labelName: '简历专员',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2018-02-03 10:10:05',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 7,
+      //     labelId: 207,
+      //     pName: '推荐工作，需求列表，需求地图，我的统计，复盘',
+      //     roleId: 87,
+      //     roleName: '职业顾问',
+      //     sort: 25,
+      //     roleType: 1,
+      //     labelName: '职业顾问',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2017-10-27 22:08:21',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 5,
+      //     labelId: 165,
+      //     pName: '跟进入职，旧在职维护，跟进离职，需求维护，需求列表，需求地图，工资核对，品牌列表，劳动合同，服务交付，工作台，在职维护，复盘，项目列表【旧】',
+      //     roleId: 84,
+      //     roleName: '项目执行',
+      //     sort: 26,
+      //     roleType: 1,
+      //     labelName: '项目执行',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2020-11-03 18:25:54',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 3,
+      //     labelId: 468,
+      //     pName: '劳动合同，工资条，服务交付，工作台，在职维护，在职维护',
+      //     roleId: 119,
+      //     roleName: '服务专员',
+      //     sort: 27,
+      //     roleType: 1,
+      //     labelName: '服务专员',
+      //   },
+      //   {
+      //     roleDesp: 'BD，负责商务拓展',
+      //     roleCreateTime: '2017-04-15 22:01:27',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 5,
+      //     labelId: 27,
+      //     pName: '工单列表，更新助手，项目概况',
+      //     roleId: 41,
+      //     roleName: '项目客服',
+      //     sort: 28,
+      //     roleType: 1,
+      //     labelName: '项目客服',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2020-03-12 10:13:18',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 1,
+      //     labelId: 355,
+      //     pName: '需求列表，需求地图，业务管理，分发管理，业务日历，简历中心，渠道来源1.0，简历生产，服务交付，工作台，龙虎榜，简历公海，在职维护，匹配失败，旧服务工单，复盘，工单时间，服务工单，等待分发，彩蛋配置',
+      //     roleId: 104,
+      //     roleName: '平台运营',
+      //     sort: 29,
+      //     roleType: 1,
+      //     labelName: '平台运营',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2020-11-16 19:39:20',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 2,
+      //     labelId: 477,
+      //     pName: '品牌列表，职位要求，职位特色，企业列表，工厂职位，项目相册，更新助手，职位分类，内容管理，热推职位，频道管理，轮播配置，活动页面，图片模板',
+      //     roleId: 121,
+      //     roleName: '内容运营',
+      //     sort: 30,
+      //     roleType: 1,
+      //     labelName: '内容运营',
+      //   },
+      //   {
+      //     roleDesp: '',
+      //     roleCreateTime: '2020-09-14 18:34:47',
+      //     classify: 0,
+      //     aliasName: '',
+      //     userNum: 4,
+      //     labelId: 458,
+      //     pName: '用户列表，成员列表，后台内容',
+      //     roleId: 118,
+      //     roleName: '公司人事',
+      //     sort: 31,
+      //     roleType: 1,
+      //     labelName: '公司人事',
+      //   },
+      //   {
+      //     roleDesp: '超级管理员',
+      //     roleCreateTime: '2017-04-13 15:27:02',
+      //     classify: 1,
+      //     aliasName: '',
+      //     userNum: 10,
+      //     labelId: 12,
+      //     pName: '简历采集，推荐工作，跟进入职，旧在职维护，跟进离职，需求维护，需求列表，需求地图，工资核对，我的统计，业务管理，分发管理，业务日历，跟进入职，在职管理，离职管理，简历中心，渠道来源1.0，简历生产，角色管理（菜单），品牌列表，职位要求，职位特色，劳动合同，业务合同，合同模板，合同企业，工资条，职业顾问提成，来源列表，系统操作日志，短信验证码，修改用户操作次数，校验姓名、身份证号，校验姓名、银行卡号，修改用户身份证照片，修改用户OpenID，修改模板对应的企业，修改人员对应的企业，合同生成PDF测试，服务交付，工作台，龙虎榜，简历公海，在职维护，匹配失败，旧服务工单，复盘，线索管理，线索挖掘，休眠线索，工单时间，在职维护，旧需求列表，服务工单，等待分发，彩蛋配置，项目收款结算，花名库配置，项',
+      //     roleId: 11,
+      //     roleName: 'admin',
+      //     sort: 32,
+      //     roleType: 0,
+      //     labelName: 'admin',
+      //   },
+      // ],
       middleauthor: null,
       authorityList: {
         dtzw: {
diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue
index c80ca42..cc9cfdc 100644
--- a/src/components/screen/largeScreen.vue
+++ b/src/components/screen/largeScreen.vue
@@ -16,7 +16,7 @@
         <div v-else>
             <!-- <div> -->
             <div class="static" v-if="!imgCarouselShow">
-                <div class="s_left">
+                <div class="s_left">
 					 <!-- @click="test" -->
                     <h4 class="f24 cf s_title fwb" @click="test">交付中心实时数据
                         <!-- <span @click="aa1">1111</span> <span @click="aa2">2222</span> -->
@@ -90,7 +90,7 @@
                     </div>
                 </a-carousel>
             </div> -->
-        </div>
+        </div>
 		<audio id="myaudio" src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/huanhu.wav"></audio>
     </div>
 </template>
@@ -114,7 +114,7 @@ const formTailLayout = {
 var timeClear;
 var timer //定时器
 var flag = false;
-var timeStamp = 0;
+var timeStamp = 0;
 var timeStamp2 = 0;
 
 var tempJson = { "classify": 0, "message": [] }
@@ -173,9 +173,9 @@ export default {
         }
     },
     mounted() {
-        var that = this;
-		
-		
+        var that = this;
+		
+		
 
         // document.getElementById('inputId').focus();
         // this.$refs.id.focus();
@@ -210,24 +210,24 @@ export default {
         document.querySelector('body').removeAttribute('style', '')
     },
 
-    methods: {
-		startAudio(){
-			var that = this;
-			let audioPlay = document.getElementById('myaudio')
-			
-			audioPlay.play()
-			
-			setTimeout(() => {
-			  audioPlay.pause()
-			  audioPlay.load()
-			}, 1000)
-			
-			
-			// setTimeout(() => {
-			//  that.playAudio3();
-			// }, 5000)
-		},
-		
+    methods: {
+		startAudio(){
+			var that = this;
+			let audioPlay = document.getElementById('myaudio')
+			
+			audioPlay.play()
+			
+			setTimeout(() => {
+			  audioPlay.pause()
+			  audioPlay.load()
+			}, 1000)
+			
+			
+			// setTimeout(() => {
+			//  that.playAudio3();
+			// }, 5000)
+		},
+		
 		
 		// async getData(){
 		// 	var that = this;
@@ -274,18 +274,18 @@ export default {
             })
         },
         func() {
-            var that = this;
-			console.log(this.nameArray);
-			// debugger
-			
+            var that = this;
+			console.log(this.nameArray);
+			// debugger
+			
 			
             if (this.nameArray[0].type == '1') {
                 that.showaliasName_curr = this.nameArray[0].aliasName
-                that.daomianStyle = this.nameArray[0].aliasName;
-				
-				console.log(that.showaliasName_curr)
-				console.log( that.daomianStyle)
-				
+                that.daomianStyle = this.nameArray[0].aliasName;
+				
+				console.log(that.showaliasName_curr)
+				console.log( that.daomianStyle)
+				
                 that.playAudio1();
                 let pageInt = parseInt(this.nameArray[0].indexA / that.pageSize)
                 setTimeout(function() {
@@ -300,7 +300,7 @@ export default {
                     if (that.nameArray.length > 0) {
                         that.func();
                     } else {
-                        that.autoSpeed = 10000;
+                        that.autoSpeed = 10000;
 						 that.$refs.welcome.goTo(pageInt, true);
                     }
                 }, 10000)
@@ -378,13 +378,59 @@ export default {
       websocketonmessage(e) { //数据接收
             // const redata = JSON.parse(e.data);
             var that = this;
-             console.log("接收消息", e.data)
-            // console.log(JSON.parse(e.data))
+             console.log("接收消息", e.data)
+            // console.log(JSON.parse(e.data))
             // console.log(JSON.parse(e.data).list)
-            // console.log(new Date());
-			// that.array = [];
-			
+            // console.log(new Date());
+			// that.array = [];
+			
 			// type 25 到面 30通过 40入职
+<<<<<<< HEAD
+            // 180000
+			// debugger
+			if(e.data != '"pong"' && (timeStamp == 0 || new Date().getTime() - timeStamp >= 180000 )){
+				
+				 timeStamp = new Date().getTime();
+				
+				var getWebsocketData = JSON.parse(e.data);
+				// console.log(getWebsocketData);
+				// console.log(getWebsocketData.list);
+				// that.array = [...getWebsocketData.list]
+				that.array = [];
+				var arr = [...getWebsocketData.list]
+				
+				var arrLength = arr.length;
+				// that.array = [];
+				
+				for (var i = 0; i < arrLength; i += that.pageSize) {
+				    that.array.push(arr.slice(i, i + that.pageSize));
+				}
+			
+				that.array.forEach((item,index)=>{
+					if(getWebsocketData.type == "25" || getWebsocketData.type == 25){ //到面
+						if(item.id == getWebsocketData.applyUserId){
+							this.nameArray.push({ type: '1', aliasName: item.aliasName, daomianStyle: item.aliasName, indexA: index });
+						}
+					}else if(getWebsocketData.type == "30" || getWebsocketData.type == 30){ //通过
+						if(item.id == getWebsocketData.applyUserId){
+							this.nameArray.push({ type: '2', aliasName: item.aliasName, tongguoStyle: item.aliasName, indexA: index });
+						}
+					}else if(getWebsocketData.type == "40" || getWebsocketData.type == 40){ //入职
+						if(item.id == getWebsocketData.applyUserId){
+							this.nameArray.push({ type: '3', aliasName: item.aliasName, ruzhiStyle: item.aliasName, indexA: index });
+						}
+					}
+					
+				})
+				
+				console.log(this.nameArray);
+				if (this.nameArray.length >= 1) {
+					this.func();
+				}
+				
+				
+			}
+=======
             // 180000
 			// debugger
 			if(e.data != '"pong"' && (timeStamp == 0 || new Date().getTime() - timeStamp >= 40000 )){
@@ -429,14 +475,70 @@ export default {
 				
 				
 			}
+>>>>>>> e72a370e92726ceca39c43a5addae86c6055b0a1
 			
             
 
-        },
-		
-		
+        },
+		
+		
 		
 test(e) { //数据接收
+<<<<<<< HEAD
+           var that = this;
+		   e.data = '{"applyUserId":318852,"list":[{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"常笑","arrived":1,"entry":2,"entryGPA":1.34,"finshedGPA":0,"funnel":3.40,"id":122240,"inAgencyStatistics":0,"nickName":"微信用户","obJob":25,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980063","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"陶帅","arrived":2,"entry":2,"entryGPA":1.47,"finshedGPA":0,"funnel":2.80,"id":321961,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980509","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"刘深圳","arrived":2,"entry":1,"entryGPA":0.67,"finshedGPA":0.30,"funnel":2.60,"id":321653,"inAgencyStatistics":0,"obJob":6,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"13271233701","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"刘欢欢","arrived":0,"entry":2,"entryGPA":2.00,"finshedGPA":0,"funnel":2.50,"id":321654,"inAgencyStatistics":0,"obJob":8,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980372","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"渠森森","arrived":0,"entry":1,"entryGPA":0.33,"finshedGPA":0,"funnel":1.70,"id":321650,"inAgencyStatistics":0,"obJob":2,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980059","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张驰","arrived":2,"entry":1,"entryGPA":0.00,"finshedGPA":0,"funnel":1.70,"id":319087,"inAgencyStatistics":0,"nickName":"张驰","obJob":12,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980035","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"闫兴乐","arrived":0,"entry":1,"entryGPA":0.00,"finshedGPA":0.67,"funnel":1.30,"id":318688,"inAgencyStatistics":0,"nickName":"微信用户","obJob":20,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980028","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"申振磊","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.70,"id":322120,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":5,"tel":"19036980052","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"朱永辉","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.30,"id":321652,"inAgencyStatistics":0,"obJob":9,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980508","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王尚","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":322356,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":2,"tel":"19036980507","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"李沂航","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":122379,"inAgencyStatistics":0,"nickName":"杰伦","obJob":3,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980030","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王名扬","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":322355,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980031","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":3,"agencyTeamName":"待分组","aliasName":"徐倩林","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321999,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980513","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"邓高琦","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0.00,"funnel":0.10,"id":321964,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980023","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张静","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321400,"inAgencyStatistics":0,"obJob":8,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980034","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"李林锟","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":322206,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980061","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"王正坤","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":318852,"inAgencyStatistics":0,"nickName":"郭星池","obJob":6,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980051","transferRatio":0.00}],"type":"40"}'
+		   
+		   
+		   console.log(JSON.parse(e.data));
+		   console.log(e.data != '"pong"');
+		   console.log(timeStamp == 0 || new Date().getTime() - timeStamp2 >= 180000);
+		   // debugger
+			if(e.data != '"pong"' && (timeStamp2 == 0 || new Date().getTime() - timeStamp2 >= 180000 )){
+				 // 
+				 timeStamp2 = new Date().getTime();
+				
+				var getWebsocketData = JSON.parse(e.data);
+				 console.log(getWebsocketData);
+				// console.log(getWebsocketData.list);
+				// that.array = [...getWebsocketData.list]
+				that.array = [];
+				var arr = [...getWebsocketData.list]
+				
+				var arrLength = arr.length;
+				// that.array = [];
+				
+				for (var i = 0; i < arrLength; i += that.pageSize) {
+				    that.array.push(arr.slice(i, i + that.pageSize));
+				}
+				console.log(that.array);
+				
+				arr.forEach((item,index)=>{
+					console.log(getWebsocketData.type);
+					
+					if(getWebsocketData.type == "25" || getWebsocketData.type == 25){ //到面
+						if(item.id - getWebsocketData.applyUserId == 0){
+							this.nameArray.push({ type: '1', aliasName: item.aliasName, daomianStyle: item.aliasName, indexA: index });
+						}
+					}else if(getWebsocketData.type == "30" || getWebsocketData.type == 30){ //通过
+						if(item.id - getWebsocketData.applyUserId == 0){
+							this.nameArray.push({ type: '2', aliasName: item.aliasName, tongguoStyle: item.aliasName, indexA: index });
+						}
+					}else if(getWebsocketData.type == "40" || getWebsocketData.type == 40){ //入职
+						if(item.id - getWebsocketData.applyUserId == 0){
+							this.nameArray.push({ type: '3', aliasName: item.aliasName, ruzhiStyle: item.aliasName, indexA: index });
+						}
+					}
+					
+				})
+				
+				console.log(this.nameArray);
+				
+				if (this.nameArray.length >= 1) {
+					this.func();
+				}
+				
+			}
+=======
            var that = this;
 		   e.data = '{"applyUserId":122240,"list":[{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"常笑","arrived":1,"entry":2,"entryGPA":1.34,"finshedGPA":0,"funnel":3.40,"id":122240,"inAgencyStatistics":0,"nickName":"微信用户","obJob":25,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980063","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"陶帅","arrived":2,"entry":2,"entryGPA":1.47,"finshedGPA":0,"funnel":2.80,"id":321961,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980509","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"刘深圳","arrived":2,"entry":1,"entryGPA":0.67,"finshedGPA":0.30,"funnel":2.60,"id":321653,"inAgencyStatistics":0,"obJob":6,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"13271233701","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"刘欢欢","arrived":0,"entry":2,"entryGPA":2.00,"finshedGPA":0,"funnel":2.50,"id":321654,"inAgencyStatistics":0,"obJob":8,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980372","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"渠森森","arrived":0,"entry":1,"entryGPA":0.33,"finshedGPA":0,"funnel":1.70,"id":321650,"inAgencyStatistics":0,"obJob":2,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980059","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张驰","arrived":2,"entry":1,"entryGPA":0.00,"finshedGPA":0,"funnel":1.70,"id":319087,"inAgencyStatistics":0,"nickName":"张驰","obJob":12,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980035","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"闫兴乐","arrived":0,"entry":1,"entryGPA":0.00,"finshedGPA":0.67,"funnel":1.30,"id":318688,"inAgencyStatistics":0,"nickName":"微信用户","obJob":20,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980028","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"申振磊","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.70,"id":322120,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":5,"tel":"19036980052","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"朱永辉","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.30,"id":321652,"inAgencyStatistics":0,"obJob":9,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980508","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王尚","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":322356,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":2,"tel":"19036980507","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"李沂航","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":122379,"inAgencyStatistics":0,"nickName":"杰伦","obJob":3,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980030","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王名扬","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":322355,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980031","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":3,"agencyTeamName":"待分组","aliasName":"徐倩林","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321999,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980513","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"邓高琦","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0.00,"funnel":0.10,"id":321964,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980023","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张静","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321400,"inAgencyStatistics":0,"obJob":8,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980034","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"李林锟","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":322206,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980061","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"王正坤","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":318852,"inAgencyStatistics":0,"nickName":"郭星池","obJob":6,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980051","transferRatio":0.00}],"type":"25"}'
 		   
@@ -493,6 +595,7 @@ test(e) { //数据接收
 				}
 				
 			}
+>>>>>>> e72a370e92726ceca39c43a5addae86c6055b0a1
 			
             
 
@@ -562,10 +665,10 @@ test(e) { //数据接收
                 //console.log(hour + ":" + minues);
             }, 60000); //每隔1分钟刷新一次
         },
-        initWebSocket() { //初始化weosocket
+        initWebSocket() { //初始化weosocket
 		//ws://daotian.matripe.com.cn/daotian/statistic/socket?agencyId=3087
-            // var wsUri = serverAddress + '/websocket/statisticsServer/' + this.reconnect;
-            // var wsUri = serverAddress + '/daotian/statistic/socket?agencyId=3087';
+            // var wsUri = serverAddress + '/websocket/statisticsServer/' + this.reconnect;
+            // var wsUri = serverAddress + '/daotian/statistic/socket?agencyId=3087';
             var wsUri = 'wss://daotian.matripe.com.cn/socket/daotian/statistic?agency=3087'
             // wsUri = wsUri.replace("https", "ws").replace("http", "ws");
             this.websock = new WebSocket(wsUri);
@@ -679,12 +782,20 @@ test(e) { //数据接收
 @import 'http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/bigScreen1.css';
 div{
 	color: #fff;
+<<<<<<< HEAD
+}
+
+/deep/ .ttd{
+	text-align: center;
+}
+=======
 }
 
 /deep/ .ttd{
 	text-align: center;
 	font-size: 35px;
 }
+>>>>>>> e72a370e92726ceca39c43a5addae86c6055b0a1
 
 .mmtt111{
   background-image: url('http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png');background-size: 100% 100%;
@@ -703,11 +814,12 @@ div{
 
 
 .imgPlay .ant-carousel {
-
     background-color: rgba(0, 0, 0, 1);
 }
 
-
+/deep/.slick-dots{
+  bottom: -30px !important;
+}
 .imgPlay .tcImg {
     position: relative;
     width: 100vw;
diff --git a/src/components/userinfo/accountsetting/inedex.vue b/src/components/userinfo/accountsetting/inedex.vue
index 7bdb984..6d401d3 100644
--- a/src/components/userinfo/accountsetting/inedex.vue
+++ b/src/components/userinfo/accountsetting/inedex.vue
@@ -128,7 +128,7 @@
             </span>
           </li>-->
         </ul>
-        <ul>
+        <!-- <ul>
           <li @click="pushto('/accountsetting/bocaiTV')" :class="{ tagactive: activelist === 9 }">
             <span>
               <i class="iconfont icon-tv"></i>伯才TV
@@ -137,7 +137,7 @@
               <i class="iconfont icon-youjiantou"></i>
             </span>
           </li>
-        </ul>
+        </ul> -->
       </div>
       <div class="rightcontent">
         <keep-alive :include="['boundwx']">
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index d98fb8e..60a2f28 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -10,101 +10,51 @@
       <a-breadcrumb-item>团队数据</a-breadcrumb-item>
     </a-breadcrumb>
     <div class="bodyContainer contentbody">
-      <div class="leftContainer br1">
+      <div class="leftContainer pb24">
         <div class="searchbox pb12 ml12 mr12">
-          <div class="searchinput">
-            <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" enter-button allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch"></a-input-search>
+          <div class>
+            <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
+              <a-icon slot="prefix" type="search" class="cccc" />
+              <a-button slot="enterButton" class="cblue">搜索</a-button>
+            </a-input-search>
           </div>
           <!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> -->
         </div>
 
         <a-radio-group v-model="menuType" class="pl12 pr12 tac" style="width:100%" :style="{ marginBottom: '8px' }">
-          <a-radio-button value="role" class="changeGroup" style="width:50%">按角色</a-radio-button>
-          <a-radio-button value="group" class="changeGroup" style="width:50%">按部门</a-radio-button>
+          <a-radio-button value="role" class="changeGroup" style="width:50%">个人排序</a-radio-button>
+          <a-radio-button value="group" class="changeGroup" style="width:50%">团队排序</a-radio-button>
         </a-radio-group>
         <div v-if="menuType == 'role'">
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">全部角色</a-menu-item>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt8 mb12" style="wdith:calc(100% - 24px)"></div>
-          <div class="f12 c9 ml24 mb8">默认角色（11人）</div>
+          <div class="bb1 ml12 mr12 mt4 mb8" style="wdith:calc(100% - 24px)"></div>
+          <!-- <div class="f12 c9 ml24 mb8">默认角色（11人）</div> -->
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <template v-for="(item, index) in groupList">
-              <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
-                {{item.teamName}}
-                <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                  <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
-                  <div class="groupdropdownbox backTable" slot="overlay">
-                    <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
-                    <div @click="delGroup(item)">删除</div>
-                    <div>上移</div>
-                    <div>下移</div>
-                  </div>
-                </a-dropdown>
-              </a-menu-item>
+              <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">{{item.teamName}}</a-menu-item>
             </template>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt8 mb12" style="wdith:calc(100% - 24px)"></div>
-          <div class="f12 c9 ml24 mb8">自定义角色（8人）</div>
-          <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <!-- <template v-for="(item, index) in groupList"> -->
-            <a-menu-item key="角色1" class="fsa showdot" @click="selectGroup('角色1')">
-              {{'角色1'}}
-              <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
-                <div class="groupdropdownbox backTable" slot="overlay">
-                  <div>修改名称</div>
-                  <div>删除</div>
-                  <div>上移</div>
-                  <div>下移</div>
-                </div>
-              </a-dropdown>
-            </a-menu-item>
-            <a-menu-item key="角色2" class="fsa showdot" @click="selectGroup('角色2')">
-              {{'角色2'}}
-              <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
-                <div class="groupdropdownbox backTable" slot="overlay">
-                  <div>修改名称</div>
-                  <div>删除</div>
-                  <div>上移</div>
-                  <div>下移</div>
-                </div>
-              </a-dropdown>
-            </a-menu-item>
-            <!-- </template> -->
-          </a-menu>
         </div>
         <div v-else>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
+            <a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">全部部门（50人）</a-menu-item>
+          </a-menu>
+          <!-- <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">全部角色</a-menu-item>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt8 mb12" style="wdith:calc(100% - 24px)"></div>
+          <div class="bb1 ml12 mr12 mt4 mb8" style="wdith:calc(100% - 24px)"></div>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <template v-for="(item, index) in groupList">
               <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
                 {{item.teamName}}
-                <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter">
-                  <i class="iconfont icon-gengduo3 thedot" @click.stop></i>
-                  <div class="groupdropdownbox backTable" slot="overlay">
-                    <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
-                    <div @click="delGroup(item)">删除</div>
-                    <div>上移</div>
-                    <div>下移</div>
-                  </div>
-                </a-dropdown>
               </a-menu-item>
             </template>
-          </a-menu>
-          <div class="pt12 ml12 mr12 mt16 bt1">
-            <a-button type="dashed" class="setMiddle" icon="plus" @click="[addGroupShow = true,isEdit = false]">
-              <!-- <i class="iconfont icon-fangda c6 f12 mr8" style="line-height:32px"></i> -->
-              添加部门
-            </a-button>
-          </div>
+          </a-menu>-->
         </div>
       </div>
-      <div class="rightContainer">
+      <div class="rightContainer mb24">
         <div class="navTitle">
           <div class="dateSelect fsa">
             <div class="fsa">
@@ -169,10 +119,15 @@
           </div>
         </div>
         <div class="content">
-          <a-table :columns="columns" :scroll="{ y: tableHeight }" class="dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index" :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users">
+          <!-- :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users" -->
+          <!-- :scroll="{ y: tableHeight }" -->
+          <a-table :columns="columns" class="dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
             <span slot="custom_objob">
               <span class="fw500">在职人数</span>
             </span>
+            <span slot="title_index">
+              <span class="pl8">序号</span>
+            </span>
             <a @click="getBillInfo(text1,10)" style="color:#576B95;text-decoration:underline" slot="signUps" slot-scope="text, text1">{{text}}</a>
             <a @click="getBillInfo(text1,20)" style="color:#576B95;text-decoration:underline" slot="arrived" slot-scope="text, text1">{{text}}</a>
             <a @click="getBillInfo(text1,30)" style="color:#576B95;text-decoration:underline" slot="passed" slot-scope="text, text1">{{text}}</a>
@@ -182,12 +137,22 @@
             <a @click="getBillInfo(text1,70)" style="color:#576B95;text-decoration:underline" slot="finshedGPA" slot-scope="text, text1">{{toFixed(text)}}</a>
           </a-table>
         </div>
+        <div class="pagecontainer mt16" v-if="dataList.length > 0">
+          <a-pagination :current="contentListSearchForm.pageNum" :default-current="1" :defaultPageSize="10" :total="contentListSearchForm.total" @change="onChange" />
+          <div class="ant-pagination-options-quick-jumper ml12 f14">
+            <span>共{{ contentListSearchForm.total }}条，</span>跳至
+            <input ref="pageinput" type="text" style="height:28px" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
+          </div>
+        </div>
       </div>
     </div>
     <a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose>
       <div slot="title" destoryOnClose>明细</div>
       <div class="searchinput">
-        <a-input-search placeholder="请输入老乡姓名" v-model.trim="billPagination.keys" enter-button allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch" />
+        <a-input-search placeholder="请输入老乡姓名" v-model.trim="billPagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
+          <a-icon slot="prefix" type="search" class="cccc" />
+          <a-button slot="enterButton" class="cblue">搜索</a-button>
+        </a-input-search>
         <!-- <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model.trim="billPagination.keys">
           <i slot="prefix" class="iconfont icon-sousuo"></i>
           <button slot="suffix" @click="onSearch">搜索</button>
@@ -211,7 +176,7 @@
 </template>
 
 <script>
-import { dataStatisticsListApi, dataStatisticsTeamDetailApi } from '../../../../api/userinfo'
+import { dataStatisticsListApi, dataStatisticsTeamDetailApi, getMemberGroupApi } from '../../../../api/userinfo'
 import moment from 'moment'
 import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed } from '../../../../utils/commonUtil'
 const rowSelection = {
@@ -247,6 +212,10 @@ export default {
       dataList: [],
       expandedRowKeys: [],
       rowSelection,
+      menuType: 'role',
+      currentData: {},
+      selectedKeys: ['all'],
+      groupList: [],
       billPagination: {
         pageNum: 1,
         pageSize: 10,
@@ -356,15 +325,17 @@ export default {
     columns() {
       const columns = [
         {
-          title: '序号',
-          dataIndex: 'index',
-          key: 'index',
+          // title: ' 序号',
+          dataIndex: 'aliasName',
+          key: 'aliasName',
+          slots: { title: 'title_index' },
+
           customRender: (text, row, index) => {
-            if (row.users) {
-              return ''
-            } else {
-              return index + 1
-            }
+            // if (row.users) {
+            //   return ''
+            // } else {
+            return index + 1
+            // }
           },
           width: 60,
         },
@@ -373,11 +344,11 @@ export default {
           dataIndex: 'aliasName',
           key: 'aliasName',
           customRender: (text, row, index) => {
-            if (row.users) {
-              return row.agencyTeamName
-            } else {
-              return row.aliasName
-            }
+            // if (row.users) {
+            //   return row.agencyTeamName
+            // } else {
+            return row.aliasName
+            // }
           },
           ellipsis: true,
           // width: 100,
@@ -387,59 +358,59 @@ export default {
           dataIndex: 'signUps',
           key: 'signUps',
           scopedSlots: { customRender: 'signUps' },
+          sorter: (a, b) => a.signUps - b.signUps,
           ellipsis: true,
-          width: 90,
+          width: 120,
         },
         {
           title: '到面',
           dataIndex: 'arrived',
           key: 'arrived',
           scopedSlots: { customRender: 'arrived' },
+          sorter: (a, b) => a.arrived - b.arrived,
 
-          width: 90,
+          width: 120,
           ellipsis: true,
         },
         {
           title: '通过',
           dataIndex: 'passed',
           key: 'passed',
+          sorter: (a, b) => a.passed - b.passed,
+
           scopedSlots: { customRender: 'passed' },
 
           ellipsis: true,
-          width: 90,
+          width: 120,
         },
         {
           title: '入职',
           dataIndex: 'entry',
           key: 'entry',
+          sorter: (a, b) => a.entry - b.entry,
           scopedSlots: { customRender: 'entry' },
 
           ellipsis: true,
-          width: 90,
+          width: 120,
         },
         {
           // title: '在职',
           dataIndex: 'obJob',
           key: 'obJob',
           slots: { title: 'custom_objob' },
-
+          sorter: (a, b) => a.obJob - b.obJob,
           scopedSlots: { customRender: 'obJob' },
           ellipsis: true,
-          width: 90,
-          // sorter: (a, b) => a.userApplyOrder.localeCompare(b.userApplyOrder),
-
-          // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
+          width: 120,
         },
         {
           title: '入职绩点',
           dataIndex: 'entryGPA',
           key: 'entryGPA',
-          // customRender: (text, row, index) => {
-          //   return toFixed(text)
-          // },
+          sorter: (a, b) => a.entryGPA - b.entryGPA,
           scopedSlots: { customRender: 'entryGPA' },
           ellipsis: true,
-          width: 90,
+          width: 120,
         },
         {
           title: '交付绩点',
@@ -448,9 +419,10 @@ export default {
           //  customRender: (text, row, index) => {
           //    return toFixed(text)
           //  },
+          sorter: (a, b) => a.finshedGPA - b.finshedGPA,
           scopedSlots: { customRender: 'finshedGPA' },
           ellipsis: true,
-          width: 90,
+          width: 120,
         },
       ]
       return columns
@@ -637,7 +609,30 @@ export default {
     },
   },
   // 侦听器
-  watch: {},
+  watch: {
+    menuType(value) {
+      //  setTimeout(()=>{
+      console.log(value)
+      if (value == 'role') {
+        console.log(this.columns)
+        this.columns.splice(2, 0, {
+          title: '部门',
+          dataIndex: 'agencyTeamName',
+          key: 'agencyTeamName',
+          ellipsis: true,
+          width: 120,
+          slots: { title: 'agencyTeamName' },
+        })
+      } else {
+        console.log(value)
+        console.log(this.columns.slice(2, 3))
+        if (this.columns.slice(2, 3)[0].title == '部门') {
+          this.columns.splice(2, 1)
+        }
+      }
+      //  },200)
+    },
+  },
   // 生命周期钩子   注：没用到的钩子请自行删除
   /**
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
@@ -648,6 +643,7 @@ export default {
     this.billList = [...this.billList, ...this.billList, ...this.billList]
     this.$emit('setTitle', '团队数据')
     this.getDataStatisticsList()
+    this.getMemberGroup()
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -754,7 +750,14 @@ export default {
 
           this.totalObj.index = index + 2
         })
-        this.dataList = data.data.list
+        let newList = []
+        data.data.list.forEach((item, index) => {
+          newList = newList.concat(item.users)
+          console.log(item)
+          console.log(index)
+        })
+        console.log(newList)
+        this.dataList = newList
         this.isspinning = false
       }
     },
@@ -841,6 +844,23 @@ export default {
         this.gitBillList()
       }
     },
+    getMemberGroup() {
+      getMemberGroupApi().then(({ data }) => {
+        if (data.status == 200) {
+          console.log(data)
+          this.groupList = data.data.list
+          this.groupList.forEach((item, index) => {
+            console.log(item)
+            if (index > 0) {
+              item.checked = false
+            } else {
+              item.checked = true
+            }
+            console.log(item)
+          })
+        }
+      })
+    },
     /**
      * 点击获取数据统计详情
      *
@@ -890,13 +910,14 @@ export default {
     async gitBillList() {
       this.isspinning = true
       console.log(this.billPagination.keys)
+      console.log(this.currentData)
       let data = {
         pageNum: this.billPagination.pageNum,
         pageSize: this.billPagination.pageSize,
         start: this.contentListSearchForm.start,
         end: this.contentListSearchForm.end,
         keys: this.billPagination.keys,
-        userId: this.currentData.id || '',
+        userId: this.currentData.id ? this.currentData.id : '',
         agencyTeamId: this.currentData.agencyTeamId,
         type: this.currentData.type,
       }
@@ -910,6 +931,12 @@ export default {
       }
       this.isspinning = false
     },
+    selectGroup(item) {
+      console.log(item)
+      this.selectedKeys = [item.teamName || item]
+      this.contentListSearchForm.agencyTeamIds = item.id + ''
+      this.getDataStatisticsList()
+    },
   },
 }
 </script>
@@ -931,9 +958,11 @@ table {
   padding-left: 0;
   padding-bottom: 0px;
   // overflow: hidden;
-  height: calc(100vh - 105px);
+  min-height: calc(100vh - 105px);
+  // height: calc(100vh - 105px);
   .leftContainer {
     width: 260px;
+    min-width: 220px;
     height: 100%;
     overflow: hidden;
     /deep/ .searchbox {
@@ -960,6 +989,17 @@ table {
     flex: 1;
     padding-left: 16px;
     overflow: hidden;
+    position: relative;
+    min-width: 1020px;
+    &::before {
+      position: absolute;
+      content: '';
+      width: 1px;
+      height: calc(100% - 16px);
+      left: 0;
+      top: 0;
+      background: #eee;
+    }
     .addmemeber {
       border: 0;
       padding: 0 12px;
@@ -1006,7 +1046,7 @@ table {
         th {
           padding: 12px 0;
           div {
-            padding: 0px 8px;
+            // padding: 0px 8px;
           }
           &:not(:first-child) {
             > span {
@@ -1028,7 +1068,7 @@ table {
       }
       .ant-table-tbody {
         .ant-table-row-cell-ellipsis {
-          padding: 12px 14px;
+          padding: 12px 12px;
         }
         .ant-table-row-expand-icon {
           // color: #000;
@@ -1072,17 +1112,16 @@ table {
   }
   /deep/ .ant-modal-content {
     .ant-modal-body {
-      min-height: 780px;
-      max-height: 780px;
+      min-height: 730px;
+      max-height: 730px;
       padding-bottom: 50px;
       overflow: auto;
     }
   }
 }
 
-/deep/ .ant-table-thead > tr > th,
-/deep/ .ant-table-tbody > tr > td {
-  padding: 12px 8px !important;
+/deep/ .ant-table-thead > tr > th {
+  padding: 12px 0px !important;
 }
 td:empty:before {
   content: '-';
@@ -1127,7 +1166,7 @@ td:empty:before {
 .content {
   position: relative;
   overflow: auto;
-  max-height: 700px;
+  // max-height: 700px;
 }
 .total {
   // background-color: #fafafa;
@@ -1214,7 +1253,7 @@ td:empty:before {
       font-size: 14px;
       // height: 20px;
       // display: inline-block;
-      // padding: 0px 16px;
+      padding: 0px 16px;
     }
     .ant-table-row-indent {
       display: none;
diff --git a/src/style/index.less b/src/style/index.less
index 8ae0d92..707c80d 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/c/font_3135652_hpjxyx26ogf.css";
+@import "http://at.alicdn.com/t/c/font_3135652_vgfhlnrtoao.css";
 
 // 初始化页面样式
 body,
@@ -295,11 +295,11 @@ i {
 .mt10 {
 	margin-top: 10px;
 }
-.ml22{
-  margin-left: 22px;
+.ml22 {
+	margin-left: 22px;
 }
-.ml24{
-  margin-left: 24px;
+.ml24 {
+	margin-left: 24px;
 }
 .mb10 {
 	margin-bottom: 10px;
@@ -330,6 +330,12 @@ i {
 .pt12 {
 	padding-top: 12px;
 }
+.letter0{
+  letter-spacing: 0;
+}
+.mb40{
+  margin-bottom: 40px;
+}
 .pb8 {
 	padding-bottom: 8px;
 }
@@ -397,6 +403,12 @@ i {
 .f24 {
 	font-size: 24px;
 }
+.f32 {
+	font-size: 32px !important;
+}
+.f36 {
+	font-size: 36px !important;
+}
 .c3 {
 	color: #333;
 }
@@ -406,6 +418,12 @@ i {
 .c9 {
 	color: #999;
 }
+.cccc {
+	color: #cccccc;
+}
+.cblue {
+	color: #1890ff;
+}
 .fsa {
 	display: flex;
 	align-items: center;
diff --git a/src/views/main.vue b/src/views/main.vue
index 2bfae13..9998da8 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -2,26 +2,29 @@
   <div class="index-container" @click="isspecialboxshow = false">
     <!-- title部分 -->
     <div class="pagetitle" v-if="isLogin && routertitleindex != 0">
-      <div class="w">
-        <span>欢迎来到伯才稻田平台！</span>
-        <span>
-          <ul>
-            <li>
-              <router-link to="/" :class="routertitleindex == 0 ? 'titleactive' : ''" rel="opener">首页</router-link>
-            </li>
-            <li>
-              <router-link to="/list" @click.native="toList" :class="routertitleindex == 1 ? 'titleactive' : ''" rel="opener">稻田职位</router-link>
-            </li>
-            <li>
-              <router-link to="/mybill" :class="routertitleindex == 5 ? 'titleactive' : ''" rel="opener">我的报名</router-link>
-            </li>
-            <li>
-              <router-link to="/mytownsman" :class="routertitleindex == 4 ? 'titleactive' : ''">我的老乡</router-link>
-            </li>
-            <!-- <li>
+      <div class="w fsa">
+        <div class="fss">
+          <svg class="svg_icon f36" aria-hidden="true">
+            <use xlink:href="#icon-daotian1" />
+          </svg>
+          <div>
+            <ul class="fsa titleTag">
+              <li>
+                <router-link to="/" :class="routertitleindex == 0 ? 'titleactive' : ''" rel="opener">首页</router-link>
+              </li>
+              <li>
+                <router-link to="/list" @click.native="toList" :class="routertitleindex == 1 ? 'titleactive' : ''" rel="opener">稻田职位</router-link>
+              </li>
+              <li>
+                <router-link to="/mybill" :class="routertitleindex == 5 ? 'titleactive' : ''" rel="opener">我的报名</router-link>
+              </li>
+              <li>
+                <router-link to="/mytownsman" :class="routertitleindex == 4 ? 'titleactive' : ''">我的老乡</router-link>
+              </li>
+              <!-- <li>
               <router-link to="/dataStatistics" :class="routertitleindex == 6 ? 'titleactive' : ''">团队数据</router-link>
-            </li>-->
-            <!-- <li>
+              </li>-->
+              <!-- <li>
               <router-link to="/serviceoutlets"
                 ><a
                   href="javascript:;"
@@ -38,9 +41,10 @@
                   >关于我们</a
                 >
               </router-link>
-            </li>-->
-          </ul>
-        </span>
+              </li>-->
+            </ul>
+          </div>
+        </div>
         <span class="login fsa">
           <div class="f14 pr16 mr16" style="line-height:1;border-right:1px solid #979797;cursor:pointer">
             <!-- <i class="iconfont icon-qiehuan cf4 f12 mr4"></i>切换到公开版 -->
@@ -50,20 +54,16 @@
               <!-- <img :src="loginValue.imgSrc" alt="" v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
               <span v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
               <span class="fsa">
-                <span class="iconfont icon-morentouxiang mr4 f24" v-if="!userbaseInfo.imgSrc"></span>
-                <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:24px;height:24px;" alt v-else />
-                {{ userbaseInfo.userName }}
+                <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
+                <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
+                <div class="ml8">{{ userbaseInfo.userName }}</div>
               </span>
               <div class="loginbox" slot="overlay">
-                <div>
+                <!-- <div>
                   <img :src="loginValue.imgSrc" alt v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
-                  <span v-else class="iconfont icon-morentouxiang avatar"></span>
-                  <span class="username">
-                    {{
-                    loginValue.userName || loginValue.nickName || loginValue.tel
-                    }}
-                  </span>
-                </div>
+                  <span v-else class="iconfont icon-morentouxiang avatar f32"></span>
+                  <span class="username">{{loginValue.userName || loginValue.nickName || loginValue.tel}}</span>
+                </div> -->
                 <router-link to="/accountsetting">
                   <div>
                     <span>
@@ -133,9 +133,9 @@
           <!-- <img :src="loginValue.imgSrc" alt="" v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
           <span v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
           <span class="fsa f14 cf shadow">
-            <span class="iconfont icon-morentouxiang mr4 f24" v-if="!userbaseInfo.imgSrc"></span>
-            <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:24px;height:24px;" alt v-else />
-            {{ userbaseInfo.userName }}
+            <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
+            <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
+            <span class="ml8">{{ userbaseInfo.userName }}</span>
           </span>
           <div class="loginbox" slot="overlay">
             <div>
@@ -663,6 +663,9 @@ export default {
   /deep/ .pagetitle {
     background-color: #f0f0f0;
     padding: 0;
+    height: 48px;
+    display: flex;
+    align-items: center;
     // height: 32px;
     // width: 100vw;
     // font-size: 16px;
@@ -677,33 +680,15 @@ export default {
       // justify-content: space-between;
       // line-height: 36px;
 
-      span {
-        height: 40px;
-        float: left;
-      }
-      > span:first-of-type {
-        display: block;
-        width: 160px;
-        font-size: 14px;
-        color: #333;
-        line-height: 40px;
-        // width: 228px;
-        // height: 36px;
-        // img {
-        //   width: 100%;
-        //   height: 100%;
-        // }
-      }
-      > span:nth-of-type(2) {
-        ul {
+        .titleTag {
           font-size: 14px;
           display: flex;
-          margin-left: 110px;
+          margin-left: 150px;
           li {
             font-weight: 400;
             color: #333;
             margin-right: 24px;
-            line-height: 40px;
+            line-height: 48px;
             // text-shadow: 2px 2px 4px 0px rgba(0, 0, 0, 0.05);
 
             a {
@@ -714,7 +699,6 @@ export default {
             }
           }
         }
-      }
       .navigationright {
         float: right;
         margin-right: 24px;
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index 6fde2ab..c31b3d0 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -48,13 +48,13 @@
               <!-- <img :src="userbaseInfo.imgSrc" alt="" v-if="userbaseInfo.imgSrc !== ''" style="border-radius: 50%" />
               <span v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
               <span class="fsa f14">
-                <span class="iconfont icon-morentouxiang mr4 f24" v-if="!userbaseInfo.imgSrc"></span>
-                <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:24px;height:24px;" alt v-else />
+                <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
+                <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
                 {{ userbaseInfo.userName }}
               </span>
               <div class="loginbox backTable" slot="overlay">
                 <div class="tal">
-                  <img :src="userbaseInfo.imgSrc" alt v-if="userbaseInfo.imgSrc !== ''" style="border-radius:50%;width:24px;height:24px;" />
+                  <img :src="userbaseInfo.imgSrc" alt v-if="userbaseInfo.imgSrc !== ''" style="border-radius:50%;width:32px;height:32px;" />
                   <span v-else class="iconfont icon-morentouxiang avatar"></span>
                   <span class="username">
                     {{
@@ -365,11 +365,13 @@ header.header,
 
 .trans {
   -webkit-transition: all 0.2s;
-  height: calc(100vh - 64px);
+  // height: calc(100vh - 64px);
+  min-height: calc(100vh - 64px);
   overflow: auto;
   background-color: #f5f5f5;
   transition: all 0.2s;
   padding: 18px;
+  padding-right: 36px;
   padding-bottom: 0;
   // padding-right: 32px;
   margin-left: 152px !important;