Commit a2ed8bf3 by caoyanzhi

update: 调整布局

parent 85de78f5
<template>
<!-- @click.stop="collapseRightList($event)" -->
<div class="member-tag">
<div class="tag-container">
<div class="member-box">
<div class="tag-input">
<el-input placeholder="请输入关键词回车搜索标签" prefix-icon="el-icon-search" style="width: 348px" v-model="memberTag" @keyup.native.enter="searchMemberList" @clear="allTagList" clearable></el-input>
</div>
......@@ -51,8 +49,6 @@
</div>
</div>
</div>
</div>
</div>
<!-- <div class="foot-box">
<vue-gic-footer></vue-gic-footer>
......@@ -782,25 +778,18 @@ export default {
z-index: 10;
}
.member-tag {
position: relative;
width: 100%;
overflow-y: auto;
.tag-container {
min-height: 100%;
box-sizing: border-box;
// padding-bottom: 93px;
}
.foot-box {
margin-top: -100px;
}
.main-tag {
display: flex;
justify-content: flex-start;
align-items: stretch;
border-top: 1px solid #ebeef5;
.tag-list {
overflow-y: auto;
flex: 0 0 470px;
flex-shrink: 0;
width: 470px;
padding: 23px 0 0 25px;
// height: 580px;
border-right: 1px solid #ebeef5;
.user-info {
font-size: 16px;
......@@ -813,8 +802,8 @@ export default {
}
.tag-all {
flex: 1;
position: relative;
padding-bottom: 40px;
overflow: hidden;
width: 100%;
.tag-name {
line-height: 34px;
padding: 10px 20px;
......@@ -833,16 +822,9 @@ export default {
}
}
}
.member-box {
padding-bottom: 20px;
margin: 20px 24px;
min-width: 1400px;
min-height: 70vh;
background-color: #fff;
.tag-input {
padding: 16px 20px;
}
}
.my-pop-tagbox {
position: fixed;
z-index: 2;
......
......@@ -2,7 +2,7 @@
<!-- 具体标签 -->
<div class="tag-some-list">
<el-table :data="tableData" style="width: 100%">
<el-table-column label="标签名称" prop="tagName" min-width="150">
<el-table-column label="标签名称" prop="tagName" min-width="140">
<template slot-scope="scope">
<span class="tag-name">{{ scope.row.tagName }}</span>
<!-- <el-tooltip class="item" effect="dark" :content="scope.row.refersh ? '更新标签' : '添加标签'" placement="bottom">-->
......@@ -12,12 +12,12 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="标签描述" prop="tagDescribe" min-width="150">
<el-table-column label="标签描述" prop="tagDescribe" min-width="140">
<template slot-scope="scope">
<div>{{ scope.row.tagDescribe ? scope.row.tagDescribe : '--' }}</div>
</template>
</el-table-column>
<el-table-column prop="memberCount" label="覆盖人数" min-width="200" show-overflow-tooltip v-if="handTag">
<el-table-column prop="memberCount" label="覆盖人数" min-width="100" show-overflow-tooltip v-if="handTag">
<template slot="header">
覆盖人数
<el-popover width="260" trigger="hover">
......@@ -32,12 +32,12 @@
{{ scope.row.memberCount?(scope.row.memberCount | formatNum) +'人': '--'}}
</template>
</el-table-column>
<el-table-column label="是否实时" prop="isActive" min-width="150">
<el-table-column label="是否实时" prop="isActive" min-width="90">
<template slot-scope="scope">
<span> {{ scope.row.isActive == 1 ? '实时' : '非实时' }} </span>
</template>
</el-table-column>
<el-table-column label="操作" v-if="handTag && (getCodeAuth('edit') || getCodeAuth('setValue') || getCodeAuth('delete'))" min-width="200">
<el-table-column label="操作" v-if="handTag && (getCodeAuth('edit') || getCodeAuth('setValue') || getCodeAuth('delete'))" min-width="180">
<template slot-scope="scope">
<!-- <span v-if="scope.row.tagType == 1"> -->
<el-button type="text" v-if="!isWeim && getCodeAuth('edit')" :limit-code="getCode('edit')" @click="editHandTag(scope.row)">编辑</el-button>
......@@ -215,7 +215,6 @@ export default {
<style lang="scss" scoped>
.tag-some-list {
margin: 0 20px;
overflow-y: auto;
}
.icon-tag-name {
display: inline-block;
......
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