diff --git a/src/api/ruleEngine/ruleEngine.js b/src/api/ruleEngine/ruleEngine.js
index 04f906e..8d75e1b 100644
--- a/src/api/ruleEngine/ruleEngine.js
+++ b/src/api/ruleEngine/ruleEngine.js
@@ -1,16 +1,15 @@
 import request from '@/utils/request'
 
-export function getRuleList(ruleListReq) {
+export function getRuleList() {
   return request({
-    url: '/data/rule/getRuleList',
-    method: 'post',
-    data: ruleListReq
+    url: '/rule/engine/getRuleEngineList',
+    method: 'get'
   })
 }
 
 export function insertRuleEngine(ruleEngine) {
   return request({
-    url: '/data/rule/insertRuleEngine',
+    url: '/rule/engine/insertOrUpdateRuleEngine',
     method: 'post',
     data: ruleEngine
   })
@@ -30,3 +29,10 @@ export function testCompile(testWord) {
     data: testWord
   })
 }
+
+export function getRuleJavaCode(ruleEngineId) {
+  return request({
+    url: '/data/rule/getRuleJavaCode?ruleEngineId=' + ruleEngineId,
+    method: 'get'
+  })
+}
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 12082ea..1ff7d5b 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -5,25 +5,6 @@ import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView'
 import InnerLink from '@/layout/components/InnerLink'
 
-let routeResponse = {
-  "msg": "操作成功",
-  "code": 200,
-  "data": [
-    {
-      "name": "EngineVersion",
-      "path": "rule-engine/engine-version/:ruleEngineId(\\d+)",
-      "hidden": true,
-      "component": "ruleEngine/engineVersion/index",
-      "meta": {
-        "title": "引擎版本",
-        "icon": "component",
-        "noCache": false,
-        "link": null
-      }
-    },
-  ]
-}
-
 const permission = {
   state: {
     routes: [],
diff --git a/src/views/ruleEngine/engineMaintenance/index.vue b/src/views/ruleEngine/engineMaintenance/index.vue
index 77f136c..0d64855 100644
--- a/src/views/ruleEngine/engineMaintenance/index.vue
+++ b/src/views/ruleEngine/engineMaintenance/index.vue
@@ -10,19 +10,16 @@
         />
       </el-form-item>
       <el-form-item label="规则类型" prop="type">
-        <el-select v-model="queryParams.ruleLevelId" placeholder="请选择规则类型" clearable>
-          <el-option
-            v-for="ruleLevel in ruleLevelList"
-            :key="ruleLevel.id"
-            :label="ruleLevel.ruleLevel"
-            :value="ruleLevel.id"
-          />
+        <el-select v-model="queryParams.ruleLevelId" placeholder="请选择规则级别" clearable>
+          <el-option label="数据集" value="1">数据集</el-option>
+          <el-option label="记录" value="2">记录</el-option>
+          <el-option label="数据字段" value="3">数据字段</el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="规则状态" prop="status">
         <el-select v-model="queryParams.ruleStatus" placeholder="请选择规则状态" clearable>
-          <el-option value="1">正常</el-option>
-          <el-option value="2">停用</el-option>
+          <el-option value='Y'>正常</el-option>
+          <el-option value='N'>停用</el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -72,7 +69,7 @@
       <el-table-column label="规则类型" align="center" prop="type">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.ruleTypeId == 1">自定义规则</el-tag>
-          <el-tag v-if="scope.row.ruleTypeId != 1" >模版规则</el-tag>
+          <el-tag v-if="scope.row.ruleTypeId == 2" >模版规则</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="规则作用域" align="center" prop="level">
@@ -85,8 +82,14 @@
       <el-table-column label="引擎编码" align="center" prop="ruleCode" />
       <el-table-column label="规则状态" align="center" prop="status">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status == 1">启用</el-tag>
-          <el-tag v-if="scope.row.status != 1">停用</el-tag>
+          <el-tag v-if="scope.row.ruleStatus == 'Y'">正常</el-tag>
+          <el-tag v-if="scope.row.ruleStatus == 'N'">停用</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否激活" align="center" prop="isActivate">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isActivate == 'Y'">已激活</el-tag>
+          <el-tag v-if="scope.row.isActivate == 'N'">未激活</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -141,21 +144,25 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="规则类型" prop="type">
+            <el-form-item label="规则类型">
               <el-select v-model="form.ruleTypeId" placeholder="请选择规则类型" style="width: 100%">
-                <el-option value="1" >自定义规则</el-option>
-                <el-option value="2" >模版规则</el-option>
+                <el-option
+                  v-for="dict in dict.type.rule_engine_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规则级别" prop="level">
+            <el-form-item label="规则级别">
               <el-select v-model="form.ruleLevelId" placeholder="请选择规则级别" style="width: 100%">
                 <el-option
-                  v-for="ruleLevel in ruleLevelList"
-                  :key="ruleLevel.id"
-                  :label="ruleLevel.ruleLevel"
-                  :value="ruleLevel.id"
+                  v-for="dict in dict.type.rule_level"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -165,8 +172,16 @@
           <el-col :span="12">
             <el-form-item label="规则状态" prop="status">
               <el-radio-group v-model="form.ruleStatus">
-                <el-radio :label="1">正常</el-radio>
-                <el-radio :label="2">停用</el-radio>
+                <el-radio label="Y">正常</el-radio>
+                <el-radio label="N">停用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否激活" prop="isActivate">
+              <el-radio-group v-model="form.isActivate">
+                <el-radio label="Y">已激活</el-radio>
+                <el-radio label="N">未激活</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -198,7 +213,7 @@ import {getRuleList, insertRuleEngine} from "@/api/ruleEngine/ruleEngine";
 
 export default {
   name: "EngineMaintenance",
-  dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
+  dicts: ['rule_engine_type', 'rule_level'],
   data() {
     return {
       // 遮罩层
@@ -260,11 +275,11 @@ export default {
     },
     /** 查询规则引擎列表 */
     getList() {
-      getRuleList(this.queryParams).then(
+      getRuleList().then(
         response => {
+          console.log("新模块",response.data)
           this.loading = true;
-          this.engineList = response.data.ruleEngineList;
-          this.ruleLevelList = response.data.ruleLevelList
+          this.engineList = response.data
           this.loading = false
         }
       )
diff --git a/src/views/ruleEngine/engineVersion/index.vue b/src/views/ruleEngine/engineVersion/index.vue
index d82b166..ed58a90 100644
--- a/src/views/ruleEngine/engineVersion/index.vue
+++ b/src/views/ruleEngine/engineVersion/index.vue
@@ -1,24 +1,242 @@
 <template>
-  <div>
-    {{ruleEngineId}}
-    呼呼哈嘿
+  <div class="app-container">
+    <el-descriptions class="margin-top" :title="ruleEngineInfo.name" :column="3" border>
+      <template slot="extra">
+        <el-dropdown split-button type="primary" @command="handleClick">
+          更多操作
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="add">版本添加</el-dropdown-item>
+            <el-dropdown-item command="activate">{{(ruleEngineInfo.isActivate === 'no-activate' ? "激活": "禁用")+'引擎'}}</el-dropdown-item>
+            <el-dropdown-item command="status">{{(ruleEngineInfo.status === '0' ? "关闭": "开启")+'引擎'}}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+
+      </template>
+      <el-descriptions-item label="规则名称"> {{ruleEngineInfo.name}} </el-descriptions-item>
+      <el-descriptions-item label="规则类型">
+        <dict-tag :options="dict.type.rule_engine_type" :value="ruleEngineInfo.type"/>
+      </el-descriptions-item>
+      <el-descriptions-item label="规则作用域">
+        <dict-tag :options="dict.type.rule_engine_level" :value="ruleEngineInfo.level"/>
+      </el-descriptions-item>
+      <el-descriptions-item label="引擎编码"> {{ruleEngineInfo.code + " ("+ruleEngineInfo.engineCode+")"}} </el-descriptions-item>
+      <el-descriptions-item label="是否激活啊">
+        <dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineInfo.isActivate"/>
+      </el-descriptions-item>
+      <el-descriptions-item label="规则状态">
+        <dict-tag :options="dict.type.sys_normal_disable" :value="ruleEngineInfo.status"/>
+      </el-descriptions-item>
+    </el-descriptions>
+    <editor style="margin-top: 20px" :read-only="true" v-model="ruleEngineInfo.description"></editor>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>规则引擎版本</span>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="12" v-for="ruleEngineVersion in ruleEngineInfo.ruleEngineVersionList">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>{{ruleEngineVersion.name + "-" + ruleEngineVersion.code}}</span>
+              <el-dropdown style="float: right; padding: 3px 0">
+                <span class="el-dropdown-link">
+                  更多操作<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="info">规则详情</el-dropdown-item>
+                  <el-dropdown-item command="test">测试规则</el-dropdown-item>
+                  <el-dropdown-item command="status">禁用规则</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+            <el-descriptions class="margin-top" :column="2" border>
+              <el-descriptions-item label="版本类" :span="2"> {{ruleEngineVersion.versionCode}} </el-descriptions-item>
+              <el-descriptions-item label="版本名称"> {{ruleEngineVersion.name}} </el-descriptions-item>
+              <el-descriptions-item label="版本CODE"> {{ruleEngineVersion.code}} </el-descriptions-item>
+              <el-descriptions-item label="是否激活">
+                <dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineVersion.isActivate"/>
+              </el-descriptions-item>
+              <el-descriptions-item label="版本状态">
+                <dict-tag :options="dict.type.rule_engine_version_status" :value="ruleEngineVersion.status"/>
+              </el-descriptions-item>
+            </el-descriptions>
+            <editor style="margin-top: 10px" :read-only="true" v-model="ruleEngineInfo.description"></editor>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-dialog
+      title="新增版本" :visible.sync="addVersionStatus"
+      width="75%">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>基本信息</span>
+          <el-button style="float: right; padding: 3px 0" type="text" @click="genEngineVersion">生成引擎版本类</el-button>
+        </div>
+        <el-form :label-position="engineVersionForm" label-width="80px" :model="engineVersionForm">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="版本类">
+                <el-input v-model="engineVersionForm.versionCode" disabled placeholder="点击类生成自动生成类名称"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="名称">
+                <el-input v-model="engineVersionForm.name"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="编码">
+                <el-input v-model="engineVersionForm.code"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="状态">
+                <dict-tag :options="dict.type.rule_engine_version_status" :value="engineVersionForm.status"/>
+
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否激活">
+                <dict-tag :options="dict.type.rule_engine_activate_status" :value="engineVersionForm.isActivate"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <editor v-model="engineVersionForm.description" :min-height="150"/>
+      </el-card>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addVersionCancel">取 消</el-button>
+        <el-button type="primary" @click="addVersionSubmission">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 export default {
   name: "EngineVersion",
+  dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level', 'rule_engine_version_status'],
   data() {
     return {
       ruleEngineId: this.$route.params && this.$route.params.ruleEngineId,
+      ruleEngineInfo: {
+        "id": 1,
+        "name": "邮箱规则",
+        "type": "rule-custom",
+        "isActivate": "no-activate",
+        "status": "0",
+        "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>",
+        "remark": "-",
+        "code": "email",
+        "engineCode": "engine_custom_email",
+        "level": "data-field",
+      },
+      // 新增版本
+      addVersionStatus: false,
+      engineVersionForm: {
+        "name": "", "code": "", "status": "0",
+        "versionCode": "",
+        "isActivate": "no-activate",
+        "description": "",
+        "codeIng": ""
+      }
     }
   },
   created() {
+    this.initRuleEngine();
   },
-  methods: {}
+  methods: {
+    // 生成规则版本
+    genEngineVersion(){
+      if (this.engineVersionForm.name == null || this.engineVersionForm.name === "") {
+        this.$message.error('规则名称不可为空');
+        return false;
+      }
+      if (this.engineVersionForm.code == null || this.engineVersionForm.code === "") {
+        this.$message.error('规则CODE不可为空');
+        return false;
+      }
+      this.engineVersionForm.versionCode = this.ruleEngineInfo.engineCode + "_" + this.engineVersionForm.code
+    },
+    // 确定新增
+    addVersionSubmission(){
+
+    },
+    // 取消新增
+    addVersionCancel(){
+
+    },
+    handleClick(clickType){
+      if (clickType === "add"){
+        this.addVersionStatus = true;
+      }else if(clickType === "activate"){
+        this.ruleEngineInfo.isActivate = 'no-activate' === this.ruleEngineInfo.isActivate ? 'activated' : 'no-activate'
+        this.$modal.msgSuccess("引擎激活状态修改成功");
+      }else if(clickType === "status"){
+        this.ruleEngineInfo.status = '0' === this.ruleEngineInfo.status ? '1' : '0'
+        this.$modal.msgSuccess("引擎状态操作成功");
+      }
+    },
+    initRuleEngine(){
+      let response = {
+        "code": 200,
+        "msg": "查询成功",
+        "data": {
+          "id": 1,
+          "name": "邮箱规则",
+          "type": "rule-custom",
+          "isActivate": "no-activate",
+          "status": "0",
+          "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>",
+          "remark": "-",
+          "code": "email",
+          "engineCode": "engine_custom_email",
+          "level": "data-field",
+          "ruleEngineVersionList": [
+            {
+              "name": "163剔除", "code": "IAW3S02", "status": "0",
+              "versionCode": "engine_custom_email_IAW3S02", "isActivate": "no-activate",
+              "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>"
+            },
+            {
+              "name": "筛选不合规邮箱", "code": "JISID8S", "status": "2",
+              "versionCode": "engine_custom_email_JISID8S", "isActivate": "activated",
+              "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>"
+            },
+            {
+              "name": "剔除自定义邮箱", "code": "DJ8S9EA", "status": "2",
+              "versionCode": "engine_custom_email_DJ8S9EA", "isActivate": "no-activate",
+              "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>"
+            },
+            {
+              "name": "邮箱默认值操作", "code": "XJS9E0S", "status": "1",
+              "versionCode": "engine_custom_email_XJS9E0S", "isActivate": "no-activate",
+              "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>"
+            }
+          ]
+        }
+      }
+      this.ruleEngineInfo = response.data
+    }
+
+  }
 }
 </script>
 
 <style scoped>
-
+.box-card{
+  margin-top: 20px;
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409EFF;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
 </style>