30

src/api/emport/Emport.js

@@ -106,3 +106,105 @@ export function deleteDict(dictId) {
         params:{dictId}
     })
 }
+
+/**
+ * 查询数据源字典
+ * @returns {AxiosPromise<any>}
+ */
+export function queryDatasource() {
+    return request({
+        url: `${prefix}/datasource`,
+        method: 'get'
+    })
+}
+
+/**
+ * 查询表信息
+ * @param dataSourceId
+ * @returns {AxiosPromise<any>}
+ */
+export function queryTable(dataSourceId) {
+    return request({
+        url: `${prefix}/datasource/table`,
+        method: 'get',
+        params:{dataSourceId}
+    })
+}
+
+/**
+ * 查询数据库字段字典
+ * @param dataSourceId
+ * @param tableName
+ * @returns {AxiosPromise}
+ */
+export function queryDbField(dataSourceId,tableName) {
+    return request({
+        url: `${prefix}/datasource/field`,
+        method: 'get',
+        params:{dataSourceId,tableName}
+    })
+}
+
+/**
+ * 文件上传
+ * @param data
+ * @returns {*}
+ */
+export async function uploadExcel(data) {
+    return {
+        code: 200
+    }
+}
+
+
+/**
+ * 字段查询
+ * @param params
+ * @returns {*}
+ */
+export function queryField(params) {
+    return request({
+        url: `${prefix}/field`,
+        method: 'get',
+        params
+    })
+}
+
+/**
+ * 新增字段
+ * @param data
+ * @returns {*}
+ */
+export function addField(data) {
+    return request({
+        url: `${prefix}/field`,
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * 修改字段
+ * @param data
+ * @returns {*}
+ */
+export function updateField(data) {
+    return request({
+        url: `${prefix}/field`,
+        method: 'put',
+        data
+    })
+}
+
+/**
+ * 删除字段
+ * @param fieldId
+ * @returns {*}
+ */
+export function deleteField(fieldId) {
+    return request({
+        url: `${prefix}/field`,
+        method: 'delete',
+        params:{fieldId}
+    })
+}

src/api/emport/datasource.js

+import request from '@/utils/request'
+
+// 查询数据源配置列表
+export function listDatasource(query) {
+    return request({
+        url: "/system/datasource/list",
+        method: "get",
+        params: query,
+    });
+}
+
+export function selectDatasource() {
+    return request({
+        url: "/system/datasource/select",
+        method: "get",
+    });
+}
+
+// 查询数据源配置详细
+export function getDatasource(datasourceId) {
+    return request({
+        url: "/system/datasource/" + datasourceId,
+        method: "get",
+    });
+}
+
+// 新增数据源配置
+export function addDatasource(data) {
+    return request({
+        url: "/system/datasource",
+        method: "post",
+        data: data,
+    });
+}
+
+// 修改数据源配置
+export function updateDatasource(data) {
+    return request({
+        url: "/system/datasource",
+        method: "put",
+        data: data,
+    });
+}
+
+// 删除数据源配置
+export function delDatasource(datasourceId) {
+    return request({
+        url: "/system/datasource/" + datasourceId,
+        method: "delete",
+    });
+}
+
+
+// 测试数据源连通性
+export function testDatasourceConect(param) {
+    return request({
+        url: "/system/datasource/getTestConnectBySource",
+        method: "get",
+        params:param
+    });
+}

src/layout/EmptyLayout/Index.vue

@@ -7,8 +7,8 @@
       </div>
       <el-menu :default-active="key" class="empty-menu" mode="horizontal" @select="handleSelect">
         <el-menu-item index="/emport">数据导入</el-menu-item>
-        <el-menu-item index="/authorization">授权管理</el-menu-item>
-        <el-menu-item index="/catalog">目录管理</el-menu-item>
+        <el-menu-item index="/rule">规则管理</el-menu-item>
+        <el-menu-item index="/datasource">数据源管理</el-menu-item>
       </el-menu>
       <!--快捷功能操作区-->
       <div v-if="false" class="operator">
@@ -27,8 +27,8 @@
 </template>
 
 <script>
-import WindowUtil from "@/utils/document/WindowUtil";
-import defaultSettings from '@/settings'
+import WindowUtil from '@/utils/document/WindowUtil'
+
 export default {
   name: 'EmptyLayout',
   computed: {

src/utils/document/StringUtil.js

@@ -20,4 +20,15 @@ export default class StringUtil {
         }
         return str1.toString() === str2.toString();
     }
+
+    /**
+     * 多字符串合并展示
+     * @param str
+     * @returns {string}
+     */
+    static mergeStr(...str){
+        return str.filter(item=>{
+            return !this.isEmpty(item)
+        }).join(" - ")
+    }
 }

src/utils/request.js

 import axios from 'axios'
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import { Loading, Message, MessageBox, Notification } from 'element-ui'
 import store from '@/store'
 import { getToken, removeToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from '@/utils/ruoyi'
+import { blobValidate, tansParams } from '@/utils/ruoyi'
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 
@@ -19,7 +19,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 1000*60*10
 })
 
 // request拦截器

src/views/emport/rule/index.vue

+<template>
+
+</template>
+
+<script>
+export default {
+    name: 'Rule'
+}
+</script>
+
+<style scoped>
+
+</style>