Commit f2301172 authored by xd's avatar xd

小调整

parent 092a1124
...@@ -209,6 +209,9 @@ export default { ...@@ -209,6 +209,9 @@ export default {
.cs { .cs {
display: flex; display: flex;
} }
.ct >>> .el-transfer-panel {
width: 180px;
}
.choose { .choose {
padding: 16px; padding: 16px;
font-size: 16px; font-size: 16px;
...@@ -220,7 +223,6 @@ export default { ...@@ -220,7 +223,6 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
/* border-bottom: 1px solid #f8f8f8; */
padding-bottom: 10px; padding-bottom: 10px;
} }
.transfer-footer { .transfer-footer {
...@@ -233,9 +235,6 @@ export default { ...@@ -233,9 +235,6 @@ export default {
.ct >>> .el-dialog__body { .ct >>> .el-dialog__body {
padding: 0; padding: 0;
} }
.ct >>> .el-transfer-panel {
width: 250px;
}
.circle { .circle {
width: 30px; width: 30px;
height: 30px; height: 30px;
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<div class="main"> <div class="main">
<div class="titles" style="height:40px;"> <div class="titles" style="height:40px;">
<span>同步成员历史</span> <span>同步成员历史</span>
<el-button class="button buttondark" size="small" @click="handleCancel">返回</el-button> <el-button class="button buttondark" size="small" @click="handleCancel"
>返回</el-button
>
</div> </div>
<div class="lists"> <div class="lists">
<el-table <el-table
...@@ -15,7 +17,12 @@ ...@@ -15,7 +17,12 @@
:header-cell-style="setListsHeadStyle" :header-cell-style="setListsHeadStyle"
height="calc(100vh - 300px)" height="calc(100vh - 300px)"
> >
<el-table-column label="序号" width="70" type="index" align="center"></el-table-column> <el-table-column
label="序号"
width="70"
type="index"
align="center"
></el-table-column>
<el-table-column <el-table-column
prop="taskType" prop="taskType"
label="姓名" label="姓名"
...@@ -42,20 +49,19 @@ ...@@ -42,20 +49,19 @@
</div> </div>
<div class="pages"> <div class="pages">
<el-pagination <el-pagination
@size-change="pagesSizeChange" @current-change="handleCurrentChange"
@current-change="pagesNowPageChange" :current-page="page.currentPage"
:current-page="currentPage4" :page-size="page.size"
:page-sizes="[100, 200, 300, 400]" layout="total, prev, pager, next, jumper"
:page-size="100" :total="page.total"
layout="prev, pager, next, sizes, jumper" >
:total="400" </el-pagination>
></el-pagination>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
list: { list: {
main: [ main: [
...@@ -166,28 +172,34 @@ export default { ...@@ -166,28 +172,34 @@ export default {
nowPageNum: 4 nowPageNum: 4
} }
}, },
isShow: true isShow: true,
} page: {
currentPage: 1,
size: 20,
total: 100
},
};
}, },
created () {}, created() {},
methods: { methods: {
listPick () {}, listPick() {},
testButtonClick () {}, testButtonClick() {},
pagesSizeChange () {}, pagesSizeChange() {},
pagesNowPageChange () {}, pagesNowPageChange() {},
setListsHeadStyle ({ row, column, rowIndex, columnIndex }) { setListsHeadStyle({ row, column, rowIndex, columnIndex }) {
if (rowIndex === 0) { if (rowIndex === 0) {
return "background-color: #0B0F32; border-right: 1px solid white;color: white;" return "background-color: #0B0F32; border-right: 1px solid white;color: white;";
} else { } else {
return '' return "";
} }
}, },
handleCancel () { handleCurrentChange() {},
this.isShow = false handleCancel() {
this.$emit('isShow', false) this.isShow = false;
this.$emit("isShow", false);
} }
} }
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.titles { .titles {
...@@ -199,9 +211,9 @@ export default { ...@@ -199,9 +211,9 @@ export default {
border-bottom: 1px solid #f8f8f8; border-bottom: 1px solid #f8f8f8;
} }
.btn { .btn {
font-size:14px; font-size: 14px;
font-weight:bold; font-weight: bold;
color:rgba(102,102,102,1); color: rgba(102, 102, 102, 1);
} }
.main { .main {
width: 100%; width: 100%;
...@@ -269,5 +281,4 @@ export default { ...@@ -269,5 +281,4 @@ export default {
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
} }
</style> </style>
...@@ -351,7 +351,6 @@ export default { ...@@ -351,7 +351,6 @@ export default {
data.children.push(newChild); data.children.push(newChild);
}, },
edit(data) { edit(data) {
console.log(1111);
}, },
remove(data) { remove(data) {
...@@ -374,7 +373,6 @@ export default { ...@@ -374,7 +373,6 @@ export default {
}, },
handleMove() { handleMove() {
this.moveDialogShow = true; this.moveDialogShow = true;
console.log(111111);
}, },
removeFinish() { removeFinish() {
this.moveDialogShow = false; this.moveDialogShow = false;
...@@ -389,13 +387,13 @@ export default { ...@@ -389,13 +387,13 @@ export default {
this.$refs.addStore.addStoreDialog = true; this.$refs.addStore.addStoreDialog = true;
}, },
getMailList() { getMailList() {
let data = { /* let data = {
} }
getMailList(data).then(res => { getMailList(data).then(res => {
console.log(res,"通讯录表格数据"); console.log(res,"通讯录表格数据");
}) }) */
}, },
handleShopowner() { handleShopowner() {
......
...@@ -32,7 +32,7 @@ const router = new VueRouter({ ...@@ -32,7 +32,7 @@ const router = new VueRouter({
* 路由拦截 * 路由拦截
* 权限验证 * 权限验证
*/ */
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
// 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201 // 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
await store.dispatch('d2admin/page/isLoaded') await store.dispatch('d2admin/page/isLoaded')
// 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198 // 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198
......
...@@ -61,7 +61,8 @@ export default { ...@@ -61,7 +61,8 @@ export default {
name: "", name: "",
floor: "", floor: "",
fileList: [], fileList: [],
bannerList:[] bannerList:[],
message: ""
}; };
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment