From 7a8920cd22441a8b14174e4dfad42be591b3725f Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 17 三月 2020 09:28:04 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/square.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/components/square.vue b/src/components/square.vue
index 48b7dde..b941b7f 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -43,6 +43,7 @@
<p v-if="noMore">娌℃湁鏇村浜�</p>
</div>
<el-dialog
+ v-if="dialogVisible"
title="璇︽儏"
:visible.sync="dialogVisible"
width="40%"
@@ -93,11 +94,11 @@
<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>
+ <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 @close="Cancel1" width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
+ <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>
</div>
@@ -113,6 +114,7 @@
return {
rowData:undefined,
dialog_1: false,
+ dialog_2: false,
uploadUrl:"/api/api/file/topicUpload",
form:{},
pageno:1,
@@ -161,13 +163,16 @@
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,
+ //id:selected.id,
desp:selected.desp,
name:selected.title,
//objective:this.selected.reseachType,
@@ -378,6 +383,7 @@
.handleClose {
margin: 10px;
text-align: left;
+ margin-left: 30%;
}
.handleClose .el-dialog__body {
padding: 10px 20px;
--
Gitblit v1.8.0