mz666
/
bocai_supplyChain_pc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
cyl/dev
wangxia 2 years ago
parent f177e97290 23f67ee126
commit 8529474714
6 changed files with 281 additions and 322 deletions
Show Stats Download Patch File Download Diff File

9
src/components/merchantManagement/dataScreen.vue
Unescape Escape View File

@ -12,18 +12,20 @@
<a-button class="newScreen"> <a-button class="newScreen">
<a target="_blank" href="http://a.matripe.com.cn/dist/index.html#/statistics/rsAllotOrderDataLargeScreen">新窗口打开</a> <a target="_blank" href="http://a.matripe.com.cn/dist/index.html#/statistics/rsAllotOrderDataLargeScreen">新窗口打开</a>
</a-button> </a-button>
<!-- <div class="pb16 bb1 mb16 f20 fsa">数据大屏</div> --> <largeScreen></largeScreen>
<iframe src="http://a.matripe.com.cn/dist/index.html#/statistics/rsAllotOrderDataLargeScreen" frameborder="0" style="width:100%;height:100%"></iframe>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import largeScreen from '../screen/largeScreen.vue'
export default { export default {
// 组件名称 // 组件名称
name: 'dataScreen', name: 'dataScreen',
// 局部注册的组件 // 局部注册的组件
components: {}, components: {
largeScreen,
},
// 组件参数 接收来自父组件的数据 // 组件参数 接收来自父组件的数据
props: {}, props: {},
// 组件状态值 // 组件状态值
@ -40,7 +42,6 @@ export default {
*/ */
created() { created() {
this.$emit('setTitle', '数据大屏') this.$emit('setTitle', '数据大屏')
}, },
/** /**
* el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。

295
src/components/merchantManagement/memberInfo.vue
Unescape Escape View File

@ -7,28 +7,31 @@
<a-icon type="home" /> <a-icon type="home" />
</router-link> </router-link>
</a-breadcrumb-item> </a-breadcrumb-item>
<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="searchbox"> <div class="leftContainer br1">
<div class="searchbox bb1 ml12 mr12">
<div class="searchinput"> <div class="searchinput">
<a-input placeholder="请输入成员姓名/手机号" @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys"> <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" enter-button allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch"></a-input-search>
<i slot="prefix" class="iconfont icon-sousuo"></i>
<button slot="suffix" @click="onSearch">搜索</button>
</a-input>
<!-- <div class="groupSelect" type="card" style="margin-bottom: 16px">
<div v-for="(item,index) in groupList" :class="item.checked?'active':''" :key="index" @click="changeGroup(item.teamName)" v-if="showGroup || index <= 5 && !showGroup">{{item.teamName}}</div>
<span class="showGroupSelect" @click="showGroup = !showGroup">{{showGroup?'收起':'展开'}}</span>
</div>-->
</div> </div>
<div class> <i class="iconfont icon-fangda ml12 c6 curp" @click="addGroupShow = true" style="line-height:32px"></i>
<button class="addGroup" @click="addGroupShow = true">添加分组</button> </div>
<button class="pagechange" @click="showDetail('add')"> <a-menu :selectedKeys="selectedKeys" :openKeys.sync="openKeys" @click="handleClick" class mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
<template v-for="(item, index) in groupList">
<a-menu-item :key="item.teamName" @click="selectGroup(item)">{{item.teamName}}</a-menu-item>
</template>
</a-menu>
</div>
<div class="rightContainer">
<div class="fsa pb14 bb1 mb16">
<div class="f20 fw500">分组1（16人）</div>
<!-- <button class="addGroup" @click="addGroupShow = true">添加分组</button> -->
<a-button class="addmemeber f14" @click="showDetail('add')">
<i class="iconfont icon-fangda"></i> 添加成员 <i class="iconfont icon-fangda"></i> 添加成员
</button> </a-button>
<!-- <button @click="changepage(1)">下一页</button> --> <!-- <button @click="changepage(1)">下一页</button> -->
</div> </div>
</div>
<!-- :expanded-row-keys.sync="expandedRowKeys" --> <!-- :expanded-row-keys.sync="expandedRowKeys" -->
<a-table :columns="columns" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle', <a-table :columns="columns" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle',
}" :locale="tablenodata"> }" :locale="tablenodata">
@ -45,8 +48,14 @@
<use xlink:href="#icon-chuangjianren" /> <use xlink:href="#icon-chuangjianren" />
</svg> </svg>
{{ record.aliasName || record.userName }} {{ record.aliasName || record.userName }}
<span>{{ record.tel?'（'+ record.tel + '）':'' }}</span> <!-- <span>{{ record.tel?'（'+ record.tel + '）':'' }}</span> -->
</span> </span>
<div slot="join">
<a-switch default-checked @change="onChange" />
</div>
<div slot="bigScreen">
<a-switch default-checked @change="onChange" />
</div>
<div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #f40"> <div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #f40">
<a @click="showDetail('detail', record)">详情</a> <a @click="showDetail('detail', record)">详情</a>
<a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="showDetail('edit', record)">编辑</a> <a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="showDetail('edit', record)">编辑</a>
@ -61,10 +70,13 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<a-modal :title="modalTitle" v-model="visible" centered id="demo" @cancel="modalCancel" width="640px" destroyOnClose class="detailWindow"> <a-modal :title="modalTitle" v-model="visible" centered id="demo" @cancel="modalCancel" width="640px" destroyOnClose class="detailWindow">
<template slot="footer" v-if="this.modalTitle != '成员详情'"> <template slot="footer" v-if="this.modalTitle != '成员详情'">
<button style="background-color: #fff; border-color: #d9d9d9" @click="modalCancel">取消</button> <a-button key="back" @click="modalCancel">取消</a-button>
<button style="background-color: #f40;color: #fff;border: none;margin-left: 16px;margin-right: 16px;" @click="handleSubmit">确定</button> <a-button key="submit" class="ml16 mr16" type="primary" :loading="loading" @click="handleSubmit">确定</a-button>
<!-- <button style="background-color: #fff; border-color: #d9d9d9" @click="modalCancel">取消</button>
<button style="background-color: #f40;color: #fff;border: none;margin-left: 16px;margin-right: 16px;" @click="handleSubmit">确定</button>-->
</template> </template>
<template slot="footer" v-else> <template slot="footer" v-else>
<span></span> <span></span>
@ -216,6 +228,7 @@ export default {
groupName: '', // 分组名称 groupName: '', // 分组名称
loading: false, loading: false,
idEdit: false, idEdit: false,
selectedKeys: ['待分组'],
} }
}, },
// 计算属性 // 计算属性
@ -223,7 +236,7 @@ export default {
columns() { columns() {
const columns = [ const columns = [
{ {
title: '序号', title: '排序',
dataIndex: 'index', dataIndex: 'index',
key: 'index', key: 'index',
customRender: (text, row, index) => { customRender: (text, row, index) => {
@ -237,12 +250,17 @@ export default {
width: 60, width: 60,
}, },
{ {
title: '姓名', title: '成员姓名',
dataIndex: 'nickName', dataIndex: 'nickName',
key: 'nickName', key: 'nickName',
scopedSlots: { customRender: 'nickName' }, scopedSlots: { customRender: 'nickName' },
ellipsis: true, ellipsis: true,
width: 230, width: 120,
onFilter: (value, record) => {
console.log(value)
console.log(record)
return record.aliasName.indexOf(value) === 0
},
}, },
// { // {
// title: '角色', // title: '角色',
@ -255,7 +273,7 @@ export default {
title: '分组', title: '分组',
dataIndex: 'agencyTeamId', dataIndex: 'agencyTeamId',
key: 'agencyTeamId', key: 'agencyTeamId',
width: 100, // width: 100,
filters: this.groupList, filters: this.groupList,
customRender: (text, row, index) => { customRender: (text, row, index) => {
let text1 let text1
@ -267,17 +285,35 @@ export default {
return text1 return text1
}, },
ellipsis: true, ellipsis: true,
onFilter: (value, record) => {
console.log(value)
console.log(record)
return record.group.indexOf(value) === 0
}, },
// {
// title: '权限',
// dataIndex: 'permission',
// key: 'permission',
// ellipsis: true,
// },
{
title: '手机号',
dataIndex: 'tel',
key: 'tel',
ellipsis: true,
width: 120,
}, },
{ {
title: '权限', title: '参与统计',
dataIndex: 'permission', dataIndex: 'join',
key: 'permission', key: 'join',
scopedSlots: { customRender: 'join' },
ellipsis: true, ellipsis: true,
width: 80,
},
{
title: '大屏显示',
dataIndex: 'bigScreen',
key: 'bigScreen',
scopedSlots: { customRender: 'bigScreen' },
ellipsis: true,
width: 80,
}, },
{ {
title: '操作', title: '操作',
@ -306,7 +342,7 @@ export default {
if (localStorage.getItem('LOGIN_DATA')) { if (localStorage.getItem('LOGIN_DATA')) {
this.loginUserInfo = JSON.parse(localStorage.getItem('LOGIN_DATA')) this.loginUserInfo = JSON.parse(localStorage.getItem('LOGIN_DATA'))
} }
this.$emit('setTitle', '我的团队') this.$emit('setTitle', '团队成员')
}, },
/** /**
* el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@ -528,6 +564,10 @@ export default {
}, },
}) })
}, },
selectGroup(item) {
console.log(item)
this.selectedKeys = [item.teamName]
},
modalCancel() { modalCancel() {
// console.log(this); // console.log(this);
this.visible = false this.visible = false
@ -721,149 +761,43 @@ export default {
} }
.contentbody { .contentbody {
overflow: hidden; overflow: hidden;
/deep/ .searchbox {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 16px; padding-left: 0;
.searchinput { overflow: hidden;
// width: 326px; .leftContainer {
display: flex; width: 260px;
position: relative; height: 100%;
.groupSelect { /deep/ .searchbox {
display: flex; display: flex;
position: relative; justify-content: space-between;
flex-wrap: wrap; padding-bottom: 14px;
width: 410px;
margin-left: 20px;
border-radius: 4px;
margin-bottom: 0 !important;
> div {
// width: 60px;
text-align: center;
padding: 5px 12px;
font-size: 14px;
border: 1px solid #eee;
cursor: pointer;
margin-bottom: 10px;
}
> div:not(:first-child) {
margin-left: -1px;
// border-left: none;
}
.active {
color: #ff4400;
border: 1px solid #ff4400;
z-index: 1;
}
.showGroupSelect {
position: absolute;
right: 12px;
top: 6px;
color: #ff4400;
font-size: 14px;
cursor: pointer;
}
}
.ant-input {
width: 280px;
position: relative;
height: 32px;
text-indent: 10px;
background: #fff;
// border: 1px solid rgba(77, 87, 94, 0.3);
border-radius: 0px;
box-shadow: 0px 2px 4px 0px transparent;
font-size: 14px !important;
padding-right: 0;
border-color: #ddd;
// z-index: ;
&::placeholder {
text-indent: 10px;
font-size: 14px !important;
}
&:hover {
border-color: #ff4400;
box-shadow: none;
}
&:focus {
border-color: #ff4400;
}
}
.ant-input-affix-wrapper {
width: unset;
position: relative;
.ant-input-prefix {
position: absolute;
width: 20px;
right: 0;
top: 16px;
i {
color: #c9c9c9;
}
}
.ant-input-suffix {
// position: absolute;
top: 0;
transform: translate(0);
right: 0px !important;
}
}
button {
width: 70px;
height: 32px;
color: white;
background: #ff4400;
border-color: #ff4400;
border: none;
border-radius: 0px;
font-size: 14px;
box-shadow: none;
cursor: pointer;
outline: none;
&:hover {
background-color: #ff4400cc;
}
// &:focus {
// border: none;
// }
}
} }
.addGroup { .leftMenu {
// width: 120px; max-width: calc(100% - 1px);
padding: 0 16px; margin-right: 1px;
height: 32px; border-right-color: transparent;
line-height: 30px; &::-webkit-scrollbar {
border: 1px solid #cccccc; width: 0;
// border-radius: 4px;
font-size: 16px;
color: #333;
background-color: #fff;
&:hover {
border-color: #ff4400;
color: #ff4400;
} }
&:first-child {
margin-right: 12px;
} }
} }
.pagechange { .rightContainer {
// width: 120px; flex: 1;
padding: 0 16px; padding-left: 16px;
.addmemeber {
padding: 0 12px;
height: 32px; height: 32px;
line-height: 30px; line-height: 32px;
border: 1px solid #f40;
// border-radius: 4px;
font-size: 16px;
color: #fff; color: #fff;
background-color: #ff4400; background: #1890ff;
&:hover { border-radius: 4px;
opacity: 0.8; i {
} font-size: 12px;
&:first-child {
margin-right: 12px;
} }
} }
} }
/deep/ .ant-table-placeholder { /deep/ .ant-table-placeholder {
min-height: 300px; min-height: 300px;
> div { > div {
@ -941,19 +875,19 @@ export default {
.ant-modal-footer { .ant-modal-footer {
border-top: none; border-top: none;
} }
.ant-btn:not(.ant-btn-primary):hover, // .ant-btn:not(.ant-btn-primary):hover,
.ant-btn:not(.ant-btn-primary):focus { // .ant-btn:not(.ant-btn-primary):focus {
color: #ff4400; // color: #ff4400;
background-color: #fff; // background-color: #fff;
border-color: #ff4400; // border-color: #ff4400;
} // }
.ant-btn-primary { // .ant-btn-primary {
background-color: #ff4400; // background-color: #ff4400;
border-color: #ff4400; // border-color: #ff4400;
&:hover { // &:hover {
opacity: 0.8; // opacity: 0.8;
} // }
} // }
} }
// } // }
.detailWindow { .detailWindow {
@ -988,18 +922,7 @@ export default {
} }
} }
} }
.ant-modal-footer {
padding: 0;
button {
outline: none;
width: 60px;
height: 32px;
font-size: 14px;
border: 1px solid #fff;
border-radius: 5px;
margin: 10px 0;
}
}
} }
} }
.groupSelectDrop { .groupSelectDrop {

11
src/components/screen/largeScreen.vue
Unescape Escape View File

@ -172,9 +172,9 @@ export default {
var that = this; var that = this;
// document.getElementById('inputId').focus(); // document.getElementById('inputId').focus();
// this.$refs.id.focus(); // this.$refs.id.focus();
document.querySelector('html').setAttribute('style', 'background-image: url(http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png);background-size: 100% 100%;min-height:100vh;'); // document.querySelector('html').setAttribute('style', 'background-image: url(http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png);background-size: 100% 100%;min-height:100vh;');
// overflow:hidden; // // overflow:hidden;
document.querySelector('body').setAttribute('style', 'background: none'); // document.querySelector('body').setAttribute('style', 'background: none');
// that.initWebSocket(); // that.initWebSocket();
// that.initClock(); // that.initClock();
@ -703,6 +703,11 @@ export default {
div{ div{
color: #fff; color: #fff;
} }
.mmtt111{
background-image: url('http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png');background-size: 100% 100%;
background-repeat: no-repeat;
min-height:100vh;
}
.imgPlay .ant-carousel .slick-slide img { .imgPlay .ant-carousel .slick-slide img {
display: inline-block; display: inline-block;
} }

44
src/components/userinfo/usercenter/components/dataStatistics.vue
Unescape Escape View File

@ -43,38 +43,38 @@
</div>--> </div>-->
<!-- <div class="fsa"> --> <!-- <div class="fsa"> -->
<div> <div>
{{totalObj.signUps}} <span class="fwb">{{totalObj.signUps}}</span>
<div>报名</div> <div>报名</div>
</div> </div>
<div> <div>
{{totalObj.arrived}} <span class="fwb">{{totalObj.arrived}}</span>
<div>到面</div> <div>到面</div>
</div> </div>
<div> <div>
{{totalObj.passed}} <span class="fwb">{{totalObj.passed}}</span>
<div>通过</div> <div>通过</div>
</div> </div>
<div> <div>
{{totalObj.entry}} <span class="fwb">{{totalObj.entry}}</span>
<div>入职</div> <div>入职</div>
</div> </div>
<div class="table_left"> <div class="table_left">
{{totalObj.obJob}} <span class="fwb">{{totalObj.obJob}}</span>
<div>在职人数</div> <div>在职人数</div>
</div> </div>
<div class="table_left"> <div class="table_left">
{{totalObj.entryGPA}} <span class="fwb">{{totalObj.entryGPA}}</span>
<div>入职绩点</div> <div>入职绩点</div>
</div> </div>
<div> <div>
{{totalObj.finshedGPA}} <span class="fwb">{{totalObj.finshedGPA}}</span>
<div>交付绩点</div> <div>交付绩点</div>
</div> </div>
<!-- </div> --> <!-- </div> -->
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<a-table :columns="columns" :scroll="{ y: 480 }" class="bb1 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"> <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">
<span slot="custom_objob"> <span slot="custom_objob">
<span class="fw500">在职人数</span> <span class="fw500">在职人数</span>
</span> </span>
@ -97,7 +97,7 @@
<button slot="suffix" @click="onSearch">搜索</button> <button slot="suffix" @click="onSearch">搜索</button>
</a-input>--> </a-input>-->
</div> </div>
<a-table :columns="billColumns" :scroll="{ x: 1100}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index"> <a-table :columns="billColumns" :scroll="{ x: 1100,y:600}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
<span slot="storeJobName" slot-scope="text">{{text}}</span> <span slot="storeJobName" slot-scope="text">{{text}}</span>
<span slot="userName" slot-scope="text">{{text}}1</span> <span slot="userName" slot-scope="text">{{text}}1</span>
@ -250,6 +250,7 @@ export default {
}, },
dateType: '', dateType: '',
dateVal: '', dateVal: '',
tableHeight: 300,
} }
}, },
// 计算属性 // 计算属性
@ -505,7 +506,7 @@ export default {
dataIndex: 'applyUserName', dataIndex: 'applyUserName',
key: 'applyUserName', key: 'applyUserName',
ellipsis: true, ellipsis: true,
width: 90, width: 120,
slots: { title: 'applyUserName' }, slots: { title: 'applyUserName' },
customRender: (text, row, index) => { customRender: (text, row, index) => {
return row.applyUserName return row.applyUserName
@ -562,7 +563,13 @@ export default {
* el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
* 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
*/ */
mounted() {}, mounted() {
console.log( document.documentElement.clientHeight)
console.log(document.getElementsByClassName("content")[0].offsetTop)
this.tableHeight = document.documentElement.clientHeight - document.getElementsByClassName("content")[0].offsetTop - 160;
},
// 组件方法 // 组件方法
methods: { methods: {
/** /**
@ -866,10 +873,12 @@ table {
} }
} }
/deep/ .ant-table-thead > tr > th, /deep/ .ant-table-thead > tr > th, /deep/ .ant-table-tbody > tr > td {
/deep/ .ant-table-tbody > tr > td {
padding: 12px 8px !important; padding: 12px 8px !important;
} }
td:empty:before {
content: "-";
}
/deep/ .ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header { /deep/ .ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header {
overflow: auto !important; overflow: auto !important;
@ -920,7 +929,7 @@ table {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 22px; font-size: 22px;
margin-top: 60px; margin-top: 48px;
padding-bottom: 32px; padding-bottom: 32px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
// padding-right: 10px; // padding-right: 10px;
@ -1091,3 +1100,10 @@ table {
// width: 200px !important; // width: 200px !important;
// } // }
</style> </style>
<style>
.ant-modal-close-x{
width: 44px;
height: 44px;
line-height: 44px;
}
</style>

14
src/style/index.less
Unescape Escape View File

@ -186,6 +186,12 @@ i {
.m16 { .m16 {
margin: 16px; margin: 16px;
} }
.mr16 {
margin-right: 16px !important;
}
.ml16 {
margin-left: 16px !important;
}
.m0 { .m0 {
margin: 0 !important; margin: 0 !important;
} }
@ -234,6 +240,9 @@ i {
.pb12 { .pb12 {
padding-bottom: 12px; padding-bottom: 12px;
} }
.pb15 {
padding-bottom: 15px;
}
.pb4 { .pb4 {
padding-bottom: 4px; padding-bottom: 4px;
} }
@ -403,9 +412,12 @@ i {
} }
.bodyContainer { .bodyContainer {
padding: 16px; padding: 16px;
height: 97%; // height: 97%;
background-color: #fff; background-color: #fff;
} }
.curp {
cursor: pointer;
}
//通用类名样式结束 //通用类名样式结束
//svg图标 //svg图标

34
src/views/merchantBack.vue
Unescape Escape View File

@ -84,11 +84,13 @@
</div> </div>
</div> </div>
</div> </div>
<a-layout-content class="trans" style="padding-top: 64px"> <a-layout-content class="trans" style="padding-top: 64px;">
<!-- <div id="littleUse" style="margin-top: 48px"> --> <!-- <div id="littleUse" style="margin-top: 48px"> -->
<router-view @setTitle="setTitle"></router-view> <router-view @setTitle="setTitle"></router-view>
<!-- </div> --> <!-- </div> -->
</a-layout-content> </a-layout-content>
<div style="height: 64px;background-color: #f5f5f5;line-height: 64px;color: #999;font-size: 14px;text-align: center;padding-left: 152px;">Copyright © 2015 - 2021 Matripe. All Rights Reserved.</div>
</div> </div>
<!-- <notice @parentPageCallBack="showMessageFromChild" ref="child"></notice> --> <!-- <notice @parentPageCallBack="showMessageFromChild" ref="child"></notice> -->
</div> </div>
@ -123,20 +125,6 @@ export default {
level: 1, level: 1,
menuType: 1, menuType: 1,
children: [ children: [
{
id: 295,
parentId: 294,
name: 'MemberInfo',
url: '/memberInfo',
icon: '',
component: 'home',
path: '/home',
title: '我的团队',
menuName: 'dashboard',
level: 2,
menuType: 1,
children: '',
},
{ {
id: -110, id: -110,
parentId: 294, parentId: 294,
@ -191,6 +179,20 @@ export default {
menuType: 1, menuType: 1,
children: '', children: '',
}, },
{
id: 295,
parentId: 294,
name: 'MemberInfo',
url: '/memberInfo',
icon: '',
component: 'home',
path: '/home',
title: '团队成员',
menuName: 'dashboard',
level: 2,
menuType: 1,
children: '',
},
], ],
}, },
], ],
@ -279,7 +281,7 @@ header.header,
.trans { .trans {
-webkit-transition: all 0.2s; -webkit-transition: all 0.2s;
height: calc(100vh); height: calc(100vh - 64px);
// overflow: scroll; // overflow: scroll;
background-color: #f5f5f5; background-color: #f5f5f5;
transition: all 0.2s; transition: all 0.2s;

Write Preview
Loading…
Cancel
Save