From abb574edd3a4ce7e239e43eda401b7ef8268a301 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 22 一月 2020 17:37:32 +0800
Subject: [PATCH] no message

---
 src/components/square.vue |  143 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 110 insertions(+), 33 deletions(-)

diff --git a/src/components/square.vue b/src/components/square.vue
index cfc70ac..fc41da3 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: 70vh; 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">
@@ -60,16 +58,16 @@
 	<el-dialog title="鍒涘缓璇濋" :visible.sync="dialogFormVisible">
 	  <el-form :model="form">
 	    <el-form-item label="璇濋鍚嶇О" :label-width="formLabelWidth">
-	      <el-input v-model="form.name" autocomplete="off"></el-input>
+	      <el-input v-model="form.title" autocomplete="off"></el-input>
 	    </el-form-item>
 	    <el-form-item label="璇濋鍐呭" :label-width="formLabelWidth">
 	        <el-input type="textarea"  v-model="form.desp" autocomplete="off"></el-input>
 	    </el-form-item>
 		<el-upload
 		  class="upload-demo"
+		  :action="uploadUrl"
 		  :on-preview="handlePreview"
-		  :on-remove="handleRemove"
-		  :before-remove="beforeRemove"
+		  :data="form"
 		  :limit="1"
 		  :auto-upload='false'
 		  :on-exceed="handleExceed"
@@ -80,7 +78,7 @@
 	  </el-form>
 	  <div slot="footer" class="dialog-footer">
 	    <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
-	    <el-button type="primary" @click="dialogFormVisible = false">纭� 瀹�</el-button>
+	    <el-button type="primary" @click="createTopic">纭� 瀹�</el-button>
 	  </div>
 	</el-dialog>
 	
@@ -91,11 +89,12 @@
 	export default {
 		data() {
 			return {
+				uploadUrl:"/api/api/file/topicUpload",
 				form:{},
-				 fileList: [],
-				 dialogVisible: false,
-				 dialogFormVisible: false,
-				labelPosition: "left",
+				fileList: [],
+				dialogVisible: false,
+				dialogFormVisible: false,
+				labelPosition: "right",
 				formInline:{},
 				selectOne:{
 					title:"biaoti",
@@ -103,8 +102,13 @@
 					attachment:"222"
 				},
 				dataList: [
-					{id:1,attachment:"222",title:"鏍囬", desp:"鎻忚堪121212121212", time:"12鍒嗛挓鍓�"},
+					{id:1,attachment:"222",title:"鏍囬", desp:"鎻忚堪鏃跺彂鐢熺籂绾峰徃绗﹀悎鍙屾柟閰掑彑鍙戝姩鏈烘椂浠e嘲宄婚厤鐢甸棿 鍒�鐗囨満姘寸數璐规悳璞嗚厫鐨悳鐨勭湅娉曟垜閮藉彨鎵撶牬鏄寰楁壒鍙戝晢闄勫姞璐圭涓夊搴︾牬鍙戞帴鏀跺埌鍙戝湴鏂瑰氨鎼滃埌鍒板洓鐐瑰垎鍙戝伓璇诲洤", 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"},
 				],
@@ -120,6 +124,30 @@
 			}
 		},
 		methods: {
+			createTopic() {
+				var userId = localStorage.getItem('userId');
+				if(!userId) {
+					this.$router.push('/login');
+				}
+				this.from.userId = userId;
+				if(fileList.length == 0) {
+					//涓嶅甫闄勪欢
+					url = "/api/topic/add";
+					this.$axios.get(url, {
+							params
+						})
+						.then(data_ => {
+							console.log(data_);
+							this.tableData = data_.data.data.records; //缁檛ableData璧嬪��
+							this.total = data_.data.data.total;
+							this.loading_table = false;
+						}).catch(error => {
+							console.log(error);
+						})
+				}else {
+					
+				}
+			},
 			 handleRemove(file, fileList) {
 			        console.log(file, fileList);
 			      },
@@ -127,7 +155,7 @@
 			        console.log(file);
 			      },
 			      handleExceed(files, fileList) {
-			        this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
+			        this.$message.warning(`褰撳墠闄愬埗閫夋嫨 1 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
 			      },
 			      beforeRemove(file, fileList) {
 			        return this.$confirm(`纭畾绉婚櫎 ${ file.name }锛焋);
@@ -187,7 +215,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