界面,修改

master
xy 1 year ago
parent fcdc5e2747
commit fd3699a3ae

@ -10,7 +10,7 @@
<template v-else>
<i :class="icon" style="padding: 0 6px;"></i>
</template>
<span>{{text}}</span>
<span style="margin-left: 5px;line-height: 2;font-size: 16px;">{{text}}</span>
</div>
<div class="content">
<slot name="content"></slot>
@ -37,20 +37,29 @@ export default {
}
};
</script>
<style lang="less" scoped>
<style lang="scss" scoped>
.v-header {
display: flex;
border-bottom: 1px solid #dcdee2;
flex-direction: column;
margin-top: 10px;
margin-bottom: 10px;
.v-left-text {
margin-top: 3px;
padding-bottom: 6px;
// padding-top: 10px;
font-weight: bold;
font-size: 15px;
color: #0077CC;
white-space: nowrap;
border-bottom: 2px solid #0077CC;
padding: 0 20px 6px;
position: relative;
&::after {
content: "";
width: 100%;
height: 2px;
background: linear-gradient(to right, $primaryColor 30%, #ffffff33);
position: absolute;
bottom: -1px;
left: 0;
}
> span {
position: relative;

@ -218,14 +218,10 @@ export default {
//
initLoad() {
if (this.height) return;
let clientHeight = document.documentElement.clientHeight;
let appMainHeight = document.querySelector('.app-main-scroll')?.getBoundingClientRect()?.height;
let lxheader = document.querySelector(".v-header")?.getBoundingClientRect();
let lxHeader_height = lxheader.height + 25; //
let paginationHeight = 37; //
let topHeight = 50; //
this.tableHeight =
clientHeight - lxHeader_height - topHeight - paginationHeight - 20 - 25;
//console.log(this.tableHeight)
this.tableHeight = appMainHeight - paginationHeight - lxheader?.height - 20;
},
async getTableData(isRefresh = false) {
if (isRefresh) {
@ -485,7 +481,7 @@ export default {
createPage() {
if (this.isPage)
return (
<div>
<div class="xy-table__page">
<transition
enter-active-class="slide-in-bottom"
leave-to-class="slide-out-down"
@ -503,7 +499,7 @@ export default {
size="small"
show-elevator={true}
show-sizer={this.showSizer}
class="xy-table__page"
class="xy-table__pagecpn"
on={{
["on-page-size-change"]: (e) => {
if (this.action) {
@ -526,23 +522,31 @@ export default {
<el-popover
placement="top-start"
width="200"
width="608"
trigger="hover"
scopedSlots={{
default: () => {
return (
<el-checkbox-group v-model={this.checkTable}>
{this.$props?.tableItem?.map((item, index) => {
return item.type !== "expand" ? (
<el-checkbox label={item.prop} key={item.prop}>
{item.label}
</el-checkbox>
) : (
""
);
})}
</el-checkbox-group>
);
<el-transfer vModel={this.checkTable}
titles={['未显示字段','显示字段']}
data={this.$props?.tableItem}
props={{
props: { key: 'prop', label: 'label' }
}}></el-transfer>
)
// return (
// <el-checkbox-group v-model={this.checkTable}>
// {this.$props?.tableItem?.map((item, index) => {
// return item.type !== "expand" ? (
// <el-checkbox label={item.prop} key={item.prop}>
// {item.label}
// </el-checkbox>
// ) : (
// ""
// );
// })}
// </el-checkbox-group>
// );
},
}}
>
@ -1061,16 +1065,13 @@ export default {
display: flex;
justify-content: right;
align-items: center;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 6px;
border-bottom-left-radius: 6px;
background: rgba(140, 140, 140, 0.6);
z-index: 10;
padding: 6px 10px !important;
position: relative;
top: 0;
left: 0;
right: 0;
::v-deep .ivu-page-item,
.ivu-page-options {

@ -1,4 +1,5 @@
<template>
<el-scrollbar wrap-class="app-main-scroll" class="main-scroll">
<section class="app-main">
<transition name="fade-transform" mode="out-in">
<keep-alive :include="['tableList','mapList']">
@ -6,6 +7,7 @@
</keep-alive>
</transition>
</section>
</el-scrollbar>
</template>
<script>
@ -20,24 +22,41 @@ export default {
</script>
<style>
.app-main-scroll {
width: calc(100% - 30px * 2);
height: calc(100vh - var(--navbar-height) - 20px - 20px);
margin-top: calc(var(--navbar-height) + 20px);
margin-left: 30px;
.app-main-scroll::-webkit-scrollbar {
height: 0;
}
</style>
<style scoped>
.main-scroll {
height: calc(100vh - var(--navbar-height) - 20px - 46px);
border-radius: 6px;
width: calc(100% - 30px * 2);
margin: calc(var(--navbar-height) + 20px) auto 0;
position: relative;
z-index: 10;
padding-bottom: 0;
background: #fff;
}
@media screen and (min-width: 1680px) {
.main-scroll {
height: calc(100vh - var(--navbar-height) - 20px - 56px);
}
}
.app-main {
/*50 = navbar */
border-radius: 6px;
max-height: calc(100vh - var(--navbar-height) - 20px - 20px);
width: calc(100% - 30px * 2);
max-height: calc(100vh - var(--navbar-height) - 20px - 46px);
width: 100%;
z-index: 10;
margin: calc(var(--navbar-height) + 20px) auto 0;
//margin: calc(var(--navbar-height) + 20px) auto 0;
position: relative;
overflow: scroll;
padding: 20px;
//overflow: scroll;
//padding: 20px;
}
@media screen and (min-width: 1680px) {
.app-main {
height: calc(100vh - var(--navbar-height) - 20px - 56px);
}
}
.fixed-header+.app-main {

@ -14,7 +14,7 @@
<div class="right-menu">
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<el-badge is-dot class="notice">
<el-badge is-dot class="notice" @click="$router.push('/info/password')">
<i class="el-icon-bell"></i>
</el-badge>
<img src="../../assets/face.jpg" class="user-avatar">
@ -109,7 +109,7 @@
margin-left: 23px;
& > img {
height: 32%;
height: 33%;
}
}
.hamburger-container {

@ -7,6 +7,10 @@
<navbar />
</div>
<app-main />
<footer>
版权所有无锡市交通产业集团有限公司
</footer>
</div>
</div>
</template>
@ -90,4 +94,20 @@ export default {
.mobile .fixed-header {
width: 100%;
}
footer {
line-height: 14px;
font-size: 14px;
text-align: center;
margin-top: 16px;
color: #595959;
}
@media screen and (min-width: 1680px) {
footer {
line-height: 16px;
font-size: 16px;
text-align: center;
margin-top: 20px;
color: #595959;
}
}
</style>

@ -191,7 +191,7 @@ top: 41px !important;
}
.app-main{
background: #fff;
//background: #fff;
}
#nprogress .bar{

@ -324,7 +324,8 @@ export class CreateDialog {
: "编辑",
visible: that.dialogVisible,
width: this.options?.width ? this.options.width : "800px",
"close-on-click-modal": false
"close-on-click-modal": false,
"append-to-body": true
},
on: {
"update:visible": (val) => {

@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 0 20px;">
<el-page-header
:content="$route.meta.title"
style="

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>
@ -138,7 +137,7 @@ export default {
{
prop: "operate",
label: "操作",
minWidth: 140,
minWidth: 160,
align: "left",
fixed: "right",
customFn: row => {

@ -1,14 +1,15 @@
<template>
<div>
<Drawer
<el-drawer
ref="dialog"
width="600px"
size="600px"
placement="right"
v-model="isShow"
:append-to-body="true"
:visible.sync="isShow"
title="附件"
:footer-hide="true"
>
<div style="display: flex;align-items: center;">
<div style="display: flex;align-items: center;padding-left: 20px;">
<el-select size="small" collapse-tags style="width: 200px;" filterable allow-create clearable v-model="filterTag" placeholder="标签" multiple>
<el-option v-for="item in ['工程类','资产类']" :value="item" :label="item">
</el-option>
@ -18,9 +19,9 @@
<Table stripe style="margin-top: 20px;" size="small" :data="fileData" :columns="table">
</Table>
</Drawer>
</el-drawer>
<Modal title="新增附件" width="580px" v-model="isShowModal" @on-ok="submit">
<el-dialog title="新增附件" width="580px" :modal-append-to-body="true" :append-to-body="true" :visible.sync="isShowModal">
<el-form size="small" label-width="100px">
<el-form-item label="年份选择">
<el-date-picker v-model="form.year" value-format="yyyy" style="width: 300px;" placeholder="年份选择" type="year"></el-date-picker>
@ -61,7 +62,12 @@
</el-upload>
</el-form-item>
</el-form>
</Modal>
<div slot="footer">
<Button type="primary" ghost @click="hidden"></Button>
<Button type="primary" @click="submit"></Button>
</div>
</el-dialog>
</div>
</template>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -1080,10 +1080,9 @@ $staticsHeight: 60px;
//}
#map {
border-radius: 4px;
border-radius: 6px;
filter: drop-shadow(2px 2px 5px #00000033);
margin-top: 20px;
}
.fade-enter-active {

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

File diff suppressed because it is too large Load Diff

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -6,7 +6,6 @@
<LxHeader
:icon="$route.meta.icon"
:text="$route.meta.title"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -2,6 +2,8 @@
<div>
<el-dialog
title="提示"
:modal-append-to-body="true"
:append-to-body="true"
:visible.sync="dialogVisible"
:fullscreen="true"
:before-close="handleClose"

@ -1,6 +1,6 @@
<template>
<div>
<el-dialog title="关联" :visible.sync="dialogVisible" width="66%">
<el-dialog title="关联" :modal-append-to-body="true" :append-to-body="true" :visible.sync="dialogVisible" width="66%">
<template>
<el-button size="small" type="primary" icon="el-icon-plus" @click="list.push({ link_table_name: '',local_key: '',foreign_key: '',link_relation: '' })"></el-button>

@ -6,7 +6,6 @@
<LxHeader
icon="md-apps"
text="自定义表单"
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
<div slot="content"></div>
<slot>

@ -1,5 +1,5 @@
<template>
<div class="" style="margin-top: 20px;">
<div class="" style="padding: 20px;">
<div v-if="user">
<el-row :gutter="20">

Loading…
Cancel
Save