From 78ced28f2de2374d008ecd9e133c3c40c1134f7c Mon Sep 17 00:00:00 2001 From: 2812875475 <2812875475@qq.com> Date: Sun, 21 Apr 2024 20:21:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=95=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detabase.js => source/source.js} | 16 +-- src/layout/components/Navbar.vue | 1 - .../detabase => source/source}/index.vue | 27 ++-- .../analysis => source/structure}/index.vue | 132 ++++++++++++++---- vue.config.js | 2 +- 5 files changed, 133 insertions(+), 45 deletions(-) rename src/api/{detabase/detabase.js => source/source.js} (75%) rename src/views/{detabase/detabase => source/source}/index.vue (96%) rename src/views/{detabase/analysis => source/structure}/index.vue (54%) diff --git a/src/api/detabase/detabase.js b/src/api/source/source.js similarity index 75% rename from src/api/detabase/detabase.js rename to src/api/source/source.js index 3d9292b..2c91872 100644 --- a/src/api/detabase/detabase.js +++ b/src/api/source/source.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询数据源列表 export function listDetabase(query) { return request({ - url: '/detabase/detabase/list', + url: '/source/source/list', method: 'get', params: query }) @@ -12,14 +12,14 @@ export function listDetabase(query) { // 查询数据源详细 export function getDetabase(id) { return request({ - url: '/detabase/detabase/' + id, + url: '/source/source/' + id, method: 'get' }) } //测试数据库连接 export function testConnection(data) { return request({ - url: '/detabase/detabase/testConnection', + url: '/source/source/testConnection/', method: 'post', data: data }) @@ -28,7 +28,7 @@ export function testConnection(data) { export function selectDatabaseList(data) { return request({ - url: '/detabase/detabase/selectDatabaseList', + url: '/source/source/selectDatabaseList', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function selectDatabaseList(data) { //查询数据库下表名 export function selectedDatabaseList(data) { return request({ - url: '/detabase/detabase/selectedDatabaseList', + url: '/source/source/selectedDatabaseList', method: 'post', data: data }) @@ -46,7 +46,7 @@ export function selectedDatabaseList(data) { // 新增数据源 export function addDetabase(data) { return request({ - url: '/detabase/detabase', + url: '/source/source', method: 'post', data: data }) @@ -55,7 +55,7 @@ export function addDetabase(data) { // 修改数据源 export function updateDetabase(data) { return request({ - url: '/detabase/detabase/'+data.id, + url: '/source/source/'+data.id, method: 'put', data: data }) @@ -64,7 +64,7 @@ export function updateDetabase(data) { // 删除数据源 export function delDetabase(id) { return request({ - url: '/detabase/detabase/' + id, + url: '/source/source/' + id, method: 'delete' }) } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 73af5a6..a0c5f08 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -107,7 +107,6 @@ import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' -import {noticList, readNotic} from "@/api/system/notice"; export default { diff --git a/src/views/detabase/detabase/index.vue b/src/views/source/source/index.vue similarity index 96% rename from src/views/detabase/detabase/index.vue rename to src/views/source/source/index.vue index b77a668..2d02561 100644 --- a/src/views/detabase/detabase/index.vue +++ b/src/views/source/source/index.vue @@ -87,7 +87,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['detabase:detabase:add']" + v-hasPermi="['source:source:add']" >新增 @@ -98,7 +98,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['detabase:detabase:edit']" + v-hasPermi="['source:source:edit']" >修改 @@ -109,7 +109,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['detabase:detabase:remove']" + v-hasPermi="['source:source:remove']" >删除 @@ -119,7 +119,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['detabase:detabase:export']" + v-hasPermi="['source:source:export']" >导出 @@ -149,20 +149,21 @@ type="text" icon="el-icon-edit" @click="testContest(scope.row)" + v-hasPermi="['source:source:testConnection']" >测试连接 修改 删除 @@ -332,10 +333,10 @@ import { addDetabase, updateDetabase, testConnection, selectDatabaseList -} from "@/api/detabase/detabase"; +} from "@/api/source/source"; export default { - name: "Detabase", + name: "source", data() { return { // 遮罩层 @@ -516,7 +517,11 @@ export default { console.log(params) testConnection(params).then( res=>{ - this.$message.success(res.data) + if (res.code == 200) { + this.$message.success(res.data) + }else { + this.$message.success(res.msg) + } } ) }, @@ -571,9 +576,9 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('detabase/detabase/export', { + this.download('source/source/export', { ...this.queryParams - }, `detabase_${new Date().getTime()}.xlsx`) + }, `source${new Date().getTime()}.xlsx`) } } }; diff --git a/src/views/detabase/analysis/index.vue b/src/views/source/structure/index.vue similarity index 54% rename from src/views/detabase/analysis/index.vue rename to src/views/source/structure/index.vue index ea08c8c..91b0104 100644 --- a/src/views/detabase/analysis/index.vue +++ b/src/views/source/structure/index.vue @@ -13,36 +13,61 @@ v-for="(database, dbIndex) in item.databaseList" :key="dbIndex" :index="item.id + '-' + (dbIndex + 1)" + class="custom-menu-item" > - {{ database }} + {{ database}} + + + {{item}} + + - - - - - 查看 - 新增 - 删除 - - - 王小虎 - - - + + + +

{{title}}--资产结构概述

- - - - - - - + + + + + + + + + + + + Aside + + Main + Footer + + + + + 查询 + + + + @@ -56,7 +81,7 @@ import { selectedDatabase, selectedDatabaseList, selectedMenu -} from "@/api/detabase/detabase"; +} from "@/api/source/source"; export default { name: 'Index', @@ -74,23 +99,49 @@ export default { /*数据源查询条件*/ queryParams: {}, databaseList:[], - tableList:[] + tableList:[], + select:[], + selectSqlResp:{}, + title:'' } }, created() { this.getList() }, + watch:{ + "select":{ + handler(val){ + val.forEach(item=>{ + if(item){ + this.selectSqlResp.tableName=item + } + }) + }, + deep:true + } + }, methods: { + selectSql(){ + console.log(this.selectSqlResp) + }, /*选中标题*/ handSubmenuTitle(item){ + this.title=item.name let databaseConnect={}; + item.databaseList=[] databaseConnect.username=item.username; databaseConnect.password=item.password; databaseConnect.host=item.host; databaseConnect.type=item.type; selectDatabaseList(databaseConnect).then( res=>{ - item.databaseList=res.data + /*所有数据库*/ + //item.databaseList=res.data + res.data.forEach(item1=>{ + if(item1==item.databaseName){ + item.databaseList.push(item1) + } + }) } ) console.log(item) @@ -137,6 +188,7 @@ export default { password: item.password, type: item.type, connectionParam: item.connectionParam, + databaseName: item.databaseName, databaseList:[ ] @@ -150,6 +202,14 @@ export default { } diff --git a/vue.config.js b/vue.config.js index 6e14aed..dd8b15d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,7 +35,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8081`, + target: `http://localhost:8080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''