模式名称改成下拉框

vue-fastapi-backend/module_admin/controller/meta_controller.py

@@ -21,6 +21,13 @@ async def get_meta_list(request: Request, meta_query: MetaPageObject = Depends(M
     return ResponseUtil.success(data=meta_query_result)
 
 
+@metaController.get("/meta/mdlname/list/{ssysId}")
+async def get_mdlname_list(request: Request, ssysId: int,
+                           query_db: AsyncSession = Depends(get_db)):
+    result = await MetaService.get_mdlname_list(query_db, ssysId)
+    return ResponseUtil.success(data=result)
+
+
 @metaController.get("/meta/column/list")
 async def get_meta_list(request: Request, meta_query: MetaColObject = Depends(MetaColObject.as_query),
                         query_db: AsyncSession = Depends(get_db)):

vue-fastapi-backend/module_admin/dao/meta_dao.py

@@ -553,6 +553,13 @@ class MetaDao:
         )).first()
         return CamelCaseUtil.transform_result(result)
 
+    @classmethod
+    async def get_mdlname_list(cls, db: AsyncSession, ssysId: int):
+        sql = text("select DISTINCT mdl_name from t_metadata_extract_info where ssys_id= :ssysId")
+        result = (await db.execute(sql, {"ssysId": ssysId})).scalars().all()
+        return result
+
+
     @classmethod
     async def get_meta_table_cn_name(cls, db: AsyncSession, ssys_id: int, mdlName: str, tabEngName: str):
         sql = text("select case when a.tab_cn_name is null then b.tab_crrct_name"

vue-fastapi-backend/module_admin/service/meta_service.py

@@ -243,6 +243,10 @@ class MetaService:
         table['columnList'] = CamelCaseUtil.transform_result(columnList)
         return table
 
+    @classmethod
+    async def get_mdlname_list(cls, result_db: AsyncSession, ssysId: int):
+        return await MetaDao.get_mdlname_list(result_db, ssysId)
+
     @classmethod
     async def getBusinessRelationShip(cls, result_db: AsyncSession, meta_query: MetaBusinessRelShipObject):
         currentNodeList = await cls.getRelationByTable(result_db, meta_query.ssys_id, meta_query.mdl_name,

vue-fastapi-frontend/src/api/meta/metaInfo.js

@@ -35,6 +35,14 @@ export function getMetaDataList(query) {
   })
 }
 
+// 查询参数列表
+export function listMdlNameBySysId(id) {
+  return request({
+    url: '/default-api/dasset/meta/mdlname/list/'+id,
+    method: 'get'
+  })
+}
+
 export function getColumnList(query){
   return request({
     url:'/default-api/dasset/meta/column/list',

vue-fastapi-frontend/src/views/meta/metaInfo/index.vue

@@ -37,13 +37,9 @@
             />
           </el-form-item>
           <el-form-item label="模式名称:">
-            <el-input
+            <el-select v-model="queryParams.mdlName" style="width: 240px" @change="handleQuery" clearable>
-                v-model="queryParams.mdlName"
+              <el-option v-for="(item,index) in mdlList" :value="item" :label="item" :key="index"></el-option>
-                placeholder="请输入搜索模式名称"
+            </el-select>
-                clearable
-                style="width: 240px"
-                @keyup.enter="handleQuery"
-            />
           </el-form-item>
           <el-form-item label="列名称:">
             <el-input
@@ -129,7 +125,7 @@
             <template #default="scope">
               <svg-icon v-if="scope.row.hasAsset === '1'" icon-class="assets"  style="color: #00bb00;width: 20px;height: 20px"/>
               <svg-icon v-if="scope.row.hasAsset === '2'" icon-class="assets"  style="width: 20px;height: 20px"/>
-              <span v-else></span>
+              <span v-if="scope.row.hasAsset !== '1' && scope.row.hasAsset !== '2'">{{''}}</span>
             </template>
           </el-table-column>
           <el-table-column label="系统英文名" width="100" align="center" prop="ssysCd"></el-table-column>
@@ -142,14 +138,18 @@
           <el-table-column label="对象中文名" width="100" align="center" prop="tabCnName"></el-table-column>
           <el-table-column label="对象标签" width="200" align="center" prop="batchTabClas">
             <template #default="scope">
-              <el-popover  placement="right" width="auto" trigger="hover">
+              <el-popover v-if="scope.row.tempTabClas && scope.row.tempTabClas.length>0"   placement="right" width="auto" trigger="hover">
                 <template #reference>
                   <template v-for="item in scope.row.tempTabClas">
                     <el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName}}</el-tag>
+                    <span v-else>{{''}}</span>
                   </template>
                 </template>
                 <div>
-                  <div style="margin: 5px" v-for="item in scope.row.showTabClas"><el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName + ":" + item.clasValue}}</el-tag></div>
+                  <div style="margin: 5px" v-if="scope.row.showTabClas && scope.row.showTabClas.length>0" v-for="item in scope.row.showTabClas" >
+                    <el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName + ":" + item.clasValue}}</el-tag>
+                    <span v-else>{{''}}</span>
+                  </div>
                 </div>
               </el-popover>
             </template>
@@ -906,7 +906,7 @@
 </template>
 
 <script setup name="Meta">
-  import {getDataSourceList, getMetaDataList, getColumnList, getMetaClasList, postMetaSupp, getMetaDataRelship, getMetaDataBloodRelship, getProcData, runBloodAnalysis, publishAstData} from "@/api/meta/metaInfo"
+  import {getDataSourceList, getMetaDataList, getColumnList, getMetaClasList, postMetaSupp, getMetaDataRelship, getMetaDataBloodRelship, getProcData, runBloodAnalysis, publishAstData, listMdlNameBySysId} from "@/api/meta/metaInfo"
   import { getMetaSecurityData } from "@/api/dataAsset/directory"
   import {getStdDict, listStdDictNoPage, listStdMainSelect} from "@/api/datastd/std.js"
   import { ref, nextTick, computed, watch, reactive, onMounted } from 'vue'
@@ -923,7 +923,6 @@
   import {ElMessage} from "element-plus";
   import useUserStore from '@/store/modules/user'
 
-
   const userStore = useUserStore()
   const dsSysList = userStore.dsSysList
   const data = reactive({
@@ -955,6 +954,7 @@
   const route = useRoute();
   // const router = useRouter()
   const { queryParams, currentMetaData } = toRefs(data);
+  const mdlList = ref([])
   const loading = ref(true);
   const drawer = ref(false);
   const dataList = ref([]);
@@ -1869,10 +1869,17 @@
     if (!value) return true;
     return data.name.indexOf(value) !== -1;
   }
+  function getMdlNameList(id){
+    listMdlNameBySysId(id).then(res=>{
+      mdlList.value = res.data
+    })
+  }
   function handleNodeClick(data) {
     queryParams.value.ssysId = data.id;
+    getMdlNameList(queryParams.value.ssysId)
     handleQuery();
   }
+
   watch(database, val => {
     proxy.$refs["databaseTreeRef"].filter(val);
   });

vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue

@@ -3,13 +3,16 @@
     <el-row :gutter="10" class="mb8">
       <el-form :inline="true" :model="queryForm">
         <el-form-item label="归属系统">
-          <el-select v-model="queryForm.ssysId" placeholder="请选择系统" clearable filterable style="width: 180px">
+          <el-select v-model="queryForm.ssysId" placeholder="请选择系统" clearable filterable style="width: 180px" @change="changeSysId">
             <el-option label="*" :value="-1"></el-option>
             <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="模式名">
-          <el-input v-model="queryForm.mdlName" placeholder="请输入模式名" clearable />
+          <el-select v-model="queryForm.mdlName" clearable style="width: 180px" allow-create filterable>
+            <el-option label="*" value="*"></el-option>
+            <el-option v-for="(item,index) in mdlList" :label="item" :value="item" :key="index"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="Search" @click="handleSearch">搜索</el-button>
@@ -102,13 +105,16 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="所属系统" prop="ssysId">
-          <el-select v-model="form1.ssysId" placeholder="请选择系统" clearable filterable style="width: 350px">
+          <el-select v-model="form1.ssysId" placeholder="请选择系统" @change="changeDialogSysId(form1.ssysId)" clearable filterable style="width: 350px">
             <el-option label="*" :value="-1"></el-option>
             <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="所属模式" prop="mdlName">
-          <el-input v-model="form1.mdlName" autocomplete="off"  />
+          <el-select v-model="form1.mdlName" clearable style="width: 350px" allow-create filterable>
+            <el-option label="*" value="*"></el-option>
+            <el-option v-for="(item,index) in dialogMdlList" :label="item" :value="item" :key="index"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -133,13 +139,16 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="所属系统" prop="ssysId">
-          <el-select v-model="form2.ssysId" placeholder="请选择系统" clearable filterable style="width: 350px">
+          <el-select v-model="form2.ssysId" placeholder="请选择系统" @change="changeDialogSysId(form2.ssysId)" clearable filterable style="width: 350px">
             <el-option label="*" :value="-1"></el-option>
             <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="所属模式" prop="mdlName">
-          <el-input v-model="form2.mdlName" autocomplete="off"  />
+          <el-select v-model="form2.mdlName" clearable style="width: 350px" allow-create filterable>
+            <el-option label="*" value="*"></el-option>
+            <el-option v-for="(item,index) in dialogMdlList" :label="item" :value="item" :key="index"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -167,13 +176,16 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="所属系统" prop="ssysId">
-          <el-select v-model="form3.ssysId" placeholder="请选择系统" clearable filterable style="width: 350px">
+          <el-select v-model="form3.ssysId" placeholder="请选择系统" @change="changeDialogSysId(form3.ssysId)" clearable filterable style="width: 350px">
             <el-option label="*" :value="-1"></el-option>
             <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="所属模式" prop="mdlName">
-          <el-input v-model="form3.mdlName" autocomplete="off"  />
+          <el-select v-model="form3.mdlName" clearable style="width: 350px" allow-create filterable>
+            <el-option label="*" value="*"></el-option>
+            <el-option v-for="(item,index) in dialogMdlList" :label="item" :value="item" :key="index"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -202,7 +214,8 @@ import {
   addDataopLabel,
   getColOpTypeLabelList,
 } from "@/api/metadataConfig/metadataConfig";
-import useUserStore  from '@/store/modules/user'; // 注意路径是否正确
+import useUserStore  from '@/store/modules/user';
+import {listMdlNameBySysId} from "../../../api/meta/metaInfo.js"; // 注意路径是否正确
 
 const userStore = useUserStore(); // 正确调用
 const dsSysList = userStore.dsSysList; // 访问属性
@@ -210,6 +223,8 @@ const queryForm = reactive({
   ssysId: undefined,
   mdlName: "",
 });
+const mdlList = ref([])
+const dialogMdlList = ref([])
 const activeTab = ref('valueType');
 const configList1 = ref([]); // 值类型参数数据
 const configList2 = ref([]); // 业务类型参数数据
@@ -378,6 +393,24 @@ function handleSearch() {
 
 }
 
+function changeSysId(){
+  if (queryForm.ssysId){
+    listMdlNameBySysId(queryForm.ssysId).then(res=>{
+      mdlList.value = res.data
+    })
+  }else {
+    mdlList.value = []
+  }
+
+}
+function changeDialogSysId(ssysId){
+  if (ssysId){
+    listMdlNameBySysId(ssysId).then(res=>{
+      dialogMdlList.value = res.data
+    })
+  }
+}
+
 // ===== 值类型弹窗处理 =====
 function openAddDialog1() {
   title.value = "新增值类型参数";
@@ -385,6 +418,7 @@ function openAddDialog1() {
   form1.value = { datatype: "", ratio: null,
     ssysId: queryForm.ssysId,
     mdlName: queryForm.mdlName, }
+  dialogMdlList.value = mdlList.value
 }
 
 function openEditDialog1(row) {
@@ -396,8 +430,13 @@ function openEditDialog1(row) {
   Object.assign(form1.value, row);
   if(row.ssysId === null){
     form1.value.ssysId = -1
+  }else {
+    listMdlNameBySysId(row.ssysId).then(res=>{
+      dialogMdlList.value = res.data
+    })
   }
   open1.value = true;
+
 }
 
 function submitForm1() {
@@ -463,6 +502,7 @@ function openAddDialog2() {
     ssysId: queryForm.ssysId,
     mdlName: queryForm.mdlName,
   }
+  dialogMdlList.value = mdlList.value
 }
 function openAddDialog3() {
   title.value = "新增字段处理类型参数";
@@ -475,6 +515,7 @@ function openAddDialog3() {
     mdlName: queryForm.mdlName,
     ratio: null,
   }
+  dialogMdlList.value = mdlList.value
 }
 
 function openEditDialog2(row) {
@@ -486,6 +527,10 @@ function openEditDialog2(row) {
   Object.assign(form2.value, row);
   if(row.ssysId === null){
     form2.value.ssysId = -1
+  }else {
+    listMdlNameBySysId(row.ssysId).then(res=>{
+      dialogMdlList.value = res.data
+    })
   }
   open2.value = true;
 }
@@ -499,6 +544,10 @@ function openEditDialog3(row) {
   Object.assign(form3.value, row);
   if(row.ssysId === null){
     form3.value.ssysId = -1
+  }else {
+    listMdlNameBySysId(row.ssysId).then(res=>{
+      dialogMdlList.value = res.data
+    })
   }
   open3.value = true;
 }

vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue

@@ -4,24 +4,30 @@
       <el-form :inline="true" :model="queryForm">
         <el-row>
           <el-form-item label="归属系统A">
-            <el-select v-model="queryForm.aSsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
+            <el-select v-model="queryForm.aSsysId" @change="changeAsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
               <el-option label="*" :value="-1"></el-option>
               <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item label="模式名A">
-            <el-input v-model="queryForm.aMdlName" placeholder="请输入模式名" clearable />
+            <el-select v-model="queryForm.aMdlName" clearable style="width: 180px" allow-create filterable>
+              <el-option label="*" value="*"></el-option>
+              <el-option v-for="(item,index) in aMdlList" :label="item" :value="item" :key="index"></el-option>
+            </el-select>
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item label="归属系统B">
-            <el-select v-model="queryForm.bSsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
+            <el-select v-model="queryForm.bSsysId"  @change="changeAsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
               <el-option label="*" :value="-1"></el-option>
               <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item label="模式名B">
-            <el-input v-model="queryForm.bMdlName" placeholder="请输入模式名" clearable />
+            <el-select v-model="queryForm.bMdlName" clearable style="width: 180px" allow-create filterable>
+              <el-option label="*" value="*"></el-option>
+              <el-option v-for="(item,index) in bMdlList" :label="item" :value="item" :key="index"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleSearch">搜索</el-button>
@@ -66,22 +72,28 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="所属系统A" prop="ssysId">
-          <el-select v-model="form1.aSsysId" placeholder="请选择系统" clearable filterable style="width: 350px">
+          <el-select v-model="form1.aSsysId" placeholder="请选择系统" @change="changeDialogBsysId" clearable filterable style="width: 350px">
             <el-option label="*" :value="-1"></el-option>
             <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="所属模式A" prop="mdlName">
-          <el-input v-model="form1.aMdlName" autocomplete="off"  />
+          <el-select v-model="form1.aMdlName" clearable style="width: 350px" allow-create filterable>
+            <el-option label="*" value="*"></el-option>
+            <el-option v-for="(item,index) in dialogAMdlList" :label="item" :value="item" :key="index"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="所属系统B" prop="ssysId">
-          <el-select v-model="form1.bSsysId" placeholder="请选择系统" clearable filterable style="width: 350px">
+          <el-select v-model="form1.bSsysId" @change="changeDialogBsysId" placeholder="请选择系统" clearable filterable style="width: 350px">
             <el-option label="*" :value="-1"></el-option>
             <el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="所属模式B" prop="mdlName">
-          <el-input v-model="form1.bMdlName" autocomplete="off"  />
+          <el-select v-model="form1.bMdlName" clearable style="width: 350px" allow-create filterable>
+            <el-option label="*" value="*"></el-option>
+            <el-option v-for="(item,index) in dialogBMdlList" :label="item" :value="item" :key="index"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -102,7 +114,8 @@ import {
   addTableRelaLabel,
   getTableRelaLabelList,
 } from "@/api/metadataConfig/metadataConfig";
-import useUserStore  from '@/store/modules/user'; // 注意路径是否正确
+import useUserStore  from '@/store/modules/user';
+import {listMdlNameBySysId} from "../../../api/meta/metaInfo.js"; // 注意路径是否正确
 
 const userStore = useUserStore(); // 正确调用
 const dsSysList = userStore.dsSysList; // 访问属性
@@ -112,6 +125,10 @@ const queryForm = reactive({
   aMdlName: "",
   bMdlName: "",
 });
+const aMdlList = ref([]);
+const bMdlList = ref([]);
+const dialogAMdlList = ref([]);
+const dialogBMdlList = ref([]);
 const activeTab = ref('valueType');
 const configList1 = ref([]); // 值类型参数数据
 const loading = ref(false);
@@ -208,6 +225,8 @@ function openAddDialog1() {
     aMdlName: queryForm.aMdlName,
     bMdlName: queryForm.bMdlName,
   }
+  dialogAMdlList.value = aMdlList.value
+  dialogBMdlList.value = bMdlList.value
 }
 
 function openEditDialog1(row) {
@@ -219,13 +238,44 @@ function openEditDialog1(row) {
   Object.assign(form1.value, row);
   if (form1.value.aSsysId === null){
     form1.value.aSsysId = -1
+  }else {
+    changeDialogAsysId(row.aSsysId)
   }
   if (form1.value.bSsysId === null){
     form1.value.bSsysId = -1
+  }else {
+    changeDialogBsysId(row.bSsysId)
   }
   open1.value = true;
 }
-
+function changeDialogAsysId(ssysId){
+  if (ssysId){
+    listMdlNameBySysId(ssysId).then(res=>{
+      dialogAMdlList.value = res.data
+    })
+  }
+}
+function changeAsysId(ssysId){
+  if (ssysId){
+    listMdlNameBySysId(ssysId).then(res=>{
+      aMdlList.value = res.data
+    })
+  }
+}
+function changeBsysId(ssysId){
+  if (ssysId){
+    listMdlNameBySysId(ssysId).then(res=>{
+      bMdlList.value = res.data
+    })
+  }
+}
+function changeDialogBsysId(ssysId){
+  if (ssysId){
+    listMdlNameBySysId(ssysId).then(res=>{
+      dialogBMdlList.value = res.data
+    })
+  }
+}
 function submitForm1() {
   clasFormRef1.value.validate(async (valid) => {
     if (!valid) return;