我的登记页面，修正首页样式

src/router/routes/index.ts

@@ -49,7 +49,7 @@ export const PCFontRoute: AppRouteRecordRaw = {
       name: 'font',
       component: () => import('@/views/AAAFont/front/index.vue'),
       meta: {
-        title: '首页',
+        title: '',
       },
     },
     {
@@ -57,7 +57,7 @@ export const PCFontRoute: AppRouteRecordRaw = {
       name: 'individualCenter',
       component: () => import('@/views/AAAFont/individualCenter/index.vue'),
       meta: {
-        title: '个人中心',
+        title: '',
       },
     },
     {
@@ -65,7 +65,7 @@ export const PCFontRoute: AppRouteRecordRaw = {
       name: 'tradingMarket',
       component: () => import('@/views/AAAFont/tradingMarket/index.vue'),
       meta: {
-        title: '交易市场',
+        title: '',
       },
     },
     {
@@ -73,7 +73,7 @@ export const PCFontRoute: AppRouteRecordRaw = {
       name: 'demandHall',
       component: () => import('@/views/AAAFont/demandHall/index.vue'),
       meta: {
-        title: '需求大厅',
+        title: '',
       },
     },
     {
@@ -81,7 +81,7 @@ export const PCFontRoute: AppRouteRecordRaw = {
       name: 'nationalPolicy',
       component: () => import('@/views/AAAFont/nationalPolicy/index.vue'),
       meta: {
-        title: '国家政策',
+        title: '',
       },
     },
     {
@@ -89,7 +89,7 @@ export const PCFontRoute: AppRouteRecordRaw = {
       name: 'dataRegistration',
       component: () => import('@/views/AAAFont/dataRegistration/index.vue'),
       meta: {
-        title: '数据登记',
+        title: '',
       },
     },
   ],
@@ -1300,7 +1300,39 @@ export const SyncMaintenanceRoute: AppRouteRecordRaw = {
     },
   ],
 };
-/**实时同步-任务运维*/
+
+/**个人中心**/
+export const PersonalCenterRoute: AppRouteRecordRaw = {
+  path: '/personalCenter',
+  name: 'personalCenter',
+  component: LAYOUT,
+  meta: {
+    title: '个人中心',
+    icon: '',
+    hidden: true,
+    currentActiveMenu: '/personalCenter',
+  },
+  children: [
+    {
+      path: 'myRegistration/edit',
+      name: 'edit',
+      component: () => import('@/views/personalCenter/myRegistration/edit.vue'),
+      meta: {
+        title: '我的登记编辑',
+      },
+    },
+    {
+      path: 'myRegistration/detail',
+      name: 'detail',
+      component: () => import('@/views/personalCenter/myRegistration/detail.vue'),
+      meta: {
+        title: '我的登记查看',
+      },
+    },
+  ],
+};
+
+/**商城资源**/
 export const ResourceRoute: AppRouteRecordRaw = {
   path: '/dataSharingAndExchange',
   name: 'dataSharingAndExchange',
@@ -1331,6 +1363,14 @@ export const ResourceRoute: AppRouteRecordRaw = {
         icon: '',
       },
     },
+    {
+      path: 'enrollAudit/edit',
+      name: 'edit',
+      component: () => import('@/views/personalCenter/myRegistration/edit.vue'),
+      meta: {
+        title: '我的登记编辑',
+      },
+    },
   ],
 };
 /**
@@ -1407,4 +1447,5 @@ export const basicRoutes = [
   BenchmarkRoute,
   PCFontRoute,
   ServicePlatformRoute,
+  PersonalCenterRoute,
 ];

src/views/AAAFont/index.vue

@@ -439,32 +439,31 @@
     font-weight: 500;
   }
 
-  .row-footer{
+  .row-footer {
     height: 242px;
     opacity: 0.8;
-    background-color: #1962E2;
+    background-color: #1962e2;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: space-evenly;
 
-    .footer-title{
+    .footer-title {
       height: 48px;
       color: #ffffff;
       font-size: 32px;
       font-weight: 500;
     }
 
-    .footer-button{
+    .footer-button {
       width: 160px;
       height: 51px;
       font-size: 18px;
-      background-color: #FFFFFF;
-      color: #1962E2;
+      background-color: #ffffff;
+      color: #1962e2;
     }
   }
 
-
   /*底部版权所有样式*/
   .footer-item-por {
     height: 72px;

src/views/personalCenter/myRegistration/detail.vue

 <template>
   <PageWrapper
-    title="登记审核"
+    :title="!isAudit ? '登记详情' : '登记审核'"
     dense
     contentBackground
     contentFullHeight
@@ -9,7 +9,7 @@
     @back="handleBack"
   >
     <Row :gutter="[16, 30]">
-      <Col :span="12" v-for="info in enrollColumns" :key="info">
+      <Col :span="12" v-for="info in myRegistrationColumns" :key="info">
         <div class="col-item">
           <div class="item-label">{{ info.title }}：</div>
           <div v-if="['enrollBook'].includes(info.dataIndex)" class="item-des"
@@ -24,6 +24,10 @@
         </div>
       </Col>
     </Row>
+    <div v-if="isAudit" style="justify-content: center; display: flex; gap: 10px">
+      <a-button @click="handleCancel">驳回</a-button>
+      <a-button type="primary" @click="handleEdit">审核</a-button>
+    </div>
   </PageWrapper>
 </template>
 
@@ -31,13 +35,16 @@
   import PageWrapper from '@/components/Page/src/PageWrapper.vue';
   import { useRoute, useRouter } from 'vue-router';
   import { Col, Row } from 'ant-design-vue';
-  import { enrollColumns } from './myRegistration.data';
+  import { myRegistrationColumns } from './myRegistration.data';
   import { ref, onMounted } from 'vue';
   import { TableImg } from '@/components/Table';
+  import { useMessage } from '@/hooks/web/useMessage';
 
+  const { createMessage } = useMessage();
   const route = useRoute();
   const data = ref(route.query);
   const router = useRouter();
+  const isAudit = ref(route.query.isAudit);
 
   function handleBack() {
     router.go(-1);
@@ -46,9 +53,19 @@
   onMounted(() => {
     console.log('date', data.value);
   });
+
+  function handleCancel() {
+    console.log('isAudit', isAudit);
+    router.go(-1);
+    createMessage.success('驳回成功！');
+  }
+  function handleEdit() {
+    router.go(-1);
+    createMessage.success('审核成功！');
+  }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
   .col-item {
     display: flex;
     gap: 10px;

src/views/personalCenter/myRegistration/edit.vue

+<template>
+  <PageWrapper
+    :title="'登记编辑'"
+    dense
+    contentBackground
+    contentFullHeight
+    fixed-height
+    headerSticky
+    @back="handleBack"
+  >
+    <BasicForm @register="registerForm">
+      <template #enrollBook="{ field, model }">
+        <Upload
+          :style="{ pointerEvents: status === 'detail' ? 'none' : null }"
+          style="width: 45%"
+          v-model:file-list="fileList"
+        >
+          <a-button>
+            <UploadOutlined />
+            重新上传文件
+          </a-button>
+        </Upload>
+      </template>
+    </BasicForm>
+    <div style="justify-content: flex-end; display: flex; gap: 10px">
+      <a-button @click="handleCancel">取消</a-button>
+      <a-button style="margin-right: 20px" type="primary" @click="handleEdit">保存</a-button>
+    </div>
+  </PageWrapper>
+</template>
+
+<script lang="ts" setup>
+  import PageWrapper from '@/components/Page/src/PageWrapper.vue';
+  import { useRoute, useRouter } from 'vue-router';
+  import { myRegistrationForm } from './myRegistration.data';
+  import { UploadOutlined } from '@ant-design/icons-vue';
+  import { onMounted, ref } from 'vue';
+  import { Upload } from 'ant-design-vue';
+  import { useMessage } from '@/hooks/web/useMessage';
+  import BasicForm from '@/components/Form/src/BasicForm.vue';
+  import { useForm } from '@/components/Form';
+
+  const { createMessage } = useMessage();
+  const route = useRoute();
+  const data = ref(route.query);
+  const router = useRouter();
+  const isAudit = ref(route.query.isAudit);
+  const fileList = ref([]);
+
+  const [registerForm, { setFieldsValue, validate }] = useForm({
+    labelWidth: 180,
+    labelAlign: 'left',
+    baseColProps: { span: 12 },
+    schemas: myRegistrationForm,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 23,
+    },
+  });
+
+  function handleBack() {
+    router.go(-1);
+  }
+
+  onMounted(() => {
+    setFieldsValue(data.value);
+    fileList.value = [
+      {
+        uid: 1,
+        name: data.value.enrollBook,
+        status: 'done',
+      },
+    ];
+  });
+
+  function handleCancel() {
+    router.go(-1);
+  }
+  function handleEdit() {
+    router.go(-1);
+    createMessage.success('保存成功！');
+  }
+</script>
+
+<style scoped>
+  :deep(.ant-form-item-label) {
+    margin-left: 60px;
+    margin-top: 30px;
+    margin-bottom: 30px;
+  }
+  :deep(.ant-form-item-row) {
+    align-items: center;
+  }
+</style>

src/views/personalCenter/myRegistration/index.vue

 <template>
-  <PageWrapper>
+  <PageWrapper dense contentBackground headerSticky>
+    <template #headerContent>
+      <div class="header">
+        <div class="h-title">
+          <FileProtectOutlined class="h-icon" :color="'#6499e9'" />
+          <div class="h-txt">
+            <div class="h-des">我的登记</div>
+          </div>
+        </div>
+      </div>
+    </template>
     <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" />
+          <TableImg :size="40" :simple-show="true" :show-badge="false" :img-list="text" />
         </template>
         <template v-if="column.key === 'action'">
           <TableAction
@@ -13,11 +23,15 @@
                 onClick: handleDetail.bind(null, record),
               },
               {
-                label: '审核',
-                onClick: handleAudit.bind(null, record),
+                label: '编辑',
+                onClick: handleEdit.bind(null, record),
               },
+              // {
+              //   label: '审核',
+              //   onClick: handleAudit.bind(null, record),
+              // },
               {
-                label: '处理异议',
+                label: '处理',
                 onClick: handleObjection.bind(null, record),
               },
             ]"
@@ -34,13 +48,14 @@
   import BasicForm from '@/components/Form/src/BasicForm.vue';
   import BasicTable from '@/components/Table/src/BasicTable.vue';
   import { useTable, TableImg } from '@/components/Table';
-  import { myRegistrationData } from './myRegistration';
-  import { enrollColumns } from './myRegistration.data';
+  import { myRegistrationData } from './myRegistrationData';
+  import { myRegistrationColumns, searchFormSchema } from './myRegistration.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';
+  import ObjectionModal from '@/views/personalCenter/myRegistration/objectionModal.vue';
+  import { FileProtectOutlined } from '@ant-design/icons-vue';
 
   const { push } = useRouter();
   const { createMessage, createConfirm } = useMessage();
@@ -58,9 +73,16 @@
       };
       return { ...response, data: myRegistrationData };
     },
-    columns: enrollColumns,
+    columns: myRegistrationColumns,
     bordered: true,
     width: 150,
+    useSearchForm: true,
+    formConfig: {
+      labelWidth: 10,
+      schemas: searchFormSchema,
+      showActionButtonGroup: false,
+      autoSubmitOnEnter: true,
+    },
     actionColumn: {
       width: 180,
       title: '操作',
@@ -68,21 +90,28 @@
     },
   });
 
-  function handleAudit() {
-    createConfirm({
-      iconType: 'warning',
-      title: '审核',
-      content: '确认审核选中数据吗？',
-      onOk() {
-        createMessage.success('审核成功！');
+  function handleDetail(record) {
+    push({
+      path: '/personalCenter/myRegistration/detail',
+      query: {
+        ...record,
       },
     });
   }
-  function handleDetail(record) {
+  function handleEdit(record) {
+    push({
+      path: '/personalCenter/myRegistration/edit',
+      query: {
+        ...record,
+      },
+    });
+  }
+  function handleAudit(record) {
     push({
       path: '/dataSharingAndExchange/enrollAudit/detail',
       query: {
         ...record,
+        isAudit: true,
       },
     });
   }
@@ -92,4 +121,31 @@
   }
 </script>
 
-<style scoped></style>
+<style scoped>
+  .header {
+    display: flex;
+    flex-direction: row;
+    gap: 10px;
+    .h-title {
+      flex: 1;
+      display: flex;
+      gap: 10px;
+      .h-icon {
+        font-size: 40px !important;
+        color: #0a208a;
+      }
+      .h-des {
+        font-size: 18px;
+        font-weight: bolder;
+        line-height: 40px;
+      }
+      .h-path {
+        font-size: 12px;
+      }
+    }
+    .h-group {
+      display: flex;
+      gap: 10px;
+    }
+  }
+</style>

src/views/personalCenter/myRegistration/myRegistration.data.ts

-import { BasicColumn } from '@/components/Table';
+import { BasicColumn, FormSchema } from '@/components/Table';
 
-export const enrollColumns: BasicColumn[] = [
+export const myRegistrationColumns: BasicColumn[] = [
   {
     title: '登记编号',
     dataIndex: 'enrollNum',
   },
-  {
-    title: '申请人',
-    dataIndex: 'applicant',
-  },
   {
     title: '数据知识产权名称',
     dataIndex: 'dataName',
@@ -38,3 +34,104 @@ export const enrollColumns: BasicColumn[] = [
     dataIndex: 'enrollBook',
   },
 ];
+export const myRegistrationForm: FormSchema[] = [
+  {
+    field: 'dataName',
+    label: '数据知识产权名称',
+    component: 'Input',
+  },
+  {
+    field: 'sector',
+    label: '所属行业',
+    component: 'Input',
+  },
+  {
+    field: 'dataBase',
+    label: '数据来源',
+    component: 'Input',
+  },
+  {
+    field: 'enrollDate',
+    label: '登记日期',
+    component: 'Input',
+  },
+  {
+    field: 'enrollStatus',
+    label: '登记备案状态',
+    component: 'Input',
+  },
+  {
+    field: 'enrollBook',
+    label: '登记证书',
+    colProps: { span: 24 },
+    slot: 'enrollBook',
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'companyName',
+    label: ' ',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入登记编号',
+    },
+    colProps: { span: 6 },
+  },
+  {
+    field: 'code',
+    label: ' ',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入申请人',
+    },
+    colProps: { span: 6 },
+  },
+  {
+    field: 'leader',
+    label: ' ',
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择是否存在异议',
+      options: [
+        { label: '是', value: '是' },
+        { label: '否', value: '否' },
+      ],
+    },
+    colProps: { span: 6 },
+  },
+];
+
+export const objectionFormSchema: FormSchema[] = [
+  {
+    field: 'applicant',
+    label: ' ',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入登记编号',
+    },
+    colProps: { span: 6 },
+  },
+  {
+    field: 'code',
+    label: ' ',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入申请人',
+    },
+    colProps: { span: 6 },
+  },
+  {
+    field: 'leader',
+    label: ' ',
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择是否存在异议',
+      options: [
+        { label: '是', value: '是' },
+        { label: '否', value: '否' },
+      ],
+    },
+    colProps: { span: 6 },
+  },
+];

src/views/personalCenter/myRegistration/myRegistration.ts → src/views/personalCenter/myRegistration/myRegistrationData.ts

@@ -8,7 +8,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2023-01-15',
     enrollStatus: '已备案',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'B987654321',
@@ -19,7 +19,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2022-09-20',
     enrollStatus: '待审核',
     isObjection: '否',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'C112233445',
@@ -30,7 +30,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2023-03-05',
     enrollStatus: '已备案',
     isObjection: '否',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'D223344556',
@@ -41,7 +41,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2022-12-10',
     enrollStatus: '已备案',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'E334455667',
@@ -52,7 +52,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2023-06-18',
     enrollStatus: '待审核',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'F445566778',
@@ -63,7 +63,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2021-11-25',
     enrollStatus: '已备案',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'G556677889',
@@ -74,7 +74,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2022-05-30',
     enrollStatus: '已备案',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'H667788990',
@@ -85,7 +85,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2023-02-10',
     enrollStatus: '待审核',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'I778899001',
@@ -96,7 +96,7 @@ export const myRegistrationData: any[] = [
     enrollDate: '2023-04-15',
     enrollStatus: '已备案',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
     enrollNum: 'J889900112',
@@ -107,6 +107,6 @@ export const myRegistrationData: any[] = [
     enrollDate: '2023-07-20',
     enrollStatus: '已备案',
     isObjection: '是',
-    enrollBook: ['src/assets/images/测试图片1.jpg'],
+    enrollBook: ['src/assets/images/登记证书.jpg'],
   },
 ];

src/views/personalCenter/myRegistration/objectionModal.vue

@@ -6,16 +6,49 @@
     :title="getTitle"
     @ok="handleSubmit"
   >
-    <BasicForm @register="registerForm" />
+    <Alert
+      show-icon
+      type="info"
+      message="请根据数据对比情况谨慎处理异议"
+      style="margin-bottom: 20px"
+    />
+    <div class="flex" style="margin-bottom: 20px">
+      <div style="margin-top: 4px">异议内容：</div>
+      <div
+        ><span>认为</span
+        ><span style="font-size: 18px; font-weight: bolder">宏源技术科技有限公司</span
+        ><span>有抄袭行为</span></div
+      >
+    </div>
+    <div class="flex">
+      <Descriptions style="margin-left: 20px" class="w-8/9" :column="1">
+        <Descriptions.Item label="相关证明材料" />
+        <Descriptions.Item label="申请人">宏源技术科技有限公司</Descriptions.Item>
+        <Descriptions.Item label="数据名称">租赁行业评价模型分析数据</Descriptions.Item>
+        <Descriptions.Item label="数据来源">公开收集</Descriptions.Item>
+        <Descriptions.Item label="数据名称">大数据人工智能预测模型</Descriptions.Item>
+        <Descriptions.Item label="应用场景"
+          >采集销售记录表中洛阳地区的数据，通过客户的最近一次消费时间（R）、最近一段时间消费频次(F)、最近一段时间消费金额(M)，
+          采用 RFM
+          模型对客户进行价值评级，实现精准化运营，通过对洛阳地区客户价值管理，满足不同价值客户的个性化需求。并为同行业企业不同价值类型的客户个性化服务提供数据支持。</Descriptions.Item
+        >
+        <Descriptions.Item label="发布时间">2024.01.03</Descriptions.Item>
+      </Descriptions>
+    </div>
   </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';
+  import { FormProps, useForm } from '@/components/Form';
+  import { Descriptions, Alert } from 'ant-design-vue';
+  import { objectionFormSchema } from '@/views/dataSharingAndExchange/enrollAudit/enroll.data';
+  import InputNumberItem from '@/layouts/default/setting/components/InputNumberItem.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
 
   const getTitle = '处理异议';
+  const { createMessage } = useMessage();
 
   /** 初始化弹框*/
   const [registerModal, { closeModal }] = useModalInner(async (data) => {});
@@ -23,12 +56,14 @@
   /** 初始化表单*/
   const [registerForm, { setFieldsValue, validate }] = useForm({
     labelWidth: 100,
+    schemas: objectionFormSchema,
     baseColProps: { lg: 24, md: 24 },
     showActionButtonGroup: false,
   } as FormProps);
 
   function handleSubmit() {
     closeModal();
+    createMessage.success('处理成功！');
   }
 </script>
 

src/views/servicePlatform/policyManagement/detail/index.vue

@@ -175,7 +175,7 @@
   });
 </script>
 
-<style scoped>
+<style lang="less" scoped>
   .header {
     display: flex;
     flex-direction: row;