Merge branch 'dev_20241202_xukangle' into develop

xukangle
Showing 5 changed files with 105 additions and 20 deletions
src/components/Form/index.vue
src/views/data_asset/registerCatalogManagement.vue
src/views/data_product/productListingDetail.vue
src/views/indexNewBigScreen.vue
src/views/security_menu/index.vue
--- a/src/components/Form/index.vue
View file @a764f06
+++ b/src/components/Form/index.vue
View file @a764f06
@@ -418,8 +418,8 @@ const downloadTemplate = async (url) => {
      }
      // 解码文件名
      name = decodeURIComponent(name);
+      name = name.replace(/_\d{8}\d{9}_\d+/g, '');
      var fileSuffix = name ? name.substring(name.lastIndexOf('.') + 1) : '';
-      console.log(name, res, fileSuffix, '-------------------name');
      download(res, name, fileSuffix);
    } else {
      res?.msg && ElMessage.error(res?.msg);
--- a/src/views/data_asset/registerCatalogManagement.vue
View file @a764f06
+++ b/src/views/data_asset/registerCatalogManagement.vue
View file @a764f06
@@ -299,18 +299,52 @@ const handleCreate = () => {
  });
 };
+// 定义 ref 和响应式高度
+const tableToolsRef = ref<any>(null);
+const tableToolsHeight = ref<any>(0);
+// 获取 TableTools 的高度
+const getTableToolsHeight = () => {
+  const tableToolsElement: any = tableToolsRef.value;
+  if (tableToolsElement) {
+    tableToolsHeight.value = tableToolsElement.offsetHeight - 40;
+  }
+};
+// 在组件挂载后获取初始高度
+onMounted(() => {
+  // 获取初始高度
+  nextTick(() => {
+    getTableToolsHeight();
+  });
+  // 监听 window resize 事件来更新高度
+  window.addEventListener('resize', handleWindowResize);
+});
+// 在组件卸载前移除监听
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', handleWindowResize);
+});
+// 处理 window resize 事件
+const handleWindowResize = () => {
+  nextTick(() => {
+    getTableToolsHeight();  // 更新 TableTools 高度
+  });
+};
 </script>
 <template>
  <div class="container_wrap">
-    <div class="table_tool_wrap">
+    <div class="table_tool_wrap" ref="tableToolsRef">
      <TableTools :searchItems="searchItemList" :searchId="'register-data-search'" @search="toSearch" />
      <div class="tools_btns">
        <el-button type="primary" @click="handleCreate" v-preReClick>新建</el-button>
      </div>
    </div>
    <div class="table_panel_wrap" :style="{ height: 'calc(100% - 89px)' }">
-      <div class="data-content" v-loading="listDataLoading">
+      <div class="data-content" v-loading="listDataLoading" :style="{ height: `calc(100% - ${tableToolsHeight}px)` }">
        <div class="card-content" v-if="listData.length" v-for="item in listData" :key="item.guid"
          @click="handleDataClick(item)">
          <div class="top-dam-img"></div>
@@ -375,7 +409,7 @@ const handleCreate = () => {
 }
 .data-content {
-  height: calc(100% - 44px);
+  // height: calc(100% - 44px);
  display: flex;
  flex-wrap: wrap;
  gap: 20px 20px;
--- a/src/views/data_product/productListingDetail.vue
View file @a764f06
+++ b/src/views/data_product/productListingDetail.vue
View file @a764f06
@@ -15,10 +15,11 @@ import { changeNum } from '@/utils/common';
 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
 import { getAreaData, getServiceTenants, getSingleList } from "@/api/modules/queryService";
 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList, getServiceDetail } from "@/api/modules/dataAsset";
-import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList, listingUpdateGateway, getDataExchangeProductList, getTemplateFile } from "@/api/modules/dataProduct";
+import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList, listingUpdateGateway, getDataExchangeProductList, getTemplateFile, getListingList } from "@/api/modules/dataProduct";
 import { getMatchDetail } from "@/api/modules/dataFinance";
 import { useValidator } from '@/hooks/useValidator';
 import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
+import { da } from "element-plus/es/locale";
 const { required } = useValidator();
 const route = useRoute();
@@ -704,6 +705,11 @@ const getTableInfo = () => {
  getDataExchangeProductList({}).then((res: any) => {
    if (res.code == proxy.$passCode) {
      let data = res.data || [];
+      // 进行去重 去掉data 中在pageLIstInfo.value中已有的数据
+      data = data.filter((item: any) => {
+        return !pageLIstInfo.value.find((pageItem: any) => pageItem.damGuid == item.damGuid)
+      })
      formInfo.value.items[0].options = data;
    }
  })
@@ -1090,7 +1096,7 @@ const btnClick = (btn) => {
    } else {
      userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
      router.push({
-        name: "productListingCheck",
+        name: "productListing",
        query: {},
      });
    }
@@ -1341,7 +1347,7 @@ onActivated(() => {
 const deploymentId = ref('');
 const qualityEvaluationData = ref<any>('');
 const costAssessmentData = ref<any>('');
-onBeforeMount(() => {
+onBeforeMount(async () => {
  // case 1: 数交易所 case 2: 门户
  if (route.query.case == '2') {
    formInfo.value.items.forEach(item => {
@@ -1350,7 +1356,12 @@ onBeforeMount(() => {
      }
    })
  }
+  await getTableData();
+  if (route.query.exchangeGuid) {
+    getTableInfo();
+  } else {
+    getProducts();
+  }
  getParentAreaPromise.value = getAreaData({ parentId: null }).then((res: any) => {
    if (res?.code == proxy.$passCode) {
      parentAreaData.value = res.data ?? [];
@@ -1452,15 +1463,27 @@ onBeforeMount(() => {
    }
  })
  if (route.query.exchangeGuid) {
-    getTableInfo();
-  } else {
-    getProducts();
-  }
-  if (route.query.exchangeGuid) {
    getTemplateInfo();
  }
 })
+const pageLIstInfo = ref<any>();
+const getTableData = async () => {
+  const res: any = await getListingList({
+    pageIndex: 1,
+    pageSize: -1,
+  });
+  if (res.code == proxy.$passCode) {
+    pageLIstInfo.value = res.data.records || [];
+  } else {
+    ElMessage({
+      type: "error",
+      message: res.msg,
+    });
+  }
+}
 // 获取模板信息
 const getTemplateInfo = () => {
  getTemplateFile({ tenantGuid: route.query.exchangeGuid }).then((res: any) => {
@@ -2102,12 +2125,17 @@ const prcieInfo = computed(() => {
    <div class="tool_btns" v-if="detailType == 'add' || detailType == 'edit' || detailType == 'redit'">
      <div class="btns">
        <el-button @click="btnClick({ value: 'cancel' })">返回</el-button>
-        <el-button @click="btnClick({ value: 'draft' })"
+        <!-- <el-button @click="btnClick({ value: 'draft' })"
-          v-if="route.query.type == 'add' || route.query.type == 'edit'">保存草稿</el-button>
+          v-if="route.query.type == 'add' || route.query.type == 'edit'">保存草稿</el-button> -->
        <el-button type="primary" @click="btnClick({ value: 'submit' })">提交流程</el-button>
      </div>
    </div>
-    <div class="tool_btns" v-else-if="detailType == 'check'">
+    <div class="tool_btns" v-else-if="detailType == 'detail'">
+      <div class="btns">
+        <el-button @click="btnClick({ value: 'cancel' })">关闭</el-button>
+      </div>
+    </div>
+    <div class=" tool_btns" v-else-if="detailType == 'check'">
      <div class="btns">
        <el-button plain @click="btnClick({ value: 'cancel' })">关闭</el-button>
        <el-button type="primary" @click="btnClick({ value: 'pass' })"
--- a/src/views/indexNewBigScreen.vue
View file @a764f06
+++ b/src/views/indexNewBigScreen.vue
View file @a764f06
@@ -669,8 +669,30 @@ watch(
    }
    handleChangeTime(daterange.value);
  },
 );
+const handleDatePickerChange = (val) => {
+  // 更新开始时间和结束时间
+  startTime.value = val[0];
+  endTime.value = val[1];
+  // 获取数据表格
+  getAssetTableData();
+  // 获取统计信息
+  fetchStatisticsInfo();
+  // 获取质量饼图数据
+  fetchQualityInfo();
+  // 获取交易和融资数据
+  getTradeTableData();
+  getFinancingTableData();
+  // 获取注册文档数据
+  fetchRegisterUrl();
+  // 取消选择按钮的 is-active 状态
+  filterDate.value = '';
+};
 const startTime = ref()
 const endTime = ref()
@@ -711,7 +733,7 @@ const handleChangeTime = (val) => {
        </div>
        <el-date-picker v-model="daterange" type="datetimerange" range-separator="至" start-placeholder="开始时间"
          :clearable="false" end-placeholder="截止时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          ref="datePickerRef" />
+          ref="datePickerRef" @change="handleDatePickerChange" />
      </div>
    </div>
    <div v-if="userData.tenantType != 1" class="main-content">
--- a/src/views/security_menu/index.vue
View file @a764f06
+++ b/src/views/security_menu/index.vue
View file @a764f06
@@ -6,6 +6,7 @@
 import { onUploadFilePreview } from '@/api/modules/common';
 import { getComplianceInfoPageList, updateComplianceInfo } from '@/api/modules/securityMenu';
 import TableTools from '@/components/Tools/table_tools.vue';
+import { TableColumnWidth } from '@/utils/enum';
 import { ElMessage } from 'element-plus';
 const { proxy } = getCurrentInstance() as any;
 const dialogLabelFormRef = ref();
@@ -68,7 +69,7 @@ const tableInfo = ref({
        return scope.row.entryComplianceProgram?.length > 0 ? '预览' : '--';
      }
    },
-    { label: "操作时间", field: "updateTime", width: 120 },
+    { label: "操作时间", field: "updateTime", width: TableColumnWidth.DATETIME },
  ],
  data: tableDataList.value,
  page: {
@@ -353,7 +354,7 @@ const getTableData = () => {
    .main_wrap {
      height: 100%;
-      padding: 11px 16px 0 16px;
+      padding: 11px 8px 0 8px;
      .main_wrap-top-area {
        display: flex;