Merge branch 'master' of http://139.159.239.83:9093/mxl/ETL-admin into master

# Conflicts:
#	src/views/kettle/home.vue

src/api/kettle/link.js

 import request from '@/utils/request'
+import { Dropdown } from 'element-ui'
 
 //获取连接类型
 export function types(data) {
@@ -70,7 +71,7 @@ export function database(data) {
   })
 }
 //连接资源库
-export function login(data){
+export function loginRepository(data){
   return request({
     url: 'etlweb/repository/login',
     data,
@@ -78,6 +79,42 @@ export function login(data){
   })
 }
 
+//资源库信息确定
+export function addRepository(data){
+  return request({
+    url: 'etlweb/repository/add',
+    data,
+    method: 'post'
+  })
+}
+
+//测试连接
+export function test(data){
+  return request({
+    url: 'etlweb/database/test',
+    data,
+    method: 'post'
+  })
+}
+
+// 删除数据库
+export function removeLink(data){
+  return request({
+    url: 'etlweb/database/remove',
+    data,
+    method: 'post'
+  })
+}
+// 删除数据库表
+export function drop(data){
+  return request({
+    url: 'etlweb/database/drop',
+    data,
+    method: 'post'
+  })
+}
+
+
 
 //etl工具列表
 export function steps(data){

src/views/dialogs-components/dialog-remind.vue

+<template>
+  <div>
+    <el-dialog
+      title="系统提示"
+      :visible.sync="dialogVisibleOne"
+      width="30%"
+      :before-close="handleCloseOne">
+      <span>您确定要删除该数据库中所有的资源库列表</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleCloseOne()">取 消</el-button>
+        <el-button type="primary" @click="dialogVisibleTwo = true">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+    <el-dialog
+      title="系统提示"
+      :visible.sync="dialogVisibleTwo"
+      width="30%"
+      :before-close="handleCloseTwo">
+      <span>请输入管理员密码：</span>
+      <el-input style="margin-top:15px;" v-model="inputValue" placeholder="请输入管理员密码"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirm()">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+
+  export default ({
+    data(){
+        return{
+            dialogVisibleTwo:false,
+            inputValue:''
+        }
+        
+        
+    },
+    // props:['dialogVisibleOne','drop'],
+    props:{
+       dialogVisibleOne:{
+        type: Boolean,
+        default:false
+      },
+        // drop:Function
+      drop: {
+        type: Function,
+        default: null
+      }
+    },
+    mounted(){
+        //  this.test();
+    },
+    methods:{
+      handleCloseOne(){
+         this.$emit("update:dialogVisibleOne", false);
+      },
+      handleCloseTwo(){
+         this.dialogVisibleTwo=false;
+      },
+      confirm(){
+      //  this.drop();
+       this.drop();
+       this.$emit('getValue',this.inputValue);
+      }
+      //资源库信息删除
+      // drop(){
+      //     var formData = new FormData();
+      //         formData.append('databaseName', params);
+
+
+      //         // JSON对象转成formData对象
+      //         var params=this.repositoryInfoModel;
+      //         params.type='KettleDatabaseRepository';//写死
+      //         var extraOptions={database:this.selectName}
+      //         params.extraOptions=extraOptions;
+      //         var formData = new FormData();
+      //         formData.append('reposityInfo', JSON.stringify(params));
+      //         // formData.append('password', true);
+
+      //         console.log('资源库信息确认提交参数==',params);
+      //     removeLink(formData).then(res=>{      
+      //         if (res) {           
+      //             this.$message.success('删除成功!');
+      //             this.listNames();//刷新列表
+      //             this.selectName='';
+      //         }else {
+      //         this.$message.error(res.errMsg)
+      //         }
+      //     })
+      // }
+    }
+  })
+</script>
+

src/views/dialogs-components/dialog.js

+import {
+    removeLink
+  } from "@/api/kettle/link";
+
+
+
+
+
+// 删除本地测试连接1
+function deleteLink(params){
+    var formData = new FormData();
+        formData.append('databaseName', params);
+    removeLink(formData).then(res=>{      
+        if (res) {           
+            this.$message.success('删除成功!');
+            this.listNames();//刷新列表
+            this.selectName='';
+        }else {
+        this.$message.error(res.errMsg)
+        }
+    })
+}
+
+
+//资源库信息删除
+function dropFunction(params){
+    var formData = new FormData();
+    console.log('进入方法==');
+        // var password=this.$refs.testDialogueRemind.inputValue;
+
+        // JSON对象转成formData对象
+        var params=this.repositoryInfoModel;
+        console.log('进入方法333==',this.repositoryInfoModel);
+        params.type='KettleDatabaseRepository';//写死
+        var extraOptions={database:this.selectName}
+        params.extraOptions=extraOptions;
+        var formData = new FormData();
+        formData.append('reposityInfo', JSON.stringify(params));
+        formData.append('password', this.inputValue);
+
+        console.log('资源库信息确认提交参数==',params);
+        drop(formData).then(res=>{      
+            if (res) {           
+                this.$message.success('删除成功!');
+            }else {
+            this.$message.error(res.errMsg)
+            }
+        })
+}
+
+export{deleteLink,dropFunction}
\ No newline at end of file

src/views/dialogs-components/test.vue

+<template>
+    <!--数据库连接start -->
+    <el-dialog
+        title="数据库连接测试"
+        encodeURIComponent
+        :visible.sync="dialogVisible"
+        width="650px"
+        top="15%"
+        :close-on-click-modal="false"
+        :before-close="handleClose" 
+
+       >
+        <div class="table-container table-container-repos" style="height:42vh;">
+        {{linkInfo}}
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <!-- <el-button @click="handleClose">取 消</el-button> -->
+            <el-button type="primary" @click="handleClose">确 定</el-button>
+        </span>
+    </el-dialog>
+    <!-- 数据库连接测试end -->
+</template>
+
+<script>
+import {
+test
+} from  "@/api/kettle/link";
+export default ({
+ data(){
+     return{
+         linkInfo:''
+     }
+     
+     
+ },
+ props:{
+     dialogVisible:{
+        type: Boolean,
+        default:false
+     }
+ },
+ mounted(){
+    //  this.test();
+ },
+ methods:{
+    // 测试连接
+    test(params){
+        test(params).then(res=>{
+            if (res) {           
+                console.log('测试：');
+                // this.linkInfo=res.message;
+                // var test2=decodeURI(res.message);
+                var test2=decodeURIComponent(res.message);
+                console.log('解码====：',test2);
+                this.linkInfo=test2;
+            }else {
+            this.$message.error(res.errMsg)
+            }
+        })
+    },
+    handleClose(){
+         this.$emit("update:dialogVisible", false);
+    }
+ }
+})
+</script>
+