From d7e4b63134fbb434ef382453ed8d3ef4cf378808 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 22 四月 2020 19:19:42 +0800
Subject: [PATCH] 界面调整
---
src/components/square.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/components/square.vue b/src/components/square.vue
index c652f01..d85423e 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -24,17 +24,16 @@
</el-row>
- <div class="infinite-list-wrapper" style="overflow:auto; height: 70vh; border-top: 1px solid #c3c5c7;">
-
+ <div ref="list_div" class="infinite-list-wrapper" style="overflow:auto; border-top: 1px solid #c3c5c7;">
<div v-if="isRefresh" class="list" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
<div v-for="one in dataList" :key="one.id" class="list-item">
- <el-row >
+ <el-row>
<el-col :span="18"><div class="grid-content z_grid-content1 grid-content_text" @click="showItem(one)">{{one.title}}</div></el-col>
<el-col :span="3"><div class="grid-content z_grid-content1 grid-content_exam" @click="showLinkItem(one)">{{formatter(one)}}</div></el-col>
<el-col :span="3"><div class="grid-content z_grid-content1 grid-content_time">{{one.time}}</div></el-col>
</el-row>
- <el-row>
+ <el-row style="padding-left: 16px;">
<el-col :span="20"><div class="grid-content z_grid-content2">{{one.desp}}</div></el-col>
</el-row>
</div>
@@ -94,7 +93,7 @@
</div>
</el-dialog>
<div style="width: 0px; height: 0px;">
- <iframe ref="frame_export" style="width: 0px; height: 0px;"></iframe>
+ <iframe ref="frame_export" style="width: 0px; height: 0px; border: 0px;"></iframe>
</div>
<el-dialog v-if="dialog_1" @close="Cancel" width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
<newProject @closeNewProject="closeNewProject" v-bind:rowData="rowData" ref="newProject_"></newProject>
@@ -167,6 +166,9 @@
},
mounted() {
this.getData();
+ let clientHeight = document.documentElement.clientHeight;
+ let tableHeight_ = clientHeight - 60 - 45 - 62;
+ this.$refs.list_div.style['height'] = tableHeight_ + "px";
},
methods: {
Cancel() {
@@ -305,7 +307,7 @@
},
getData(query,empty) {
this.setRefresh();
- this.dataList = [];
+ // this.dataList = [];
let me = this;
this.loading = true
this.loading_table = true;
@@ -343,6 +345,7 @@
.grid-content_text {
font-weight: bold;
+ font-size: 14px;
font-style: italic;
color: #000;
}
@@ -366,13 +369,15 @@
.z_grid-content1{
display:table-cell;
vertical-align:bottom;
- height: 50px;
+ height: 30px;
}
.z_grid-content2{
color: #83878a;
+ font-size: 14px;
padding: 0px;
- height: 40px;
- line-height: 40px;
+ min-height: 24px;
+ height: 24px;
+ line-height: 24px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -389,7 +394,7 @@
}
.list-item {
- margin-top: 20px;
+ margin-top: 0px;
padding-bottom: 5px;
border-bottom: 1px solid #c3c5c7;
}
--
Gitblit v1.8.0