From e6a76f6620bda068e734fa0fec4bfdb6de75a12e Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 22 一月 2020 17:37:45 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/square.vue | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/components/square.vue b/src/components/square.vue
index 13c2f79..2f0751e 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -21,7 +21,7 @@
</el-row>
- <div class="infinite-list-wrapper" style="overflow:auto; height: 75vh; border-top: 1px solid #c3c5c7;">
+ <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)">
@@ -51,23 +51,23 @@
</div>
<span slot="footer" class="dialog-footer">
- <el-button :v-if="selectOne.attachment == '' ? false: true" type="primary" @click="download">涓� 杞�</el-button>
+ <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download">涓� 杞�</el-button>
</span>
</el-dialog>
<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"
@@ -78,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>
@@ -89,10 +89,11 @@
export default {
data() {
return {
+ uploadUrl:"/api/api/file/topicUpload",
form:{},
- fileList: [],
- dialogVisible: false,
- dialogFormVisible: false,
+ fileList: [],
+ dialogVisible: false,
+ dialogFormVisible: false,
labelPosition: "right",
formInline:{},
selectOne:{
@@ -123,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);
},
@@ -130,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 }锛焋);
--
Gitblit v1.8.0