Merge remote-tracking branch 'origin/master'

src/views/AAAFont/tradingMarket/details/data.ts

@@ -83,3 +83,30 @@ export const informationColumns: BasicColumn[] = [
     width: 100,
   },
 ];
+
+export const applyInfoData: any[]= {
+  enrollCode: 'DIP2024000084573',
+    enrollDate: '2016-05-02',
+    applicant: '**先导精密机械有限公司',
+    dataName: '关系型与非关系型数据库分析数据',
+    industry: '科学研究和技术服务业',
+    dataSource: '自行产生',
+    dataStructure: '关系型与非关系型数据库分析数据',
+    dataSize: '932条',
+    updateRate: '每分钟',
+    applyScene:
+  '光温湿指数（THSW)是衡量人体在特定环境下舒适程度的重要指\n' +
+  '标。它考虑了影响人体舒适度的多个关键因素，如温度、湿\n' +
+  '度、太阳辐射和风等，因此能够更全面地反映人体在不同环境\n' +
+  '下的感受。通过THSW指数，可以了解城市的气候特点，为人们的出行\n' +
+  '和居住提供参考。',
+    ruleExplain:
+  '（1）数据采集：通过在线设备，每分钟实时测量获取' +
+  '区段温度、湿度及光照强度数据；（2）数据处\n' +
+  '理：将数据清洗后，根据公式光温湿指数（THSW)=温度*温度\n' +
+  '权重（α）+湿度*湿度权重（β）+光照强度*光照权重（v），\n' +
+  '三项权重为设定的固定值，计算结果保留小数点后两位。',
+    publicCode: 'NO.9294483',
+    publicSituation: '已于「知识产权区块链公共存证平台」存证',
+}
+

src/views/AAAFont/tradingMarket/details/dataFileData.ts

@@ -90,3 +90,73 @@ export const informationTableList: any[] = [
     standard: '-',
   },
 ];
+
+export const applyInfo: any[]= [
+  {
+    span: 12,
+    label: '登记编号',
+    field: 'enrollCode',
+  },
+  {
+    span: 12,
+    label: '登记日期',
+    field: 'enrollDate',
+  },
+  {
+    span: 12,
+    label: '申请人',
+    field: 'applicant',
+  },
+
+  {
+    span: 12,
+    label: '数据知识产权名称',
+    field: 'dataName',
+  },
+  {
+    span: 12,
+    label: '所属行业',
+    field: 'industry',
+  },
+  {
+    span: 12,
+    label: '数据来源',
+    field: 'dataSource',
+  },
+  {
+    span: 24,
+    label: '数据结构',
+    field: 'dataStructure',
+  },
+  {
+    span: 12,
+    label: '数据规模',
+    field: 'dataSize',
+  },
+  {
+    span: 12,
+    label: '更新频次',
+    field: 'updateRate',
+  },
+  {
+    span: 12,
+    label: '应用场景',
+    field: 'applyScene',
+  },
+
+  {
+    span: 12,
+    label: '算法规则简要说明',
+    field: 'ruleExplain',
+  },
+  {
+    span: 12,
+    label: '公证编号',
+    field: 'publicCode',
+  },
+  {
+    span: 12,
+    label: '存证公证情况',
+    field: 'publicSituation',
+  },
+]

src/views/AAAFont/tradingMarket/details/file.vue

@@ -23,33 +23,60 @@
         <div class="buttonGroup"> </div>
       </div>
     </template>
-    <div class="desc-wrap">
-      <step-header title="基本信息" />
-      <Description
-        size="middle"
-        :bordered="false"
-        :column="2"
-        :data="basicData"
-        :schema="basicSchema"
-        :labelStyle="{ fontSize: '16px' }"
-        :contentStyle="{ fontSize: '16px' }"
-      />
-      <step-header class="mt-5" title="列信息" />
-      <BasicTable @register="registerTable" />
-    </div>
+<!--    <div class="desc-wrap">-->
+<!--      <step-header title="基本信息" />-->
+<!--      <Description-->
+<!--        size="middle"-->
+<!--        :bordered="false"-->
+<!--        :column="2"-->
+<!--        :data="basicData"-->
+<!--        :schema="basicSchema"-->
+<!--        :labelStyle="{ fontSize: '16px' }"-->
+<!--        :contentStyle="{ fontSize: '16px' }"-->
+<!--      />-->
+<!--      <step-header class="mt-5" title="列信息" />-->
+<!--      <BasicTable @register="registerTable" />-->
+<!--    </div>-->
+    <el-card class="w-1/1 mb-8" >
+      <div style="margin-left: 30px">
+        <div style="display: inline-block"
+        >更新时间
+          <el-tooltip content="更新时间为最近一次状态更新的时间" placement="top">
+            <Icon icon="ant-design:question-circle-outlined" />
+          </el-tooltip>
+          :</div
+        >
+        <div style="display: inline-block; margin-left: 10px">2024-12-19 13:55:47</div>
+
+        <div style="margin-top: 30px"
+        ><Icon style="color: #409eff" icon="ant-design:send-outlined" />申请详细信息</div
+        >
+        <Row :gutter="[16, 30]">
+          <Col :span="info.span" v-for="info in applyInfo" :key="info">
+            <div class="col-item">
+              <div class="item-label">{{ info.label }}：</div>
+              <div class="item-des">{{
+                  applyInfoData[info.field] ? applyInfoData[info.field] : '-'
+                }}</div>
+            </div>
+          </Col>
+        </Row>
+      </div>
+    </el-card>
+
   </PageWrapper>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue';
 import { PageWrapper } from '@/components/Page';
-import { Tabs } from 'ant-design-vue';
+import {Col, Row, Tabs} from 'ant-design-vue';
 import { useMessage } from '@/hooks/web/useMessage';
 import { router } from '@/router';
 import Icon from '@/components/Icon/Icon.vue';
 import { Description } from '@/components/Description';
-import { basicSchema, searchEditFormSchema, informationColumns } from './data';
-import { basicData, informationTableList } from './dataFileData';
+import { basicSchema, searchEditFormSchema, informationColumns,applyInfoData } from './data';
+import { basicData, informationTableList,applyInfo } from './dataFileData';
 import { BasicTable, useTable } from '@/components/Table';
 import BasicTitle from "@/components/Basic/src/BasicTitle.vue";
 import StepHeader from "@/components/stepHeader.vue";
@@ -60,6 +87,7 @@ const { createMessage, createConfirm } = useMessage();
 const ATabs = Tabs;
 const ATabPane = Tabs.TabPane;
 
+
 const [registerTable] = useTable({
   api: async () => {
     const response = {
@@ -125,4 +153,23 @@ onMounted(() => {});
   }
 }
 
+.col-item {
+  display: flex;
+  gap: 10px;
+  margin: 20px 60px;
+  .item-label {
+    width: 127px;
+    display: flex;
+    justify-content: right;
+    color: #606266;
+  }
+  .item-img {
+    width: 150px;
+    height: 100px;
+  }
+  .item-des {
+    width: 400px;
+  }
+}
+
 </style>

src/views/AAAFont/tradingMarket/index.vue

@@ -192,11 +192,89 @@
                 </el-tab-pane>
                 <el-tab-pane name="fourth">
                   <el-row class="mt-5 w-365" :gutter="20">
+                    <el-col
+                      @click="handleDetail(0)"
+                      class="mb-4"
+                      :span="6"
+                      v-for="card in cardsData"
+                      :key="card.title"
+                    >
+                      <el-card class="card-box">
+                        <template #header>
+                          <div style="display: flex; justify-content: space-between">
+                            <div style="display: flex; align-items: center">
+                              <Icon
+                                icon="ant-design:exception-outlined"
+                                :color="'#9d00ae'"
+                                :size="26"
+                              />
+                              <span class="ml-4" style="font-size: 20px; font-weight: 550">{{
+                                card.title
+                              }}</span>
+                            </div>
+                            <el-tag type="danger">{{ card.tag }}</el-tag>
+                          </div>
+                        </template>
+                        <div class="card-row">
+                          <div class="card-right">
+                            <!--                          <p>{{card.applicant}}</p>-->
+                            <!--                          <p>{{card.dataSource}}</p>-->
+                            <!--                          <p>{{card.applicationScenarios}}</p>-->
+                            <p>{{ card.illustrate }}</p>
+                          </div>
+                        </div>
+                        <div class="card_bottom">
+                          <span style="color: #ec7520; font-size: 24px">面议</span>
+                          <el-button style="padding: 0; border: none; box-shadow: none" round>
+                            <Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{ card.look }}
+                          </el-button>
+                        </div>
+                      </el-card>
+                    </el-col>
+                    <el-col
+                      @click="handleDetail(1)"
+                      class="mb-4"
+                      :span="6"
+                      v-for="card in cardsData1"
+                      :key="card.title"
+                    >
+                      <el-card class="card-box">
+                        <template #header>
+                          <div style="display: flex; justify-content: space-between">
+                            <div style="display: flex; align-items: center">
+                              <Icon
+                                icon="ant-design:exception-outlined"
+                                :color="'#9d00ae'"
+                                :size="26"
+                              />
+                              <span class="ml-4" style="font-size: 20px; font-weight: 550">{{
+                                card.title
+                              }}</span>
+                            </div>
+                            <el-tag type="danger">{{ card.tag }}</el-tag>
+                          </div>
+                        </template>
+                        <div class="card-row">
+                          <div class="card-right">
+                            <!--                          <p>{{card.applicant}}</p>-->
+                            <!--                          <p>{{card.dataSource}}</p>-->
+                            <!--                          <p>{{card.applicationScenarios}}</p>-->
+                            <p>{{ card.illustrate }}</p>
+                          </div>
+                        </div>
+                        <div class="card_bottom">
+                          <span style="color: #ec7520; font-size: 24px">面议</span>
+                          <el-button style="padding: 0; border: none; box-shadow: none" round>
+                            <Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{ card.look }}
+                          </el-button>
+                        </div>
+                      </el-card>
+                    </el-col>
                     <el-col
                       @click="handleDetail(2)"
                       class="mb-4"
                       :span="6"
-                      v-for="card in [...cardsData, ...cardsData1, ...cardsData2]"
+                      v-for="card in cardsData2"
                       :key="card.title"
                     >
                       <el-card class="card-box">
@@ -455,7 +533,7 @@
             tag: '开发',
           },
           {
-            title: 'API流量监控日志',
+            title: '流量监控日志',
             applicant: '运维部',
             dataSource: '实时流处理系统',
             applicationScenarios: '流量监控',
@@ -475,7 +553,7 @@
         ],
         cardsData2: [
           {
-            title: '用户行为分析日志',
+            title: 'API用户行为分析日志',
             applicant: '市场部',
             dataSource: 'NoSQL数据库',
             applicationScenarios: '用户分析',
@@ -484,7 +562,7 @@
             tag: '数据分析',
           },
           {
-            title: '支付接口调用日志',
+            title: 'API支付接口调用日志',
             applicant: '财务部',
             dataSource: '关系型数据库',
             applicationScenarios: '交易监控',