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

xukangle
Showing 7 changed files with 119 additions and 111 deletions
.env.development
.env.product
src/api/modules/queryService.ts
src/views/data_asset/registerDetail.vue
src/views/data_asset/registerManagemant.vue
src/views/data_asset/registerStart.vue
vite.config.ts
--- a/.env.development
View file @71becdb
+++ b/.env.development
View file @71becdb
@@ -79,6 +79,9 @@ VITE_APP_ATTACHMENT_TEMPLATE = ms-daop-personel-service
 #人员服务
 VITE_APP_PERSONAL_URL = 'ms-daop-personel-service'
+#流通平台地址
+VITE_APP_CIRCULATION = http://192.168.6.20:18052/
 # 是否在打包时生成 sourcemap
 VITE_BUILD_SOURCEMAP = false
 # 是否在打包时开启压缩，支持 gzip 和 brotli
--- a/.env.product
View file @71becdb
+++ b/.env.product
View file @71becdb
@@ -114,6 +114,10 @@ VITE_API_MESSAGE = ms-swzl-message-notification-service
 #企业信息接口
 VITE_APP_PERSONAL_URL = ms-daop-personel-service
+#流通平台接口地址
+VITE_APP_CIRCULATION = http://192.168.6.20:18052/
 # 是否在打包时生成 sourcemap
 VITE_BUILD_SOURCEMAP = false
 # 是否在打包时开启压缩，支持 gzip 和 brotli
--- a/src/api/modules/queryService.ts
View file @71becdb
+++ b/src/api/modules/queryService.ts
View file @71becdb
@@ -82,6 +82,13 @@ export const getProduct = (params) => request({
  method: 'get',
  params
 })
+// 查看平台会员信息
+export const getTenantInfo = (params) => request({
+  // url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
+  url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
+  method: 'get',
+  params
+})
 // 查看平台会员详情
 export const getTenantDetailInfo = (params) => request({
  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
--- a/src/views/data_asset/registerDetail.vue
View file @71becdb
+++ b/src/views/data_asset/registerDetail.vue
View file @71becdb
@@ -25,7 +25,8 @@ import {
 } from "@/api/modules/dataAsset";
 import {
  getTenantDetailInfo,
-  getImageContent
+  getImageContent,
+  getTenantInfo
 } from "@/api/modules/queryService";
 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
 import useDataAssetStore from "@/store/modules/dataAsset";
@@ -253,8 +254,8 @@ const getDetailInfo = () => {
      isTextTruncated();
    })
  } else {
-    getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
+    let ps: any = [], tentData = {};
-      fullscreenLoading.value = false;
+    ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
      if (res.code == proxy.$passCode) {
        const data = res.data || {};
        let { approveVO } = data;
@@ -266,6 +267,29 @@ const getDetailInfo = () => {
      } else {
        ElMessage.error(res.msg);
      }
+    }));
+    ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
+      if (res.code == proxy.$passCode) {
+        const data = res.data ?? {};
+        tentData = {...tentData, ...data};
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }));
+    ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
+      if (res.code == proxy.$passCode) {
+        const data = res.data ?? {};
+        tentData = {...tentData, ...data};
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }))
+    Promise.all(ps).then(() => {
+      fullscreenLoading.value = false;
+      tenantDetail.value = tentData;
+    }).catch(() => {
+      fullscreenLoading.value = false;
    });
  }
  // approveTableInfo.value.loading = true;
@@ -286,7 +310,7 @@ const handleExpand = () => {
 onBeforeMount(() => {
  getDetailInfo();
-  getTenantDetail();
+  // getTenantDetail();
 });
 onActivated(() => {
@@ -402,14 +426,22 @@ const tenantDetail: any = ref({});
 /** 获取当前登录会员，服务商，企业等详情。 */
 const getTenantDetail = () => {
-  getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
+  // getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
-    if (res.code == proxy.$passCode) {
+  //   if (res.code == proxy.$passCode) {
-      const data = res.data ?? {};
+  //     const data = res.data ?? {};
-      tenantDetail.value = data;
+  //     userData.value = data;
-    } else {
+  //   } else {
-      ElMessage.error(res.msg);
+  //     ElMessage.error(res.msg);
-    }
+  //   }
-  });
+  // })
+  // getTenantInfo({tenantName: userData.tenantName}).then((res: any) => {
+  //   if (res.code == proxy.$passCode) {
+  //     const data = res.data ?? {};
+  //     tenantDetail.value = data;
+  //   } else {
+  //     ElMessage.error(res.msg);
+  //   }
+  // });
 }
 const onUploadFilePreview = (file) => {
@@ -1402,8 +1434,8 @@ const handleClickDamCatalogDetail = () => {
            <div class="list_item is_block isFile" :style="{ width: '40%' }"
              v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span>
-              <span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])"
+              <span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])" class="item_value"
-                class="item_value" :style="{ 'padding-left': '0px' }">
+                :style="{ 'padding-left': '0px' }">
                <div class="file-operate">
                  <template
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'xls' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'xlsx' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'csv'">
@@ -1603,7 +1635,7 @@ const handleClickDamCatalogDetail = () => {
            </div>
            <div class="list_item">
              <span class="item_label">统一社会信用代码:</span>
-              <span class="item_value">{{ tenantDetail.usci ?? "--" }}</span>
+              <span class="item_value">{{ tenantDetail.socialCreditCode ?? "--" }}</span>
            </div>
            <div class="list_item">
              <span class="item_label">是否列入失信:</span>
@@ -1615,15 +1647,15 @@ const handleClickDamCatalogDetail = () => {
            </div>
            <div class="list_item">
              <span class="item_label">注册日期:</span>
-              <span class="item_value">{{ tenantDetail.registerDate ?? "--" }}</span>
+              <span class="item_value">{{ tenantDetail.registrationDate ?? "--" }}</span>
            </div>
            <div class="list_item">
              <span class="item_label">营业开始日期:</span>
-              <span class="item_value">{{ tenantDetail.tradeStartDate ?? "--" }}</span>
+              <span class="item_value">{{ tenantDetail.businessLicenseStartDate ?? "--" }}</span>
            </div>
            <div class="list_item">
              <span class="item_label">营业结束日期:</span>
-              <span class="item_value">{{ tenantDetail.tradeEndDate ?? "--" }}</span>
+              <span class="item_value">{{ tenantDetail.businessLicenseEndDate ?? "--" }}</span>
            </div>
            <div class="list_item is_block">
              <span class="item_label">单位注册地址:</span>
--- a/src/views/data_asset/registerManagemant.vue
View file @71becdb
+++ b/src/views/data_asset/registerManagemant.vue
View file @71becdb
@@ -208,6 +208,7 @@ const currTableData: any = ref({});
 const btnClick = (btn) => {
  const type = btn.value;
  if (type == 'create') {
+    localStorage.setItem('isRestart', '');
    router.push({
      name: 'registerStart',
      query: { exchangeGuid: btn.exchangeGuid, type }
@@ -277,20 +278,6 @@ const tableBtnClick = (scope, btn) => {
  }
 };
-const handleDataClick = (item) => {
-  if (item.approveState === 'N') {
-    router.push({
-      name: 'registerStart',
-      query: { guid: item.guid }
-    });
-  } else {
-    router.push({
-      name: 'registerInfoDetail',
-      query: { guid: item.guid, type: 'asset', daTenantGuid: item.tenantGuid }
-    });
-  }
-}
 const delTableOpen = (msg, type, isBatch: boolean = false) => {
  ElMessageBox.confirm(msg, "提示", {
    confirmButtonText: "确定",
@@ -535,10 +522,6 @@ const rejectDialogBtnClick = (btn, info) => {
  }
 };
-const createBtnVisible = computed(() => {
-  return isCompanyPlatform || (userStore.hasPermission('数据资产', path, '新建'))
-})
 </script>
 <template>
@@ -574,51 +557,8 @@ const createBtnVisible = computed(() => {
          </div>
        </div>
      </div>
-      <div class="table_panel_wrap" :style="{ height: createBtnVisible ? 'calc(100% - 89px)' : 'calc(100% - 40px)' }">
+      <div class="table_panel_wrap">
-        <div v-if="activeListType === 'card'" class="data-content" v-loading="listDataLoading">
+        <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
-          <div class="card-content" v-for="item in listData" :key="item.guid" @click="handleDataClick(item)">
-            <div class="title-row">
-              <div class="title">
-                <ellipsis-tooltip :content="item.daName" class-name="w100f"
-                  :refName="'tooltipOver' + item.guid"></ellipsis-tooltip>
-              </div>
-              <el-tag :type="(tagType(item, 'approveState') as any)">{{
-                tagMethod(item, 'approveState')
-              }}</el-tag>
-            </div>
-            <div v-if="!isCompanyPlatform" class="desc">{{ item.tenantName ?? '深圳传世般若有限公司' }}</div>
-            <div class="desc">{{ item.updateTime }}</div>
-            <div class="type-btn">
-              <template v-if="item.ownIndustryName?.length">
-                <div class="type-items">
-                  <div v-for="(info) in item.ownIndustryName" class="type">{{ info }}</div>
-                </div>
-              </template>
-              <template v-else>
-                <div class="type-items"></div>
-              </template>
-              <el-popover v-model="cardBtnVisible" placement="bottom" width="96" trigger="click"
-                popper-class="tree-item-edit-menu" :show-arrow="false" :hide-after="0">
-                <template #reference>
-                  <el-icon class="list-more" color="#666" v-show="getTableBtns(item, false)?.length > 0"
-                    @click.stop="cardBtnVisible = true">
-                    <MoreFilled />
-                  </el-icon>
-                </template>
-                <div class="levitation-ul">
-                  <span class="levitation-li" v-for="btn in getTableBtns(item, false)"
-                    @click="tableBtnClick({ row: item }, btn)">{{
-                      btn.label }}</span>
-                </div>
-              </el-popover>
-            </div>
-          </div>
-          <div v-if="!listData.length" class="card-noData">
-            <img src="../../assets/images/no-data.png" :style="{ width: '96px', height: '96px' }" />
-            <span>暂无数据资产</span>
-          </div>
-        </div>
-        <Table v-else :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
        <PageNav :class="[pageInfo.type]" :pageInfo="pageInfo" @pageChange="pageChange" />
      </div>
    </div>
--- a/src/views/data_asset/registerStart.vue
View file @71becdb
+++ b/src/views/data_asset/registerStart.vue
View file @71becdb
@@ -11,6 +11,7 @@ import { ContentWrap } from '@/components/ContentWrap';
 import useUserStore from "@/store/modules/user";
 import {
  getAreaData,
+  getTenantInfo,
  getTenantDetailInfo,
  getServiceTenants,
  getTenantAttach,
@@ -47,7 +48,7 @@ const guid = route.query.guid;
 const fullPath = route.fullPath;
 const editType = route.query.type;
 const exGuid = route.query.exchangeGuid;
-const restart = localStorage.getItem('isRestart');
+const restart = ref(false);
 /** 资产目录列表 */
 const registerCatalogList: any = ref([]);
@@ -166,14 +167,30 @@ const tenantDetail: any = ref({});
 /** 获取当前登录会员，服务商，企业等详情。 */
 const getTenantDetail = () => {
-  getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
+  let ps: any = [], tentData = {};
-    if (res.code == proxy.$passCode) {
+    ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
-      const data = res.data ?? {};
+      if (res.code == proxy.$passCode) {
-      tenantDetail.value = data;
+        const data = res.data ?? {};
+        tentData = {...tentData, ...data};
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }));
+    ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
+      if (res.code == proxy.$passCode) {
+        const data = res.data ?? {};
+        tentData = {...tentData, ...data};
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }))
+    Promise.all(ps).then(() => {
+      tenantDetail.value = tentData;
      propertyFormItems.value.forEach((item, index) => {
-        if (item.field == 'address' || item.field == 'usci' || item.field == 'registerDate' || item.field == 'tradeStartDate' || item.field == 'tradeEndDate') {//在会员详情处获取。
+        if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
          item.default = tenantDetail.value[item.field];
-        } else if (item.field == 'businessLicense') {
+        } else if (item.field == 'businessLicenseJson') {
          item.default = tenantDetail.value[item.field] || [];
          if (!item.default.length) {
            item.visible = false;
@@ -186,10 +203,9 @@ const getTenantDetail = () => {
          }
        }
      });
-    } else {
+    }).catch(() => {
-      ElMessage.error(res.msg);
+      fullscreenLoading.value = false;
-    }
+    });
-  });
 }
 const setBaseFormItemsValue = (info) => {
@@ -327,9 +343,9 @@ const setPropertyFormItemsValue = (info) => {
        propertyFormItems.value[index + 1].visible = false;
        propertyFormItems.value[index + 2].visible = false;
      }
-    } else if (item.field == 'address' || item.field == 'usci' || item.field == 'registerDate' || item.field == 'tradeStartDate' || item.field == 'tradeEndDate') {//在会员详情处获取。
+    } else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
      item.default = tenantDetail.value[item.field];
-    } else if (item.field == 'businessLicense') {
+    } else if (item.field == 'businessLicenseJson') {
      item.default = tenantDetail.value[item.field] || [];
      if (!item.default.length) {
        item.visible = false;
@@ -391,6 +407,7 @@ onActivated(() => {
 })
 onBeforeMount(() => {
+  restart.value = localStorage.getItem('isRestart')?true:false;
  if (guid) {
    fullscreenLoading.value = true;
    getRegiaterDetail({ guid: guid }).then((res: any) => {
@@ -955,7 +972,7 @@ const baseFormItems: any = ref([
    block: true,
    field: "dataSensitivityLevel",
    col: 'other-group-flex',
-    default: [1],
+    default: [],
    children: [
      {
        label: "公开数据",
@@ -1041,7 +1058,7 @@ const baseFormItems: any = ref([
    type: "checkbox-group-row",
    placeholder: "",
    field: "dataGetWay",
-    default: [1],
+    default: [],
    col: 'other-group-flex',
    block: true,
    children: [
@@ -1093,7 +1110,7 @@ const baseFormItems: any = ref([
    type: "checkbox-group-row",
    placeholder: "",
    field: "updateFrequency",
-    default: [3],
+    default: [],
    block: true,
    col: 'other-group-flex',
    children: [
@@ -1143,7 +1160,7 @@ const baseFormItems: any = ref([
    placeholder: "",
    col: 'other-group-flex',
    field: "ownIndustry",
-    default: [2],
+    default: [],
    children: [
      {
        label: "能源",
@@ -1181,7 +1198,7 @@ const baseFormItems: any = ref([
    placeholder: "",
    col: 'other-group-flex',
    field: "bizOwn",
-    default: [1],
+    default: [],
    children: [
      {
        label: "生产类业务数据",
@@ -1401,7 +1418,7 @@ const propertyFormItems: any = ref([
    type: "checkbox-group-row",
    placeholder: "",
    field: "propertyType",
-    default: [3],
+    default: [],
    children: [
      {
        label: "数据资源持有权",
@@ -1424,7 +1441,7 @@ const propertyFormItems: any = ref([
    placeholder: "",
    field: "rightsContent",
    col: 'col2',
-    default: [5],
+    default: [],
    children: [
      {
        label: "可转让",
@@ -1600,10 +1617,10 @@ const propertyFormItems: any = ref([
    label: '统一社会信用代码',
    type: 'input',
    placeholder: '请输入',
-    field: 'usci',
+    field: 'socialCreditCode',
    col: 'mr8',
    disabled: true,
-    default: tenantDetail.value.usci ?? "",
+    default: tenantDetail.value.socialCreditCode ?? "",
    required: false
  },
  {
@@ -1648,9 +1665,9 @@ const propertyFormItems: any = ref([
  {
    label: "注册日期",
    type: "date",
-    field: "registerDate",
+    field: "registrationDate",
    col: 'mr8',
-    default: tenantDetail.value.registerDate ?? "",
+    default: tenantDetail.value.registrationDate ?? "",
    placeholder: "请选择",
    clearable: true,
    disabled: true,
@@ -1660,9 +1677,9 @@ const propertyFormItems: any = ref([
    label: '营业开始日期',
    type: 'date',
    placeholder: '请输入',
-    field: 'tradeStartDate',
+    field: 'businessLicenseStartDate',
    col: 'mr8',
-    default: tenantDetail.value.tradeStartDate ?? "",
+    default: tenantDetail.value.businessLicenseStartDate ?? "",
    unlink: true,
    disabled: true,
    clearable: true,
@@ -1672,8 +1689,8 @@ const propertyFormItems: any = ref([
    label: '营业结束日期',
    type: 'date',
    placeholder: '无固定期限',
-    field: 'tradeEndDate',
+    field: 'businessLicenseEndDate',
-    default: tenantDetail.value.tradeEndDate ?? "",
+    default: tenantDetail.value.businessLicenseEndDate ?? "",
    unlink: true,
    col: 'no-margin-r',
    disabled: true,
@@ -1688,7 +1705,7 @@ const propertyFormItems: any = ref([
    templateUrl: null,
    default: [],
    visible: false,
-    field: 'businessLicense'
+    field: 'businessLicenseJson'
  },
 ]);
@@ -2015,7 +2032,7 @@ const save = () => {
              fullscreenLoading.value = true;
              if (draftDetailInfo.value.guid) {
                params.guid = draftDetailInfo.value.guid;
-                params.isRestart = restart ? true : false;
+                params.isRestart = restart.value;
                registerUpdate(params).then((res: any) => {
                  fullscreenLoading.value = false;
                  if (res.code == proxy.$passCode) {
--- a/vite.config.ts
View file @71becdb
+++ b/vite.config.ts
View file @71becdb
@@ -40,6 +40,11 @@ export default ({ mode, command }) => {
          changeOrigin: env.VITE_OPEN_PROXY === 'true',
          rewrite: path => path.replace(/\/portal/, ''),
        },
+        '/circulation':{
+          target: env.VITE_APP_CIRCULATION,
+          changeOrigin: env.VITE_OPEN_PROXY === 'true',
+          rewrite: path => path.replace(/\/circulation/, ''),
+        },
        '/obs': {
          target: '//csbr-daop.obs.cn-north-1.myhuaweicloud.com:443',
          changeOrigin: env.VITE_OPEN_PROXY === 'true',