From fadf2795757ac6df1c792546725ea177c93d9d7a Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 18 三月 2020 14:03:10 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/square.vue | 206 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 160 insertions(+), 46 deletions(-)
diff --git a/src/components/square.vue b/src/components/square.vue
index 6c3b130..c652f01 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -17,17 +17,21 @@
</el-form-item>
</el-form>
</el-col>
- <el-col :span="4" ><el-button type="primary" @click="createNew">鍒涘缓</el-button></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; 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)">
+ <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-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-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>
@@ -39,6 +43,7 @@
<p v-if="noMore">娌℃湁鏇村浜�</p>
</div>
<el-dialog
+ v-if="dialogVisible"
title="璇︽儏"
:visible.sync="dialogVisible"
width="40%"
@@ -51,11 +56,13 @@
</div>
<span slot="footer" class="dialog-footer">
- <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download">涓� 杞�</el-button>
+ <el-button v-if="canEdit" type="primary" @click="edit">淇敼</el-button>
+ <el-button v-if="!selectOne.examine" type="primary" @click="addProject">鐢熸垚椤圭洰</el-button>
+ <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download(selectOne)">涓� 杞�</el-button>
</span>
</el-dialog>
- <el-dialog title="鍒涘缓璇濋" :visible.sync="dialogFormVisible">
+ <el-dialog title="鍒涘缓璇濋" :visible.sync="dialogFormVisible" @close="closeCreate" >
<el-form :model="form">
<el-form-item label="璇濋鍚嶇О" :label-width="formLabelWidth">
<el-input v-model="form.title" autocomplete="off"></el-input>
@@ -63,34 +70,60 @@
<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"
- :data="form"
- :limit="3"
- :auto-upload='false'
- ref="upload"
- :on-change="onChange"
- :on-exceed="handleExceed"
- :file-list="fileList">
- <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
- <div slot="tip" class="el-upload__tip">涓嶈秴杩�50M</div>
- </el-upload>
+ <el-form-item>
+ <el-upload
+ class="upload-demo"
+ :action="uploadUrl"
+ :on-preview="handlePreview"
+ :data="form"
+ :limit="3"
+ :auto-upload='false'
+ ref="upload"
+ :on-change="onChange"
+ :on-exceed="handleExceed"
+ :on-success="uploadSuccess"
+ >
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">涓嶈秴杩�50M</div>
+ </el-upload>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="createTopic">纭� 瀹�</el-button>
</div>
</el-dialog>
+ <div style="width: 0px; height: 0px;">
+ <iframe ref="frame_export" style="width: 0px; height: 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>
+ </el-dialog>
+ <el-dialog v-if="dialog_2" @close="Cancel1" width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
+ <newProject ref="newProject1_"></newProject>
+ </el-dialog>
+
+ <el-dialog v-if="dialogProdetail" width="70%" top="50px" :visible.sync="dialogProdetail" append-to-body>
+ <prodetail v-bind:rowData="rowData" ref="newProject2_"></prodetail>
+ </el-dialog>
</div>
</template>
<script>
+ import newProject from '../components/popup/newProject.vue'
+ import prodetail from '../components/popup/prodetail.vue'
export default {
+ components: {
+ newProject,
+ prodetail
+ },
data() {
return {
+ isRefresh: true,
+ rowData: {},
+ dialog_1: false,
+ dialog_2: false,
uploadUrl:"/api/api/file/topicUpload",
form:{},
pageno:1,
@@ -98,6 +131,7 @@
maxPage:0,
fileList: [],
dialogVisible: false,
+ dialogProdetail: false,
dialogFormVisible: false,
labelPosition: "right",
formInline:{},
@@ -106,6 +140,7 @@
desp:"miaoshu",
attachment:"222"
},
+ formLabelWidth:"100px",
dataList: [
// {id:1,attachment:"222",title:"鏍囬", desp:"鎻忚堪鏃跺彂鐢熺籂绾峰徃绗﹀悎鍙屾柟閰掑彑鍙戝姩鏈烘椂浠ｅ嘲宄婚厤鐢甸棿 鍒�鐗囨満姘寸數璐规悳璞嗚厫鐨悳鐨勭湅娉曟垜閮藉彨鎵撶牬鏄寰楁壒鍙戝晢闄勫姞璐圭涓夊搴︾牬鍙戞帴鏀跺埌鍙戝湴鏂瑰氨鎼滃埌鍒板洓鐐瑰垎鍙戝伓璇诲洤", time:"12鍒嗛挓鍓�"},
// {id:1,attachment:"222",title:"11", desp:"111", time:"11111"},
@@ -122,6 +157,7 @@
}
},
computed: {
+
noMore() {
return this.maxPage == this.pageno
},
@@ -133,9 +169,48 @@
this.getData();
},
methods: {
+ Cancel() {
+ this.$refs.newProject_.Cancel();
+ this.dialogFormVisible = false;
+ },
+ Cancel1() {
+
+ },
+ addProject() {
+ this.rowData = {
+ parentid: this.selectOne.id,
+ desp: this.selectOne.desp,
+ name: this.selectOne.title,
+ //objective:this.selected.reseachType,
+ //items:[this.$moment(this.selected.startTime).format('YYYY-MM-DD'),this.$moment(this.selected.endTime).format('YYYY-MM-DD')]
+ }
+
+ this.dialog_1 = true;
+ this.dialogVisible = false;
+ },
+ closeNewProject() {
+ this.dialog_1 = false;
+ this.getData();
+ },
+ download(val) {
+ if(val) {
+ this.$refs.frame_export.src = "/api/api/file/download/" + val.id;
+ }else {
+ this.$message({message:'鑾峰彇鍦板潃澶辫触', type: 'warning'});
+ }
+
+ },
+ uploadSuccess() {
+ this.dialogFormVisible = false;
+ },
onChange(file, fileList) {
+ this.fileList = [];
this.fileList = fileList;
},
+ canExam() {
+ return true;
+ },
+
createTopic() {
let me = this;
var userId = localStorage.getItem('userId');
@@ -159,55 +234,85 @@
this.$message({message:'璇濋鍒涘缓澶辫触', type: 'warning'});
}
}).catch(error => {
- console.log(error);
})
}else {
this.$refs.upload.submit();
}
},
- handleRemove(file, fileList) {
- console.log(file, fileList);
- },
- handlePreview(file) {
- console.log(file);
- },
- handleExceed(files, fileList) {
- this.$message.warning(`褰撳墠闄愬埗閫夋嫨 1 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
- },
- beforeRemove(file, fileList) {
- return this.$confirm(`纭畾绉婚櫎 ${ file.name }锛焋);
- },
+ handleRemove(file, fileList) {
+ },
+ handlePreview(file) {
+ },
+ handleExceed(files, fileList) {
+ this.$message.warning(`褰撳墠闄愬埗閫夋嫨 1 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
+ },
+ beforeRemove(file, fileList) {
+ return this.$confirm(`纭畾绉婚櫎 ${ file.name }锛焋);
+ },
load() {
-
+ let me = this;
if(me.pageno < me.maxPage) {
me.pageno++;
}
- query_();
-
-
+ this.query_();
},
showItem(one) {
this.dialogVisible = true;
this.selectOne = one;
},
+ showLinkItem(one) {
+ this.rowData = {
+ id: one.linkId,
+ }
+ this.dialogProdetail = true;
+ },
createNew() {
+ this.form = {};
this.dialogFormVisible = true;
+ },
+ formatter(one){
+ if(one.examine && one.linkId){
+ return "宸插叧鑱旈」鐩�";
+ }
},
empty_() {
this.formInline = {};
this.query_();
},
query_() {
- this.getData(this.formInline);
+ this.getData(this.formInline, true);
},
- getData(query) {
+ canEdit() {
+ return this.selectOne.userId == this.userId;
+ },
+ edit(){
+ this.form = {
+ title: this.selectOne.title,
+ desp: this.selectOne.desp,
+ id: this.selectOne.id
+ };
+ this.dialogFormVisible = true;
+ this.dialogVisible = false;
+ },
+ closeCreate() {
+ this.dialogFormVisible = false;
+ this.getData();
+ },
+
+ setRefresh() {
+ this.isRefresh = false;
+ this.isRefresh = true;
+ },
+ getData(query,empty) {
+ this.setRefresh();
+ this.dataList = [];
let me = this;
this.loading = true
this.loading_table = true;
let pageno = this.pagenum;
let url = "/api/topic/page/" + this.pageno;
let params = {};
- if(query){
+ if(query && query != {}){
params.title = query.title;
params.desp = query.desp;
}
@@ -215,18 +320,14 @@
params
})
.then(data_ => {
- console.log(data_);
if(data_.data.success) {
me.dataList.push.apply(me.dataList, data_.data.data.records)
me.total = data_.data.data.total;
me.pageno = data_.data.data.pageno;
me.maxPage = data_.data.data.maxPage;
-
-
}
me.loading = false
}).catch(error => {
- console.log(error);
me.loading = false
})
},
@@ -245,11 +346,23 @@
font-style: italic;
color: #000;
}
+ .grid-content_text:hover {
+ color: #409EFF;
+ cursor:pointer;
+ }
.grid-content_time {
font-weight: bold;
- font-style: italic;
color: #909399;
}
+ .grid-content_exam {
+ color: #00aaff;
+ font-size: 14px;
+ }
+ .grid-content_exam:hover {
+ font-weight: bold;
+ cursor:pointer;
+ }
+
.z_grid-content1{
display:table-cell;
vertical-align:bottom;
@@ -284,6 +397,7 @@
.handleClose {
margin: 10px;
text-align: left;
+ margin-left: 30%;
}
.handleClose .el-dialog__body {
padding: 10px 20px;
--
Gitblit v1.8.0