From 6454e7d76f47b6337d7869f34e584f7f73e6cc5f Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Fri, 9 May 2025 12:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue             | 12 ++++++------
 src/views/data/modules/dataIndexingModal.vue | 12 +++++++++---
 src/views/data/thematicLibrary.vue           |  4 ++--
 src/views/datalink/modules/SliceUpload.vue   |  4 +++-
 src/views/fileManage/modules/SliceUpload.vue |  4 +++-
 5 files changed, 23 insertions(+), 13 deletions(-)

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 @@
             <span class="subTitle">总内存：</span>
             <span class="clore5">{{ memoryInfo.totalMemory }}</span>
             <span class="subTitle">已用内存：</span>
-            <span class="clore6">{{ memoryInfo.usedMemory }}% </span>
+            <span class="clore6">{{ memoryInfo.usedMemory }}GB </span>
             <span class="subTitle">剩余内存：</span>
-            <span class="clore7">{{ memoryInfo.freeMemory }}%</span>
+            <span class="clore7">{{ memoryInfo.freeMemory }}GB</span>
             <span class="subTitle">使用率：</span>
-            <span class="clore8">{{ memoryInfo.memoryUsage }}%</span>
+            <span class="clore8">{{ memoryInfo.memoryUsage }}GB</span>
           </div>
         </div>
         <div id="catalogingStorage" class="catalogingStorage" ref="catalogingStorage"
@@ -134,11 +134,11 @@
             <span class="subTitle">总内存：</span>
             <span class="clore5">{{ jvmInfo.jvmTotalMemory }}</span>
             <span class="subTitle">已用内存：</span>
-            <span class="clore6">{{ jvmInfo.jvmUsedMemory }}% </span>
+            <span class="clore6">{{ jvmInfo.jvmUsedMemory }}GB </span>
             <span class="subTitle">剩余内存：</span>
-            <span class="clore7">{{ jvmInfo.jvmFreeMemory }}%</span>
+            <span class="clore7">{{ jvmInfo.jvmFreeMemory }}GB</span>
             <span class="subTitle">使用率：</span>
-            <span class="clore8">{{ jvmInfo.jvmMemoryUsage }}%</span>
+            <span class="clore8">{{ jvmInfo.jvmMemoryUsage }}GB</span>
           </div>
         </div>
         <div id="typeStorage" class="typeStorage" ref="typeStorage"
diff --git a/src/views/data/modules/dataIndexingModal.vue b/src/views/data/modules/dataIndexingModal.vue
index ff7cb09..1cca7c0 100644
--- a/src/views/data/modules/dataIndexingModal.vue
+++ b/src/views/data/modules/dataIndexingModal.vue
@@ -108,6 +108,11 @@ import pick from 'lodash.pick'
         this.schemaMass = schemaMass;
         this.tableName = tableName;
         this.visible =true;
+        this.form ={
+          indexName: '',
+          columnName: '',
+          indexTypeId: 0
+        },
         this.getQuerytableColumns()
       },
       edit (schemaMass,tableName,record) {
@@ -134,16 +139,17 @@ import pick from 'lodash.pick'
             this.model.indexName = this.form.indexName;
             this.model.columns = this.checkedList.join(',');
             this.model.indexTypeCode = this.form.indexTypeId;
-            console.log(this.model);
+            
             postAction("/tableIndex/updateIndexSafe?schemaMass="+this.schemaMass+"&tableName="+this.tableName+"&indexName="+this.model.indexName+"&columns="+this.model.columns+"&indexTypeCode="+this.model.indexTypeCode,{}).then(res => {
               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 @@
   <a-row :gutter="30">
     <a-col :md="24" :sm="1" >
       <div class="table-page-search-wrapper"style="background: #e6e9f1;padding:10px;">
-       <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="datatypequeryParam.schemaName" @change="getTables" style="width: 40%;">
+       <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="datatypequeryParam.schemaMass" @change="getTables" style="width: 40%;">
           <a-select-option v-for="d in dataTypedataSources" :key="d.cnName">
             {{ d.cnName }}
           </a-select-option>
@@ -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%;