Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

lxs
Showing 11 changed files with 355 additions and 161 deletions
src/api/modules/dataAsset.ts
src/api/modules/dataAssetIndex.ts
src/api/modules/dataMetaService.ts
src/views/data_inventory/classifyGradeCatalogue.vue
src/views/data_inventory/configureRules.vue
src/views/data_inventory/existingTableSelect.vue
src/views/data_inventory/tableCreateExisting.vue
src/views/data_meta/analysisView.vue
src/views/data_meta/metaSheet.vue
src/views/indexNewBigScreen.vue
src/views/platformIndexNewBigScreen.vue
--- a/src/api/modules/dataAsset.ts
View file @93c44eb
+++ b/src/api/modules/dataAsset.ts
View file @93c44eb
@@ -242,14 +242,14 @@ export const getParamsList = () => request({
 /** 获取参数类型列表 */
 export const getDamTypesList = () => request({
-    url:`${import.meta.env.VITE_APP_API_BASEURL}/data-dict/get-data-list`,
+    url:`${import.meta.env.VITE_APP_DATA_SOURCE_URL}/data-dict/get-data-list`,
    method: 'post',
    data: { paramCode: "DAM-TYPE" }
 })
 /** 获取所属主题的四级参数类型列表 */
 export const getSubjectDoaminList = () => request({
-    url:`${import.meta.env.VITE_APP_API_BASEURL}/data-dict/get-data-tree`,
+    url:`${import.meta.env.VITE_APP_DATA_SOURCE_URL}/data-dict/get-data-tree`,
    method: 'post',
    data: { paramCode: "SUBJECT-DOMAIN" }
 })
@@ -262,85 +262,85 @@ export const getDataTypeList = () => request({
 })
 export const getDamCatalogTable = (params) => request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/page-list`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/page-list`,
    method: 'post',
    data: params
 })
 /** 删除数据资产目录 */
 export const registerCatalogDelete = (params) => request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/delete`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/delete`,
    method: 'delete',
    data: params
 });
 /** 保存数据资产目录 */
 export const registerCatalogSave = (params) =>  request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/save`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/save`,
    method: 'post',
    data: params
 });
 /** 验证资产名称是否存在 */
 export const existDamName = (params) => request({
-    url:`${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/exists?damName=${params}`,
+    url:`${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/exists?damName=${params}`,
    method: 'get'
 });
 /** 获取资产目录基本信息的详情 */
 export const getRegisterCatalogDetail = (guid) => request({
-    url:`${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/detail?guid=${guid}`,
+    url:`${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/detail?guid=${guid}`,
    method: 'get'
 });
 /** 获取资产目录表的详情 */
 export const getRegisterCatalogTableDetail = (subjectGuid) => request({
-    url:`${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/get-table-detail?subjectGuid=${subjectGuid}`,
+    url:`${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/get-table-detail?subjectGuid=${subjectGuid}`,
    method: 'get'
 });
 /** 编辑资产目录基本信息 */
 export const registerCatalogUpdate = (params) =>  request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/update`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/update`,
    method: 'post',
    data: params
 });
 /** 新增资产目录表 */
 export const registerCatalogTableSave = (params) =>  request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/add-table`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/add-table`,
    method: 'post',
    data: params
 });
 /** 编辑资产目录表 */
 export const registerCatalogTableUpdate = (params) =>  request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/update-table`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/update-table`,
    method: 'post',
    data: params
 });
 /** 删除资产目录表 */
 export const registerCatalogTableDelete = (params) =>  request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/remove-table?damGuid=${params.damGuid}&subjectGuid=${params.subjectGuid}`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/remove-table?damGuid=${params.damGuid}&subjectGuid=${params.subjectGuid}`,
    method: 'post'
 });
 /** 获取资产目录表 */
 export const getRegisterCatalogTableList = (damGuid) =>  request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/get-table-list?damGuid=${damGuid}`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/get-table-list?damGuid=${damGuid}`,
    method: 'get'
 });
 /** 查看资产表数据 */
 export const queryData = (subjectGuid) => request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/preview-data/${subjectGuid}`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/preview-data/${subjectGuid}`,
    method: 'get'
 });
 /** 验证新增和编辑资产表 */
 export const checkDamTableChange = (params) =>  request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/check-table-change`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/check-table-change`,
    method: 'post',
    data: params
 });
@@ -349,14 +349,14 @@ export const checkDamTableChange = (params) =>  request({
 /** ------------------ 公示异议处理 -------------------------------- */
 /** 获取异议列表数据 */
 export const getDissentList = (params) => request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-dissent-handle/page-list`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-dissent-handle/page-list`,
    method: 'post',
    data: params
 })
 /** 更新异议处理 */
 export const updateDissentState = (params) => request({
-    url: `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-dissent-handle/update-state`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-dissent-handle/update-state`,
    method: 'post',
    data: params
 })
--- a/src/api/modules/dataAssetIndex.ts
View file @93c44eb
+++ b/src/api/modules/dataAssetIndex.ts
View file @93c44eb
@@ -7,9 +7,10 @@ export const getHomeServiceInfo = () => request({
 })
 /** 获取首页资产统计信息 */
-export const getStatisticsInfo = () =>  request({
+export const getStatisticsInfo = (data) =>  request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/company/statistics-info`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取首页资产登记情况 */
@@ -20,9 +21,10 @@ export const getRegisterInfo = (params) => request({
 })
 /** 获取首页资产质量情况 */
-export const getQualityInfo = () => request({
+export const getQualityInfo = (data) => request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/company/quality-info`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取首页资产交易情况 */
@@ -40,43 +42,50 @@ export const getFinanceInfo = (params) => request({
 })
 /** 获取资产证件照url */
-export const getRegisterUrl = () => request({
+export const getRegisterUrl = (data) => request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/company/list-doc-url`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取资产行业类型分布 */
-export const getIndustryInfo = () => request({
+export const getIndustryInfo = (data) => request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/platform/industry-statistics`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取平台授信主体金额分布 */
-export const getCreditMoneyInfo = () => request({
+export const getCreditMoneyInfo = (data) => request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/platform/credit-money-statistics`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取平台资产统计信息 */
-export const getPlatformStatisticsInfo = () =>  request({
+export const getPlatformStatisticsInfo = (data) =>  request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/platform/statistics-info`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取平台服务企业地区分布 */
-export const getPlatformService = () =>  request({
+export const getPlatformService = (data) =>  request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/platform/service-statistics`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取平台服务企业地区分布-按省 */
-export const getPlatformProvinceService = () =>  request({
+export const getPlatformProvinceService = (data) =>  request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/platform/service-statistics-province`,
-    method: 'get',
+    method: 'post',
+    data
 })
 /** 获取平台数据资产登记趋势 */
-export const getPlatformMonth = () =>  request({
+export const getPlatformMonth = (data) =>  request({
    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/platform/register-month-statistics`,
-    method: 'get',
+    method: 'post',
+    data
 })
--- a/src/api/modules/dataMetaService.ts
View file @93c44eb
+++ b/src/api/modules/dataMetaService.ts
View file @93c44eb
@@ -142,7 +142,7 @@ export const getTableFieldLineage = (params) => request({
 /** 获取表的所有字段血缘数据 */
 export const getTableAllFieldLineage = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/lineage/lineage-query-field?databaseName=${params.databaseName}&tableName=${params.tableName}`,
+  url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/lineage/lineage-query-field?databaseName=${params.databaseName}&tableName=${params.tableName}&tableGuid=${params.tableGuid}`,
  method: 'get',
 })
--- a/src/views/data_inventory/classifyGradeCatalogue.vue
View file @93c44eb
+++ b/src/views/data_inventory/classifyGradeCatalogue.vue
View file @93c44eb
--- a/src/views/data_inventory/configureRules.vue
View file @93c44eb
+++ b/src/views/data_inventory/configureRules.vue
View file @93c44eb
@@ -155,8 +155,14 @@ const batchDelete = () => {
  selectedRows.value = [];
 };
+// 暂存编辑的行数据
+const tempRowData = ref<any>();
 // 编辑行
 const editRow = (row) => {
+  console.log('编辑:', row);
+  // 暂存编辑前的数据
+  tempRowData.value = { ...row };
  if (row.fieldLengthCondition) {
    const arr = row.fieldLengthCondition.split('#')
    row.lengthSymbol = arr[0]
@@ -307,6 +313,15 @@ const cancel = () => {
  });
 }
+// 点击取消
+const cancelEdit = (row) => {
+  console.log('取消编辑:', row);
+  // 可在此恢复原始数据逻辑，如果需要
+  Object.assign(row, tempRowData.value);
+  row.isEdit = false; // 退出编辑状态
+}
 </script>
 <template>
  <div class="configure-rules">
@@ -323,11 +338,11 @@ const cancel = () => {
        <el-table-column prop="description" label="描述" width="180" show-overflow-tooltip />
      </el-table>
    </div>
-    <div class="btn-area">
+    <!-- <div class="btn-area">
      <el-button @click="moveUp">上移</el-button>
      <el-button @click="moveDown">下移</el-button>
      <el-button @click="batchDelete">批量删除</el-button>
-    </div>
+    </div> -->
    <div class="bottom_table">
      <el-table :data="tableData" v-loading="tableFieldsLoading" :highlight-current-row="true" stripe border
        height="100%" row-key="guid" @selection-change="selectionFieldsChange" tooltip-effect="light" :style="{
@@ -351,9 +366,9 @@ const cancel = () => {
          </template>
        </el-table-column>
        <!-- 分类（不可编辑）classifyName -->
-        <el-table-column prop="classifyName" label="分类" width="80" show-overflow-tooltip>
+        <el-table-column prop="classifyDetailName" label="分类" width="120" show-overflow-tooltip>
          <template #default="scope">
-            {{ scope.row.classifyName ? scope.row.classifyName : '--' }}
+            {{ scope.row.classifyDetailName ? scope.row.classifyDetailName : '--' }}
          </template>
        </el-table-column>
        <!-- 分级（不可编辑） -->
@@ -383,6 +398,8 @@ const cancel = () => {
                <el-option label="大于" value=">"></el-option>
                <el-option label="等于" value="="></el-option>
                <el-option label="小于" value="<"></el-option>
+                <el-option label="大于等于" value=">="></el-option>
+                <el-option label="小于等于" value="<="></el-option>
              </el-select>
              <el-input v-model="scope.row.lengthValue" placeholder="请输入" style="width: 45%;" />
            </div>
@@ -411,7 +428,8 @@ const cancel = () => {
        <!-- 数据是否唯一（可编辑） -->
        <el-table-column prop="isUnique" label="数据是否唯一" width="150" align="center">
          <template #default="scope">
-            <span v-if="!scope.row.isEdit || !editableFields.isUnique">{{ scope.row.isUnique ? scope.row.isUnique : '--'
+            <span v-if="!scope.row.isEdit || !editableFields.isUnique">{{ scope.row.isUnique ? (scope.row.isUnique ===
+              'Y' ? '是' : '否') : '--'
              }}</span>
            <el-select v-else v-model="scope.row.isUnique" placeholder="请选择">
              <el-option label="是" value="Y" />
@@ -420,10 +438,11 @@ const cancel = () => {
          </template>
        </el-table-column>
        <!-- 是否必填（可编辑） -->
-        <el-table-column prop="isRequired" label="是否必填" width="120" align="center">
+        <el-table-column prop="notNull" label="是否必填" width="120" align="center">
          <template #default="scope">
-            <span v-if="!scope.row.isEdit">{{ scope.row.isRequired ? scope.row.isRequired : '--' }}</span>
+            <span v-if="!scope.row.isEdit">{{ scope.row.notNull ? (scope.row.notNull === 'Y' ? '是' : '否') : '--'
-            <el-select v-else v-model="scope.row.isRequired" placeholder="请选择">
+              }}</span>
+            <el-select v-else v-model="scope.row.notNull" placeholder="请选择">
              <el-option label="是" value="Y" />
              <el-option label="否" value="N" />
            </el-select>
@@ -448,14 +467,17 @@ const cancel = () => {
        </el-table-column>
        <!-- 操作列 -->
-        <el-table-column label="操作" width="100" align="center" fixed="right">
+        <el-table-column label="操作" width="120" align="center" fixed="right">
          <template #default="scope">
            <span class="text_btn" v-if="!scope.row.isEdit" @click="editRow(scope.row)">编辑</span>
-            <span class="text_btn" v-else @click="saveRow(scope.row)">保存</span>
+            <span v-else>
-            <el-divider direction="vertical" />
+              <span class="text_btn" @click="saveRow(scope.row)">保存</span>
-            <span class="text_btn" @click="deleteRow(scope.$index)">删除</span>
+              <el-divider direction="vertical" />
+              <span class="text_btn" @click="cancelEdit(scope.row)">取消</span>
+            </span>
          </template>
        </el-table-column>
      </el-table>
    </div>
    <div class="botton_btn">
@@ -485,7 +507,7 @@ const cancel = () => {
  :deep(.bottom_table) {
    margin-top: 12px;
-    height: calc(100% - 150px);
+    height: calc(100% - 115px);
    overflow-y: auto;
    .el-table td.el-table__cell {
--- a/src/views/data_inventory/existingTableSelect.vue
View file @93c44eb
+++ b/src/views/data_inventory/existingTableSelect.vue
View file @93c44eb
@@ -320,7 +320,7 @@ watch(
    if (val?.length && !currDatasourceSelect.value?.tableName) {
      currDatasourceSelect.value = val[0];
    }
-    emits("datasourceSelectedChange", val, databaseGuid.value);
+    emits("datasourceSelectedChange", val, currDatasourceSelect.value);
  },
  {
    deep: true,
@@ -361,9 +361,9 @@ const getTextAlign = (field) => {
          <el-table-column type="selection" :width="22" align="center" />
          <el-table-column prop="tableName" label="名称" width="100px" align="left" show-overflow-tooltip>
          </el-table-column>
-          <el-table-column prop="tableComment" label="表注释" width="60px" align="left" show-overflow-tooltip>
+          <el-table-column prop="tableChName" label="表中文名称" width="80px" align="left" show-overflow-tooltip>
            <template #default="scope">
-              <span>{{ scope.row['tableComment'] ?? '--' }}</span>
+              <span>{{ scope.row['tableChName'] ?? '--' }}</span>
            </template>
          </el-table-column>
        </el-table>
@@ -497,7 +497,7 @@ const getTextAlign = (field) => {
  height: calc(100% - 80px);
  .content-left {
-    width: 200px;
+    width: 220px;
    border-right: 1px solid #d9d9d9;
    .title-left {
@@ -532,7 +532,7 @@ const getTextAlign = (field) => {
  }
  .content-right {
-    width: calc(100% - 200px);
+    width: calc(100% - 220px);
    .title-right {
      height: 44px;
--- a/src/views/data_inventory/tableCreateExisting.vue
View file @93c44eb
+++ b/src/views/data_inventory/tableCreateExisting.vue
View file @93c44eb
--- a/src/views/data_meta/analysisView.vue
View file @93c44eb
+++ b/src/views/data_meta/analysisView.vue
View file @93c44eb
@@ -284,7 +284,7 @@ const loadTreeNode = (node, resolve) => {
          })
          node.data.children = data;
          nextTick(() => {
-           treeInfo.value.currentNodeKey && treeInfoRef.value.setCurrentKey(treeInfo.value.currentNodeKey);
+            treeInfo.value.currentNodeKey && treeInfoRef.value.setCurrentKey(treeInfo.value.currentNodeKey);
            treeInfo.value.currentNodeKey && isCurrentNodeField && scrollToNode(treeInfo.value.currentNodeKey);
            let node1 = treeInfoRef.value.treeRef.store.nodesMap[treeInfo.value.currentNodeKey];
            if (node1) {
@@ -1010,7 +1010,7 @@ const getTableFieldLineageMap = () => {
 const getAllTableFieldLineageMap = () => {
  lineageLoading.value = true;
  isFieldLineage.value = true;
-  getTableAllFieldLineage({ databaseName: lastClickNode.value.databaseName, tableName: lastClickNode.value.tableName }).then((res: any) => {
+  getTableAllFieldLineage({ databaseName: lastClickNode.value.databaseName, tableName: lastClickNode.value.tableName, tableGuid: lastClickNode.value.guid }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      let data1 = res.data || [];
      lineageData.value = data1;
@@ -1152,4 +1152,4 @@ const handleLineageSwitchChange = (val, type) => {
  z-index: 10000;
  /* 设置一个较高的z-index值确保在最上层显示 */
 }
-</style>
\ No newline at end of file
+</style>
--- a/src/views/data_meta/metaSheet.vue
View file @93c44eb
+++ b/src/views/data_meta/metaSheet.vue
View file @93c44eb
@@ -100,11 +100,11 @@ const fieldTableInfo = ref({
          //跳转倒查看血缘页面。
          let row = scope.row;
          set({
-            tableGuid: sheetInfo.value.guid, 
+            tableGuid: sheetInfo.value.guid,
-            table: sheetInfo.value.tableName, 
+            table: sheetInfo.value.tableName,
-            databas: sheetInfo.value.databaseName, 
+            databas: sheetInfo.value.databaseName,
            databaseCh: sheetInfo.value.databaseChName,
-            dsGuid: sheetInfo.value.databaseGuid, 
+            dsGuid: sheetInfo.value.databaseGuid,
            fGuid: row.guid,
            fEnName: row.enName
          })
@@ -191,7 +191,7 @@ const tabsPaneMap = ref({
      type: 'table',
      tableInfo: fieldTableInfo.value,
      show: true
-    }, 
+    },
    {
      title: '索引信息',
      type: 'table',
@@ -680,11 +680,11 @@ const handleRefres = () => {
 const handleEdit = () => {
  lineageGraph.value[0].handleEdit({});//先退出全屏再跳转，否则回来查看时就没有了。
  set({
-    tableGuid: sheetInfo.value.guid, 
+    tableGuid: sheetInfo.value.guid,
-    table: sheetInfo.value.tableName, 
+    table: sheetInfo.value.tableName,
-    databas: sheetInfo.value.databaseName, 
+    databas: sheetInfo.value.databaseName,
    databaseCh: sheetInfo.value.databaseChName,
-    dsGuid: sheetInfo.value.databaseGuid, 
+    dsGuid: sheetInfo.value.databaseGuid,
    isFieldLine: isFieldLineage.value
  })
  router.push({
@@ -722,7 +722,7 @@ const getTableLineageMap = () => {
 const getAllTableFieldLineageMap = () => {
  lineageDataLoading.value = true;
  isFieldLineage.value = true;
-  getTableAllFieldLineage({ databaseName: sheetInfo.value.databaseName, tableName: sheetInfo.value.tableName }).then((res: any) => {
+  getTableAllFieldLineage({ databaseName: sheetInfo.value.databaseName, tableName: sheetInfo.value.tableName, tableGuid: sheetInfo.value.guid }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      let data1 = res.data || [];
      lineageData.value = data1;
@@ -802,8 +802,8 @@ const handleLineageSwitchChange = (val) => {
              <LineageGraph ref="lineageGraph" v-if="lineageData.length" layout="vertical" :lineageData="lineageData"
                :is-field-lineage="isFieldLineage" :primary-table="sheetInfo.tableName" :is-detail="true"
                :primaryDatabase="sheetInfo.databaseName" :isEdit="true" @handleSave="handleSave"
-                @tableContextMenu="handleTableContextMenu" @handleToggle="handleToggle" :isToggle="isToggle" @handleChOrEn=handleChOrEn :isCh="isCh"
+                @tableContextMenu="handleTableContextMenu" @handleToggle="handleToggle" :isToggle="isToggle"
-                @handleRefres="handleRefres" @handleEdit="handleEdit"
+                @handleChOrEn=handleChOrEn :isCh="isCh" @handleRefres="handleRefres" @handleEdit="handleEdit"
                @handleLineageSwitchChange="handleLineageSwitchChange" />
            </div>
--- a/src/views/indexNewBigScreen.vue
View file @93c44eb
+++ b/src/views/indexNewBigScreen.vue
View file @93c44eb
@@ -229,6 +229,8 @@ const getAssetTableData = () => {
  getRegisterInfo({
    pageSize: 200,
    pageIndex: 1,
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
  }).then((res: any) => {
    assetTableInfo.value.loading1 = false;
    if (res.code == proxy.$passCode) {
@@ -291,6 +293,9 @@ const getTradeTableData = () => {
  getDaTradeInfo({
    pageSize: 200,
    pageIndex: 1,
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
  }).then((res: any) => {
    tradeTableInfo.value.loading1 = false;
    if (res.code == proxy.$passCode) {
@@ -368,6 +373,8 @@ const getFinancingTableData = () => {
  getFinanceInfo({
    pageSize: 200,
    pageIndex: 1,
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
  }).then((res: any) => {
    financingTableInfo.value.loading1 = false;
    if (res.code == proxy.$passCode) {
@@ -408,95 +415,108 @@ const assetTableRef = ref();
 const rolltimer = ref();
 onBeforeMount(() => {
-  if (userData.tenantType != 1) {
+  if (userData.tenantType == 1) {
+    // 获取数据表格
    getAssetTableData();
-    statisticsInfoLoading.value = true;
-    getStatisticsInfo().then((res: any) => {
+    // 获取统计信息
-      statisticsInfoLoading.value = false;
+    fetchStatisticsInfo();
-      if (res.code == proxy.$passCode) {
-        let data = res.data || {};
+    // 获取质量饼图数据
-        registerNum.value = changeNum(data.registerNum ?? 0);
+    fetchQualityInfo();
-        costAssessNum.value = changeNum(data.costAssessNum ?? 0);
-        qualityAssessNum.value = changeNum(data.qualityAssessNum ?? 0);
+    // 获取交易和融资数据
-        cardList.value.forEach((card) => {
-          if (card.name == 'assessmentMoney') {
-            card.value = changeNum((data[card.name] ?? 0) / 10000, 2, true);
-          } else if (card.name == "lastIntableTime") {
-            card.value = data[card.name] ?? "--";
-          } else if (card.name == "dataScale") {
-            card.value = changeNum(data[card.name] ?? 0, 2, true);
-          } else {
-            card.value = changeNum(data[card.name] ?? 0);
-          }
-        });
-      } else {
-        ElMessage.error(res.msg);
-      }
-    });
-    qualityPieLoading.value = true;
-    getQualityInfo().then((res: any) => {
-      qualityPieLoading.value = false;
-      //   qualityPieChart = echarts.init(document.getElementById("pie-quality"));
-      if (res.code == proxy.$passCode) {
-        qualityPieData.value = res.data || [];
-        let sum = qualityPieData.value
-          .map((d) => d.value)
-          .reduce(function (prev, curr, idx, arr) {
-            return prev + curr;
-          });
-        qualityPieData.value.forEach(v => {
-          v.percent = changeNum((v.value / sum) * 100, 2, true) + '%';
-        });
-      } else {
-        ElMessage.error(res.msg);
-      }
-    });
    getTradeTableData();
    getFinancingTableData();
-    docUrlLoading.value = true;
-    getRegisterUrl().then((res: any) => {
+    // 获取注册文档数据
-      if (res.code == proxy.$passCode) {
+    fetchRegisterUrl();
-        let data = docData.value = res.data || [];
+  }
-        if (data.length) {
+});
-          let ps: any = [];
+// 获取统计信息
-          for (const d of data) {
+function fetchStatisticsInfo() {
-            d.documentTypeDesc = d.documentType == 1 ? 'A证' : (d.documentType == 2 ? 'B证' : 'C证');
+  statisticsInfoLoading.value = true;
-            ps.push(
+  getStatisticsInfo({
-              getImageContent(d.documentFile[0]).then((res: any) => {
+    startTime: startTime.value || '',
-                if (res) {
+    endTime: endTime.value || '',
-                  return URL.createObjectURL(res);
+  }).then((res: any) => {
-                }
+    statisticsInfoLoading.value = false;
-              })
+    if (res.code == proxy.$passCode) {
-            );
+      const data = res.data || {};
-          }
+      registerNum.value = changeNum(data.registerNum ?? 0);
-          Promise.all(ps).then((res: any[]) => {
+      costAssessNum.value = changeNum(data.costAssessNum ?? 0);
-            console.log(res);
+      qualityAssessNum.value = changeNum(data.qualityAssessNum ?? 0);
-            docUrl.value = res;
-            docUrlList.value = res.flatMap((value, index, array) => {
+      cardList.value.forEach((card) => {
-              return [
+        if (card.name === 'assessmentMoney') {
-                array.slice(index, index + 1).map((a) => {
+          card.value = changeNum((data[card.name] ?? 0) / 10000, 2, true);
-                  return { url: a };
+        } else if (card.name === 'lastIntableTime') {
-                }),
+          card.value = data[card.name] ?? '--';
-              ];
+        } else if (card.name === 'dataScale') {
-            });
+          card.value = changeNum(data[card.name] ?? 0, 2, true);
-            docUrlLoading.value = false;
-            nextTick(() => {
-              processImgDesc();
-            });
-          });
        } else {
-          docUrl.value = [];
+          card.value = changeNum(data[card.name] ?? 0);
-          docData.value = [];
-          docUrlList.value = [];
-          docUrlLoading.value = false;
        }
+      });
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+// 获取质量信息
+function fetchQualityInfo() {
+  qualityPieLoading.value = true;
+  getQualityInfo({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    qualityPieLoading.value = false;
+    if (res.code == proxy.$passCode) {
+      const qualityData = res.data || [];
+      const sum = qualityData.reduce((acc, item) => acc + item.value, 0);
+      qualityPieData.value = qualityData.map((item) => ({
+        ...item,
+        percent: changeNum((item.value / sum) * 100, 2, true) + '%',
+      }));
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+}
+// 获取注册文档 URL
+function fetchRegisterUrl() {
+  docUrlLoading.value = true;
+  getRegisterUrl({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    docUrlLoading.value = false;
+    if (res.code == proxy.$passCode) {
+      const data = res.data || [];
+      if (data.length) {
+        const promises = data.map((d) => {
+          d.documentTypeDesc = d.documentType === 1 ? 'A证' : d.documentType === 2 ? 'B证' : 'C证';
+          return getImageContent(d.documentFile[0]).then((res: any) => (res ? URL.createObjectURL(res) : null));
+        });
+        Promise.all(promises).then((urls: any[]) => {
+          docUrl.value = urls;
+          docUrlList.value = urls.map((url) => [{ url }]);
+          nextTick(() => {
+            processImgDesc();
+          });
+        });
      } else {
-        docUrlLoading.value = false;
+        docUrl.value = [];
-        ElMessage.error(res.msg);
+        docUrlList.value = [];
      }
-    });
+    } else {
-  }
+      ElMessage.error(res.msg);
-});
+    }
+  });
+}
 const processImgDesc = () => {
  let domImg = document.getElementById('register-img');
@@ -600,15 +620,35 @@ watch(
 );
+const startTime = ref()
+const endTime = ref()
 const handleChangeTime = (val) => {
  console.log(val)
+  startTime.value = val[0]
+  endTime.value = val[1]
+  // 获取数据表格
+  getAssetTableData();
+  // 获取统计信息
+  fetchStatisticsInfo();
+  // 获取质量饼图数据
+  fetchQualityInfo();
+  // 获取交易和融资数据
+  getTradeTableData();
+  getFinancingTableData();
+  // 获取注册文档数据
+  fetchRegisterUrl();
 }
 </script>
 <template>
  <div style="width: 100%;height: 100%">
-    <div class="right-filter-main" v-if="userData.tenantType != 1">
+    <div class="right-filter-main" v-if="userData.tenantType == 1">
      <div class="right-filter">
        <div class="filter-btns">
          <div class="btn" :class="{ 'is-active': filterDate == 'today' }" @click="handleFilterClick('today')">今日</div>
@@ -622,7 +662,7 @@ const handleChangeTime = (val) => {
          ref="datePickerRef" />
      </div>
    </div>
-    <div v-if="userData.tenantType != 1" class="main-content">
+    <div v-if="userData.tenantType == 1" class="main-content">
      <div class="one-row">
        <div class="row-per">
          <div class="header">
@@ -778,7 +818,7 @@ const handleChangeTime = (val) => {
      </div>
    </div>
    <!-- <platformIndex v-else-if="userData.tenantType != 1" /> -->
-    <platformIndexNewBigScreen v-else-if="userData.tenantType == 1" />
+    <platformIndexNewBigScreen v-else-if="userData.tenantType != 1" />
    <div v-else class="main-placeholder">
      <img width="210" height="100" src="../../public/swzl_logo.png" />
    </div>
--- a/src/views/platformIndexNewBigScreen.vue
View file @93c44eb
+++ b/src/views/platformIndexNewBigScreen.vue
View file @93c44eb
@@ -135,6 +135,8 @@ const getFinancingTableData = () => {
  getFinanceInfo({
    pageSize: 500,
    pageIndex: 1,
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
  }).then((res: any) => {
    financingTableInfo.value.loading1 = false;
    if (res.code == proxy.$passCode) {
@@ -151,7 +153,10 @@ const statisticsInfoLoading = ref(false);
 onBeforeMount(() => {
  getFinancingTableData();
  statisticsInfoLoading.value = true;
-  getPlatformStatisticsInfo().then((res: any) => {
+  getPlatformStatisticsInfo({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
    statisticsInfoLoading.value = false;
    if (res.code == proxy.$passCode) {
      let data = res.data || {};
@@ -961,7 +966,10 @@ const bindPieAction = (chart, data) => {
 onMounted(() => {
  industryPieChart = echarts.init(document.getElementById("pie-industry"));
  industryPieLoading.value = true;
-  getIndustryInfo().then((res: any) => {
+  getIndustryInfo({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
    industryPieLoading.value = false;
    if (res.code == proxy.$passCode) {
      industryPieData.value = res.data?.homeGraphStatistics || [];
@@ -977,7 +985,10 @@ onMounted(() => {
  creditMoneyPieChart = echarts.init(
    document.getElementById("pie-creditMoney")
  );
-  getCreditMoneyInfo().then((res: any) => {
+  getCreditMoneyInfo({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
    creditMoneyPieLoading.value = false;
    if (res.code == proxy.$passCode) {
      creditMoneyPieData.value = res.data || [];
@@ -991,7 +1002,10 @@ onMounted(() => {
  serviceAreaBarLoading.value = true;
  serviceAreaBarChart = echarts.init(document.getElementById("bar-area"));
-  getPlatformService().then((res: any) => {
+  getPlatformService({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
    serviceAreaBarLoading.value = false;
    if (res.code == proxy.$passCode) {
      serviceAreaBarData.value = res.data || [];
@@ -1001,7 +1015,10 @@ onMounted(() => {
    }
  });
-  getPlatformProvinceService().then((res: any) => {
+  getPlatformProvinceService({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      serviceAreaMapData.value = res.data || [];
    } else {
@@ -1010,7 +1027,10 @@ onMounted(() => {
  });
  platformMonthBarLoading.value = true;
  platformMonthBarChart = echarts.init(document.getElementById("bar-month"));
-  getPlatformMonth().then((res: any) => {
+  getPlatformMonth({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
    platformMonthBarLoading.value = false;
    if (res.code == proxy.$passCode) {
      platformMonthBarData.value = res.data || [];
@@ -1063,8 +1083,111 @@ watch(
 );
+const startTime = ref()
+const endTime = ref()
 const handleChangeTime = (val) => {
-  console.log(val)
+  startTime.value = val[0];
+  endTime.value = val[1];
+  getFinancingTableData();
+  statisticsInfoLoading.value = true;
+  getPlatformStatisticsInfo({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    statisticsInfoLoading.value = false;
+    if (res.code == proxy.$passCode) {
+      let data = res.data || {};
+      cardList.value.forEach((card) => {
+        if (card.name == 'assessmentMoney') {
+          card.value = changeNum((data[card.name] ?? 0) / 10000, 2, true);
+        } else if (card.name == "dataScale") {
+          card.value = changeNum(data[card.name] ?? 0, 2);
+        } else {
+          card.value = changeNum(data[card.name] ?? 0);
+        }
+      });
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+  industryPieChart = echarts.init(document.getElementById("pie-industry"));
+  industryPieLoading.value = true;
+  getIndustryInfo({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    industryPieLoading.value = false;
+    if (res.code == proxy.$passCode) {
+      industryPieData.value = res.data?.homeGraphStatistics || [];
+      industryPieDataTotal.value = res.data?.totalCompanyNum ?? 0;
+      setPieChartOption().then(() => {
+        bindPieAction(industryPieChart, industryPieData.value);
+      });
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+  creditMoneyPieLoading.value = true;
+  creditMoneyPieChart = echarts.init(
+    document.getElementById("pie-creditMoney")
+  );
+  getCreditMoneyInfo({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    creditMoneyPieLoading.value = false;
+    if (res.code == proxy.$passCode) {
+      creditMoneyPieData.value = res.data || [];
+      setCreditPieChartOption().then(() => {
+        bindPieAction(creditMoneyPieChart, creditMoneyPieData.value);
+      });
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+  serviceAreaBarLoading.value = true;
+  serviceAreaBarChart = echarts.init(document.getElementById("bar-area"));
+  getPlatformService({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    serviceAreaBarLoading.value = false;
+    if (res.code == proxy.$passCode) {
+      serviceAreaBarData.value = res.data || [];
+      setBarChartOption(serviceAreaBarData.value.slice(0, 5), serviceAreaBarChart);
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+  getPlatformProvinceService({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    if (res.code == proxy.$passCode) {
+      serviceAreaMapData.value = res.data || [];
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+  platformMonthBarLoading.value = true;
+  platformMonthBarChart = echarts.init(document.getElementById("bar-month"));
+  getPlatformMonth({
+    startTime: startTime.value || '',
+    endTime: endTime.value || '',
+  }).then((res: any) => {
+    platformMonthBarLoading.value = false;
+    if (res.code == proxy.$passCode) {
+      platformMonthBarData.value = res.data || [];
+      setAreaChartOption(platformMonthBarData.value, platformMonthBarChart);
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
 }
 </script>