Skip to content

B
bigDataSystem
Commit d4e454f3 authored by chenjiahao's avatar chenjiahao
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/AAAFont/index.vue
parents 40fe6d97 80f6e44c
Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 19 deletions
src/router/routes/index.ts
View file @ d4e454f3
......@@ -149,6 +149,14 @@ export const PCFontRoute: AppRouteRecordRaw = {
title: '',
},
},
{
path: '/aaaFont/dataRegistration/enrollApply',
name: 'enrollApply',
component: () => import('@/views/AAAFont/dataRegistration/enrollApply.vue'),
meta: {
title: '',
},
},
],
};
// export const fontRoute: AppRouteRecordRaw = {
......
src/views/AAAFont/dataRegistration/enrollApply.vue 0 → 100644
View file @ d4e454f3
<template>
<div style="display: flex; justify-content: center">
<div
style="
margin-top: 30px;
width: 1440px;
display: flex;
flex-direction: column;
justify-content: center;
"
>
<div style="padding: 0 20%">
<div style="text-align: left; flex-direction: column;margin-bottom: 30px">
<Icon style="color: #409eff" icon="ant-design:send-outlined" />申请详细信息</div
>
<el-form ref="form" :model="form" label-width="80px">
<Row>
<Col :span="12">
<el-form-item label="登记编号">
<el-input class="input1" v-model="form.enrollCode" />
</el-form-item>
</Col>
<Col :span="12">
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
</Row>
<Row>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
</Row>
<Row>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
</Row>
<Row>
<Col :span="24">
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
</Row>
<Row>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
</Row>
<Row>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
</Row>
<Row>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
<Col>
<el-form-item label="登记编号">
<el-input v-model="form.enrollCode" />
</el-form-item>
</Col>
</Row>
</el-form>
</div>
</div>
</div>
<!-- <Row :gutter="[16, 30]">-->
<!-- <Col>-->
<!-- <el-input label="登记编号:" />-->
<!-- </Col>-->
<!-- <Col>-->
<!-- <el-input label="登记编号:" />-->
<!-- </Col>-->
<!-- </Row>-->
</template>
<script>
import { Col, Row } from 'ant-design-vue';
import Icon from '@/components/Icon/Icon.vue';
export default {
name: 'EnrollApply',
components: { Icon, Row, Col },
data() {
return {
form: {
enrollCode: '',
enrollDate: '',
applicant: '',
dataName: '',
industry: '',
dataSource: '',
dataStructure: '',
dataSize: '',
updateRate: '',
applyScene: '',
ruleExplain: '',
publicCode: '',
publicSituation: '',
},
applyInfo: [
{
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',
},
],
};
},
};
</script>
<style scoped>
.col-item {
display: flex;
gap: 10px;
margin: 20px 60px;
.item-label {
width: 127px;
display: flex;
justify-content: right;
}
.item-img {
width: 150px;
height: 100px;
}
.item-des {
width: 400px;
}
}
</style>
src/views/AAAFont/dataRegistration/index.vue
View file @ d4e454f3
......@@ -12,6 +12,24 @@
</el-carousel>
</div>
<el-button
style="
background-color: rgb(255, 255, 255, 0.2);
backdrop-filter: blur(10px);
border: 2px solid #ffffff;
margin-top: -150px;
margin-bottom: 150px;
width: 130px;
height: 50px;
font-size: 18px;
color: #ffffff;
z-index: 2;
"
round
@click="handleApply"
>登记申请</el-button
>
<h3 class="content-item-h3">登记公示</h3>
<span class="title_bottom">共114条数据，公示期为10个工作日</span>
<div class="tab-pane">
......@@ -225,6 +243,7 @@
/>
</div>
<!-- 登记公告详情页-->
<div v-if="enrollNotice === '3'" class="item-content-box">
<el-card style="width: 1440px; margin: 30px 0">
<div style="margin-left: 30px">
......@@ -249,7 +268,7 @@
><Icon style="color: #409eff" icon="ant-design:send-outlined" />申请详细信息</div
>
<Row :gutter="[16, 30]">
<Col :span="12" v-for="info in applyInfo" :key="info">
<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">{{
......@@ -348,56 +367,69 @@
applyInfo: [
{
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',
},
{
label: '公证编号',
field: 'publicCode',
},
{
span: 12,
label: '应用场景',
field: 'applyScene',
},
{
span: 12,
label: '算法规则简要说明',
field: 'ruleExplain',
},
{
span: 12,
label: '公证编号',
field: 'publicCode',
},
{
span: 12,
label: '存证公证情况',
field: 'publicSituation',
},
......@@ -486,6 +518,11 @@
handleDetail() {
this.enrollNotice = '3';
},
handleApply() {
this.$router.push({
path: '/aaaFont/dataRegistration/enrollApply',
});
},
// 进入后台方法
toBackstage() {
......
src/views/AAAFont/front/index.vue
View file @ d4e454f3
......@@ -28,9 +28,9 @@
<div>
<div style="display: flex; align-items: center">
<img :src="cardLogo" />
<span class="ml-4" style="font-size: 20px; font-weight: 550"
>{{card.title}}</span
>
<span class="ml-4" style="font-size: 20px; font-weight: 550">{{
card.title
}}</span>
</div>
</div>
</template>
......@@ -44,12 +44,10 @@
<p>公示截止时间</p>
</div>
<div class="card-right">
<p>{{card.applicant}}</p>
<p>{{card.dataSource}}</p>
<p>{{card.applicationScenarios}}</p>
<p>
{{card.illustrate}}</p
>
<p>{{ card.applicant }}</p>
<p>{{ card.dataSource }}</p>
<p>{{ card.applicationScenarios }}</p>
<p> {{ card.illustrate }}</p>
</div>
</div>
<div class="card_bottom">
......@@ -62,7 +60,7 @@
</el-tab-pane>
</el-tabs>
<el-button-group>
<el-button plain class="back-button" type="text">
<el-button plain class="back-button" type="text" @click="handleMore">
查看更多&nbsp;<Icon :size="24" icon="icon-park-solid:right-c" />
</el-button>
</el-button-group>
......@@ -82,7 +80,8 @@
margin-top: 24px;
background-color: #754e9e;
"
><img :src="dynamicImg" /></div>
><img :src="dynamicImg"
/></div>
<div class="mt-5 big-event">
<el-tag style="font-size: 14px">大事件</el-tag>
<span class="ml-2" style="font-size: 18px">大数据平台上线</span>
......@@ -373,21 +372,23 @@
applicant: '办公室',
dataSource: '自行生产',
applicationScenarios: '销售宣传',
illustrate: '撰写季度党建工作总结报告'
illustrate: '撰写季度党建工作总结报告',
},
{
title: '大学食堂销量预测',
applicant: '天津融创软通科技股份有限公司',
dataSource: '现场采集',
applicationScenarios: '问卷调查',
illustrate: 'Apriori算法对数据集进行多次扫描，第一次扫描得到频繁1-项集L1，第k(k>1)次.........'
illustrate:
'Apriori算法对数据集进行多次扫描，第一次扫描得到频繁1-项集L1，第k(k>1)次.........',
},
{
title: '销售量对价格变化的反应研究',
applicant: '天津融创软通科技股份有限公司',
dataSource: '关系型与非关系型数据库分析数据',
applicationScenarios: '销售宣传',
illustrate: '关联规则是形如X=>Y的蕴含式，其中X、Y分别是一事务的真子集，且X∩Y=Φ。X称为规则的......'
illustrate:
'关联规则是形如X=>Y的蕴含式，其中X、Y分别是一事务的真子集，且X∩Y=Φ。X称为规则的......',
},
],
};
......@@ -396,6 +397,9 @@
handleClick(tab, event) {
console.log(tab, event);
},
handleMore() {
this.$router.push({ path: '/aaaFont/dataRegistration' });
},
// 进入后台方法
toBackstage() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment