From ccb7aabaeb832e20707523a59e39918cff0f7db8 Mon Sep 17 00:00:00 2001 From: Jiang Peng <2622360564@qq.com> Date: Fri, 12 Apr 2024 14:31:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD=20=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login.vue | 4 ++-- src/views/register.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/login.vue b/src/views/login.vue index bdd86d9..5eda208 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -6,7 +6,7 @@ @@ -80,7 +80,7 @@ export default { }, loginRules: { username: [ - {required: true, trigger: "blur", message: "请输入您的账号"} + {required: true, trigger: "blur", message: "请输入您的账号/邮箱"} ], password: [ {required: true, trigger: "blur", message: "请输入您的密码"} diff --git a/src/views/register.vue b/src/views/register.vue index 9b4dc96..aacc15a 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -3,7 +3,7 @@

若依后台管理系统

- + @@ -90,7 +90,7 @@ export default { }, registerRules: { username: [ - {required: true, trigger: "blur", message: "请输入您的账号"}, + {required: true, trigger: "blur", message: "请输入您的账号/邮箱"}, {min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur'} ], password: [ From eb780d381245251fce76dfe8679c9605ea5ae602 Mon Sep 17 00:00:00 2001 From: Jiang Peng <2622360564@qq.com> Date: Fri, 12 Apr 2024 16:20:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=86=E7=A0=81=20=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/index.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index a5014a8..a800db6 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -371,9 +371,12 @@ import { resetUserPwd, updateUser } from "@/api/system/user"; + +import {forceLogout,list} from '@/api/monitor/online'; import {getToken} from "@/utils/auth"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; +import userInfo from '@/views/system/user/profile/userInfo.vue' export default { name: "User", @@ -381,6 +384,10 @@ export default { components: {Treeselect}, data() { return { + queryParam: { + ipaddr: undefined, + userName: undefined + }, // 遮罩层 loading: true, // 选中数组 @@ -624,6 +631,14 @@ export default { }).then(({value}) => { resetUserPwd(row.userId, value).then(response => { this.$modal.msgSuccess("修改成功,新密码是:" + value); + list(this.queryParam).then(res => { + const userList = res.data.rows + userList.forEach(userInfo => { + if(userInfo.userName == row.userName){ + forceLogout(userInfo.tokenId); + } + }) + }) }); }).catch(() => { }); From b638518aff536a365521b6fba0bd5efb42c7e6a2 Mon Sep 17 00:00:00 2001 From: Jiang Peng <2622360564@qq.com> Date: Mon, 22 Apr 2024 13:58:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/etl/source.js | 69 +++++ src/views/etl/assets/index.vue | 143 ++++++++++ src/views/etl/source/index.vue | 502 +++++++++++++++++++++++++++++++++ 3 files changed, 714 insertions(+) create mode 100644 src/api/etl/source.js create mode 100644 src/views/etl/assets/index.vue create mode 100644 src/views/etl/source/index.vue diff --git a/src/api/etl/source.js b/src/api/etl/source.js new file mode 100644 index 0000000..29de5ab --- /dev/null +++ b/src/api/etl/source.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +// 查询【请填写功能名称】列表 +export function listSource(query) { + return request({ + url: '/etl/source/list', + method: 'get', + params: query + }) +} + +export function assetsList(data) { + return request({ + url: '/etl/source/AssetsList', + method: 'post', + data + }) +} + +export function structureList(data) { + return request({ + url: '/etl/source/StructureList', + method: 'post', + data + }) +} + +// 查询【请填写功能名称】详细 +export function getSource(id) { + return request({ + url: '/etl/source/' + id, + method: 'get' + }) +} + +// 新增【请填写功能名称】 +export function addSource(data) { + return request({ + url: '/etl/source', + method: 'post', + data: data + }) +} + +// 测试连接 +export function testConnection(data) { + return request({ + url: '/etl/source/TestConnection', + method: 'post', + data: data + }) +} + +// 修改【请填写功能名称】 +export function updateSource(data) { + return request({ + url: '/etl/source', + method: 'put', + data: data + }) +} + +// 删除【请填写功能名称】 +export function delSource(id) { + return request({ + url: '/etl/source/' + id, + method: 'delete' + }) +} diff --git a/src/views/etl/assets/index.vue b/src/views/etl/assets/index.vue new file mode 100644 index 0000000..b7d9c99 --- /dev/null +++ b/src/views/etl/assets/index.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/etl/source/index.vue b/src/views/etl/source/index.vue new file mode 100644 index 0000000..9475001 --- /dev/null +++ b/src/views/etl/source/index.vue @@ -0,0 +1,502 @@ + + + From d1b4c668f704d9ae6b92e51bbac3503365af3246 Mon Sep 17 00:00:00 2001 From: Jiang Peng <2622360564@qq.com> Date: Tue, 23 Apr 2024 16:23:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/etl/source.js | 24 ++++++ src/views/etl/assets/index.vue | 150 +++++++++++++++++++-------------- src/views/etl/source/index.vue | 39 +++++++-- 3 files changed, 142 insertions(+), 71 deletions(-) diff --git a/src/api/etl/source.js b/src/api/etl/source.js index 29de5ab..94681ed 100644 --- a/src/api/etl/source.js +++ b/src/api/etl/source.js @@ -9,6 +9,22 @@ export function listSource(query) { }) } +export function dataAssetList(data) { + return request({ + url: '/etl/source/DataAssetList', + method: 'post', + data + }) +} + +export function assetModelList(data) { + return request({ + url: '/etl/source/AssetModelList', + method: 'post', + data + }) +} + export function assetsList(data) { return request({ url: '/etl/source/AssetsList', @@ -17,6 +33,14 @@ export function assetsList(data) { }) } +export function synchronousData(data) { + return request({ + url: '/etl/source/SynchronousData', + method: 'post', + data + }) +} + export function structureList(data) { return request({ url: '/etl/source/StructureList', diff --git a/src/views/etl/assets/index.vue b/src/views/etl/assets/index.vue index b7d9c99..455427c 100644 --- a/src/views/etl/assets/index.vue +++ b/src/views/etl/assets/index.vue @@ -1,76 +1,75 @@ + diff --git a/src/views/etl/assets/dashboard/OverallAssets.vue b/src/views/etl/assets/dashboard/OverallAssets.vue new file mode 100644 index 0000000..94acea2 --- /dev/null +++ b/src/views/etl/assets/dashboard/OverallAssets.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/views/etl/assets/dashboard/OverallSpecificAssets.vue b/src/views/etl/assets/dashboard/OverallSpecificAssets.vue new file mode 100644 index 0000000..dd0401f --- /dev/null +++ b/src/views/etl/assets/dashboard/OverallSpecificAssets.vue @@ -0,0 +1,203 @@ + + + + +