Merge remote-tracking branch 'origin/master'

src/router/routes/index.ts

@@ -1322,6 +1322,15 @@ export const ResourceRoute: AppRouteRecordRaw = {
       name: 'detail2',
       component: () => import('@/views/dataSharingAndExchange/carouselManagement/detail/index.vue'),
     },
+    {
+      path: 'enrollAudit/detail',
+      name: 'detail3',
+      component: () => import('@/views/dataSharingAndExchange/enrollAudit/detail.vue'),
+      meta: {
+        title: '登记审核详情',
+        icon: '',
+      },
+    },
   ],
 };
 /**
@@ -1342,15 +1351,21 @@ export const ServicePlatformRoute: AppRouteRecordRaw = {
       path: 'policyManagement/detail',
       name: 'policyManagementDetail',
       component: () => import('@/views/servicePlatform/policyManagement/detail/index.vue'),
+      meta: {
+        title: '政策管理',
+        icon: '',
+      },
     },
     {
       path: 'enterpriseCertification/detail',
-      name: 'detail',
+      name: 'enterpriseDetail',
       component: () => import('@/views/servicePlatform/enterpriseCertification/detail.vue'),
       meta: {
-        title: '企业认证',
+        title: '企业认证详情',
         icon: '',
       },
+    },
+    {
       path: 'carouselManagement/detail',
       name: 'detail2',
       component: () => import('@/views/dataSharingAndExchange/carouselManagement/detail/index.vue'),

src/views/dataSharingAndExchange/enrollAudit/detail.vue

+<template>
+  <PageWrapper
+    title="登记审核"
+    dense
+    contentBackground
+    contentFullHeight
+    fixed-height
+    headerSticky
+    @back="handleBack"
+  >
+    <Row :gutter="[16, 30]">
+      <Col :span="12" v-for="info in enrollColumns" :key="info">
+        <div class="col-item">
+          <div class="item-label">{{ info.title }}：</div>
+          <div v-if="['enrollBook'].includes(info.dataIndex)" class="item-des"
+            ><TableImg
+              :size="150"
+              :simpleShow="true"
+              :showBadge="false"
+              :imgList="data[info.dataIndex]"
+            />
+          </div>
+          <div v-else class="item-des">{{ data[info.dataIndex] ? data[info.dataIndex] : '-' }}</div>
+        </div>
+      </Col>
+    </Row>
+  </PageWrapper>
+</template>
+
+<script lang="ts" setup>
+  import PageWrapper from '@/components/Page/src/PageWrapper.vue';
+  import { useRoute, useRouter } from 'vue-router';
+  import { Col, Row } from 'ant-design-vue';
+  import { enrollColumns } from './enroll.data';
+  import { ref, onMounted } from 'vue';
+  import { TableImg } from '@/components/Table';
+
+  const route = useRoute();
+  const data = ref(route.query);
+  const router = useRouter();
+
+  function handleBack() {
+    router.go(-1);
+  }
+
+  onMounted(() => {
+    console.log('date', data.value);
+  });
+</script>
+
+<style scoped>
+  .col-item {
+    display: flex;
+    gap: 10px;
+    margin: 20px 60px;
+    .item-label {
+      width: 150px;
+    }
+  }
+</style>

src/views/dataSharingAndExchange/enrollAudit/enroll.data.ts

+import { BasicColumn } from '@/components/Table';
+
+export const enrollColumns: BasicColumn[] = [
+  {
+    title: '登记编号',
+    dataIndex: 'enrollNum',
+  },
+  {
+    title: '申请人',
+    dataIndex: 'applicant',
+  },
+  {
+    title: '数据知识产权名称',
+    dataIndex: 'dataName',
+  },
+  {
+    title: '所属行业',
+    dataIndex: 'sector',
+  },
+  {
+    title: '数据来源',
+    dataIndex: 'dataBase',
+  },
+  {
+    title: '登记日期',
+    dataIndex: 'enrollDate',
+  },
+  {
+    title: '登记备案状态',
+    dataIndex: 'enrollStatus',
+  },
+  {
+    title: '是否存在异议',
+    dataIndex: 'isObjection',
+  },
+  {
+    title: '登记证书',
+    dataIndex: 'enrollBook',
+  },
+];

src/views/dataSharingAndExchange/enrollAudit/enrollData.ts

+export const enrollData: any[] = [
+  {
+    enrollNum: 'A123456789',
+    applicant: '张三',
+    dataName: '人工智能预测模型',
+    sector: '信息技术',
+    dataBase: '腾讯云数据中心',
+    enrollDate: '2023-01-15',
+    enrollStatus: '已备案',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'B987654321',
+    applicant: '李四',
+    dataName: '生物医药数据分析平台',
+    sector: '医疗健康',
+    dataBase: '华为云数据平台',
+    enrollDate: '2022-09-20',
+    enrollStatus: '待审核',
+    isObjection: '否',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'C112233445',
+    applicant: '王五',
+    dataName: '金融风控数据模型',
+    sector: '金融',
+    dataBase: '阿里云大数据中心',
+    enrollDate: '2023-03-05',
+    enrollStatus: '已备案',
+    isObjection: '否',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'D223344556',
+    applicant: '赵六',
+    dataName: '电商用户行为数据集',
+    sector: '电子商务',
+    dataBase: '百度云大数据平台',
+    enrollDate: '2022-12-10',
+    enrollStatus: '已备案',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'E334455667',
+    applicant: '钱七',
+    dataName: '智慧城市交通流量数据',
+    sector: '智慧城市',
+    dataBase: '京东云数据中心',
+    enrollDate: '2023-06-18',
+    enrollStatus: '待审核',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'F445566778',
+    applicant: '孙八',
+    dataName: '社交媒体舆情数据分析',
+    sector: '传媒',
+    dataBase: '网易云数据平台',
+    enrollDate: '2021-11-25',
+    enrollStatus: '已备案',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'G556677889',
+    applicant: '周九',
+    dataName: '气象预测大数据模型',
+    sector: '气象',
+    dataBase: '华为云数据平台',
+    enrollDate: '2022-05-30',
+    enrollStatus: '已备案',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'H667788990',
+    applicant: '吴十',
+    dataName: '电子商务用户消费行为数据',
+    sector: '电子商务',
+    dataBase: '阿里云数据中心',
+    enrollDate: '2023-02-10',
+    enrollStatus: '待审核',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'I778899001',
+    applicant: '郑十一',
+    dataName: '制造业生产线监控数据',
+    sector: '制造业',
+    dataBase: '腾讯云大数据平台',
+    enrollDate: '2023-04-15',
+    enrollStatus: '已备案',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+  {
+    enrollNum: 'J889900112',
+    applicant: '冯十二',
+    dataName: '健康医疗影像数据分析',
+    sector: '医疗健康',
+    dataBase: '百度云数据中心',
+    enrollDate: '2023-07-20',
+    enrollStatus: '已备案',
+    isObjection: '是',
+    enrollBook: ['src/assets/images/测试图片1.jpg'],
+  },
+];

src/views/dataSharingAndExchange/enrollAudit/index.vue

+<template>
+  <PageWrapper>
+    <BasicTable @register="registerTable">
+      <template #bodyCell="{ column, record, text }">
+        <template v-if="column.key === 'enrollBook'">
+          <TableImg :size="50" :simple-show="true" :show-badge="false" :img-list="text" />
+        </template>
+        <template v-if="column.key === 'action'">
+          <TableAction
+            :actions="[
+              {
+                label: '详情',
+                onClick: handleDetail.bind(null, record),
+              },
+              {
+                label: '审核',
+                onClick: handleAudit.bind(null, record),
+              },
+              {
+                label: '处理异议',
+                onClick: handleObjection.bind(null, record),
+              },
+            ]"
+          />
+        </template>
+      </template>
+    </BasicTable>
+    <ObjectionModal @register="registerModal" />
+  </PageWrapper>
+</template>
+
+<script lang="ts" setup>
+  import PageWrapper from '@/components/Page/src/PageWrapper.vue';
+  import BasicForm from '@/components/Form/src/BasicForm.vue';
+  import BasicTable from '@/components/Table/src/BasicTable.vue';
+  import { useTable, TableImg } from '@/components/Table';
+  import { enrollData } from './enrollData';
+  import { enrollColumns } from './enroll.data';
+  import TableAction from '@/components/Table/src/components/TableAction.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+  import { useRouter } from 'vue-router';
+  import { useModal } from '@/components/Modal';
+  import ObjectionModal from '@/views/dataSharingAndExchange/enrollAudit/objectionModal.vue';
+
+  const { push } = useRouter();
+  const { createMessage, createConfirm } = useMessage();
+  const [registerModal, { openModal }] = useModal();
+  const [registerTable, {}] = useTable({
+    api: async (params) => {
+      const response = {
+        pageNu: '1',
+        pageSize: '10',
+        pages: '1',
+        totoal: enrollData.length,
+        code: '',
+        message: '',
+        data: enrollData,
+      };
+      return { ...response, data: enrollData };
+    },
+    columns: enrollColumns,
+    bordered: true,
+    width: 150,
+    actionColumn: {
+      width: 180,
+      title: '操作',
+      dataIndex: 'action',
+    },
+  });
+
+  function handleAudit() {
+    createConfirm({
+      iconType: 'warning',
+      title: '审核',
+      content: '确认审核选中数据吗？',
+      onOk() {
+        createMessage.success('审核成功！');
+      },
+    });
+  }
+  function handleDetail(record) {
+    push({
+      path: '/dataSharingAndExchange/enrollAudit/detail',
+      query: {
+        ...record,
+      },
+    });
+  }
+
+  function handleObjection() {
+    openModal(true, {});
+  }
+</script>
+
+<style scoped></style>

src/views/dataSharingAndExchange/enrollAudit/objectionModal.vue

+<template>
+  <BasicModal
+    width="40%"
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import BasicModal from '@/components/Modal/src/BasicModal.vue';
+  import { useModalInner } from '@/components/Modal';
+  import {FormProps, useForm} from '@/components/Form';
+
+  const getTitle = '处理异议';
+
+  /** 初始化弹框*/
+  const [registerModal, { closeModal }] = useModalInner(async (data) => {});
+
+  /** 初始化表单*/
+  const [registerForm, { setFieldsValue, validate }] = useForm({
+    labelWidth: 100,
+    baseColProps: { lg: 24, md: 24 },
+    showActionButtonGroup: false,
+  } as FormProps);
+
+  function handleSubmit() {
+    closeModal();
+  }
+</script>
+
+<style scoped></style>

src/views/servicePlatform/enterpriseCertification/detail.vue

@@ -8,22 +8,42 @@
     headerSticky
     @back="handleBack"
   >
-    <Description
-      @register="register1"
-      class="mt-4"
-      style="font-size: 30px; margin: 30px 30px"
-      :column="2"
+    <Row :gutter="[16, 30]">
+      <Col :span="12" v-for="info in formSchema1" :key="info">
+        <div class="col-item">
+          <div class="item-label">{{ info.label }}：</div>
+          <div v-if="['license', 'logo'].includes(info.field)" class="item-des"
+            ><TableImg
+              :size="150"
+              :simpleShow="true"
+              :showBadge="false"
+              :imgList="data[info.field]"
             />
+          </div>
+          <div v-else class="item-des">{{ data[info.field] ? data[info.field] : '-' }}</div>
+        </div>
+      </Col>
+    </Row>
   </PageWrapper>
 </template>
 
 <script lang="ts" setup>
   import PageWrapper from '@/components/Page/src/PageWrapper.vue';
-  import { useRouter } from 'vue-router';
-  import { Description, useDescription } from '@/components/Description';
+  import { useRoute, useRouter } from 'vue-router';
+  import { useDescription } from '@/components/Description';
+  import { Col, Descriptions, Row } from 'ant-design-vue';
   import { formSchema1 } from './enterpriseColumns.data';
   import { mockData } from './enterpriseData';
+  import {
+    infoList,
+    model,
+  } from '@/views/mallResourceDevelopment/API/apiByApply/apiDetail/detailData';
+  import { ref, onMounted } from 'vue';
+  import moment from 'moment/moment';
+  import { TableImg } from '@/components/Table';
 
+  const route = useRoute();
+  const data = ref(route.query);
   const router = useRouter();
   const [register1] = useDescription({
     bordered: false,
@@ -34,6 +54,23 @@
   function handleBack() {
     router.go(-1);
   }
+
+  onMounted(() => {
+    console.log('date', data.value);
+  });
 </script>
 
-<style scoped></style>
+<style scoped>
+  .col-item {
+    display: flex;
+    gap: 10px;
+    margin: 20px 60px;
+    .item-label {
+      width: 150px;
+    }
+    .item-img {
+      width: 150px;
+      height: 100px;
+    }
+  }
+</style>

src/views/servicePlatform/enterpriseCertification/enterpriseColumns.data.ts

@@ -22,6 +22,16 @@ export const enterpriseColumns: BasicColumn[] = [
     dataIndex: 'leaderNum',
     width: 150,
   },
+  {
+    title: '营业执照',
+    dataIndex: 'license',
+    width: 150,
+  },
+  {
+    title: '公司LOGO',
+    dataIndex: 'logo',
+    width: 150,
+  },
   {
     title: '成立日期',
     dataIndex: 'buildTime',

src/views/servicePlatform/enterpriseCertification/enterpriseData.ts

@@ -4,6 +4,8 @@ export const enterprisesData: any[] = [
     code: '123123',
     leader: '张三',
     leaderNum: '12312312',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2020-03-05',
     registerNum: '1000',
     businessRange: '科学研究和技术服务业',
@@ -15,6 +17,8 @@ export const enterprisesData: any[] = [
     code: '87654321',
     leader: '李四',
     leaderNum: '98765432',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2019-02-20',
     registerNum: '1200',
     businessRange: '信息技术与服务',
@@ -26,6 +30,8 @@ export const enterprisesData: any[] = [
     code: '23456789',
     leader: '王五',
     leaderNum: '23456789',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2021-05-15',
     registerNum: '1500',
     businessRange: '软件开发与销售',
@@ -37,6 +43,8 @@ export const enterprisesData: any[] = [
     code: '34567890',
     leader: '赵六',
     leaderNum: '34567890',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2018-08-10',
     registerNum: '800',
     businessRange: '人工智能与机器学习',
@@ -48,6 +56,8 @@ export const enterprisesData: any[] = [
     code: '45678901',
     leader: '钱七',
     leaderNum: '45678901',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2020-07-30',
     registerNum: '2000',
     businessRange: '电子商务与物流',
@@ -59,6 +69,8 @@ export const enterprisesData: any[] = [
     code: '56789012',
     leader: '孙八',
     leaderNum: '56789012',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2021-01-25',
     registerNum: '950',
     businessRange: '网络安全与服务',
@@ -70,6 +82,8 @@ export const enterprisesData: any[] = [
     code: '67890123',
     leader: '周九',
     leaderNum: '67890123',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2017-06-14',
     registerNum: '1100',
     businessRange: '大数据与云计算',
@@ -81,6 +95,8 @@ export const enterprisesData: any[] = [
     code: '78901234',
     leader: '吴十',
     leaderNum: '78901234',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2020-09-01',
     registerNum: '1300',
     businessRange: '科技创新与研发',
@@ -92,6 +108,8 @@ export const enterprisesData: any[] = [
     code: '89012345',
     leader: '郑十一',
     leaderNum: '89012345',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2022-04-10',
     registerNum: '600',
     businessRange: '智能硬件与产品设计',
@@ -103,6 +121,8 @@ export const enterprisesData: any[] = [
     code: '90123456',
     leader: '冯十二',
     leaderNum: '90123456',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2019-12-15',
     registerNum: '1400',
     businessRange: '电子技术与设备制造',
@@ -114,6 +134,8 @@ export const enterprisesData: any[] = [
     code: '12345678',
     leader: '刘十三',
     leaderNum: '12345678',
+    license: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/测试图片1.jpg'],
     buildTime: '2021-03-25',
     registerNum: '1000',
     businessRange: '在线教育与培训服务',
@@ -132,6 +154,6 @@ export const mockData: Recordable = {
   businessRange: '科学研究和技术服务业',
   registerAddress: '天津市西青区中北镇中北科技产业业',
   detailAddress: '天津市西青区中北镇中北科技产业园',
-  license: '天津市西青区中北镇中北科技产业园',
-  logo: '天津市西青区中北镇中北科技产业园',
+  license: ['src/assets/images/测试图片1.jpg'],
+  logo: '[src/assets/images/测试图片1.jpg]',
 };

src/views/servicePlatform/enterpriseCertification/index.vue

@@ -12,7 +12,13 @@
     </template>
     <div class="h-full" style="padding: 0 25px">
       <BasicTable @register="registerApplySuccessTable">
-        <template #bodyCell="{ column, record }">
+        <template #bodyCell="{ column, record, text }">
+          <template v-if="column.key === 'license'">
+            <TableImg :size="60" :simpleShow="true" :showBadge="false" :imgList="text" />
+          </template>
+          <template v-if="column.key === 'logo'">
+            <TableImg :size="60" :simpleShow="true" :showBadge="false" :imgList="text" />
+          </template>
           <template v-if="column.key === 'action'">
             <TableAction
               :actions="[
@@ -37,7 +43,7 @@
   import { onMounted, ref } from 'vue';
   import PageWrapper from '@/components/Page/src/PageWrapper.vue';
   import { useMessage } from '@/hooks/web/useMessage';
-  import { BasicTable, useTable, TableAction, BasicTableProps } from '@/components/Table';
+  import { BasicTable, useTable, TableAction, BasicTableProps, TableImg } from '@/components/Table';
   import { FileProtectOutlined } from '@ant-design/icons-vue';
   import { enterpriseColumns } from '@/views/servicePlatform/enterpriseCertification/enterpriseColumns.data';
   import { enterprisesData } from '@/views/servicePlatform/enterpriseCertification/enterpriseData';
@@ -119,9 +125,12 @@
       },
     });
   }
-  function handleDetail() {
+  function handleDetail(record) {
     push({
       path: '/servicePlatform/enterpriseCertification/detail',
+      query: {
+        ...record,
+      },
     });
   }
 </script>

src/views/servicePlatform/policyManagement/index.vue

@@ -20,12 +20,7 @@
       <BasicTable @register="registerTable" ref="table">
         <template #bodyCell="{ column, record, text }">
           <template v-if="column.key === 'imgSrc'">
-            <TableImg
-              :size="60"
-              :simpleShow="true"
-              :showBadge="false"
-              :imgList="text"
-            />
+            <TableImg :size="60" :simpleShow="true" :showBadge="false" :imgList="text" />
           </template>
           <template v-if="column.key === 'action'">
             <TableAction