Merge branch 'main' of http://git.hivekion.com:3000/IDCDatasync/IDCDatasync-vue

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

src/views/data/thematicLibrary.vue

@@ -2,9 +2,9 @@
   <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.schemaMass" @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.enName">
-            {{ d.enName }} {{ d.cnName }}
+            {{ d.cnName }}
           </a-select-option>
         </a-select>
       </div>
@@ -45,6 +45,7 @@
         contentList:[],
         datatypequeryParam: {
           schemaMass:"",
+          schemaDesc:"",
           sourceType:3
         },
         queryParam: {
@@ -76,14 +77,12 @@
             dataIndex: 'tableMessName'
           },
           {
-            title: '开始时间',
+            title: '数据类型',
-            align:"center",
+            align: "center",
-            dataIndex: 'startTime'
+            dataIndex: 'tableMessName',
-          },
+            customRender: () => {
-          {
+              return this.datatypequeryParam.schemaDesc;
-            title: '最后更新时间',
+            }
-            align:"center",
-            dataIndex: 'endTime'
           },
           {
             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);

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"
         />
     </a-spin>
   </a-modal>