From ec112f5ce69edb933e4914bbb9d8dbc34358d172 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 22 一月 2020 16:28:10 +0800
Subject: [PATCH] 两个滚动
---
src/components/square.vue | 102 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 77 insertions(+), 25 deletions(-)
diff --git a/src/components/square.vue b/src/components/square.vue
index cfc70ac..13c2f79 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -1,40 +1,38 @@
<template>
<div>
<el-row >
- <el-col :span="18"><el-form label-width="80px" :inline="true" :label-position="labelPosition" :model="formInline" class="form-inline">
- <el-form-item label="鏍囬">
- <el-input v-model="formInline.title" placeholder="鏍囬"></el-input>
- </el-form-item>
-
- <el-form-item label="鎻忚堪">
- <el-input v-model="formInline.desp" placeholder="鎻忚堪"></el-input>
- </el-form-item>
-
-
- <el-form-item >
- <el-button type="primary" @click="query_">鏌ヨ</el-button>
- <el-button type="info" @click="empty_">閲嶇疆</el-button>
- </el-form-item>
-
-
- </el-form></el-col>
+ <el-col :span="18">
+ <el-form label-width="80px" :inline="true" :label-position="labelPosition" :model="formInline" class="form-inline">
+ <el-form-item label="鏍囬">
+ <el-input v-model="formInline.title" placeholder="鏍囬"></el-input>
+ </el-form-item>
+
+ <el-form-item label="鎻忚堪">
+ <el-input v-model="formInline.desp" placeholder="鎻忚堪"></el-input>
+ </el-form-item>
+
+ <el-form-item >
+ <el-button type="primary" @click="query_">鏌ヨ</el-button>
+ <el-button type="info" @click="empty_">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-col>
<el-col :span="4" ><el-button type="primary" @click="createNew">鍒涘缓</el-button></el-col>
</el-row>
- <div class="infinite-list-wrapper" style="overflow:auto">
+ <div class="infinite-list-wrapper" style="overflow:auto; height: 75vh; border-top: 1px solid #c3c5c7;">
<div class="list" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
<div v-for="one in dataList" :key="one.id" class="list-item" @click="showItem(one)">
<el-row >
- <el-col :span="8"><div class="grid-content">{{one.title}}</div></el-col>
- <el-col :span="4" :offset="12"><div class="">{{one.time}}</div></el-col>
+ <el-col :span="20"><div class="grid-content z_grid-content1 grid-content_text">{{one.title}}</div></el-col>
+ <el-col :span="4"><div class="grid-content z_grid-content1 grid-content_time">{{one.time}}</div></el-col>
</el-row>
<el-row>
- <el-col :span="20"><div class="grid-content">{{one.desp}}</div></el-col>
+ <el-col :span="20"><div class="grid-content z_grid-content2">{{one.desp}}</div></el-col>
</el-row>
- <el-divider></el-divider>
</div>
</div>
<p v-if="loading">鍔犺浇涓�...</p>
@@ -45,7 +43,7 @@
:visible.sync="dialogVisible"
width="40%"
height="40%"
- :before-close="handleClose">
+ custom-class="handleClose">
<span>{{selectOne.title}}</span>
<el-divider></el-divider>
<div style="content">
@@ -95,7 +93,7 @@
fileList: [],
dialogVisible: false,
dialogFormVisible: false,
- labelPosition: "left",
+ labelPosition: "right",
formInline:{},
selectOne:{
title:"biaoti",
@@ -103,8 +101,13 @@
attachment:"222"
},
dataList: [
- {id:1,attachment:"222",title:"鏍囬", desp:"鎻忚堪121212121212", time:"12鍒嗛挓鍓�"},
+ {id:1,attachment:"222",title:"鏍囬", desp:"鎻忚堪鏃跺彂鐢熺籂绾峰徃绗﹀悎鍙屾柟閰掑彑鍙戝姩鏈烘椂浠ｅ嘲宄婚厤鐢甸棿 鍒�鐗囨満姘寸數璐规悳璞嗚厫鐨悳鐨勭湅娉曟垜閮藉彨鎵撶牬鏄寰楁壒鍙戝晢闄勫姞璐圭涓夊搴︾牬鍙戞帴鏀跺埌鍙戝湴鏂瑰氨鎼滃埌鍒板洓鐐瑰垎鍙戝伓璇诲洤", time:"12鍒嗛挓鍓�"},
{id:1,attachment:"222",title:"11", desp:"111", time:"11111"},
+ {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
+ {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
+ {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
+ {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
+ {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
{id:1,attachment:"",title:"11", desp:"111", time:"11111"},
{id:1,attachment:"",title:"11", desp:"111", time:"11111"},
],
@@ -187,7 +190,56 @@
text-align: left;
padding: 5px;
}
+
+ .grid-content_text {
+ font-weight: bold;
+ font-style: italic;
+ color: #000;
+ }
+ .grid-content_time {
+ font-weight: bold;
+ font-style: italic;
+ color: #909399;
+ }
+ .z_grid-content1{
+ display:table-cell;
+ vertical-align:bottom;
+ height: 50px;
+ }
+ .z_grid-content2{
+ color: #83878a;
+ padding: 0px;
+ height: 40px;
+ line-height: 40px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
.content{
}
+
+ .form-inline {
+ text-align: left;
+ }
+
+ .list {
+
+ }
+ .list-item {
+ margin-top: 20px;
+ padding-bottom: 5px;
+ border-bottom: 1px solid #c3c5c7;
+ }
+
+ .handleClose {
+ margin: 10px;
+ text-align: left;
+ }
+ .handleClose .el-dialog__body {
+ padding: 10px 20px;
+ }
+ .handleClose .el-divider--horizontal{
+ margin: 5px;
+ }
</style>
--
Gitblit v1.8.0