From 050f815891df7c732e1ef64f1f32a83da495af11 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 11 二月 2020 23:46:29 +0800
Subject: [PATCH] 时间段调整
---
src/components/square.vue | 99 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 89 insertions(+), 10 deletions(-)
diff --git a/src/components/square.vue b/src/components/square.vue
index f7c0a4c..6b0f9ba 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -17,7 +17,10 @@
</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>
@@ -26,8 +29,9 @@
<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="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">{{one.title}}</div></el-col>
+ <el-col :span="3"><div class="grid-content z_grid-content1 grid-content_exam">{{formatter(one.examine)}}</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>
@@ -51,11 +55,13 @@
</div>
<span slot="footer" class="dialog-footer">
+ <el-button v-if="canEdit" type="primary" @click="edit">淇敼</el-button>
+ <el-button v-if="!selectOne.examine" type="primary" @click="addProject(selectOne)">鐢熸垚椤圭洰</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>
@@ -87,13 +93,27 @@
<div style="width: 0px; height: 0px;">
<iframe ref="frame_export" style="width: 0px; height: 0px;"></iframe>
</div>
+ <el-dialog @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 @close="Cancel1" width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
+ <newProject ref="newProject1_"></newProject>
+ </el-dialog>
</div>
</template>
<script>
+ import newProject from '../components/popup/newProject.vue'
export default {
+ components: {
+ newProject
+ },
data() {
return {
+ rowData:undefined,
+ dialog_1: false,
+ dialog_2: false,
uploadUrl:"/api/api/file/topicUpload",
form:{},
pageno:1,
@@ -109,6 +129,7 @@
desp:"miaoshu",
attachment:"222"
},
+ formLabelWidth:"40%",
dataList: [
// {id:1,attachment:"222",title:"鏍囬", desp:"鎻忚堪鏃跺彂鐢熺籂绾峰徃绗﹀悎鍙屾柟閰掑彑鍙戝姩鏈烘椂浠ｅ嘲宄婚厤鐢甸棿 鍒�鐗囨満姘寸數璐规悳璞嗚厫鐨悳鐨勭湅娉曟垜閮藉彨鎵撶牬鏄寰楁壒鍙戝晢闄勫姞璐圭涓夊搴︾牬鍙戞帴鏀跺埌鍙戝湴鏂瑰氨鎼滃埌鍒板洓鐐瑰垎鍙戝伓璇诲洤", time:"12鍒嗛挓鍓�"},
// {id:1,attachment:"222",title:"11", desp:"111", time:"11111"},
@@ -125,6 +146,7 @@
}
},
computed: {
+
noMore() {
return this.maxPage == this.pageno
},
@@ -136,6 +158,39 @@
this.getData();
},
methods: {
+ Cancel() {
+ this.$refs.newProject_.Cancel();
+ this.dialogFormVisible = false;
+ },
+ Cancel1() {
+
+ },
+ addProject(selected) {
+ let url = "/api/topic/exam/" + selected.id;
+ this.$axios.get(url)
+ .then(data_ => {
+ if(data_.data.success) {
+ this.rowData = {
+ id:selected.id,
+ desp:selected.desp,
+ name:selected.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.dialogFormVisible = false;
+ this.dialog_1 = true;
+ }else {
+ this.$message({message:'鍒涘缓椤圭洰澶辫触', type: 'warning'});
+ }
+ }).catch(error => {
+ })
+
+
+ },
+ closeNewProject() {
+ this.dialog_1 = false;
+ getData();
+ },
download(val) {
if(val) {
this.$refs.frame_export.src = "/api/api/file/download/" + val.id;
@@ -151,6 +206,10 @@
this.fileList = [];
this.fileList = fileList;
},
+ canExam() {
+ return true;
+ },
+
createTopic() {
let me = this;
var userId = localStorage.getItem('userId');
@@ -170,21 +229,19 @@
if(data_.data.success) {
this.$message('鍒涘缓鎴愬姛');
me.dialogFormVisible = false;
+ me.getData();
}else {
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} 涓枃浠禶);
@@ -208,12 +265,33 @@
createNew() {
this.dialogFormVisible = true;
},
+ formatter(exam){
+ if(exam){
+ return "宸插叧鑱旈」鐩�";
+ }
+ },
empty_() {
this.formInline = {};
this.query_();
},
query_() {
this.getData(this.formInline, true);
+ },
+ 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();
},
getData(query,empty) {
if(empty) {
@@ -233,7 +311,6 @@
params
})
.then(data_ => {
- console.log(data_);
if(data_.data.success) {
me.dataList.push.apply(me.dataList, data_.data.data.records)
me.t
@@ -245,7 +322,6 @@
}
me.loading = false
}).catch(error => {
- console.log(error);
me.loading = false
})
},
@@ -266,9 +342,12 @@
}
.grid-content_time {
font-weight: bold;
- font-style: italic;
color: #909399;
}
+ .grid-content_exam {
+ color: #00aaff;
+ font-size: 14px;
+ }
.z_grid-content1{
display:table-cell;
vertical-align:bottom;
--
Gitblit v1.8.0