Merge branch 'dev_20241202_xukangle' into develop

xukangle
Showing 7 changed files with 57 additions and 41 deletions
.env.product
src/api/modules/dataProduct.ts
src/views/data_inventory/classifyGradeCatalogue.vue
src/views/data_inventory/configureRules.vue
src/views/data_inventory/tableCreateExisting.vue
src/views/data_product/productListing.vue
src/views/data_product/productListingDetail.vue
--- a/.env.product
View file @3ce663e
+++ b/.env.product
View file @3ce663e
@@ -70,7 +70,11 @@ VITE_APP_COMMON_URL = 'ms-daop-common-service'
 #门户接口
 VITE_API_PORTALURL = https://swzl-test.zgsjzc.com/portal
+#新门户接口
+VITE_API_NEW_PORTAL = ms-daop-zcgl-asset-dam-service
+#人员服务
+VITE_APP_PERSONAL_URL = 'ms-daop-personel-service'
 #数据资产接口地址
 VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
 #数据同步接口地址
--- a/src/api/modules/dataProduct.ts
View file @3ce663e
+++ b/src/api/modules/dataProduct.ts
View file @3ce663e
@@ -13,7 +13,7 @@ export const getProductList = (params) => request({
 /** 获取已添加的数据产品列表 */
 export const getAddedProductList = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/product-grounding/list-select`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/list-select`,
  method: 'post',
  data: params
 })
@@ -27,35 +27,43 @@ export const getListingList = (params) => request({
 /** 获取数据产品上架详情 */
 export const getListingDetail = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/product-grounding/detail`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/detail`,
  method: 'get',
  params
 })
 /** 新增数据产品上架信息 */
 export const listingSave = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/product-grounding/save`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/save`,
+  method: 'post',
+  data: params
+});
+/**数据产品上架新增门户/product-grounding/save-gateway */
+export const listingSavePortal = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/save-gateway`,
  method: 'post',
  data: params
 });
 /** 更新数据产品上架信息 */
 export const listingUpdate = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/product-grounding/update`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/update`,
  method: 'post',
  data: params
 });
 /** 删除数据产品上架信息 */
 export const listingDelete = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/product-grounding/delete`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/delete`,
  method: 'delete',
  data: params
 });
 /** 更新数据产品上架状态及上架平台 */
 export const listingUpdateStatus = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/product-grounding/update-grounding-pick`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/update-grounding-pick`,
  method: 'post',
  data: params
 });
@@ -65,75 +73,75 @@ export const listingUpdateStatus = (params) => request({
 **/
 /** 获取数据需求列表。 */
 export const getDemandList = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/page-list`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/page-list`,
  method: 'post',
  data: params
 })
 /** 获取数据需求发布详情 */
 export const getDemandDetail = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/detail`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/detail`,
  method: 'get',
  params
 })
 /** 新增数据需求发布信息 */
 export const demandSave = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/save`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/save`,
  method: 'post',
  data: params
 });
 /** 新增竞赛需求发布 */
 export const competitionSave = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/competition-save`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/competition-save`,
  method: 'post',
  data: params
 });
 /** 新增要素市场需求发布 */
 export const marketSave = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/market-save`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/market-save`,
  method: 'post',
  data: params
 });
 /** 更新数据需求发布信息 */
 export const demandUpdate = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/update`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/update`,
  method: 'post',
  data: params
 });
 /** 更新竞赛发布信息 */
 export const competitionUpdate = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/competition-update`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/competition-update`,
  method: 'post',
  data: params
 });
 /** 更新数据要素市场发布信息 */
 export const marketUpdate = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/market-update`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/market-update`,
  method: 'post',
  data: params
 });
 /** 删除数据需求发布信息 */
 export const demandDelete = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/delete`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/delete`,
  method: 'delete',
  data: params
 });
 /** 更新数据需求发布状态及上架平台 */
 export const demandUpdateStatus = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/update-listing-Status`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/update-listing-Status`,
  method: 'post',
  data: params
 });
 /** 验证数据需求名称唯一性 */
 export const checkDemandName = (params) => request({
-  url: `${import.meta.env.VITE_API_ASSET_BASEURL}/demand-release/verify-data-name?dataName=${params}`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/demand-release/verify-data-name?dataName=${params}`,
  method: 'get'
 })
--- a/src/views/data_inventory/classifyGradeCatalogue.vue
View file @3ce663e
+++ b/src/views/data_inventory/classifyGradeCatalogue.vue
View file @3ce663e
--- a/src/views/data_inventory/configureRules.vue
View file @3ce663e
+++ b/src/views/data_inventory/configureRules.vue
View file @3ce663e
--- a/src/views/data_inventory/tableCreateExisting.vue
View file @3ce663e
+++ b/src/views/data_inventory/tableCreateExisting.vue
View file @3ce663e
@@ -1087,7 +1087,7 @@ onActivated(() => {
                  </el-select>
                </div>
                <div v-else>
-                  {{ fieldData ? fieldData.find(item => item.value === scope.row.fieldType)?.label : '--' }}
+                  {{ fieldData ? (fieldData.find(item => item.value === scope.row.fieldType)?.label || '--') : '--' }}
                </div>
              </template>
            </el-table-column>
@@ -1096,7 +1096,8 @@ onActivated(() => {
            <el-table-column prop="fieldLength" label="长度" width="100" align="left">
              <template #default="scope">
                <!-- 非编辑状态 -->
-                <span v-if="!scope.row.isEdit || (scope.row.isPrimary === 'Y' && route.query.editOpt === '1')">
+                <span
+                  v-if="!scope.row.isEdit || (scope.row.isPrimary === 'Y' && route.query.editOpt === '1' && route.query.state != '0')">
                  {{ ['varchar', 'decimal', 'char'].includes(scope.row.fieldType) ? scope.row.fieldLength || '--' : '--'
                  }}
                </span>
--- a/src/views/data_product/productListing.vue
View file @3ce663e
+++ b/src/views/data_product/productListing.vue
View file @3ce663e
@@ -215,7 +215,8 @@ const toPatn = (type) => {
    router.push({
      name: "productListingDetail",
      query: {
-        type
+        type,
+        groundingPick: '门户数据专区'
      },
    });
  } else {
--- a/src/views/data_product/productListingDetail.vue
View file @3ce663e
+++ b/src/views/data_product/productListingDetail.vue
View file @3ce663e
@@ -15,7 +15,7 @@ import { changeNum } from '@/utils/common';
 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
 import { getAreaData, getServiceTenants } from "@/api/modules/queryService";
 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getSubjectDoaminList, getServiceDetail } from "@/api/modules/dataAsset";
-import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, getParamsDataList } from "@/api/modules/dataProduct";
+import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList } from "@/api/modules/dataProduct";
 import { getMatchDetail } from "@/api/modules/dataFinance";
 import { useValidator } from '@/hooks/useValidator';
@@ -153,15 +153,15 @@ const formInfo = ref({
      clearable: true,
      required: true,
    }, {
-      label: "产品类型",
+      label: "资产类型",
      type: "select",
      placeholder: "请选择",
      field: "damType",
      default: '',
      options: damTypes.value,
      props: {
-        value: 'paramValue',
+        value: 'value',
-        label: 'paramName'
+        label: 'label'
      },
      disabled: true,
      required: true,
@@ -214,7 +214,7 @@ const formInfo = ref({
      maxlength: 19,
      regexp: /\D/g,
      default: '',
-      disabled: true,
+      disabled: false,
      required: true
    }, {
      label: '病例总数(例)',
@@ -222,7 +222,7 @@ const formInfo = ref({
      placeholder: '请输入',
      field: 'caseNumber',
      default: '',
-      disabled: true,
+      disabled: false,
      required: false
    }, {
      label: '数据覆盖地域',
@@ -300,6 +300,7 @@ const formInfo = ref({
      field: 'productPrice',
      default: '',
      disabled: false,
+      inputType: 'moneyNumber',
      required: true
    },
    {
@@ -788,11 +789,17 @@ const submitForm = (btn, formEl, tosub = false) => {
      // if (params.content) {
      //   params.productDesc = truncateHTML(params.content, 400);
      // }
-      params.dataScale = formInfo.value.items.at(4).defaultValue;
+      console.log(params, formInfo.value.items.at(4).defaultValue, formInfo.value, '-----------------');
-      params.caseNumber = formInfo.value.items.at(5).defaultValue;
+      params.dataScale = formInfo.value.items.at(4).defaultValue || formInfo.value.items.at(4).default;
+      params.caseNumber = formInfo.value.items.at(5).defaultValue || formInfo.value.items.at(4).default;
+      params.timeAreaStart = params.dateRange ? params.dateRange[0] : '';
+      params.timeAreaEnd = params.dateRange ? params.dateRange[1] : '';
+      params.groundingPick = [route.query.groundingPick];
+      // 删除dateRange字段
+      delete params.dateRange;
      flowDetailLoading.value = true;
      if (detailType == 'add') {
-        listingSave(params).then((res: any) => {
+        listingSavePortal(params).then((res: any) => {
          if (res.code == proxy.$passCode) {
            ElMessage({
              type: "success",
@@ -1136,7 +1143,7 @@ onBeforeMount(() => {
    }
  }
  getApproveData();
-  getParamsDataList({ dictType: '字段类型' }).then((res: any) => {
+  getParamsDataList({ dictType: '资产类型' }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      damTypes.value = res.data || [];
      let item = formInfo.value.items.find(item => item.field == 'damType');
@@ -1148,9 +1155,8 @@ onBeforeMount(() => {
  getParamsDataList({ dictType: '交付方式' }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      deliveryWayList.value = res.data || [];
-      // let item = formInfo.value.items.find(item => item.field == 'deliveryWay');
+      let item = formInfo.value.items.find(item => item.field == 'deliveryWay');
-      // item && (item.options = deliveryWayList.value);
+      item && (item.options = deliveryWayList.value);
-      formInfo.value.items[6].options = res.data || [];
    } else {
      proxy.$ElMessage.error(res.msg);
    }
@@ -1158,10 +1164,8 @@ onBeforeMount(() => {
  getParamsDataList({ dictType: '定价方式' }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      pricingMethodList.value = res.data || [];
-      formInfo.value.items[7].options = res.data || [];
+      let item = formInfo.value.items.find(item => item.field == 'pricingWay');
-      // let item = formInfo.value.items.find(item => item.field == 'deliveryWay');
+      item && (item.options = pricingMethodList.value);
-      // item && (item.options = deliveryWayList.value);
-      // formInfo.value.items[7].options = res.data || [];
    } else {
      proxy.$ElMessage.error(res.msg);
    }
@@ -1169,10 +1173,8 @@ onBeforeMount(() => {
  getParamsDataList({ dictType: '价格单位' }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      priceUnitList.value = res.data || [];
-      formInfo.value.items[9].options = res.data || [];
+      let item = formInfo.value.items.find(item => item.field == 'priceUnit');
-      // let item = formInfo.value.items.find(item => item.field == 'deliveryWay');
+      item && (item.options = priceUnitList.value);
-      // item && (item.options = deliveryWayList.value);
-      // formInfo.value.items[7].options = res.data || [];
    } else {
      proxy.$ElMessage.error(res.msg);
    }