diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index e52ce3b..6921440 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -115,11 +115,11 @@
总内存:
{{ memoryInfo.totalMemory }}
已用内存:
- {{ memoryInfo.usedMemory }}%
+ {{ memoryInfo.usedMemory }}GB
剩余内存:
- {{ memoryInfo.freeMemory }}%
+ {{ memoryInfo.freeMemory }}GB
使用率:
- {{ memoryInfo.memoryUsage }}%
+ {{ memoryInfo.memoryUsage }}GB
总内存:
{{ jvmInfo.jvmTotalMemory }}
已用内存:
- {{ jvmInfo.jvmUsedMemory }}%
+ {{ jvmInfo.jvmUsedMemory }}GB
剩余内存:
- {{ jvmInfo.jvmFreeMemory }}%
+ {{ jvmInfo.jvmFreeMemory }}GB
使用率:
- {{ jvmInfo.jvmMemoryUsage }}%
+ {{ jvmInfo.jvmMemoryUsage }}GB
{
if (res.success) {
+ console.log(res);
that.$message.success(res.result);
that.visible =false;
that.$emit('ok');
} else {
- that.$message.warning(res.message);
- that.confirmLoading = false;
+ that.$message.warning(res.result);
}
+ that.confirmLoading = false;
})
}
})
diff --git a/src/views/data/thematicLibrary.vue b/src/views/data/thematicLibrary.vue
index 7bc5b4b..aa898ca 100644
--- a/src/views/data/thematicLibrary.vue
+++ b/src/views/data/thematicLibrary.vue
@@ -2,7 +2,7 @@
-
+
{{ d.cnName }}
@@ -44,7 +44,7 @@
description: '专题库',
contentList:[],
datatypequeryParam: {
- schemaName:"",
+ schemaMass:"",
sourceType:3
},
queryParam: {
diff --git a/src/views/datalink/modules/SliceUpload.vue b/src/views/datalink/modules/SliceUpload.vue
index 5e09058..7c7feab 100644
--- a/src/views/datalink/modules/SliceUpload.vue
+++ b/src/views/datalink/modules/SliceUpload.vue
@@ -432,7 +432,9 @@ export default {
width: 100%;
}
}
-
+.fileName{
+ color: black;
+}
.result-wrapper {
margin-top: 10px;
width: 100%;
diff --git a/src/views/fileManage/modules/SliceUpload.vue b/src/views/fileManage/modules/SliceUpload.vue
index 05ea86f..61fff0e 100644
--- a/src/views/fileManage/modules/SliceUpload.vue
+++ b/src/views/fileManage/modules/SliceUpload.vue
@@ -450,7 +450,9 @@ export default {
position: absolute;
top: 2px
}
-
+.fileName{
+ color: black;
+}
.result-wrapper {
margin-top: 10px;
width: 100%;