Merge remote-tracking branch 'origin/master'

src/api/engine/engine.js

@@ -1,157 +1,262 @@
 import request from '@/utils/request'
 
 //查询规则引擎列表
-export function selectEngineList(data){
+
+export function selectEngineList(data) {
+
   return request({
+
     url: "/engine/engine/getMaintenanceList",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 
 //添加规则数据
-export  function insert(data){
+
+export function insert(data) {
+
   return request({
+
     url: "/engine/engine/insert",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 
 //修改规则数据
-export  function update(data){
+
+export function update(data) {
+
   return request({
+
     url: "/engine/engine/update",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 
 //通过id删除数据
-export  function del(id){
+
+export function del(id) {
+
   return request({
+
     url: "/engine/engine/delete/" + id,
+
     method: "post",
-    data:id
+
+    data: id
+
   })
+
 }
 
 //开启
-export  function onEngine(id){
+
+export function onEngine(id) {
+
   return request({
+
     url: "/engine/version/open/" + id,
+
     method: "post"
+
   })
+
 }
 
 //禁用
-export  function forbiddenEngine(id){
+
+export function forbiddenEngine(id) {
+
   return request({
+
     url: "/engine/version/close/" + id,
+
     method: "post"
+
   })
+
 }
 
 //查看等级列表信息
-export  function selectLevel(){
+
+export function selectLevel() {
+
   return request({
+
     url: "/engine/level/selectLevelList",
+
     method: "post"
+
   })
+
 }
 
 // 查询规则引擎版本列表
-export function getRuleEngineInfo(id) {
-  return request({
-    url: '/engine/engine/getRuleEngineInfo/' + id,
-    method: 'put'
-  })
-}
 
 // 通过id查询
 export function findById(id) {
   return request({
+
     url: '/engine/engine/findByIdsfindByIds/' + id,
-    method:'get'
+
+    method: 'get'
+
   })
+
 }
 
 //通过id删除数据
-export function dels(id) {
-  return request({
-    url: '/engine/version/delete/' + id,
-    method: 'post',
-    data: id
-  })
-}
 
+export function dels(id) {
+
+  return request({
+
+    url: '/engine/version/delete/' + id,
+
+    method: 'post',
+
+    data: id
+
+  })
+
+}
 
 
 //添加规则数据
-export  function add(data){
+
+export function add(data) {
+
   return request({
+
     url: "/engine/version/insertVersion",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 
 
+export function selectEngineById(id) {
 
-
-export  function selectEngineById(id){
   return request({
+
     url: "/engine/engine/selectEngineById/" + id,
+
     method: "post",
-    data:id
+
+    data: id
+
   })
+
 }
 
 //根据版本id查询版本信息
-export  function sel(id){
+
+export function sel(id) {
+
   return request({
+
     url: "/engine/version/selectListById/" + id,
+
     method: "post"
+
   })
+
 }
 
-
-
-
-
 //根据版本id查询版本信息
-export  function generate(data){
+
+export function generate(data) {
+
   return request({
+
     url: "/engine/engine/generate",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 
+export function getVersionData(id) {
 
-export  function getVersionData(id){
   return request({
+
     url: "/engine/version/getVersionById/" + id,
+
     method: "get",
-    data:id
+
+    data: id
+
   })
+
 }
 
 //数据库查询
-export  function selectDataBase(){
+
+export function selectDataBase() {
+
   return request({
+
     url: "/engine/version/selectDataBase",
+
     method: "post",
+
   })
+
 }
 
 //数据字段查询
-export  function selectData(){
+
+export function selectData() {
+
   return request({
+
     url: "/engine/version/selectData",
+
     method: "post",
+
   })
+
+}
+
+//测试
+
+export function testData(data) {
+
+  return request({
+
+    url: "/engine/engine/testData",
+
+    method: "post",
+
+    data: data
+
+  })
+
 }
 
 
 
+
+

src/api/engine/getRuleEngineInfo.js

@@ -0,0 +1,13 @@
+import request from "@/utils/request";
+
+export function getRuleEngineInfo(id) {
+
+  return request({
+
+    url: '/engine/engine/getRuleEngineInfo/' + id,
+
+    method: 'put'
+
+  })
+
+}

src/api/type/type.js

@@ -1,46 +1,81 @@
 import request from '@/utils/request'
 
 //查询规则引擎列表
-export function list(){
+
+export function list() {
+
   return request({
+
     url: "/engine/type/list",
+
     method: "post"
+
   })
+
 }
 
 //添加类型数据
-export  function insert(data){
+
+export function insert(data) {
+
   return request({
+
     url: "/engine/type/add",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 
 //修改类型数据
-export  function update(data){
+
+export function update(data) {
+
   return request({
+
     url: "/engine/type/update",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 
+
 //删除类型数据
-export  function del(id){
+
+export function del(id) {
+
   return request({
+
     url: "/engine/type/delete/" + id,
+
     method: "post",
-    data:id
+
+    data: id
+
   })
+
 }
 
 //导出类型数据
-export function exports(data){
+
+export function exports(data) {
+
   return request({
+
     url: "/engine/type/export",
+
     method: "post",
-    data:data
+
+    data: data
+
   })
+
 }
 

src/views/engine/engine/index.vue

@@ -317,9 +317,7 @@
 
       <el-table-column label="描述" prop="description"></el-table-column>
 
-      <el-table-column
-
-        align="right">
+      <el-table-column align="right">
 
         <template slot-scope="scope">
 
@@ -354,6 +352,7 @@
             type="text"
 
             @click="engineRuleMaintenance(scope.row)">规则维护
+
           </el-button>
 
         </template>
@@ -626,7 +625,6 @@ export default {
 
     engineRuleMaintenance(row) {
 
-
       this.$router.push({
 
         path: 'list',

src/views/engine/engine/list.vue

@@ -216,35 +216,6 @@
 
     </el-dialog>
 
-    <!--测试规则-->
-    <el-button type="text" @click="dialogFormVisible = true">测试</el-button>
-
-    <el-dialog title="选择数据库" :visible.sync="dialogFormVisible">
-
-      <el-form :model="datas">
-
-        <el-form-item label="请选择数据库" :label-width="formLabelWidth">
-
-          <el-select v-model="datas.source" autocomplete="off">
-
-            <el-options :label="sources.name" :value="sources.id" v-for="sources in source"></el-options>
-
-          </el-select>
-
-        </el-form-item>
-
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-
-        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
-
-      </div>
-
-    </el-dialog>
-
   </div>
 
 </template>
@@ -252,14 +223,25 @@
 <script>
 
 import {
+
   add,
+
   dels,
+
   findById,
+
   forbiddenEngine,
+
   generate,
+
   onEngine,
+
   sel,
-  selectEngineById
+
+  selectEngineById,
+
+  testData
+
 } from "@/api/engine/engine";
 
 import Java from "@/components/JavaIDE.vue/java.vue";
@@ -267,15 +249,23 @@ import Java from "@/components/JavaIDE.vue/java.vue";
 import {codemirror} from 'vue-codemirror'
 
 import "codemirror/theme/ambiance.css";
-import source from "@/views/assets/source/index.vue"; // 这里引入的是主题样式，根据设置的theme的主题引入，一定要引入！！
+
+import source from "@/views/assets/source/index.vue";
+
+import {selectSourceList} from "@/api/etl/switch"; // 这里引入的是主题样式，根据设置的theme的主题引入，一定要引入！！
 
 require("codemirror/mode/javascript/javascript"); // 这里引入的模式的js，根据设置的mode引入，一定要引入！！
 
 export default {
+
   computed: {
+
     source() {
+
       return source
+
     }
+
   },
 
   dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
@@ -290,9 +280,7 @@ export default {
 
   },
 
-  props: {
-
-  },
+  props: {},
 
   data() {
 
@@ -300,13 +288,17 @@ export default {
 
     return {
 
-      versionFormVisibles:false,
+      engines: [],
+
+      versionFormVisibles: false,
+
+      datas: {
+
+        source: []
 
-      datas:{
-        source:[]
       },
 
-      dialogTableVisible:false,
+      dialogTableVisible: false,
 
       direction: 'rtl',
 
@@ -366,7 +358,13 @@ export default {
 
   methods: {
 
-    testEngine(){
+    testEngine() {
+
+      testData(this.versions).then(res => {
+
+        this.$message.success(res.msg || "成功")
+
+      })
 
     },
 
@@ -478,6 +476,16 @@ export default {
 
     },
 
+    selectSourceList() {
+
+      selectSourceList({}).then(res => {
+
+        this.engines = res.data;
+
+      })
+
+    },
+
     List() {
 
       findById(this.maintenance.id).then(res => {
@@ -524,6 +532,8 @@ export default {
 
     this.selectEngine();
 
+    this.selectSourceList();
+
   }
 
 }

src/views/type/index.vue

@@ -60,6 +60,7 @@
       </el-table-column>
 
     </el-table>
+
   </div>
 
 </template>
@@ -152,5 +153,7 @@ export default {
 
 }
 </script>
+
 <style scoped>
+
 </style>

src/views/version/version/version.vue

@@ -275,10 +275,6 @@ export default {
 
         this.arr = res.data;
 
-        console.log(res)
-
-        console.log(this.arr)
-
       })
 
     },
@@ -327,5 +323,7 @@ export default {
 
 }
 </script>
+
 <style scoped>
+
 </style>

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1/prod-api/`,
+        target: `http://172.13.1.1/prod-api/`,
         // target: `http://127.0.0.1/8080`, `http://172.13.1.1/prod-api`,
         changeOrigin: true,
         pathRewrite: {