张少康 2 years ago
commit 2f13555971

@ -8,7 +8,7 @@
<script> <script>
import zhCn from "ant-design-vue/lib/locale-provider/zh_CN"; import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
let sp = document.createElement('script') 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) document.body.appendChild(sp)
export default { export default {
provide() { provide() {

@ -10,48 +10,43 @@
<a-breadcrumb-item>团队成员</a-breadcrumb-item> <a-breadcrumb-item>团队成员</a-breadcrumb-item>
</a-breadcrumb> </a-breadcrumb>
<div class="contentbody bodyContainer"> <div class="contentbody bodyContainer">
<div class="leftContainer br1"> <div class="leftContainer pb24">
<div class="searchbox pb12 ml12 mr12"> <div class="searchbox pb12 ml12 mr12">
<div class="searchinput"> <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> </div>
<!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> --> <!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> -->
</div> </div>
<a-radio-group v-model="menuType" class="pl12 pr12 tac" style="width:100%" :style="{ marginBottom: '8px' }"> <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="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> </a-radio-group>
<div v-if="menuType == 'role'"> <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 :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> </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> <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;"> <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"> <template v-for="(item, index) in ['创建人(1人)','管理员(3人)','成员(12人)']">
<a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)"> <a-menu-item :key="item" class="fsa showdot" @click="selectGroup(item)">
{{item.teamName}} {{item}}
<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>
</template> </template>
</a-menu> </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> <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;"> <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"> --> <!-- <template v-for="(item, index) in groupList"> -->
<a-menu-item key="角色1" class="fsa showdot" @click="selectGroup('角色1')"> <a-menu-item key="角色1" class="fsa showdot" @click="selectGroup('角色1')">
{{'角色1'}} {{'角色1'}}
<a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter"> <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
<i class="iconfont icon-gengduo3 thedot" @click.stop></i> <i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
<div class="groupdropdownbox backTable" slot="overlay"> <div class="groupdropdownbox backTable" slot="overlay">
<div>修改名称</div> <div>修改名称</div>
<div>删除</div> <div>删除</div>
@ -62,8 +57,8 @@
</a-menu-item> </a-menu-item>
<a-menu-item key="角色2" class="fsa showdot" @click="selectGroup('角色2')"> <a-menu-item key="角色2" class="fsa showdot" @click="selectGroup('角色2')">
{{'角色2'}} {{'角色2'}}
<a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter"> <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
<i class="iconfont icon-gengduo3 thedot" @click.stop></i> <i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
<div class="groupdropdownbox backTable" slot="overlay"> <div class="groupdropdownbox backTable" slot="overlay">
<div>修改名称</div> <div>修改名称</div>
<div>删除</div> <div>删除</div>
@ -77,15 +72,15 @@
</div> </div>
<div v-else> <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 :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> </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;"> <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"> <template v-for="(item, index) in groupList">
<a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)"> <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
{{item.teamName}} {{item.teamName}}
<a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomCenter"> <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
<i class="iconfont icon-gengduo3 thedot" @click.stop></i> <i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
<div class="groupdropdownbox backTable" slot="overlay"> <div class="groupdropdownbox backTable" slot="overlay">
<div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div> <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
<div @click="delGroup(item)"></div> <div @click="delGroup(item)"></div>
@ -96,7 +91,7 @@
</a-menu-item> </a-menu-item>
</template> </template>
</a-menu> </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]"> <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> --> <!-- <i class="iconfont icon-fangda c6 f12 mr8" style="line-height:32px"></i> -->
添加部门 添加部门
@ -104,9 +99,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="rightContainer"> <div class="rightContainer mb24">
<div class="fsa pb14 bb1 mb24"> <div class="fsa pb14 bb1 mb24">
<div class="f20 fw500">{{modalTitle ? modalTitle : "部门116人"}}</div> <div class="f16 fw500">{{modalTitle ? modalTitle : selectedKeys[0] == 'all' ? '全部成员':selectedKeys[0] }}</div>
<!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> --> <!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> -->
<a-button class="addmemeber f14" v-if="modalTitle == ''" @click="showDetail('add')"> <a-button class="addmemeber f14" v-if="modalTitle == ''" @click="showDetail('add')">
<i class="iconfont icon-fangda"></i> 添加成员 <i class="iconfont icon-fangda"></i> 添加成员
@ -115,7 +110,7 @@
</div> </div>
<!-- :expanded-row-keys.sync="expandedRowKeys" --> <!-- :expanded-row-keys.sync="expandedRowKeys" -->
<!-- v-if="modalTitle == ''" --> <!-- 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-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> --> <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
<span slot="nickName" slot-scope="text, record"> <span slot="nickName" slot-scope="text, record">
@ -143,7 +138,7 @@
</div> </div>
</a-table> </a-table>
<div class="pagecontainer mt16"> <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"> <div class="ant-pagination-options-quick-jumper f14 ml12">
<span>{{ pagination.total }}</span>跳至 <span>{{ pagination.total }}</span>跳至
<input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" /> <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />
@ -358,7 +353,7 @@ export default {
form: this.$form.createForm(this), form: this.$form.createForm(this),
pagination: { pagination: {
pageNum: 1, pageNum: 1,
pageSize: 8, pageSize: 20,
total: null, // total: null, //
status: 0, status: 0,
keys: null, keys: null,
@ -392,8 +387,8 @@ export default {
groupName: '', // groupName: '', //
loading: false, loading: false,
isEdit: false, // isEdit: false, //
selectedKeys: ['待部门'], selectedKeys: ['all'],
menuType: 'role', menuType: 'group',
} }
}, },
// //
@ -487,7 +482,7 @@ export default {
// sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order, // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
// ellipsis: true, // ellipsis: true,
width: 84, width: 90,
}, },
] ]
return columns return columns
@ -576,6 +571,9 @@ export default {
item.permission = getAgencyPermissionNameById(item.agencyPermissions) item.permission = getAgencyPermissionNameById(item.agencyPermissions)
// }) // })
}) })
this.memberList.sort((a, b) => {
return a.agencyRole - b.agencyRole
})
this.pagination.total = data.data.recordCount this.pagination.total = data.data.recordCount
} }
}) })
@ -721,7 +719,7 @@ export default {
aliasName: this.currentMember.aliasName, aliasName: this.currentMember.aliasName,
tel: this.currentMember.tel, tel: this.currentMember.tel,
group: this.currentMember.group, group: this.currentMember.group,
agencyTeamId: this.currentMember.agencyTeamId, agencyTeamId: this.currentMember.teamName,
}) })
}, 200) }, 200)
} else if (type == 'detail') { } else if (type == 'detail') {
@ -762,11 +760,17 @@ export default {
selectGroup(item) { selectGroup(item) {
console.log(item) console.log(item)
this.selectedKeys = [item.teamName || item] this.selectedKeys = [item.teamName || item]
if (typeof item != 'object') {
this.pagination.agencyTeamIds = ''
} else {
this.pagination.agencyTeamIds = item.id + ''
}
this.getMemberList()
}, },
modalCancel() { modalCancel() {
// console.log(this); // console.log(this);
this.modalTitle = '' this.modalTitle = ''
// this.visible = false this.visible = false
// this.permission = getAgencyPermissionsByRole() // this.permission = getAgencyPermissionsByRole()
// this.permissionName = getAgencyPermissionNameById(this.permission) // this.permissionName = getAgencyPermissionNameById(this.permission)
}, },
@ -964,9 +968,11 @@ export default {
padding-left: 0; padding-left: 0;
padding-bottom: 0px; padding-bottom: 0px;
// overflow: hidden; // overflow: hidden;
height: calc(100vh - 105px); // min-height: calc(100vh - 105px);
// height: calc(100vh - 105px);
.leftContainer { .leftContainer {
width: 260px; width: 260px;
min-width: 220px;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
/deep/ .searchbox { /deep/ .searchbox {
@ -993,6 +999,17 @@ export default {
flex: 1; flex: 1;
padding-left: 16px; padding-left: 16px;
overflow: hidden; overflow: hidden;
position: relative;
min-width: 1020px;
&::before {
position: absolute;
content: '';
width: 1px;
height: calc(100% - 16px);
left: 0;
top: 0;
background: #eee;
}
.addmemeber { .addmemeber {
border: 0; border: 0;
padding: 0 12px; padding: 0 12px;
@ -1033,7 +1050,8 @@ export default {
// transform: translateY(-50%); // transform: translateY(-50%);
} }
} }
/deep/ .ant-table-content { /deep/.ant-table {
.ant-table-content {
.ant-table-body { .ant-table-body {
.ant-table-thead { .ant-table-thead {
th { th {
@ -1053,14 +1071,17 @@ export default {
} }
} }
.ant-table-row-cell-break-word { .ant-table-row-cell-break-word {
font-size: 14px !important;
font-weight: bold; font-weight: bold;
} }
.ant-table-row-cell-ellipsis { .ant-table-row-cell-ellipsis {
font-size: 14px !important;
font-weight: bold; font-weight: bold;
} }
} }
.ant-table-tbody { .ant-table-tbody {
.ant-table-row-cell-ellipsis { .ant-table-row-cell-ellipsis {
font-size: 14px !important;
padding: 12px 14px; padding: 12px 14px;
} }
.ant-table-row-expand-icon { .ant-table-row-expand-icon {
@ -1074,6 +1095,7 @@ export default {
} }
} }
} }
}
/deep/ .ant-table-column-sorter-inner { /deep/ .ant-table-column-sorter-inner {
height: 16px !important; height: 16px !important;
} }
@ -1085,8 +1107,8 @@ export default {
.delete { .delete {
// border-left: 1px solid #979797; // border-left: 1px solid #979797;
border-right: 1px solid #979797; border-right: 1px solid #979797;
padding: 0 9px 0 0; padding: 0 6px 0 0;
margin: 0 9px 0 0; margin: 0 6px 0 0;
} }
} }
// /deep/ .ant-table-row-cell-break-word { // /deep/ .ant-table-row-cell-break-word {
@ -1199,11 +1221,12 @@ export default {
overflow: hidden; overflow: hidden;
background-color: #fff; background-color: #fff;
border-radius: 4px; border-radius: 4px;
text-align: center; text-align: left;
box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4); box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4);
padding: 8px 0; padding: 8px 0;
> div { > div {
height: 32px; height: 32px;
padding: 0 12px;
line-height: 32px; line-height: 32px;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
@ -1213,6 +1236,4 @@ export default {
} }
} }
} }
.changeGroup {
}
</style> </style>

@ -121,456 +121,456 @@ export default {
// searchTag: 1, // searchTag: 1,
}, },
isspinning: false, isspinning: false,
roleList: [ // roleList: [
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-10-20 14:27:17', // roleCreateTime: '2023-10-20 14:27:17',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 21, // userNum: 21,
labelId: 672, // labelId: 672,
pName: '', // pName: '',
roleId: 145, // roleId: 145,
roleName: '稻田内测用户', // roleName: '',
sort: 1, // sort: 1,
roleType: 1, // roleType: 1,
labelName: '稻田内测用户', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-10-12 09:34:33', // roleCreateTime: '2023-10-12 09:34:33',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 2, // userNum: 2,
labelId: 670, // labelId: 670,
pName: '工厂职位,工单列表', // pName: '',
roleId: 144, // roleId: 144,
roleName: '询单客服', // roleName: '',
sort: 2, // sort: 2,
roleType: 1, // roleType: 1,
labelName: '询单客服', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-09-22 11:46:25', // roleCreateTime: '2023-09-22 11:46:25',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 2, // userNum: 2,
labelId: 667, // labelId: 667,
pName: '', // pName: '',
roleId: 143, // roleId: 143,
roleName: '管理角色', // roleName: '',
sort: 3, // sort: 3,
roleType: 1, // roleType: 1,
labelName: '管理角色', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-09-06 20:05:46', // roleCreateTime: '2023-09-06 20:05:46',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 1, // userNum: 1,
labelId: 662, // labelId: 662,
pName: '品牌列表,职位要求,职位特色,企业列表,总包列表,工单列表,工厂职位,工单列表,项目相册,更新助手,职位分类,逾期工单,热推职位', // pName: '',
roleId: 142, // roleId: 142,
roleName: '跟单客服', // roleName: '',
sort: 4, // sort: 4,
roleType: 1, // roleType: 1,
labelName: '跟单客服', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-08-19 18:30:20', // roleCreateTime: '2023-08-19 18:30:20',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 0, // userNum: 0,
labelId: 658, // labelId: 658,
pName: '品牌列表,职位要求,职位特色,工作台,分析页,龙虎榜,用户列表,企业列表,总包列表,后台内容,代理列表,代理线索,矩阵官网,伯才官网,一手单官网,工单列表,工厂职位,老乡列表,项目页,工厂职位,代理列表,工单列表,项目通告,项目通知,位置管理,项目相册,官网表单,账单管理,数据大屏,更新助手,项目概况,职位分类,内容管理,呼叫数据,逾期工单,热推职位,频道管理,轮播配置,活动页面,图片模板,图片模板', // pName: '线',
roleId: 141, // roleId: 141,
roleName: '新管理员', // roleName: '',
sort: 5, // sort: 5,
roleType: 1, // roleType: 1,
labelName: '新管理员', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-08-11 10:48:15', // roleCreateTime: '2023-08-11 10:48:15',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 0, // userNum: 0,
labelId: 656, // labelId: 656,
pName: '品牌列表,职位要求,职位特色,工作台,企业列表,总包列表,后台内容,代理列表,代理线索,矩阵官网,伯才官网,一手单官网,工单列表,工厂职位,工单列表,项目相册,官网表单,数据看板,更新助手,项目概况,职位分类,内容管理,呼叫数据,逾期工单,热推职位,频道管理,轮播配置,活动页面,图片模板,图片模板', // pName: '线',
roleId: 140, // roleId: 140,
roleName: '开发测试', // roleName: '',
sort: 6, // sort: 6,
roleType: 1, // roleType: 1,
labelName: '开发测试', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-07-31 16:03:23', // roleCreateTime: '2023-07-31 16:03:23',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 8, // userNum: 8,
labelId: 655, // labelId: 655,
pName: '代理列表', // pName: '',
roleId: 139, // roleId: 139,
roleName: '电话客服', // roleName: '',
sort: 7, // sort: 7,
roleType: 1, // roleType: 1,
labelName: '渠道拓展', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2023-01-29 13:53:17', // roleCreateTime: '2023-01-29 13:53:17',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 18, // userNum: 18,
labelId: 636, // labelId: 636,
pName: '', // pName: '',
roleId: 138, // roleId: 138,
roleName: '成员通用', // roleName: '',
sort: 8, // sort: 8,
roleType: 1, // roleType: 1,
labelName: '成员通用', // labelName: '',
}, // },
{ // {
roleDesp: '交付中心主管', // roleDesp: '',
roleCreateTime: '2020-06-09 16:26:25', // roleCreateTime: '2020-06-09 16:26:25',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 6, // userNum: 6,
labelId: 408, // labelId: 408,
pName: '品牌列表,职位要求,职位特色,工作台,分析页,龙虎榜,企业列表,总包列表,代理列表,工单列表,工厂职位,老乡列表,项目页,工厂职位,代理列表,工单列表,项目通告,项目通知,位置管理,项目相册,数据看板,数据大屏,更新助手,项目概况,职位分类,热推职位', // pName: '',
roleId: 106, // roleId: 106,
roleName: '项目主管', // roleName: '',
sort: 9, // sort: 9,
roleType: 1, // roleType: 1,
labelName: '项目主管', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2022-04-27 10:40:43', // roleCreateTime: '2022-04-27 10:40:43',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 5, // userNum: 5,
labelId: 616, // labelId: 616,
pName: '代理列表,工单列表,平台数据,渠道运营,代理数据,数据看板', // pName: '',
roleId: 136, // roleId: 136,
roleName: '渠道主管', // roleName: '',
sort: 10, // sort: 10,
roleType: 1, // roleType: 1,
labelName: '渠道主管', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2022-02-24 19:58:45', // roleCreateTime: '2022-02-24 19:58:45',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 12, // userNum: 12,
labelId: 612, // labelId: 612,
pName: '工厂职位,代理列表,工单列表', // pName: '',
roleId: 135, // roleId: 135,
roleName: '客户经理', // roleName: '',
sort: 11, // sort: 11,
roleType: 1, // roleType: 1,
labelName: '客户经理', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2020-08-30 10:12:30', // roleCreateTime: '2020-08-30 10:12:30',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 1, // userNum: 1,
labelId: 452, // labelId: 452,
pName: '品牌列表,职位要求,职位特色,劳动合同,业务合同,合同模板,合同企业,工资条,工作台,分析页,龙虎榜,复盘,用户列表,成员列表,企业列表,总包列表,代理列表,代理线索,工单列表,工厂职位,老乡列表,代理列表,项目相册,账单管理,数据看板,数据大屏,更新助手,内容管理,呼叫数据,逾期工单', // pName: '线',
roleId: 117, // roleId: 117,
roleName: '财务', // roleName: '',
sort: 12, // sort: 12,
roleType: 1, // roleType: 1,
labelName: '财务', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2022-06-10 14:12:00', // roleCreateTime: '2022-06-10 14:12:00',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 0, // userNum: 0,
labelId: 622, // labelId: 622,
pName: '短信验证码,修改用户操作次数,校验姓名、身份证号,校验姓名、银行卡号', // pName: '',
roleId: 137, // roleId: 137,
roleName: '开发角色01', // roleName: '01',
sort: 13, // sort: 13,
roleType: 1, // roleType: 1,
labelName: '开发角色01', // labelName: '01',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2021-12-27 19:36:07', // roleCreateTime: '2021-12-27 19:36:07',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 1, // userNum: 1,
labelId: 607, // labelId: 607,
pName: '品牌列表,工作台,项目列表【旧】,工单管理-襄县渠道管理代理列表1.0,推广明细,企业列表,总包列表,代理入口', // pName: '-1.0广',
roleId: 133, // roleId: 133,
roleName: '门店店长', // roleName: '',
sort: 14, // sort: 14,
roleType: 1, // roleType: 1,
labelName: '门店店长', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2021-10-26 13:56:05', // roleCreateTime: '2021-10-26 13:56:05',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 10, // userNum: 10,
labelId: 588, // labelId: 588,
pName: '品牌列表,职位要求,职位特色,企业列表,总包列表,工厂职位,工单列表,项目相册,更新助手,职位分类', // pName: '',
roleId: 132, // roleId: 132,
roleName: '项目经理', // roleName: '',
sort: 15, // sort: 15,
roleType: 1, // roleType: 1,
labelName: '项目经理', // labelName: '',
}, // },
{ // {
roleDesp: '安置专员角色', // roleDesp: '',
roleCreateTime: '2021-10-14 09:37:00', // roleCreateTime: '2021-10-14 09:37:00',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 2, // userNum: 2,
labelId: 586, // labelId: 586,
pName: '', // pName: '',
roleId: 130, // roleId: 130,
roleName: '安置专员', // roleName: '',
sort: 16, // sort: 16,
roleType: 1, // roleType: 1,
labelName: '安置专员', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2021-10-13 16:20:01', // roleCreateTime: '2021-10-13 16:20:01',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 2, // userNum: 2,
labelId: 585, // labelId: 585,
pName: '简历采集,推荐工作,跟进入职,跟进离职,需求维护,需求列表,需求地图,品牌列表,职位要求,职位特色,工作台,在职维护,项目列表【旧】,企业列表,总包列表,后台内容,代理列表,工单列表,工厂职位', // pName: '',
roleId: 129, // roleId: 129,
roleName: '产品经理', // roleName: '',
sort: 17, // sort: 17,
roleType: 1, // roleType: 1,
labelName: '产品经理', // labelName: '',
}, // },
{ // {
roleDesp: '白名单的角色,扫码、报名后,只要绑定了代理一定会触发推广事件和佣金,且佣金免审核自动发送到余额', // roleDesp: '广',
roleCreateTime: '2021-10-07 17:20:01', // roleCreateTime: '2021-10-07 17:20:01',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 3, // userNum: 3,
labelId: 584, // labelId: 584,
pName: '', // pName: '',
roleId: 128, // roleId: 128,
roleName: '代理佣金白名单', // roleName: '',
sort: 18, // sort: 18,
roleType: 1, // roleType: 1,
labelName: '代理佣金白名单', // labelName: '',
}, // },
{ // {
roleDesp: '线下代理点拓展', // roleDesp: '线',
roleCreateTime: '2021-08-31 15:23:45', // roleCreateTime: '2021-08-31 15:23:45',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 2, // userNum: 2,
labelId: 582, // labelId: 582,
pName: '工作台项目列表【旧】渠道管理代理列表1.0,推广明细,企业列表,代理入口', // pName: '1.0广',
roleId: 126, // roleId: 126,
roleName: '招工经理', // roleName: '',
sort: 19, // sort: 19,
roleType: 1, // roleType: 1,
labelName: '招工经理', // labelName: '',
}, // },
{ // {
roleDesp: '设计', // roleDesp: '',
roleCreateTime: '2021-08-18 18:00:44', // roleCreateTime: '2021-08-18 18:00:44',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 3, // userNum: 3,
labelId: 580, // labelId: 580,
pName: '品牌列表,工作台,企业列表,项目相册,更新助手', // pName: '',
roleId: 125, // roleId: 125,
roleName: '平面设计', // roleName: '',
sort: 20, // sort: 20,
roleType: 1, // roleType: 1,
labelName: '平面设计', // labelName: '',
}, // },
{ // {
roleDesp: '试用期', // roleDesp: '',
roleCreateTime: '2021-05-12 10:27:09', // roleCreateTime: '2021-05-12 10:27:09',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 0, // userNum: 0,
labelId: 561, // labelId: 561,
pName: '工厂职位', // pName: '',
roleId: 124, // roleId: 124,
roleName: '试用', // roleName: '',
sort: 21, // sort: 21,
roleType: 1, // roleType: 1,
labelName: '试用', // labelName: '',
}, // },
{ // {
roleDesp: '注册用户,无后台权限', // roleDesp: '',
roleCreateTime: '2017-04-18 14:16:41', // roleCreateTime: '2017-04-18 14:16:41',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 7225, // userNum: 7225,
labelId: 1, // labelId: 1,
pName: '', // pName: '',
roleId: 45, // roleId: 45,
roleName: 'A', // roleName: 'A',
sort: 22, // sort: 22,
roleType: 1, // roleType: 1,
labelName: 'A', // labelName: 'A',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2020-11-18 20:12:40', // roleCreateTime: '2020-11-18 20:12:40',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 3, // userNum: 3,
labelId: 479, // labelId: 479,
pName: '工作台', // pName: '',
roleId: 122, // roleId: 122,
roleName: '新人', // roleName: '',
sort: 23, // sort: 23,
roleType: 1, // roleType: 1,
labelName: '新人', // labelName: '',
}, // },
{ // {
roleDesp: '原”在线客服“、”流量专员“', // roleDesp: '线',
roleCreateTime: '2019-11-15 18:04:13', // roleCreateTime: '2019-11-15 18:04:13',
classify: 0, // classify: 0,
aliasName: '简历专员', // aliasName: '',
userNum: 4, // userNum: 4,
labelId: 433, // labelId: 433,
pName: '简历采集,需求列表,需求地图,复盘', // pName: '',
roleId: 102, // roleId: 102,
roleName: '简历专员', // roleName: '',
sort: 24, // sort: 24,
roleType: 1, // roleType: 1,
labelName: '简历专员', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2018-02-03 10:10:05', // roleCreateTime: '2018-02-03 10:10:05',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 7, // userNum: 7,
labelId: 207, // labelId: 207,
pName: '推荐工作,需求列表,需求地图,我的统计,复盘', // pName: '',
roleId: 87, // roleId: 87,
roleName: '职业顾问', // roleName: '',
sort: 25, // sort: 25,
roleType: 1, // roleType: 1,
labelName: '职业顾问', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2017-10-27 22:08:21', // roleCreateTime: '2017-10-27 22:08:21',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 5, // userNum: 5,
labelId: 165, // labelId: 165,
pName: '跟进入职,旧在职维护,跟进离职,需求维护,需求列表,需求地图,工资核对,品牌列表,劳动合同,服务交付,工作台,在职维护,复盘,项目列表【旧】', // pName: '',
roleId: 84, // roleId: 84,
roleName: '项目执行', // roleName: '',
sort: 26, // sort: 26,
roleType: 1, // roleType: 1,
labelName: '项目执行', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2020-11-03 18:25:54', // roleCreateTime: '2020-11-03 18:25:54',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 3, // userNum: 3,
labelId: 468, // labelId: 468,
pName: '劳动合同,工资条,服务交付,工作台,在职维护,在职维护', // pName: '',
roleId: 119, // roleId: 119,
roleName: '服务专员', // roleName: '',
sort: 27, // sort: 27,
roleType: 1, // roleType: 1,
labelName: '服务专员', // labelName: '',
}, // },
{ // {
roleDesp: 'BD负责商务拓展', // roleDesp: 'BD',
roleCreateTime: '2017-04-15 22:01:27', // roleCreateTime: '2017-04-15 22:01:27',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 5, // userNum: 5,
labelId: 27, // labelId: 27,
pName: '工单列表,更新助手,项目概况', // pName: '',
roleId: 41, // roleId: 41,
roleName: '项目客服', // roleName: '',
sort: 28, // sort: 28,
roleType: 1, // roleType: 1,
labelName: '项目客服', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2020-03-12 10:13:18', // roleCreateTime: '2020-03-12 10:13:18',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 1, // userNum: 1,
labelId: 355, // labelId: 355,
pName: '需求列表需求地图业务管理分发管理业务日历简历中心渠道来源1.0,简历生产,服务交付,工作台,龙虎榜,简历公海,在职维护,匹配失败,旧服务工单,复盘,工单时间,服务工单,等待分发,彩蛋配置', // pName: '1.0',
roleId: 104, // roleId: 104,
roleName: '平台运营', // roleName: '',
sort: 29, // sort: 29,
roleType: 1, // roleType: 1,
labelName: '平台运营', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2020-11-16 19:39:20', // roleCreateTime: '2020-11-16 19:39:20',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 2, // userNum: 2,
labelId: 477, // labelId: 477,
pName: '品牌列表,职位要求,职位特色,企业列表,工厂职位,项目相册,更新助手,职位分类,内容管理,热推职位,频道管理,轮播配置,活动页面,图片模板', // pName: '',
roleId: 121, // roleId: 121,
roleName: '内容运营', // roleName: '',
sort: 30, // sort: 30,
roleType: 1, // roleType: 1,
labelName: '内容运营', // labelName: '',
}, // },
{ // {
roleDesp: '', // roleDesp: '',
roleCreateTime: '2020-09-14 18:34:47', // roleCreateTime: '2020-09-14 18:34:47',
classify: 0, // classify: 0,
aliasName: '', // aliasName: '',
userNum: 4, // userNum: 4,
labelId: 458, // labelId: 458,
pName: '用户列表,成员列表,后台内容', // pName: '',
roleId: 118, // roleId: 118,
roleName: '公司人事', // roleName: '',
sort: 31, // sort: 31,
roleType: 1, // roleType: 1,
labelName: '公司人事', // labelName: '',
}, // },
{ // {
roleDesp: '超级管理员', // roleDesp: '',
roleCreateTime: '2017-04-13 15:27:02', // roleCreateTime: '2017-04-13 15:27:02',
classify: 1, // classify: 1,
aliasName: '', // aliasName: '',
userNum: 10, // userNum: 10,
labelId: 12, // labelId: 12,
pName: '简历采集推荐工作跟进入职旧在职维护跟进离职需求维护需求列表需求地图工资核对我的统计业务管理分发管理业务日历跟进入职在职管理离职管理简历中心渠道来源1.0简历生产角色管理菜单品牌列表职位要求职位特色劳动合同业务合同合同模板合同企业工资条职业顾问提成来源列表系统操作日志短信验证码修改用户操作次数校验姓名、身份证号校验姓名、银行卡号修改用户身份证照片修改用户OpenID修改模板对应的企业修改人员对应的企业合同生成PDF测试服务交付工作台龙虎榜简历公海在职维护匹配失败旧服务工单复盘线索管理线索挖掘休眠线索工单时间在职维护旧需求列表服务工单等待分发彩蛋配置项目收款结算花名库配置项', // pName: '1.0OpenIDPDF线线线',
roleId: 11, // roleId: 11,
roleName: 'admin', // roleName: 'admin',
sort: 32, // sort: 32,
roleType: 0, // roleType: 0,
labelName: 'admin', // labelName: 'admin',
}, // },
], // ],
middleauthor: null, middleauthor: null,
authorityList: { authorityList: {
dtzw: { dtzw: {

File diff suppressed because one or more lines are too long

@ -128,7 +128,7 @@
</span> </span>
</li>--> </li>-->
</ul> </ul>
<ul> <!-- <ul>
<li @click="pushto('/accountsetting/bocaiTV')" :class="{ tagactive: activelist === 9 }"> <li @click="pushto('/accountsetting/bocaiTV')" :class="{ tagactive: activelist === 9 }">
<span> <span>
<i class="iconfont icon-tv"></i>伯才TV <i class="iconfont icon-tv"></i>伯才TV
@ -137,7 +137,7 @@
<i class="iconfont icon-youjiantou"></i> <i class="iconfont icon-youjiantou"></i>
</span> </span>
</li> </li>
</ul> </ul> -->
</div> </div>
<div class="rightcontent"> <div class="rightcontent">
<keep-alive :include="['boundwx']"> <keep-alive :include="['boundwx']">

@ -10,101 +10,51 @@
<a-breadcrumb-item>团队数据</a-breadcrumb-item> <a-breadcrumb-item>团队数据</a-breadcrumb-item>
</a-breadcrumb> </a-breadcrumb>
<div class="bodyContainer contentbody"> <div class="bodyContainer contentbody">
<div class="leftContainer br1"> <div class="leftContainer pb24">
<div class="searchbox pb12 ml12 mr12"> <div class="searchbox pb12 ml12 mr12">
<div class="searchinput"> <div class>
<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> </div>
<!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> --> <!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> -->
</div> </div>
<a-radio-group v-model="menuType" class="pl12 pr12 tac" style="width:100%" :style="{ marginBottom: '8px' }"> <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="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="group" class="changeGroup" style="width:50%">团队排序</a-radio-button>
</a-radio-group> </a-radio-group>
<div v-if="menuType == 'role'"> <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 :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> </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>
<div class="f12 c9 ml24 mb8">默认角色11</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;"> <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"> <template v-for="(item, index) in groupList">
<a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)"> <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">{{item.teamName}}</a-menu-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> </template>
</a-menu> </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>
<div v-else> <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 :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-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')"></a-menu-item>
</a-menu> </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;"> <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"> <template v-for="(item, index) in groupList">
<a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)"> <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
{{item.teamName}} {{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>
</template> </template>
</a-menu> </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> </div>
</div> </div>
</div> <div class="rightContainer mb24">
<div class="rightContainer">
<div class="navTitle"> <div class="navTitle">
<div class="dateSelect fsa"> <div class="dateSelect fsa">
<div class="fsa"> <div class="fsa">
@ -169,10 +119,15 @@
</div> </div>
</div> </div>
<div class="content"> <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 slot="custom_objob">
<span class="fw500">在职人数</span> <span class="fw500">在职人数</span>
</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,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,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> <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 @click="getBillInfo(text1,70)" style="color:#576B95;text-decoration:underline" slot="finshedGPA" slot-scope="text, text1">{{toFixed(text)}}</a>
</a-table> </a-table>
</div> </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>
</div> </div>
<a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose> <a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose>
<div slot="title" destoryOnClose>明细</div> <div slot="title" destoryOnClose>明细</div>
<div class="searchinput"> <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"> <!-- <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model.trim="billPagination.keys">
<i slot="prefix" class="iconfont icon-sousuo"></i> <i slot="prefix" class="iconfont icon-sousuo"></i>
<button slot="suffix" @click="onSearch"></button> <button slot="suffix" @click="onSearch"></button>
@ -211,7 +176,7 @@
</template> </template>
<script> <script>
import { dataStatisticsListApi, dataStatisticsTeamDetailApi } from '../../../../api/userinfo' import { dataStatisticsListApi, dataStatisticsTeamDetailApi, getMemberGroupApi } from '../../../../api/userinfo'
import moment from 'moment' import moment from 'moment'
import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed } from '../../../../utils/commonUtil' import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed } from '../../../../utils/commonUtil'
const rowSelection = { const rowSelection = {
@ -247,6 +212,10 @@ export default {
dataList: [], dataList: [],
expandedRowKeys: [], expandedRowKeys: [],
rowSelection, rowSelection,
menuType: 'role',
currentData: {},
selectedKeys: ['all'],
groupList: [],
billPagination: { billPagination: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -356,15 +325,17 @@ export default {
columns() { columns() {
const columns = [ const columns = [
{ {
title: '序号', // title: ' ',
dataIndex: 'index', dataIndex: 'aliasName',
key: 'index', key: 'aliasName',
slots: { title: 'title_index' },
customRender: (text, row, index) => { customRender: (text, row, index) => {
if (row.users) { // if (row.users) {
return '' // return ''
} else { // } else {
return index + 1 return index + 1
} // }
}, },
width: 60, width: 60,
}, },
@ -373,11 +344,11 @@ export default {
dataIndex: 'aliasName', dataIndex: 'aliasName',
key: 'aliasName', key: 'aliasName',
customRender: (text, row, index) => { customRender: (text, row, index) => {
if (row.users) { // if (row.users) {
return row.agencyTeamName // return row.agencyTeamName
} else { // } else {
return row.aliasName return row.aliasName
} // }
}, },
ellipsis: true, ellipsis: true,
// width: 100, // width: 100,
@ -387,59 +358,59 @@ export default {
dataIndex: 'signUps', dataIndex: 'signUps',
key: 'signUps', key: 'signUps',
scopedSlots: { customRender: 'signUps' }, scopedSlots: { customRender: 'signUps' },
sorter: (a, b) => a.signUps - b.signUps,
ellipsis: true, ellipsis: true,
width: 90, width: 120,
}, },
{ {
title: '到面', title: '到面',
dataIndex: 'arrived', dataIndex: 'arrived',
key: 'arrived', key: 'arrived',
scopedSlots: { customRender: 'arrived' }, scopedSlots: { customRender: 'arrived' },
sorter: (a, b) => a.arrived - b.arrived,
width: 90, width: 120,
ellipsis: true, ellipsis: true,
}, },
{ {
title: '通过', title: '通过',
dataIndex: 'passed', dataIndex: 'passed',
key: 'passed', key: 'passed',
sorter: (a, b) => a.passed - b.passed,
scopedSlots: { customRender: 'passed' }, scopedSlots: { customRender: 'passed' },
ellipsis: true, ellipsis: true,
width: 90, width: 120,
}, },
{ {
title: '入职', title: '入职',
dataIndex: 'entry', dataIndex: 'entry',
key: 'entry', key: 'entry',
sorter: (a, b) => a.entry - b.entry,
scopedSlots: { customRender: 'entry' }, scopedSlots: { customRender: 'entry' },
ellipsis: true, ellipsis: true,
width: 90, width: 120,
}, },
{ {
// title: '', // title: '',
dataIndex: 'obJob', dataIndex: 'obJob',
key: 'obJob', key: 'obJob',
slots: { title: 'custom_objob' }, slots: { title: 'custom_objob' },
sorter: (a, b) => a.obJob - b.obJob,
scopedSlots: { customRender: 'obJob' }, scopedSlots: { customRender: 'obJob' },
ellipsis: true, ellipsis: true,
width: 90, width: 120,
// sorter: (a, b) => a.userApplyOrder.localeCompare(b.userApplyOrder),
// sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
}, },
{ {
title: '入职绩点', title: '入职绩点',
dataIndex: 'entryGPA', dataIndex: 'entryGPA',
key: 'entryGPA', key: 'entryGPA',
// customRender: (text, row, index) => { sorter: (a, b) => a.entryGPA - b.entryGPA,
// return toFixed(text)
// },
scopedSlots: { customRender: 'entryGPA' }, scopedSlots: { customRender: 'entryGPA' },
ellipsis: true, ellipsis: true,
width: 90, width: 120,
}, },
{ {
title: '交付绩点', title: '交付绩点',
@ -448,9 +419,10 @@ export default {
// customRender: (text, row, index) => { // customRender: (text, row, index) => {
// return toFixed(text) // return toFixed(text)
// }, // },
sorter: (a, b) => a.finshedGPA - b.finshedGPA,
scopedSlots: { customRender: 'finshedGPA' }, scopedSlots: { customRender: 'finshedGPA' },
ellipsis: true, ellipsis: true,
width: 90, width: 120,
}, },
] ]
return columns 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属性还不存在 * 组件实例创建完成属性已绑定但DOM还未生成$ el属性还不存在
@ -648,6 +643,7 @@ export default {
this.billList = [...this.billList, ...this.billList, ...this.billList] this.billList = [...this.billList, ...this.billList, ...this.billList]
this.$emit('setTitle', '团队数据') this.$emit('setTitle', '团队数据')
this.getDataStatisticsList() this.getDataStatisticsList()
this.getMemberGroup()
}, },
/** /**
* el 被新创建的 vm.el 替换并挂载到实例上去之后调用该钩子 * el 被新创建的 vm.el 替换并挂载到实例上去之后调用该钩子
@ -754,7 +750,14 @@ export default {
this.totalObj.index = index + 2 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 this.isspinning = false
} }
}, },
@ -841,6 +844,23 @@ export default {
this.gitBillList() 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() { async gitBillList() {
this.isspinning = true this.isspinning = true
console.log(this.billPagination.keys) console.log(this.billPagination.keys)
console.log(this.currentData)
let data = { let data = {
pageNum: this.billPagination.pageNum, pageNum: this.billPagination.pageNum,
pageSize: this.billPagination.pageSize, pageSize: this.billPagination.pageSize,
start: this.contentListSearchForm.start, start: this.contentListSearchForm.start,
end: this.contentListSearchForm.end, end: this.contentListSearchForm.end,
keys: this.billPagination.keys, keys: this.billPagination.keys,
userId: this.currentData.id || '', userId: this.currentData.id ? this.currentData.id : '',
agencyTeamId: this.currentData.agencyTeamId, agencyTeamId: this.currentData.agencyTeamId,
type: this.currentData.type, type: this.currentData.type,
} }
@ -910,6 +931,12 @@ export default {
} }
this.isspinning = false this.isspinning = false
}, },
selectGroup(item) {
console.log(item)
this.selectedKeys = [item.teamName || item]
this.contentListSearchForm.agencyTeamIds = item.id + ''
this.getDataStatisticsList()
},
}, },
} }
</script> </script>
@ -931,9 +958,11 @@ table {
padding-left: 0; padding-left: 0;
padding-bottom: 0px; padding-bottom: 0px;
// overflow: hidden; // overflow: hidden;
height: calc(100vh - 105px); min-height: calc(100vh - 105px);
// height: calc(100vh - 105px);
.leftContainer { .leftContainer {
width: 260px; width: 260px;
min-width: 220px;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
/deep/ .searchbox { /deep/ .searchbox {
@ -960,6 +989,17 @@ table {
flex: 1; flex: 1;
padding-left: 16px; padding-left: 16px;
overflow: hidden; overflow: hidden;
position: relative;
min-width: 1020px;
&::before {
position: absolute;
content: '';
width: 1px;
height: calc(100% - 16px);
left: 0;
top: 0;
background: #eee;
}
.addmemeber { .addmemeber {
border: 0; border: 0;
padding: 0 12px; padding: 0 12px;
@ -1006,7 +1046,7 @@ table {
th { th {
padding: 12px 0; padding: 12px 0;
div { div {
padding: 0px 8px; // padding: 0px 8px;
} }
&:not(:first-child) { &:not(:first-child) {
> span { > span {
@ -1028,7 +1068,7 @@ table {
} }
.ant-table-tbody { .ant-table-tbody {
.ant-table-row-cell-ellipsis { .ant-table-row-cell-ellipsis {
padding: 12px 14px; padding: 12px 12px;
} }
.ant-table-row-expand-icon { .ant-table-row-expand-icon {
// color: #000; // color: #000;
@ -1072,17 +1112,16 @@ table {
} }
/deep/ .ant-modal-content { /deep/ .ant-modal-content {
.ant-modal-body { .ant-modal-body {
min-height: 780px; min-height: 730px;
max-height: 780px; max-height: 730px;
padding-bottom: 50px; padding-bottom: 50px;
overflow: auto; overflow: auto;
} }
} }
} }
/deep/ .ant-table-thead > tr > th, /deep/ .ant-table-thead > tr > th {
/deep/ .ant-table-tbody > tr > td { padding: 12px 0px !important;
padding: 12px 8px !important;
} }
td:empty:before { td:empty:before {
content: '-'; content: '-';
@ -1127,7 +1166,7 @@ td:empty:before {
.content { .content {
position: relative; position: relative;
overflow: auto; overflow: auto;
max-height: 700px; // max-height: 700px;
} }
.total { .total {
// background-color: #fafafa; // background-color: #fafafa;
@ -1214,7 +1253,7 @@ td:empty:before {
font-size: 14px; font-size: 14px;
// height: 20px; // height: 20px;
// display: inline-block; // display: inline-block;
// padding: 0px 16px; padding: 0px 16px;
} }
.ant-table-row-indent { .ant-table-row-indent {
display: none; display: none;

@ -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, body,
@ -330,6 +330,12 @@ i {
.pt12 { .pt12 {
padding-top: 12px; padding-top: 12px;
} }
.letter0{
letter-spacing: 0;
}
.mb40{
margin-bottom: 40px;
}
.pb8 { .pb8 {
padding-bottom: 8px; padding-bottom: 8px;
} }
@ -397,6 +403,12 @@ i {
.f24 { .f24 {
font-size: 24px; font-size: 24px;
} }
.f32 {
font-size: 32px !important;
}
.f36 {
font-size: 36px !important;
}
.c3 { .c3 {
color: #333; color: #333;
} }
@ -406,6 +418,12 @@ i {
.c9 { .c9 {
color: #999; color: #999;
} }
.cccc {
color: #cccccc;
}
.cblue {
color: #1890ff;
}
.fsa { .fsa {
display: flex; display: flex;
align-items: center; align-items: center;

@ -2,10 +2,13 @@
<div class="index-container" @click="isspecialboxshow = false"> <div class="index-container" @click="isspecialboxshow = false">
<!-- title部分 --> <!-- title部分 -->
<div class="pagetitle" v-if="isLogin && routertitleindex != 0"> <div class="pagetitle" v-if="isLogin && routertitleindex != 0">
<div class="w"> <div class="w fsa">
<span>欢迎来到伯才稻田平台</span> <div class="fss">
<span> <svg class="svg_icon f36" aria-hidden="true">
<ul> <use xlink:href="#icon-daotian1" />
</svg>
<div>
<ul class="fsa titleTag">
<li> <li>
<router-link to="/" :class="routertitleindex == 0 ? 'titleactive' : ''" rel="opener">首页</router-link> <router-link to="/" :class="routertitleindex == 0 ? 'titleactive' : ''" rel="opener">首页</router-link>
</li> </li>
@ -40,7 +43,8 @@
</router-link> </router-link>
</li>--> </li>-->
</ul> </ul>
</span> </div>
</div>
<span class="login fsa"> <span class="login fsa">
<div class="f14 pr16 mr16" style="line-height:1;border-right:1px solid #979797;cursor:pointer"> <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>切换到公开版 --> <!-- <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%" /> <!-- <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 v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
<span class="fsa"> <span class="fsa">
<span class="iconfont icon-morentouxiang mr4 f24" v-if="!userbaseInfo.imgSrc"></span> <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
<img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:24px;height:24px;" alt v-else /> <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
{{ userbaseInfo.userName }} <div class="ml8">{{ userbaseInfo.userName }}</div>
</span> </span>
<div class="loginbox" slot="overlay"> <div class="loginbox" slot="overlay">
<div> <!-- <div>
<img :src="loginValue.imgSrc" alt v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" /> <img :src="loginValue.imgSrc" alt v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
<span v-else class="iconfont icon-morentouxiang avatar"></span> <span v-else class="iconfont icon-morentouxiang avatar f32"></span>
<span class="username"> <span class="username">{{loginValue.userName || loginValue.nickName || loginValue.tel}}</span>
{{ </div> -->
loginValue.userName || loginValue.nickName || loginValue.tel
}}
</span>
</div>
<router-link to="/accountsetting"> <router-link to="/accountsetting">
<div> <div>
<span> <span>
@ -133,9 +133,9 @@
<!-- <img :src="loginValue.imgSrc" alt="" v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" /> <!-- <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 v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
<span class="fsa f14 cf shadow"> <span class="fsa f14 cf shadow">
<span class="iconfont icon-morentouxiang mr4 f24" v-if="!userbaseInfo.imgSrc"></span> <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
<img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:24px;height:24px;" alt v-else /> <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
{{ userbaseInfo.userName }} <span class="ml8">{{ userbaseInfo.userName }}</span>
</span> </span>
<div class="loginbox" slot="overlay"> <div class="loginbox" slot="overlay">
<div> <div>
@ -663,6 +663,9 @@ export default {
/deep/ .pagetitle { /deep/ .pagetitle {
background-color: #f0f0f0; background-color: #f0f0f0;
padding: 0; padding: 0;
height: 48px;
display: flex;
align-items: center;
// height: 32px; // height: 32px;
// width: 100vw; // width: 100vw;
// font-size: 16px; // font-size: 16px;
@ -677,33 +680,15 @@ export default {
// justify-content: space-between; // justify-content: space-between;
// line-height: 36px; // line-height: 36px;
span { .titleTag {
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 {
font-size: 14px; font-size: 14px;
display: flex; display: flex;
margin-left: 110px; margin-left: 150px;
li { li {
font-weight: 400; font-weight: 400;
color: #333; color: #333;
margin-right: 24px; margin-right: 24px;
line-height: 40px; line-height: 48px;
// text-shadow: 2px 2px 4px 0px rgba(0, 0, 0, 0.05); // text-shadow: 2px 2px 4px 0px rgba(0, 0, 0, 0.05);
a { a {
@ -714,7 +699,6 @@ export default {
} }
} }
} }
}
.navigationright { .navigationright {
float: right; float: right;
margin-right: 24px; margin-right: 24px;

@ -48,13 +48,13 @@
<!-- <img :src="userbaseInfo.imgSrc" alt="" v-if="userbaseInfo.imgSrc !== ''" style="border-radius: 50%" /> <!-- <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 v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
<span class="fsa f14"> <span class="fsa f14">
<span class="iconfont icon-morentouxiang mr4 f24" v-if="!userbaseInfo.imgSrc"></span> <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
<img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:24px;height:24px;" alt v-else /> <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
{{ userbaseInfo.userName }} {{ userbaseInfo.userName }}
</span> </span>
<div class="loginbox backTable" slot="overlay"> <div class="loginbox backTable" slot="overlay">
<div class="tal"> <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 v-else class="iconfont icon-morentouxiang avatar"></span>
<span class="username"> <span class="username">
{{ {{
@ -365,11 +365,13 @@ header.header,
.trans { .trans {
-webkit-transition: all 0.2s; -webkit-transition: all 0.2s;
height: calc(100vh - 64px); // height: calc(100vh - 64px);
min-height: calc(100vh - 64px);
overflow: auto; overflow: auto;
background-color: #f5f5f5; background-color: #f5f5f5;
transition: all 0.2s; transition: all 0.2s;
padding: 18px; padding: 18px;
padding-right: 36px;
padding-bottom: 0; padding-bottom: 0;
// padding-right: 32px; // padding-right: 32px;
margin-left: 152px !important; margin-left: 152px !important;

Loading…
Cancel
Save