From 6ac0efe235670df835805c46930a65269c14cb50 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Sat, 8 Mar 2025 17:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/dataCleansing.vue     |  70 ++++-------------
 src/views/data/dataManage.vue        |  68 ++++-------------
 src/views/data/thematicLibrary.vue   | 109 +++++++++++----------------
 src/views/user/LoginSelectTenant.vue |  10 +--
 4 files changed, 80 insertions(+), 177 deletions(-)

diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue
index 019aa6c..bf505bd 100644
--- a/src/views/data/dataCleansing.vue
+++ b/src/views/data/dataCleansing.vue
@@ -3,8 +3,8 @@
     <a-col :md="12" :sm="1" >
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
-         <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="queryParam.datatype" @change="getTables" style="width: 40%;">
-            <a-select-option v-for="d in dataTypedataSources" :key="d.id">
+         <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="datatypequeryParam.schemaName" @change="getTables" style="width: 40%;">
+            <a-select-option v-for="d in dataTypedataSources" :key="d.enName">
               {{ d.cnName }}
             </a-select-option>
           </a-select>
@@ -66,55 +66,16 @@
         contentList:[],
         percent:0,
         websock:{},
+        datatypequeryParam: {
+          schemaName:"",
+          sourceType:1
+        },
         queryParam: {
-          datatype:"",
           pageNum :1,
           pageSize:9999999,
         },
         dataTypedataSources: [],
         dataSource:[
-          {
-            tableName:"LA_DATA_TABLE_0001",
-            data1:"舰艇综合导航信息II",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"侦察预警、指挥控制",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0002",
-            data1:"动力报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"指挥控制",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0003",
-            data1:"电测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"支援保障",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0004",
-            data1:"损管测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"支援保障",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0005",
-            data1:"舰炮测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"装备运行状态",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0006",
-            data1:"反潜测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"装备运行状态",
-          },
         ],
         columns: [
           {
@@ -210,22 +171,21 @@
         dataTypePageList(this.queryParam).then((res) => {
             if (res.success) {
                 this.dataTypedataSources = res.result.rows||res.result;
-                this.queryParam.datatype = res.result.rows[0].cnName
+                this.queryParam.schemaName = res.result.rows[0].enName
+                this.getTables();
             } else {
                 this.$message.warning(res.message);
             }
         });
       },
       getTables(){
-        // datasyncgetTableInfo().then((res) => {
-        //     if (res.result) {
-        //       this.confirmLoading = false;
-        //       this.dataSource = res.result;
-        //       this.models = 2;
-        //     } else {
-        //         this.$message.warning(res.message);
-        //     }
-        // });
+        getAction("/dataManager/getDataManagerInfo",datatypequeryParam).then((res) => {
+            if (res.result) {
+              this.dataSource = res.result;
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
       },
     }
   }
diff --git a/src/views/data/dataManage.vue b/src/views/data/dataManage.vue
index 3f94e74..79e52d9 100644
--- a/src/views/data/dataManage.vue
+++ b/src/views/data/dataManage.vue
@@ -3,7 +3,7 @@
     <a-col :md="12" :sm="1" >
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
-         <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="queryParam.datatype" @change="getTables" style="width: 40%;">
+         <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="datatypequeryParam.schemaName" @change="getTables" style="width: 40%;">
             <a-select-option v-for="d in dataTypedataSources" :key="d.id">
               {{ d.cnName }}
             </a-select-option>
@@ -72,55 +72,16 @@
         contentList:[],
         percent:0,
         websock:{},
+        datatypequeryParam: {
+          schemaName:"",
+          sourceType:2
+        },
         queryParam: {
-          datatype:"",
           pageNum :1,
           pageSize:9999999,
         },
         dataTypedataSources: [],
         dataSource:[
-          {
-            tableName:"LA_DATA_TABLE_0001",
-            data1:"舰艇综合导航信息II",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"侦察预警、指挥控制",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0002",
-            data1:"动力报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"指挥控制",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0003",
-            data1:"电测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"支援保障",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0004",
-            data1:"损管测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"支援保障",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0005",
-            data1:"舰炮测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"装备运行状态",
-          },
-          {
-            tableName:"LA_DATA_TABLE_0006",
-            data1:"反潜测试报文",
-            data2:"2024-03-06 10:30:26",
-            data3:"2024-03-06 15:30:26",
-            data4:"装备运行状态",
-          },
         ],
         columns: [
           {
@@ -218,22 +179,21 @@
         dataTypePageList(this.queryParam).then((res) => {
             if (res.success) {
                 this.dataTypedataSources = res.result.rows||res.result;
-                this.queryParam.datatype = res.result.rows[0].cnName
+                this.queryParam.schemaName = res.result.rows[0].enName
+                this.getTables();
             } else {
                 this.$message.warning(res.message);
             }
         });
       },
       getTables(){
-        // datasyncgetTableInfo().then((res) => {
-        //     if (res.result) {
-        //       this.confirmLoading = false;
-        //       this.dataSource = res.result;
-        //       this.models = 2;
-        //     } else {
-        //         this.$message.warning(res.message);
-        //     }
-        // });
+        getAction("/dataManager/getDataManagerInfo",datatypequeryParam).then((res) => {
+            if (res.result) {
+              this.dataSource = res.result;
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
       },
     }
   }
diff --git a/src/views/data/thematicLibrary.vue b/src/views/data/thematicLibrary.vue
index b655878..c4a188f 100644
--- a/src/views/data/thematicLibrary.vue
+++ b/src/views/data/thematicLibrary.vue
@@ -1,17 +1,28 @@
 <template>
     <a-row :gutter="30">
       <a-col :md="24" :sm="1" >
-          <!-- table区域-begin -->
-          <div style="height:900px;overflow-y:auto;">
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource">
+        <div class="table-page-search-wrapper">
+         <a-select  placeholder="选择数据类型"  option-filter-prop="children" v-model="datatypequeryParam.schemaName" @change="getTables" style="width: 40%;">
+            <a-select-option v-for="d in dataTypedataSources" :key="d.id">
+              {{ d.cnName }}
+            </a-select-option>
+          </a-select>
+        </div>
+        <!-- table区域-begin -->
+        <div style="height:900px;overflow-y:auto;">
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            :pagination="false"
+            :scroll="{ y: 800 }"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource">
+    <!--        :locale="myLocale"-->
 
-            </a-table>
+            <!-- 字符串超长截取省略号显示-->
+          </a-table>
           </div>
       </a-col>
     </a-row>
@@ -28,53 +39,16 @@
         return {
           description: '专题库',
           contentList:[],
+          datatypequeryParam: {
+            schemaName:"",
+            sourceType:3
+          },
           queryParam: {
             pageNum :1,
-            pageSize:20
+            pageSize:9999999,
           },
+          dataTypedataSources: [],
           dataSource:[
-            {
-              tableName:"LA_DATA_TABLE_0001",
-              data1:"舰艇综合导航信息II",
-              data2:"2024-03-06 10:30:26",
-              data3:"2024-03-06 15:30:26",
-              data4:"3646135477",
-            },
-            {
-              tableName:"LA_DATA_TABLE_0002",
-              data1:"动力报文",
-              data2:"2024-03-06 10:30:26",
-              data3:"2024-03-06 15:30:26",
-              data4:"92547612",
-            },
-            {
-              tableName:"LA_DATA_TABLE_0003",
-              data1:"电测试报文",
-              data2:"2024-03-06 10:30:26",
-              data3:"2024-03-06 15:30:26",
-              data4:"1658432215",
-            },
-            {
-              tableName:"LA_DATA_TABLE_0004",
-              data1:"损管测试报文",
-              data2:"2024-03-06 10:30:26",
-              data3:"2024-03-06 15:30:26",
-              data4:"8535411",
-            },
-            {
-              tableName:"LA_DATA_TABLE_0005",
-              data1:"舰炮测试报文",
-              data2:"2024-03-06 10:30:26",
-              data3:"2024-03-06 15:30:26",
-              data4:"1235744",
-            },
-            {
-              tableName:"LA_DATA_TABLE_0006",
-              data1:"反潜测试报文",
-              data2:"2024-03-06 10:30:26",
-              data3:"2024-03-06 15:30:26",
-              data4:"159748153",
-            },
           ],
           columns: [
             {
@@ -116,7 +90,7 @@
         }
       },
       mounted() { 
-         this.getTables()
+         this.getselect()
       },
       computed: {
       },
@@ -126,16 +100,25 @@
   
       },
       methods: {
+        getselect(){
+          dataTypePageList(this.queryParam).then((res) => {
+              if (res.success) {
+                  this.dataTypedataSources = res.result.rows||res.result;
+                  this.queryParam.schemaName = res.result.rows[0].enName
+                  this.getTables();
+              } else {
+                  this.$message.warning(res.message);
+              }
+          });
+        },
         getTables(){
-          // datasyncgetTableInfo().then((res) => {
-          //     if (res.result) {
-          //       this.confirmLoading = false;
-          //       this.dataSource = res.result;
-          //       this.models = 2;
-          //     } else {
-          //         this.$message.warning(res.message);
-          //     }
-          // });
+          getAction("/dataManager/getDataManagerInfo",datatypequeryParam).then((res) => {
+              if (res.result) {
+                this.dataSource = res.result;
+              } else {
+                  this.$message.warning(res.message);
+              }
+          });
         },
       }
     }
diff --git a/src/views/user/LoginSelectTenant.vue b/src/views/user/LoginSelectTenant.vue
index fd4b46d..9df5699 100644
--- a/src/views/user/LoginSelectTenant.vue
+++ b/src/views/user/LoginSelectTenant.vue
@@ -97,11 +97,11 @@
         let multi_depart = loginResult.multi_depart
         //0:无部门 1:一个部门 2:多个部门
         if(multi_depart==0){
-          this.$notification.warn({
-            message: '提示',
-            description: `您尚未归属部门,请确认账号信息`,
-            duration:3
-          });
+          // this.$notification.warn({
+          //   message: '提示',
+          //   description: `您尚未归属部门,请确认账号信息`,
+          //   duration:3
+          // });
           this.isMultiDepart = false
         }else if(multi_depart==2){
           this.visible=true