From dacfe78a56ed6ea0dc9fcdf7bb0d1e062c6337d8 Mon Sep 17 00:00:00 2001 From: hekaiyu <13673834656@163.com> Date: Wed, 14 May 2025 20:06:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?jvm=E7=99=BE=E5=88=86=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/Analysis.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index ceedb7c..1521c45 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -427,7 +427,7 @@ export default { this.jvmInfo.jvmTotalMemory = res.result.jvmTotalMemory this.jvmInfo.jvmUsedMemory = res.result.jvmUsedMemory this.jvmInfo.jvmFreeMemory = res.result.jvmFreeMemory - this.jvmInfojvmMemoryUsage = res.result.jvmMemoryUsage + this.jvmInfo.jvmMemoryUsage = res.result.jvmMemoryUsage this.jvmInfo.chartDate.xData.push(xlable) this.jvmInfo.chartDate.yData.push(res.result.jvmUsedMemory) // 初始化图 From 5af899a9c1cd6f702cbcb00dfdfd0c0ab792e69f Mon Sep 17 00:00:00 2001 From: hekaiyu <13673834656@163.com> Date: Wed, 14 May 2025 21:11:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E7=A7=8D?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/fileManage/modules/uploadModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/fileManage/modules/uploadModal.vue b/src/views/fileManage/modules/uploadModal.vue index e9901a9..9cb37cd 100644 --- a/src/views/fileManage/modules/uploadModal.vue +++ b/src/views/fileManage/modules/uploadModal.vue @@ -16,7 +16,7 @@ :box-height="50" :max-file="999999" :can-download="false" - accept=".docx,.doc,.png,jpg,.pdf,.mp4" + accept=".txt,.doc,.docx,.xls,.xlsx,.wps,.et,.csv,.xml,.json,.mp3,.mp4,.avi,.wmv,.jpg,.bmp,.png" /> From d9d35c4e5b828e33c193aa75dc863357fed16e24 Mon Sep 17 00:00:00 2001 From: hekaiyu <13673834656@163.com> Date: Sun, 18 May 2025 19:28:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=9856=201.?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=80=9A=E8=BF=87=202.=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=88=97?= =?UTF-8?q?=203.=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8F=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=8F=8F=E8=BF=B0=EF=BC=8C=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B8=A6=E5=AD=97=E6=AF=8DSMZGZB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/data/thematicLibrary.vue | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/views/data/thematicLibrary.vue b/src/views/data/thematicLibrary.vue index 6ce6605..de30a5e 100644 --- a/src/views/data/thematicLibrary.vue +++ b/src/views/data/thematicLibrary.vue @@ -2,9 +2,9 @@
- + - {{ d.enName }} {{ d.cnName }} + {{ d.cnName }}
@@ -45,6 +45,7 @@ contentList:[], datatypequeryParam: { schemaMass:"", + schemaDesc:"", sourceType:3 }, queryParam: { @@ -76,14 +77,12 @@ dataIndex: 'tableMessName' }, { - title: '开始时间', - align:"center", - dataIndex: 'startTime' - }, - { - title: '最后更新时间', - align:"center", - dataIndex: 'endTime' + title: '数据类型', + align: "center", + dataIndex: 'tableMessName', + customRender: () => { + return this.datatypequeryParam.schemaDesc; + } }, { title: '标签类型', @@ -118,6 +117,7 @@ this.dataTypedataSources = res.result.result.DATA_CONN_SPECIAL if(res.result.result.DATA_CONN_SPECIAL.length > 0){ this.datatypequeryParam.schemaMass = res.result.result.DATA_CONN_SPECIAL[0].enName + this.datatypequeryParam.schemaDesc = res.result.result.DATA_CONN_SPECIAL[0].cnName } this.getTables(); } else { @@ -128,6 +128,11 @@ getTables(){ getAction("/dataManager/getDataManagerInfo",this.datatypequeryParam).then((res) => { if (res.result) { + // 根据 enName 查找对应的 cnName + const selectedOption = this.dataTypedataSources.find( + (d) => d.enName === this.datatypequeryParam.schemaMass + ) + this.datatypequeryParam.schemaDesc = selectedOption?selectedOption.cnName:"" this.dataSource = res.result; } else { this.$message.warning(res.message);