数据使用

@@ -38,4 +38,11 @@ export const getDataUsePageList = (params) => request({
   url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/page-list`,
   url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/page-list`,
   method: 'post',
   method: 'post',
   data: params
   data: params
-})
\ No newline at end of file
+})
+
+/** 删除数据使用 */
+export const deleteDataUse = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/delete`,
+  method: 'delete',
+  data: params
+});

@@ -179,8 +179,8 @@ onMounted(() => {
 
 
         </template>
         </template>
         <template v-else-if="item.type == 'date-time'">
         <template v-else-if="item.type == 'date-time'">
-          <el-date-picker v-model="formInline[item.field]" type="datetimerange" start-placeholder="开始时间"
-            end-placeholder="结束时间" />
+          <el-date-picker v-model="formInline[item.field]" type="datetimerange" :start-placeholder="item.startPlaceholder ?? '开始时间'"
+          :default-time="item.defaultTime ?? [item.defaultStartTime, item.defaultEndTime]" :end-placeholder="item.endPlaceholder ?? '结束时间'" />
         </template>
         </template>
         <template v-else-if="item.type == 'date-range'">
         <template v-else-if="item.type == 'date-range'">
           <el-date-picker v-model="formInline[item.field]" type="daterange" :start-placeholder="item.startPlaceholder ?? '开始日期'" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
           <el-date-picker v-model="formInline[item.field]" type="daterange" :start-placeholder="item.startPlaceholder ?? '开始日期'" format="YYYY-MM-DD" value-format="YYYY-MM-DD"

@@ -69,7 +69,7 @@ const routes: RouteRecordRaw[] = [
         name: 'apiDetail',
         name: 'apiDetail',
         component: () => import('@/views/data_asset/detail_serviceApi.vue'),
         component: () => import('@/views/data_asset/detail_serviceApi.vue'),
         meta: {
         meta: {
-          title: '流程详情',
+          title: '详情-',
           sidebar: false,
           sidebar: false,
           breadcrumb: false,
           breadcrumb: false,
           cache: true,
           cache: true,

@@ -62,6 +62,42 @@ const routes: RouteRecordRaw[] = [
             return;
             return;
           }
           }
         }
         }
+      },
+      {
+        path: 'usage-register-catalog-detail',
+        name: 'usageCatalogDetail',
+        component: () => import('@/views/data_asset/registerCatalogDetail.vue'),
+        meta: {
+          title: '详情-',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+          reuse: true
+        }
+      },
+      {
+        path: 'usage-api-detail',
+        name: 'usageApiDetail',
+        component: () => import('@/views/data_asset/detail_serviceApi.vue'),
+        meta: {
+          title: '详情-',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+          reuse: true
+        }
+      },
+      {
+        path: 'data-usage-log',
+        name: 'dataUsageLog',
+        component: () => import('@/views/data_asset/dataUsageLog.vue'),
+        meta: {
+          title: '使用日志-',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+          reuse: true
+        }
       }
       }
     ],
     ],
   },
   },

@@ -234,7 +234,7 @@ const tableInfo = ref({
       }
       }
       // 交付只有核验通过有。
       // 交付只有核验通过有。
       let verifySatus = row.verifySatus;
       let verifySatus = row.verifySatus;
-      (verifySatus == 1 || verifySatus == 4) && !row.isRefresh && btns.push({
+      (deliveryStatus == 3 || verifySatus == 1 || verifySatus == 4) && !row.isRefresh && btns.push({
         value: 'refresh', label: '刷新', click: (scope) => {
         value: 'refresh', label: '刷新', click: (scope) => {
           scope.row.isRefresh = true;
           scope.row.isRefresh = true;
           //只刷新当前这一条数据
           //只刷新当前这一条数据
@@ -273,7 +273,7 @@ const tableInfo = ref({
         });
         });
       }
       }
       //已通过且未交付时，有交付按钮
       //已通过且未交付时，有交付按钮
-      verifySatus == 3 && deliveryStatus != 2 && btns.push({
+      verifySatus == 3 && deliveryStatus != 2 && deliveryStatus != 3 && btns.push({
         value: 'delivery', label: '交付', click: (scope) => {
         value: 'delivery', label: '交付', click: (scope) => {
           deliveryContract(scope.row.guid).then((res: any) => {
           deliveryContract(scope.row.guid).then((res: any) => {
             if (res?.code == proxy.$passCode) {
             if (res?.code == proxy.$passCode) {

@@ -3,9 +3,11 @@ import TableTools from "@/components/Tools/table_tools.vue";
 import { commonPageConfig, TableColumnWidth } from '@/utils/enum';
 import { commonPageConfig, TableColumnWidth } from '@/utils/enum';
 import {
 import {
   getDataUsePageList,
   getDataUsePageList,
-
+  deleteDataUse,
 } from "@/api/modules/dataDelivery";
 } from "@/api/modules/dataDelivery";
+import { useValidator } from "@/hooks/useValidator";
 
 
+const { required } = useValidator();
 const router = useRouter();
 const router = useRouter();
 const route = useRoute();
 const route = useRoute();
 const { proxy } = getCurrentInstance() as any;
 const { proxy } = getCurrentInstance() as any;
@@ -40,22 +42,20 @@ const page = ref({
 const tableFields = ref([
 const tableFields = ref([
   { label: "序号", type: "index", width: 56, align: "center" },
   { label: "序号", type: "index", width: 56, align: "center" },
   {
   {
-    label: "数据产品名称", field: "dataProductName", width: 150, type: "text_btn", columClass: 'text_btn', value: "detail", click: (scope) => {
-      //TODO.是在数据使用方使用的
+    label: "数据产品名称", field: "dataProductName", width: 160, type: "text_btn", columClass: 'text_btn', value: "detail", click: (scope) => {
       router.push({
       router.push({
-        path: '/data-asset/register-catalog/register-catalog-detail',
+        name: 'usageCatalogDetail',
         query: {
         query: {
           guid: scope.row.dataProductGuid,
           guid: scope.row.dataProductGuid,
           type: 'detail',
           type: 'detail',
-          dataSources: 2,
-          foundMode: 1,
+          foundMode: 'use',
           name: scope.row.dataProductName,
           name: scope.row.dataProductName,
         }
         }
       });
       });
     }
     }
   },
   },
   {
   {
-    label: "合约名称", field: "contractName", width: 160, type: "text_btn", columClass: 'text_btn', value: "detail1", click: (scope) => {
+    label: "合约名称", field: "contractName", width: 170, type: "text_btn", columClass: 'text_btn', value: "detail1", click: (scope) => {
       //履约中的合约状态
       //履约中的合约状态
       router.push({
       router.push({
         name: 'smartContractDetail',
         name: 'smartContractDetail',
@@ -73,7 +73,7 @@ const tableFields = ref([
       return scope.row.deliveryMethod == 1 ? '文件' : 'API';
       return scope.row.deliveryMethod == 1 ? '文件' : 'API';
     }
     }
   },
   },
-  { label: "交付方", field: "deliveryPartyName", width: 240 },
+  { label: "交付方", field: "deliveryPartyName", width: 220 },
   { label: "交付时间", field: "deliveryTime", width: 170 },
   { label: "交付时间", field: "deliveryTime", width: 170 },
 ]);
 ]);
 
 
@@ -92,16 +92,75 @@ const tableInfo = ref({
   actionInfo: {
   actionInfo: {
     label: "操作",
     label: "操作",
     type: "btn",
     type: "btn",
-    width: 160,
+    width: 230,
     btns: (scope) => {
     btns: (scope) => {
-      let btns: any = [];
-      //TODO。根据返回值显示按钮
-      btns.push({ label: '日志', value: 'log' });
-      return btns;
+      let actions = scope.row.actions || {};
+      let arrBtns: any = [];
+      for (let action in actions) {
+        arrBtns.push({ label: actions[action], value: action, click: btnHanldesMap[action] });
+      }
+      arrBtns.push({ label: '日志', value: 'log', click: btnHanldesMap['log'] });
+      return arrBtns;
     }
     }
   }
   }
 });
 });
 
 
+const btnHanldesMap = {
+  /** 查看产品详情 */
+  read: (scope) => {
+    router.push({
+      name: 'usageCatalogDetail',
+      query: {
+        guid: scope.row.dataProductGuid,
+        type: 'detail',
+        foundMode: 'read',
+        name: scope.row.dataProductName,
+      }
+    });
+  },
+  download: (scope) => { //下载
+    router.push({
+      name: 'usageCatalogDetail',
+      query: {
+        guid: scope.row.dataProductGuid,
+        type: 'detail',
+        foundMode: 'download',
+        name: scope.row.dataProductName,
+      }
+    });
+  },
+  distribute: (scope) => { //分发
+    currTableData.value = scope.row;
+    tenantDialogInfo.value.visible = true;
+    templateFormItems.value[0].options = currTableData.value.deliveryNodes || [];
+    templateFormItems.value[0].default = '';
+  },
+  delete: (scope) => {//删除
+    proxy.$openMessageBox('确定要删除该数据使用吗？', () => {
+      deleteDataUse([scope.row.guid]).then((res: any) => {
+        if (res.code == proxy.$passCode) {
+          page.value.curr = 1;
+          getTableData();
+          proxy.$ElMessage.success("删除成功");
+        } else {
+          proxy.$ElMessage.error(res.msg);
+        }
+      });
+    }, () => {
+      proxy.$ElMessage.info("已取消");
+    })
+  },
+  log: (scope) => { //日志
+    router.push({
+      name: 'dataUsageLog',
+      query: {
+        contractGuid: scope.row.contractGuid,
+        contractName: scope.row.contractName
+      }
+    });
+  }
+}
+
 const toSearch = (val: any, clear: boolean = false) => {
 const toSearch = (val: any, clear: boolean = false) => {
   if (clear) {
   if (clear) {
     searchItemList.value.map((item) => (item.default = ""));
     searchItemList.value.map((item) => (item.default = ""));
@@ -149,6 +208,51 @@ onBeforeMount(() => {
   toSearch({});
   toSearch({});
 });
 });
 
 
+const templateFormItems = ref([{
+  type: 'select',
+  label: '分发连接器',
+  field: 'tenantGuids',
+  default: '',
+  block: true,
+  placeholder: '请选择',
+  options: [],
+  props: {
+    value: 'guid',
+    label: 'tenantName'
+  },
+  filterable: true,
+  multiple: true,
+  clearable: true,
+  required: true
+}]);
+
+const templateFormRules = ref({
+  tenantGuids: [required('请选择分发连接器')]
+});
+
+const tenantDialogInfo = ref({
+  visible: false,
+  size: 480,
+  title: "选择分发连接器",
+  type: 'edit',
+  formInfo: {
+    id: 'copy-form',
+    items: templateFormItems.value,
+    rules: templateFormRules.value
+  },
+  submitBtnLoading: false,
+  btns: {
+    submit: (btn, info) => {
+      tenantDialogInfo.value.submitBtnLoading = true;
+
+      tenantDialogInfo.value.visible = false;
+    },
+    cancel: () => {
+      tenantDialogInfo.value.visible = false;
+    }
+  }
+});
+
 </script>
 </script>
 
 
 <template>
 <template>
@@ -159,6 +263,8 @@ onBeforeMount(() => {
     <div class="table_panel_wrap" style="height: calc(100% - 44px);">
     <div class="table_panel_wrap" style="height: calc(100% - 44px);">
       <Table :tableInfo="tableInfo" @tablePageChange="tablePageChange" />
       <Table :tableInfo="tableInfo" @tablePageChange="tablePageChange" />
     </div>
     </div>
+    <!-- 选择分发企业的对话框 -->
+    <Dialog_form :dialogConfigInfo="tenantDialogInfo" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -40,6 +40,8 @@ const evaGuid = route.query.evaGuid;
 const costAssessGuid = route.query.costAssessGuid;
 const costAssessGuid = route.query.costAssessGuid;
 const certificateGuid = route.query.certificateGuid;
 const certificateGuid = route.query.certificateGuid;
 const detailType = ref(route.query.type);
 const detailType = ref(route.query.type);
+const dataSources = ref(route.query.dataSources  || 2)
+const foundMode = ref(route.query.foundMode);
 
 
 const { proxy } = getCurrentInstance() as any;
 const { proxy } = getCurrentInstance() as any;
 /** 当前主要类型的详情信息。 */
 /** 当前主要类型的详情信息。 */
@@ -174,7 +176,7 @@ const registerDetailTableInfo = ref({
           });
           });
         } else if (row.type == 'trade') {
         } else if (row.type == 'trade') {
           router.push({
           router.push({
-            path: route.query.dataSources == '1' ? '/data-asset/authordata-catalog/register-catalog-transaction-detail' : '/data-asset/register-catalog/register-catalog-transaction-detail',
+            path: dataSources.value == '1' ? '/data-asset/authordata-catalog/register-catalog-transaction-detail' : '/data-asset/register-catalog/register-catalog-transaction-detail',
             //name: 'transactionManagement'
             //name: 'transactionManagement'
             query: {
             query: {
               guid: row.guid,
               guid: row.guid,
@@ -340,7 +342,24 @@ const productTableInfo = ref({
   data: [],
   data: [],
   showPage: false,
   showPage: false,
   actionInfo: {
   actionInfo: {
-    show: false
+    label: "操作",
+    type: "btn",
+    isMore: false,
+    width: 130,
+    btns: (scope) => {
+      let arrBtns: any = [];
+      //若是使用方，则换一个api地址
+      arrBtns.push({
+        label: '查看', value: 'view', click: (scope) => {
+          router.push({
+            name: (route.query.foundMode == 'read' || route.query.foundMode == 'download') ? 'useApiDetail' : 'apiDetail',
+            query: { guid: scope.row.guid, apiName: scope.row.apiName }
+          });
+        }
+      })
+      // 是否显示下载等。
+      return arrBtns;
+    }
   },
   },
   loading: false
   loading: false
 });
 });
@@ -354,10 +373,10 @@ onBeforeMount(() => {
 onActivated(() => {
 onActivated(() => {
   if (detailInfo.value?.damName) {
   if (detailInfo.value?.damName) {
     if (fullPath === route.fullPath) {
     if (fullPath === route.fullPath) {
-      document.title = `详情-${detailInfo.value?.damName}`;
+      document.title = foundMode.value == 'download' ? `下载详情-${detailInfo.value?.damName}` : (foundMode.value == 'read' ? `查看详情-${detailInfo.value?.damName}`  : `详情-${detailInfo.value?.damName}`);
       let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
       let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
       if (tab) {
       if (tab) {
-        tab.meta.title = `详情-${detailInfo.value?.damName}`;
+        tab.meta.title = foundMode.value == 'download' ? `下载详情-${detailInfo.value?.damName}` : (foundMode.value == 'read' ? `查看详情-${detailInfo.value?.damName}`  : `详情-${detailInfo.value?.damName}`);
       }
       }
     }
     }
   }
   }
@@ -416,7 +435,7 @@ const handleTableViewData = (scope) => {
   let row = scope.row;
   let row = scope.row;
   router.push({
   router.push({
     // name: 'damTableDataView',
     // name: 'damTableDataView',
-    path: route.query.dataSources == '1' ? '/data-asset/authordata-catalog/damTableDataView' : '/data-asset/register-catalog/damTableDataView',
+    path: dataSources.value == '1' ? '/data-asset/authordata-catalog/damTableDataView' : '/data-asset/register-catalog/damTableDataView',
     query: {
     query: {
       guid: row.guid,
       guid: row.guid,
       name: row.tableChName,
       name: row.tableChName,
@@ -425,6 +444,11 @@ const handleTableViewData = (scope) => {
   });
   });
 }
 }
 
 
+/** 下载数据 */
+const handleTableViewDataDown = (scope) => {
+  //TODO
+}
+
 const toolBtns: any = computed(() => {
 const toolBtns: any = computed(() => {
   let btnsArr: any = [{
   let btnsArr: any = [{
     label: "关闭", value: "cancel", plain: true
     label: "关闭", value: "cancel", plain: true
@@ -452,7 +476,7 @@ const btnClick = (btn) => {
     console.log('detailType', detailType.value);
     console.log('detailType', detailType.value);
     if (detailType.value == 'asset') {
     if (detailType.value == 'asset') {
       router.push({
       router.push({
-        path: route.query.dataSources == '1' ? '/data-asset/authordata-catalog' : '/data-asset/register-catalog',
+        path: dataSources.value == '1' ? '/data-asset/authordata-catalog' : '/data-asset/register-catalog',
         //name: 'registerCatalogManagement',
         //name: 'registerCatalogManagement',
         query: {}
         query: {}
       });
       });
@@ -1103,16 +1127,16 @@ const formattedAmount = computed(() => {
 
 
 const handleClick = () => {
 const handleClick = () => {
   // 跳转到 apiDetail 页面
   // 跳转到 apiDetail 页面
-  if (detailInfo.value.foundMode == '2') {
-    router.push({
-      path: route.query.dataSources == '1' ? '/data-asset/authordata-catalog/api-detail' : '/data-asset/register-catalog/api-detail',
-      //name: 'apiDetail',
-      query: {
-        guid: detailInfo.value.guid,
-        type: 'detaile',
-      }
-    });
-  }
+  // if (detailInfo.value.foundMode == '2') {
+  //   router.push({
+  //     path: route.query.dataSources == '1' ? '/data-asset/authordata-catalog/api-detail' : '/data-asset/register-catalog/api-detail',
+  //     //name: 'apiDetail',
+  //     query: {
+  //       guid: detailInfo.value.guid,
+  //       type: 'detaile',
+  //     }
+  //   });
+  // }
 };
 };
 
 
 const deliverySpanMethod = ({
 const deliverySpanMethod = ({
@@ -1215,7 +1239,7 @@ const respParamsTableInfo = ref({
         <div class="right-main">
         <div class="right-main">
           <div class="asset-title">
           <div class="asset-title">
             <div style="display: flex;align-items: center;width: 100%">
             <div style="display: flex;align-items: center;width: 100%">
-              <div @click="handleClick" :class="{ 'foundMode': detailInfo.foundMode == '2', 'title1': true }"><ellipsis-tooltip :content="detailInfo.damName ?? '--'"
+              <div :class="{ 'title1': true }"><ellipsis-tooltip :content="detailInfo.damName ?? '--'"
                   class-name="w100f" :refName="'tooltipOver' + 'damName'"></ellipsis-tooltip></div>
                   class-name="w100f" :refName="'tooltipOver' + 'damName'"></ellipsis-tooltip></div>
               <div class="dataLabel">{{ detailInfo.damTypeName }}</div>
               <div class="dataLabel">{{ detailInfo.damTypeName }}</div>
               <div class="dataLabel" v-show="detailInfo.domainName">{{ detailInfo.domainName }}</div>
               <div class="dataLabel" v-show="detailInfo.domainName">{{ detailInfo.domainName }}</div>
@@ -1434,9 +1458,10 @@ const respParamsTableInfo = ref({
               <span>{{ scope.row["updateTime"] || '--' }}</span>
               <span>{{ scope.row["updateTime"] || '--' }}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column label="操作" v-if="!detailInfo.nodeId" minWidth="120px" align="left" fixed="right" show-overflow-tooltip>
+          <el-table-column label="操作" v-if="!detailInfo.nodeId || foundMode == 'download'" minWidth="120px" align="left" fixed="right" show-overflow-tooltip>
             <template #default="scope">
             <template #default="scope">
               <span class="text_btn" @click="handleTableViewData(scope)">查看样例数据</span>
               <span class="text_btn" @click="handleTableViewData(scope)">查看样例数据</span>
+              <span class="text_btn" @click="handleTableViewDataDown(scope)">下载数据</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>

@@ -196,10 +196,10 @@ const tableInfo = ref({
     btns: (scope) => {
     btns: (scope) => {
       const { row } = scope;
       const { row } = scope;
       let list: any = [];
       let list: any = [];
-      list.push({ label: "编辑", disabled: row.apiState == 1, value: "edit", click: apiManageTableBtnMap.EDIT });
-      list.push({ label: "删除", disabled: row.apiState == 1, value: "del", click: apiManageTableBtnMap.DELETE });
+      list.push({ label: "编辑", disabled: row.apiState == 1 || !!row.nodeId, value: "edit", click: apiManageTableBtnMap.EDIT });
+      list.push({ label: "删除", disabled: row.apiState == 1 || !!row.nodeId, value: "del", click: apiManageTableBtnMap.DELETE });
       list.push({ label: "详情", value: "detail", click: apiManageTableBtnMap.DETAIL });
       list.push({ label: "详情", value: "detail", click: apiManageTableBtnMap.DETAIL });
-      list.push({ label: "复制", value: "copy", click: apiManageTableBtnMap.COPY })
+      list.push({ label: "复制", value: "copy", disabled: !!row.nodeId, click: apiManageTableBtnMap.COPY })
       return list;
       return list;
       // const approveVO = row.approveVO || {};
       // const approveVO = row.approveVO || {};
       // if (!approveVO && row.isApprove == 'N') {
       // if (!approveVO && row.isApprove == 'N') {

@@ -64,8 +64,8 @@ const processTableSearchItemList = ref([{
   default: [],
   default: [],
   defaultStartTime: new Date(2000, 1, 1, 0, 0, 0),
   defaultStartTime: new Date(2000, 1, 1, 0, 0, 0),
   defaultEndTime: new Date(2000, 1, 1, 23, 59, 59),
   defaultEndTime: new Date(2000, 1, 1, 23, 59, 59),
-  startPlaceholder: '操作开始时间',
-  endPlaceholder: '操作结束时间',
+  startPlaceholder: '执行开始时间',
+  endPlaceholder: '执行结束时间',
   clearable: true
   clearable: true
 }, {
 }, {
   type: 'select',
   type: 'select',