Merge remote-tracking branch 'origin/master'

src/api/engine/engine.js

@@ -122,7 +122,7 @@ export  function sel(id){
 //根据版本id查询版本信息
 export  function generate(data){
   return request({
-    url: "/engine/version/generate",
+    url: "/engine/engine/generate",
     method: "post",
     data:data
   })

src/views/engine/engine/index.vue

@@ -628,11 +628,12 @@ export default {
 
     engineRuleMaintenance(row) {
 
+
       this.$router.push({
 
         path: 'list',
 
-        query: {id: row.id}
+        query: {"id": row.id}
 
       })
 

src/views/engine/engine/list.vue

@@ -5,7 +5,7 @@
     <el-button type="text" @click="addVersion()">新增</el-button>
 
     <el-dialog title="添加版本信息" :visible.sync="dialogFormVisible">
-
+          {{versions}}
       <el-form :model="versions">
 
         <el-form-item label="版本类名" :label-width="formLabelWidth">
@@ -51,7 +51,7 @@
         </el-form-item>
         <!--        ref="mycode" "  class="code"-->
         <div v-show="opens">
-          <codemirror :value="this.javaClass" :options="cmOptions" >
+          <codemirror v-model="versions.ruleContent"   :value="this.versions.ruleContent" :options="cmOptions" >
           </codemirror>
         </div>
 
@@ -120,12 +120,6 @@
 
         <template slot-scope="scope">
 
-          <el-button @click.native.prevent="del(scope.row.id)" type="text" size="small">
-
-            删除
-
-          </el-button>
-
           <el-button v-show="scope.row.isActivate==1" @click="forbiddenEngines(scope.row.id)" type="text" size="small">
 
             关闭引擎
@@ -260,48 +254,6 @@ export default {
       },
 
       opens: false,
-      //
-      // javaClass: "package com.muyu.rule.engine.custom;\n" +
-      //
-      //   "\n" +
-      //
-      //   "import com.muyu.engine.action.ActionDiscard;\n" +
-      //
-      //   "import com.muyu.engine.scope.DataModelEngine;\n" +
-      //
-      //   "\n" +
-      //
-      //   "/**\n" +
-      //
-      //   " * @Author: qdm\n" +
-      //
-      //   new Date+
-      //
-      //   "\n * @Description: 没有描述\n" +
-      //
-      //   " * @Version: 2.2\n" +
-      //
-      //   " */\n" +
-      //
-      //   "public class engine_80 extends DataModelEngine {\n" +
-      //
-      //   "    @Override\n" +
-      //
-      //   "    public void execution () {\n" +
-      //
-      //   "        Object value = getValue();\n" +
-      //
-      //   "\n" +
-      //
-      //   "        if (value == null || \"\".equals(value) || \"null\".equals(value)) {\n" +
-      //
-      //   "            throw new ActionDiscard();\n" +
-      //
-      //   "        }\n" +
-      //
-      //   "    }\n" +
-      //
-      //   "}",
 
       title: "",
 
@@ -315,37 +267,14 @@ export default {
 
         testStatus: '未测试',
 
-        status: '初始化'
+        status: '初始化',
+
+        ruleContent:''
+
       },
 
       cmOptions: {
 
-        // autorefresh: true,
-
-        // tabSize: 4,
-
-        // mode: 'text/x-properties',
-
-        // theme: 'ayu-mirage',
-
-        // line: true,
-
-        // viewportMargin: Infinity, //处理高度自适应时搭配使用
-
-        // highlightDifferences: true,
-
-        // autofocus: false,
-
-        // indentUnit: 2,
-
-        // smartIndent: true,
-
-        // readOnly: true, // 只读
-
-        // showCursorWhenSelecting: true,
-
-        // firstLineNumber: 1
-
         lineNumbers: true, // 显示行号
 
         mode: 'text/x-yaml', // 语法model
@@ -374,12 +303,25 @@ export default {
 
     showCode() {
 
+      this.versions.isActivate = 1
+
+      this.versions.testStatus = 1
+
+      this.versions.status = 1
+
+      this.versions.id = this.$route.query.id
+
+
       generate(this.versions).then(res =>{
 
+        this.versions.ruleContent = res.ruleContent;
+
         this.$message.success(res.msg || "成功");
 
       })
 
+      this.opens=true
+
     },
 
     //添加弹窗

src/views/money/pay/index.vue

@@ -44,7 +44,7 @@ export default {
       addSysUser: {},
       disabled: false,
       // 同步跳转页面地址
-      returnUrl:'http://172.13.1.1//money/money',
+      returnUrl:'http://172.13.1.1/money/money',
       //充值参数
       rechargeParams: {
         "totalAmt": '', //金额