Merge remote-tracking branch 'origin/master'

src/api/engine/engine.js

@@ -9,33 +9,35 @@ export function selectEngineList(data){
   })
 }
 
-//导出
+
-export function selectSourceExport(data){
+
+
+export  function insert(data){
   return request({
-    url: "/source/source/export",
+    url: "/engine/engine/insert",
-    method: "POST",
+    method: "post",
+    data:data
+  })
+}
+
+export  function update(data){
+  return request({
+    url: "/engine/engine/update",
+    method: "post",
     data:data
   })
 }
 
 
-//新增
-export function insertAdd(data){
-  return request({
-    url: "/source/source/insert",
-    method: "get",
-    data:data
-  })
-}
 
-
+export  function del(id){
-//获取基本信息
-export function getInfo(id){
   return request({
-    url: "/source/source/id",
+    url: "/engine/engine/delete/" + id,
-    method: "get",
+    method: "post",
+    data:id
   })
 }
 
 
 
+

src/api/etl/switch.js

@@ -9,14 +9,14 @@ export function selectSourceList(data){
   })
 }
 
-//导出
+// //导出
-export function selectSourceExport(data){
+// export function selectSourceExport(data){
-  return request({
+//   return request({
-    url: "/source/source/export",
+//     url: "/source/source/export",
-    method: "POST",
+//     method: "POST",
-    data:data
+//     data:data
-  })
+//   })
-}
+// }
 
 //新增
 export function insertAdd(data){

src/views/engine/engine/index.vue

@@ -20,15 +20,16 @@
     </el-form>
 
 
-<!--    <el-button-->
+
-<!--      v-hasPermi="['tool:gen:import']"-->
+    <el-button
-<!--      icon="el-icon-upload"-->
+      type="warning"
-<!--      plain-->
+      plain
-<!--      size="mini"-->
+      icon="el-icon-download"
-<!--      type="info"-->
+      size="mini"
-<!--      @click="findSelectSourceExport"-->
+      @click="findSelectSourceExport"
-<!--    >导出-->
+      v-hasPermi="['source:data:export']"
-<!--    </el-button>-->
+    >导出
+    </el-button>
 
 
 <!--    <el-button-->
@@ -41,61 +42,42 @@
 <!--    </el-button>-->
 
 
-<!--    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">-->
+    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">
 
-<!--      <el-form :model="sourceAddReq">-->
+      <el-form :model="engine">
-<!--        <el-form-item label="接入源名称">-->
+        <el-form-item label="接入源名称">
-<!--          <el-input v-model="sourceAddReq.dataResourceName"></el-input>-->
+          <el-input v-model="engine.id"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="数据来源系统名称">-->
+        <el-form-item label="数据来源系统名称">
-<!--          <el-input v-model="sourceAddReq.dataSourcesSystemName"></el-input>-->
+          <el-input v-model="engine.name"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="主机地址">-->
+        <el-form-item label="主机地址">
-<!--          <el-input v-model="sourceAddReq.host"></el-input>-->
+          <el-input v-model="engine.type"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="主机端口">-->
+        <el-form-item label="主机端口">
-<!--          <el-input v-model="sourceAddReq.port"></el-input>-->
+          <el-input v-model="engine.scope"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="数据接入类型">-->
+        <el-form-item label="数据接入类型">
-<!--          <el-input v-model="sourceAddReq.databaseType"></el-input>-->
+          <el-input v-model="engine.engineCode"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="数据库名称">-->
+        <el-form-item label="数据库名称">
-<!--          <el-input v-model="sourceAddReq.databaseName"></el-input>-->
+          <el-input v-model="engine.isActivate"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="数据库用户">-->
+        <el-form-item label="数据库用户">
-<!--          <el-input v-model="sourceAddReq.username"></el-input>-->
+          <el-input v-model="engine.status"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="数据库密码">-->
+        <el-form-item label="数据库密码">
-<!--          <el-input v-model="sourceAddReq.password"></el-input>-->
+          <el-input v-model="engine.description"></el-input>
-<!--        </el-form-item>-->
+        </el-form-item>
-<!--        <el-form-item label="数据连接参数">-->
-<!--          <el-input v-model="sourceAddReq.connectionParams"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="初始化连接数量">-->
-<!--          <el-input v-model="sourceAddReq.initLinkNum"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="最大连接数量">-->
-<!--          <el-input v-model="sourceAddReq.maxLinkNum"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="最大等待时间">-->
-<!--          <el-input v-model="sourceAddReq.maxWaitTime"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="最大等待次数">-->
-<!--          <el-input v-model="sourceAddReq.maxWaitTimes"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备注">-->
-<!--          <el-input v-model="sourceAddReq.remark"></el-input>-->
-<!--        </el-form-item>-->
 
-<!--      </el-form>-->
+      </el-form>
 
 
-<!--      <div slot="footer" class="dialog-footer">-->
+      <div slot="footer" class="dialog-footer">
-<!--        <el-button @click="dialogFormVisible = false">测试</el-button>-->
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
-<!--        <el-button @click="dialogFormVisible = false">取 消</el-button>-->
+        <el-button type="primary" @click="dialogFormVisible = insert">确 定</el-button>
-<!--        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>-->
+      </div>
-<!--      </div>-->
+    </el-dialog>
-<!--    </el-dialog>-->
 
 
 
@@ -146,23 +128,20 @@
       <el-table-column
         align="right">
         <template slot-scope="scope">
-          <el-button
-            icon="el-icon-pear"
-            size="mini"
-            type="text"
-            @click="update(scope.row)">规则维护</el-button>
 
           <el-button
             icon="el-icon-delete"
             size="mini"
             type="text"
-            @click="handleDelete(scope.row)">删除</el-button>
+            @click="handleDelete(scope.row.id)">删除</el-button>
 
           <el-button
             icon="el-icon-service"
             size="mini"
             type="text"
-            @click="struceure(scope.row)">修改</el-button>
+            @click="handUpdate(scope.row.id)">规则维护</el-button>
+
+
         </template>
 
       </el-table-column>
@@ -182,8 +161,8 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 import {insertAdd} from "@/api/etl/switch";
-import {selectEngineList} from "@/api/engine/engine";
+import {insert, selectEngineList} from "@/api/engine/engine";
-import {selectList} from "@/api/pay/customer";
+import {del, selectList, update} from "@/api/pay/customer";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -192,14 +171,14 @@ export default {
     //这里存放数据"
 
     return {
-      // dialogFormVisible:false,
+      engineReq:{
-      // SourceReq:{
+
-      //
+      },
-      // },
       engine:{
 
       },
       arr:[],
+      dialogFormVisible:false
     };
   },
   //计算属性 类似于data概念",
@@ -208,15 +187,31 @@ export default {
   watch: {},
   //方法集合",
   methods: {
-    selectList,
+    insert(){
-    // insertAdd(){
+      insert(this.engine).then(res =>{
-    //   this.dialogFormVisible=true
+        this.$message.success(res.msg || "添加成功")
-    // },
+      })
+    },
     findSelectSourceList(){
       selectEngineList().then(res=>{
           this.arr=res.data;
       })
     },
+    handleDelete(id){
+      del(id).then(res =>{
+        this.$message.success(res.msg || "删除成功")
+      })
+    },
+    handUpdate(){
+      update(this.engine).then(res =>{
+        this.$message.success(res.msg || "修改成功")
+      })
+    },
+    findSelectSourceExport(){
+      this.download('engine/engine/export', {
+        ...this.engineReq
+      }, `source_${new Date().getTime()}.xlsx`)
+    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {

src/views/etl/switch/index.vue

@@ -28,10 +28,10 @@
 
     <el-button
       v-hasPermi="['tool:gen:import']"
-      icon="el-icon-upload"
+      icon="el-icon-download"
       plain
       size="mini"
-      type="info"
+      type="warning"
       @click="findSelectSourceExport"
     >导出
     </el-button>
@@ -295,7 +295,9 @@ export default {
       })
     },
     findSelectSourceExport(){
-      selectSourceExport(this.SourceReq).then();
+      this.download('source/source/export', {
+        ...this.SourceReq
+      }, `source_${new Date().getTime()}.xlsx`)
     },
     handleSelectionChange(row){
       this.ids=[];

src/views/port/port/index.vue

@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>手机号查询归属地</span>
+        <el-button style="float: right; padding: 3px 0" type="text">查看</el-button>&nbsp;&nbsp;
+        <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+      </div>
+      <div v-for="o in 4" :key="o" class="text item">
+        {{'列表内容 ' + o }}
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>IP查询归属地</span>
+        <el-button style="float: right; padding: 3px 0" type="text">查看</el-button>&nbsp;&nbsp;
+        <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+      </div>
+      <div v-for="o in 4" :key="o" class="text item">
+        {{'列表内容 ' + o }}
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+export default {
+  //import引入的组件需要注入到对象中才能使用"
+  components: {},
+  props: {},
+  data() {
+    //这里存放数据"
+
+    return {};
+  },
+  //计算属性 类似于data概念",
+  computed: {},
+  //监控data中的数据变化",
+  watch: {},
+  //方法集合",
+  methods: {},
+  //生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）",
+  mounted() {
+  },
+  beforeCreate() {
+  }, //生命周期 - 创建之前",
+  beforeMount() {
+  }, //生命周期 - 挂载之前",
+  beforeUpdate() {
+  }, //生命周期 - 更新之前",
+  updated() {
+  }, //生命周期 - 更新之后",
+  beforeDestroy() {
+  }, //生命周期 - 销毁之前",
+  destroyed() {
+  }, //生命周期 - 销毁完成",
+  activated() {
+  } //如果页面有keep-alive缓存功能，这个函数会触发",
+};
+</script>
+<style scoped>
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    margin-bottom: 18px;
+  }
+
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
+
+  .box-card {
+    width: 480px;
+  }
+</style>