Commit 17c80965 authored by xd's avatar xd

样式调整

parent 04f28a6d
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
:data="list.main" :data="list.main"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
height="340" :height="tableHeight"
@selection-change="listPick" @selection-change="listPick"
> >
<el-table-column type="selection" width="60"></el-table-column> <el-table-column type="selection" width="60"></el-table-column>
...@@ -115,6 +115,30 @@ export default { ...@@ -115,6 +115,30 @@ export default {
return { return {
list: { list: {
main: [ main: [
{
id: "1001",
taskName: "2019年男装销售任务",
taskType: "拉新",
bar: "男装",
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{
id: "1002",
taskName: "2019年男装销售任务",
taskType: "拉新",
bar: "男装",
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{
id: "1003",
taskName: "2019年男装销售任务",
taskType: "拉新",
bar: "男装",
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{ {
id: "1001", id: "1001",
taskName: "2019年男装销售任务", taskName: "2019年男装销售任务",
...@@ -176,6 +200,7 @@ export default { ...@@ -176,6 +200,7 @@ export default {
}, },
detailDialog: false, detailDialog: false,
counterDialog: false, counterDialog: false,
tableHeight: window.innerHeight * 0.5 ,
}; };
}, },
created() {}, created() {},
...@@ -190,12 +215,16 @@ export default { ...@@ -190,12 +215,16 @@ export default {
addCounter() { addCounter() {
this.$refs.addCounter.counterDialog= true this.$refs.addCounter.counterDialog= true
}, },
addCounterFinish() { addCounterFinish() {
this.counterDialog = false this.counterDialog = false
} }
} },
}; /* mounted() {
this.$nextTick(() => {
this.tableHeight = window.innerHeight - 120;
})
} */
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.main { .main {
...@@ -207,6 +236,7 @@ export default { ...@@ -207,6 +236,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
width: 100%;
} }
.searchs { .searchs {
height: 40px; height: 40px;
......
...@@ -82,6 +82,7 @@ export default { ...@@ -82,6 +82,7 @@ export default {
} }
.content { .content {
width: 82%; width: 82%;
display: flex;
} }
.ct >>> .d2-container-full__body { .ct >>> .d2-container-full__body {
display: flex; display: flex;
...@@ -89,7 +90,7 @@ export default { ...@@ -89,7 +90,7 @@ export default {
padding: 0 !important; padding: 0 !important;
} }
.tac { .tac {
width: 100%; width: 99%;
height: 100%; height: 100%;
box-shadow:0px 2px 4px 0px rgba(221,221,221,1); box-shadow:0px 2px 4px 0px rgba(221,221,221,1);
} }
......
<template> <template>
<div class="ct"> <div>
<div class="left"> <div class="left">
<div class="title">组织架构</div> <div class="title">组织架构</div>
<div class="bottom"> <div class="bottom">
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
node-key="id" node-key="id"
default-expand-all default-expand-all
:expand-on-click-node="false" :expand-on-click-node="false"
class="tree"
> >
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span> <span>{{ node.label }}</span>
...@@ -86,7 +88,7 @@ ...@@ -86,7 +88,7 @@
:data="list.main" :data="list.main"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
height="370px" height="calc(100% - 130px)"
> >
<el-table-column type="selection" width="60"></el-table-column> <el-table-column type="selection" width="60"></el-table-column>
<el-table-column <el-table-column
...@@ -202,6 +204,20 @@ export default { ...@@ -202,6 +204,20 @@ export default {
label: "二级 3-2" label: "二级 3-2"
} }
] ]
},
{
id: 9,
label: "一级 3",
children: [
{
id: 10,
label: "二级 3-1"
},
{
id: 11,
label: "二级 3-2"
}
]
} }
]; ];
return { return {
...@@ -232,6 +248,38 @@ export default { ...@@ -232,6 +248,38 @@ export default {
taskContent: "任务内容任务内容任务内容...", taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08" sendDate: "2019/02/08"
}, },
{
id: "1003",
taskName: "2019年男装销售任务",
taskType: "拉新",
bar: "男装",
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{
id: "1003",
taskName: "2019年男装销售任务",
taskType: "拉新",
bar: "男装",
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{
id: "1003",
taskName: "2019年男装销售任务",
taskType: "拉新",
bar: "男装",
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{
id: "1003",
taskName: "2019年男装销售任务",
taskType: "拉新",
bar: "男装",
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{ {
id: "1003", id: "1003",
taskName: "2019年男装销售任务", taskName: "2019年男装销售任务",
...@@ -327,18 +375,25 @@ export default { ...@@ -327,18 +375,25 @@ export default {
</script> </script>
<style scoped> <style scoped>
.tree {
}
.top { .top {
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid #f8f8f8; border-bottom: 1px solid #f8f8f8;
} }
.left {
position: relative;
width: 20%;
}
.end { .end {
position: absolute; position: absolute;
display: flex; display: flex;
align-items: center; align-items: center;
border: 1px solid rgba(78, 89, 199, 1); border: 1px solid rgba(78, 89, 199, 1);
width: 100%; width: 100%;
bottom: 0;
box-sizing: border-box; box-sizing: border-box;
} }
.add-l, .add-l,
.add-r { .add-r {
...@@ -370,6 +425,7 @@ export default { ...@@ -370,6 +425,7 @@ export default {
} }
.bottom { .bottom {
padding: 12px; padding: 12px;
margin-bottom: 50px;
} }
.title { .title {
height: 48px; height: 48px;
...@@ -385,15 +441,13 @@ export default { ...@@ -385,15 +441,13 @@ export default {
background-color: #f8f8f8; background-color: #f8f8f8;
min-height: 100%; min-height: 100%;
} }
.left {
position: relative;
width: 20%;
}
.left, .left,
.right { .right {
display: inline-block;
background-color: #fff; background-color: #fff;
height: 518px; /* height: 518px; */
height: 100%;
overflow: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -401,7 +455,7 @@ export default { ...@@ -401,7 +455,7 @@ export default {
position: relative; position: relative;
padding: 10px; padding: 10px;
margin-left: 10px; margin-left: 10px;
width: 80%; width: 79%;
} }
.number { .number {
font-size: 14px; font-size: 14px;
...@@ -416,6 +470,7 @@ export default { ...@@ -416,6 +470,7 @@ export default {
.main { .main {
/* // border: 2px solid orange; */ /* // border: 2px solid orange; */
width: 100%;
height: 100vh; height: 100vh;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
...@@ -38,8 +38,9 @@ ...@@ -38,8 +38,9 @@
:data="list.main" :data="list.main"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
height="340px"
@selection-change="listPick" @selection-change="listPick"
:height="tableHeight"
> >
<el-table-column type="selection" width="60"></el-table-column> <el-table-column type="selection" width="60"></el-table-column>
<el-table-column <el-table-column
...@@ -205,6 +206,7 @@ export default { ...@@ -205,6 +206,7 @@ export default {
] ]
} }
}, },
tableHeight: window.innerHeight * 0.5 ,
data: { data: {
search: { search: {
bar: "", bar: "",
...@@ -255,6 +257,7 @@ export default { ...@@ -255,6 +257,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
width: 100%;
} }
.buttons { .buttons {
......
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