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) // 初始化图 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); 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" />