From 49fb4f5269bb6a0a8a228180bba1be8e3802119f Mon Sep 17 00:00:00 2001
From: lzh <52725224+Yourdaylight@users.noreply.github.com>
Date: Tue, 25 May 2021 16:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BC=93=E5=AD=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/nav1/MLmodel.vue | 11 +++++++----
 src/views/nav1/user.vue    |  2 +-
 src/views/nav2/History.vue |  3 +--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/nav1/MLmodel.vue b/src/views/nav1/MLmodel.vue
index 329a01f..e1fbb0f 100644
--- a/src/views/nav1/MLmodel.vue
+++ b/src/views/nav1/MLmodel.vue
@@ -89,7 +89,7 @@
 
 		<!--生成代码弹框-->
         <el-dialog title="代码" :visible.sync="dialogVisible" :close-on-click-modal="true" :modal="true" :show-close="true" :center="true">
-			<el-col style="white-space: pre-wrap;">{{original_code}}</el-col>-->
+			<el-col style="white-space: pre-wrap;">{{original_code}}</el-col>
 			<span slot="footer" class="dialog-footer">
                  <el-button @click="dialogVisible = false">取 消</el-button>
                  <el-button type="primary" @click="onExportCode">导出文件</el-button>
@@ -169,6 +169,8 @@
 		methods: {
 			onSubmit() {
 				console.log('submit!');
+				// 如果存在之前的运行结果，先清空
+				this.run_code_result=""
 				axios.post('/api/generate_code',{
 					username:JSON.parse(sessionStorage.getItem('user')),
 					data:this.form
@@ -176,7 +178,6 @@
 					var code=response.data.data
 					this.original_code=code
 					this.dialogVisible=true;
-
 				})
 			},
 			//保存当前查询条件
@@ -321,8 +322,10 @@
 						this.run_code_result = insert_iframe
 						this.dialogVisible = false
 					}
-					else
-						this.$message.error(response.data.msg)
+					else {
+						this.$message.error("运行失败，请确保训练的特征以及清洗完毕")
+						this.original_code = response.data.msg
+					}
 
 				}).catch(error => {
 					console.log(error.response)
diff --git a/src/views/nav1/user.vue b/src/views/nav1/user.vue
index 36fa28b..9cc67ae 100644
--- a/src/views/nav1/user.vue
+++ b/src/views/nav1/user.vue
@@ -131,7 +131,7 @@
                     .then((response) => {
                         var html_name = response.data.data
                         var insert_iframe = '<iframe  src="../../../static/'+html_name+
-                                            '" scrolling="yes" style="width: 100%;height: 500px;" frameborder="0"></iframe>'
+                                            '" scrolling="yes" style="width: 100%;height: 650px;" frameborder="0"></iframe>'
                         this.frame=insert_iframe
                         console.log("生成成功")
                         this.dialogVisible = true
diff --git a/src/views/nav2/History.vue b/src/views/nav2/History.vue
index 3167b4f..e241da3 100644
--- a/src/views/nav2/History.vue
+++ b/src/views/nav2/History.vue
@@ -10,7 +10,6 @@
             <el-table-column prop="evaluate_methods" label="模型评估方法" width="120"></el-table-column>
             <el-table-column prop="model_scene" label="模型使用场景" width="120"></el-table-column>
 
-
             <el-table-column label="快速建模" width="120">
                 <template slot-scope="scope">
                     <el-button size="mini" type="warning" @click="build_model(scope.row,scope.$index)">快速建模</el-button>
@@ -45,7 +44,6 @@
         inject:['reload'],
         methods: {
             history_list() {
-                var history_list = []
                 var username = sessionStorage.getItem('user')
                 axios.get('/api/get_history_list?username=' + JSON.parse(username))
                     .then((response) => {
@@ -65,6 +63,7 @@
 					model_params[key] = list_fields.indexOf(key)>-1 ? row[key].split(","):row[key]
 				}
 				sessionStorage.setItem("model_params",JSON.stringify(model_params))
+                sessionStorage.setItem("dataset_name",model_params["dataset_name"])
 				this.$router.push({path:'/MLmodel'})
 			},