Browse Source

去除最外侧滚动条,管理系统中去除面包屑中首页的关闭按钮

V1.0
mk 3 years ago
parent
commit
8fee7b7e4c
  1. 3
      src/assets/scss/common.scss
  2. 2
      src/assets/scss/modules/management/list-main.scss
  3. 3
      src/views/main-content.vue
  4. 15
      src/views/modules/base/resi.vue
  5. 2
      src/views/modules/communityService/gxxq/index.vue
  6. 2
      src/views/modules/communityService/labelConfig/index.vue
  7. 4
      src/views/modules/communityService/policy/policyList.vue
  8. 8
      src/views/modules/shequzhili/event/eventList.vue
  9. 4
      src/views/modules/shequzhili/issue/issueAuditList.vue
  10. 7
      src/views/modules/shequzhili/issue/issueList.vue
  11. 11
      src/views/modules/shequzhili/xiangmu/index.vue

3
src/assets/scss/common.scss

@ -716,7 +716,8 @@ img {
} }
} }
> .el-tabs__content { > .el-tabs__content {
padding: $content--padding; // 去除全部滚动条注释M
// padding: $content--padding;
.el-loading-mask { .el-loading-mask {
z-index: 830; z-index: 830;
} }

2
src/assets/scss/modules/management/list-main.scss

@ -8,7 +8,7 @@
// box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12); box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
margin:7px 7px; margin:20px 7px 7px;
overflow:hidden; overflow:hidden;

3
src/views/main-content.vue

@ -22,12 +22,13 @@
@tab-click="tabSelectedHandle" @tab-click="tabSelectedHandle"
@tab-remove="tabRemoveHandle" @tab-remove="tabRemoveHandle"
> >
<!-- item.name !== 'indexWork', -->
<el-tab-pane <el-tab-pane
v-for="item in $store.state.contentTabs" v-for="item in $store.state.contentTabs"
:key="item.name" :key="item.name"
:name="item.name" :name="item.name"
:label="item.title" :label="item.title"
:closable="item.name !== 'indexWork'" :closable=" item.name !== 'home'"
:class="{ 'is-iframe': tabIsIframe(item.iframeURL) }" :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }"
> >
<template v-if="tabIsIframe(item.iframeURL)"> <template v-if="tabIsIframe(item.iframeURL)">

15
src/views/modules/base/resi.vue

@ -639,7 +639,7 @@ export default {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total: null, total: null,
searchH: 0, searchH: 241,
resideathAddObj1: {}, // resideathAddObj1: {}, //
conditions: [], conditions: [],
activeName: "", activeName: "",
@ -715,8 +715,8 @@ export default {
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() { tableHeight() {
const h = const h =
this.clientHeight - this.searchH - 275 + this.iframeHeight; this.clientHeight - this.searchH - 241 + this.iframeHeight;
const _h = this.clientHeight - 275 - this.searchH; const _h = this.clientHeight - 241 - this.searchH;
return this.$store.state.inIframe ? h : _h; return this.$store.state.inIframe ? h : _h;
}, },
}, },
@ -736,13 +736,8 @@ export default {
}, },
async mounted() { async mounted() {
// this.$nextTick(() => { this.searchH = this.$refs.myResiSearch.offsetHeight;
// this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
// })
console.log(
"document.documentElement.clientWidth",
document.documentElement.clientHeight
);
this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({ this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
elseParams: { elseParams: {
categoryKeys: ["resi_info"], categoryKeys: ["resi_info"],

2
src/views/modules/communityService/gxxq/index.vue

@ -304,7 +304,7 @@ export default {
pageSize: 20, pageSize: 20,
tableLoading: true, tableLoading: true,
total: 0, total: 0,
searchH: 172, searchH: 115,
formShow: false, formShow: false,
formTitle: "", formTitle: "",
rowObj: {}, rowObj: {},

2
src/views/modules/communityService/labelConfig/index.vue

@ -135,7 +135,7 @@ export default {
pageSize:20, pageSize:20,
tableLoading:true, tableLoading:true,
total:0, total:0,
searchH:100, searchH:115,
formShow:false, formShow:false,
formTitle:"", formTitle:"",
rowObj:{} rowObj:{}

4
src/views/modules/communityService/policy/policyList.vue

@ -330,8 +330,8 @@ export default {
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 350 + this.iframeHeigh ? this.clientHeight - 400 + this.iframeHeigh
: this.clientHeight - 350; : this.clientHeight - 400;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

8
src/views/modules/shequzhili/event/eventList.vue

@ -565,6 +565,8 @@ export default {
disabledDate: startDisabledDate, disabledDate: startDisabledDate,
}, },
eventId: "", eventId: "",
searchH:180,
eventDetailData: {}, eventDetailData: {},
@ -576,9 +578,9 @@ export default {
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.$store.state.inIframe const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
? this.clientHeight - 410 + this.iframeHeigh const _h = this.clientHeight - 275 - this.searchH;
: this.clientHeight - 410; return this.$store.state.inIframe ? h : _h;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

4
src/views/modules/shequzhili/issue/issueAuditList.vue

@ -273,8 +273,8 @@ export default {
computed: { computed: {
maxTableHeight () { maxTableHeight () {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 360 + this.iframeHeigh ? this.clientHeight - 400 + this.iframeHeigh
: this.clientHeight - 360; : this.clientHeight - 400;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

7
src/views/modules/shequzhili/issue/issueList.vue

@ -295,13 +295,14 @@ export default {
issueId: '', issueId: '',
issueDetailData: {}, issueDetailData: {},
searchH:120,
}; };
}, },
computed: { computed: {
maxTableHeight () { maxTableHeight () {
return this.$store.state.inIframe const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
? this.clientHeight - 360 + this.iframeHeigh const _h = this.clientHeight - 275 - this.searchH;
: this.clientHeight - 360; return this.$store.state.inIframe ? h : _h;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

11
src/views/modules/shequzhili/xiangmu/index.vue

@ -246,9 +246,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> <div>
<div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
@ -260,6 +258,9 @@
> >
</el-pagination> </el-pagination>
</div> </div>
</div>
</div> </div>
<div class="g-page" v-if="pageType == 'edit' || pageType == 'info'"> <div class="g-page" v-if="pageType == 'edit' || pageType == 'info'">
@ -351,8 +352,8 @@ export default {
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 360 + this.iframeHeigh ? this.clientHeight - 400 + this.iframeHeigh
: this.clientHeight - 360; : this.clientHeight - 400;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

Loading…
Cancel
Save