Merge branch 'develop' into xuxiaoming

src/views/plan/workbench/homePage/beta/predict/predictEdit.vue

@@ -96,6 +96,7 @@
 						<el-col :span="24">
 							<el-form-item class="fr" style="margin: 10px 0 0;">
 								<el-button v-if="item.title === '修改'" @click="delHandle" class="search-button-style" style="background: red;border-color: red;">D 删除</el-button>
+								<el-button @click="goBackHandle" class="search-button-style">R 返回</el-button>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -231,6 +232,10 @@ export default {
 				}
 			})
 		},
+		// 返回上一个页面
+		goBackHandle() {
+			this.$router.push({path:'/plan/workbench/homePage',query: {CustomerId: this.item.CustomerId}})
+		},
 		// 删除数据
     delHandle() {
       this.$confirm('是否确认删除"' + this.item.CustomerId + '"的数据项?', "警告", {