Commit 3ea08d2c authored by chenjiahao's avatar chenjiahao

Merge remote-tracking branch 'origin/master'

parents 50d7b66f d1b722ec
...@@ -9,100 +9,120 @@ ...@@ -9,100 +9,120 @@
justify-content: center; justify-content: center;
" "
> >
<div style="padding: 0 20%"> <div style="padding: 0 10%">
<div style="text-align: left; flex-direction: column;margin-bottom: 30px"> <div style="text-align: left; flex-direction: column; margin-bottom: 30px">
<Icon style="color: #409eff" icon="ant-design:send-outlined" />申请详细信息</div <Icon style="color: #409eff" icon="ant-design:send-outlined" />申请信息</div
> >
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :model="form" label-width="130px">
<Row> <Row class="row1">
<Col :span="12"> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="登记编号">
<el-input class="input1" v-model="form.enrollCode" /> <el-input class="input1" v-model="form.enrollCode" />
</el-form-item> </el-form-item>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="申请日期">
<el-input v-model="form.enrollCode" /> <el-input class="input1" v-model="form.enrollDate" />
</el-form-item> </el-form-item>
</Col> </Col>
</Row> </Row>
<Row> <Row class="row1">
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="申请人">
<el-input v-model="form.enrollCode" /> <el-input class="input1" v-model="form.applicant" />
</el-form-item> </el-form-item>
</Col> </Col>
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="数据知识产权名称">
<el-input v-model="form.enrollCode" /> <el-input class="input1" v-model="form.dataName" />
</el-form-item> </el-form-item>
</Col> </Col>
</Row> </Row>
<Row> <Row class="row1">
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="所属行业">
<el-input v-model="form.enrollCode" /> <el-input class="input1" v-model="form.industry" />
</el-form-item> </el-form-item>
</Col> </Col>
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="数据来源">
<el-input v-model="form.enrollCode" /> <el-input class="input1" v-model="form.dataSource" />
</el-form-item> </el-form-item>
</Col> </Col>
</Row> </Row>
<Row> <Row class="row1">
<Col :span="24"> <Col :span="24">
<el-form-item label="登记编号"> <el-form-item label="数据结构">
<el-input v-model="form.enrollCode" /> <el-input
type="textarea"
rows="6"
style="width: 96%"
v-model="form.dataStructure"
/>
</el-form-item> </el-form-item>
</Col> </Col>
</Row> </Row>
<Row> <Row class="row1">
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="数据规模">
<el-input v-model="form.enrollCode" /> <el-input class="input1" v-model="form.dataSize" />
</el-form-item> </el-form-item>
</Col> </Col>
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="更新频次">
<el-input v-model="form.enrollCode" /> <el-input class="input1" v-model="form.updateRate" />
</el-form-item> </el-form-item>
</Col> </Col>
</Row> </Row>
<Row> <Row class="row1">
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="应用场景">
<el-input v-model="form.enrollCode" /> <el-input type="textarea" rows="6" class="input1" v-model="form.applyScene" />
</el-form-item> </el-form-item>
</Col> </Col>
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="算法规则简要说明">
<el-input v-model="form.enrollCode" /> <el-input type="textarea" rows="6" class="input1" v-model="form.ruleExplain" />
</el-form-item> </el-form-item>
</Col> </Col>
</Row> </Row>
<Row> <Row class="row1">
<Col> <Col :span="12">
<el-form-item label="登记编号"> <el-form-item label="上传文件">
<el-input v-model="form.enrollCode" /> <el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
multiple
:limit="3"
:on-exceed="handleExceed"
:file-list="fileList"
>
<el-button size="small" type="primary">选择文件</el-button>
<template #tip>
<div>可上传jpg/png/excel/word/pdf文件,且不超过500kb</div>
</template>
</el-upload>
</el-form-item> </el-form-item>
</Col> </Col>
<Col>
<el-form-item label="登记编号"> <Col :span="12" style="text-align: right; padding: 0 4% 0 0">
<el-input v-model="form.enrollCode" /> <el-button size="large" @click="handleCancel">取消</el-button>
</el-form-item> <el-button type="primary" size="large" @click="handleSubmit">提交</el-button>
</Col> </Col>
</Row> </Row>
</el-form> </el-form>
</div> </div>
</div> </div>
</div> </div>
<!-- <Row :gutter="[16, 30]">--> <!-- <Row class="row1" :gutter="[16, 30]">-->
<!-- <Col>--> <!-- <Col :span="12">-->
<!-- <el-input label="登记编号:" />--> <!-- <el-input class="input1" label="登记编号:" />-->
<!-- </Col>--> <!-- </Col>-->
<!-- <Col>--> <!-- <Col :span="12">-->
<!-- <el-input label="登记编号:" />--> <!-- <el-input class="input1" label="登记编号:" />-->
<!-- </Col>--> <!-- </Col>-->
<!-- </Row>--> <!-- </Row>-->
</template> </template>
...@@ -140,7 +160,7 @@ ...@@ -140,7 +160,7 @@
}, },
{ {
span: 12, span: 12,
label: '登记日期', label: '申请日期',
field: 'enrollDate', field: 'enrollDate',
}, },
{ {
...@@ -190,19 +210,18 @@ ...@@ -190,19 +210,18 @@
label: '算法规则简要说明', label: '算法规则简要说明',
field: 'ruleExplain', field: 'ruleExplain',
}, },
{
span: 12,
label: '公证编号',
field: 'publicCode',
},
{
span: 12,
label: '存证公证情况',
field: 'publicSituation',
},
], ],
}; };
}, },
methods: {
handleSubmit() {
this.$message.success('提交成功!');
this.$router.go(-1);
},
handleCancel() {
this.$router.go(-1);
},
},
}; };
</script> </script>
...@@ -224,4 +243,10 @@ ...@@ -224,4 +243,10 @@
width: 400px; width: 400px;
} }
} }
.input1 {
width: 90%;
}
.row1 {
margin: 30px 0;
}
</style> </style>
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
}, },
], ],
applyInfoData: { applyInfoData: {
enrollCode: 'DIP2024000016125', enrollCode: 'DIP2024000084573',
enrollDate: '2016-05-02', enrollDate: '2016-05-02',
applicant: '**先导精密机械有限公司', applicant: '**先导精密机械有限公司',
dataName: '关系型与非关系型数据库分析数据', dataName: '关系型与非关系型数据库分析数据',
...@@ -452,13 +452,11 @@ ...@@ -452,13 +452,11 @@
'光温湿指数(THSW)是衡量人体在特定环境下舒适程度的重要指\n' + '光温湿指数(THSW)是衡量人体在特定环境下舒适程度的重要指\n' +
'标。它考虑了影响人体舒适度的多个关键因素,如温度、湿\n' + '标。它考虑了影响人体舒适度的多个关键因素,如温度、湿\n' +
'度、太阳辐射和风等,因此能够更全面地反映人体在不同环境\n' + '度、太阳辐射和风等,因此能够更全面地反映人体在不同环境\n' +
'下的感受。在气候评价中,THSW指数可用于评估某个地区或城\n' + '下的感受。通过THSW指数,可以了解城市的气候特点,为人们的出行\n' +
'市的气候适宜性,特别是在康养、旅游等领域。通过THSW指\n' +
'数,可以了解衢州市江山市金坞村的气候特点,为人们的出行\n' +
'和居住提供参考。', '和居住提供参考。',
ruleExplain: ruleExplain:
'(1)数据采集:通过在线设备,每分钟实时测量获取衢州市江\n' + '(1)数据采集:通过在线设备,每分钟实时测量获取' +
'山市金坞村区段温度、湿度及光照强度数据;(2)数据处\n' + '区段温度、湿度及光照强度数据;(2)数据处\n' +
'理:将数据清洗后,根据公式光温湿指数(THSW)=温度*温度\n' + '理:将数据清洗后,根据公式光温湿指数(THSW)=温度*温度\n' +
'权重(α)+湿度*湿度权重(β)+光照强度*光照权重(v),\n' + '权重(α)+湿度*湿度权重(β)+光照强度*光照权重(v),\n' +
'三项权重为设定的固定值,计算结果保留小数点后两位。', '三项权重为设定的固定值,计算结果保留小数点后两位。',
......
...@@ -91,6 +91,15 @@ ...@@ -91,6 +91,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="page">
<div class="pg-left">
<LeftOutlined />
</div>
<div class="pg-num active"> 1 </div>
<div class="pg-right">
<RightOutlined />
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -100,6 +109,7 @@ ...@@ -100,6 +109,7 @@
<script> <script>
import Icon from '@/components/Icon/Icon.vue'; import Icon from '@/components/Icon/Icon.vue';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
const items = [ const items = [
{ {
...@@ -113,7 +123,7 @@ ...@@ -113,7 +123,7 @@
]; ];
export default { export default {
name: 'DemandHall', name: 'DemandHall',
components: { Icon }, components: { Icon, LeftOutlined, RightOutlined },
data() { data() {
return { return {
items, items,
...@@ -937,4 +947,26 @@ ...@@ -937,4 +947,26 @@
} }
} }
} }
.page {
padding: 5px;
display: flex;
gap: 20px;
font-size: 20px;
.pg-left {
padding: 15px 18px;
background-color: #f6f7fa;
}
.pg-right {
padding: 15px 18px;
background-color: #f6f7fa;
}
.pg-num {
padding: 15px 18px;
background-color: #f6f7fa;
}
.active {
background-color: #4e80f8;
color: #ffffff;
}
}
</style> </style>
...@@ -8,6 +8,12 @@ export const identityFormSchema: FormSchema[] = [ ...@@ -8,6 +8,12 @@ export const identityFormSchema: FormSchema[] = [
defaultValue: '数据买家', defaultValue: '数据买家',
slot: 'identity', slot: 'identity',
required: true, required: true,
rules: [
{
required: true,
message: '请选择身份',
},
],
}, },
]; ];
export const enterpriseFormSchema: FormSchema[] = [ export const enterpriseFormSchema: FormSchema[] = [
...@@ -16,18 +22,36 @@ export const enterpriseFormSchema: FormSchema[] = [ ...@@ -16,18 +22,36 @@ export const enterpriseFormSchema: FormSchema[] = [
label: '营业执照', label: '营业执照',
slot: 'license', slot: 'license',
required: true, required: true,
rules: [
{
required: true,
message: '请上传营业执照',
},
],
}, },
{ {
field: 'logo', field: 'logo',
label: '公司LOGO', label: '公司LOGO',
slot: 'logo', slot: 'logo',
required: true, required: true,
rules: [
{
required: true,
message: '请上传公司LOGO',
},
],
}, },
{ {
field: 'companyName', field: 'companyName',
label: '公司名称', label: '公司名称',
slot: 'companyName', slot: 'companyName',
required: true, required: true,
rules: [
{
required: true,
message: '请输入公司名称',
},
],
}, },
{ {
field: 'code', field: 'code',
...@@ -43,6 +67,12 @@ export const enterpriseFormSchema: FormSchema[] = [ ...@@ -43,6 +67,12 @@ export const enterpriseFormSchema: FormSchema[] = [
label: '法人', label: '法人',
slot: 'leader', slot: 'leader',
required: true, required: true,
rules: [
{
required: true,
message: '请输入法人姓名',
},
],
}, },
{ {
field: 'leaderNum', field: 'leaderNum',
...@@ -104,30 +134,60 @@ export const applicantFormSchema: FormSchema[] = [ ...@@ -104,30 +134,60 @@ export const applicantFormSchema: FormSchema[] = [
label: '申办人身份', label: '申办人身份',
defaultValue: '授权代表', defaultValue: '授权代表',
slot: 'type', slot: 'type',
rules: [
{
required: true,
message: '请选择申办人身份',
},
],
}, },
{ {
field: 'idCardFront', field: 'idCardFront',
label: '申办人身份证正面', label: '申办人身份证正面',
required: true, required: true,
slot: 'idCardFront', slot: 'idCardFront',
rules: [
{
required: true,
message: '请上传申办人身份证正面',
},
],
}, },
{ {
field: 'idCardReverse', field: 'idCardReverse',
label: '申办人身份证反面', label: '申办人身份证反面',
required: true, required: true,
slot: 'idCardReverse', slot: 'idCardReverse',
rules: [
{
required: true,
message: '请上传申办人身份证反面',
},
],
}, },
{ {
field: 'name', field: 'name',
label: '申办人姓名', label: '申办人姓名',
required: true, required: true,
slot: 'name', slot: 'name',
rules: [
{
required: true,
message: '请输入申办人姓名',
},
],
}, },
{ {
field: 'idNo', field: 'idNo',
label: '申办人身份证号码', label: '申办人身份证号码',
required: true, required: true,
slot: 'idNo', slot: 'idNo',
rules: [
{
required: true,
message: '请输入申办人身份证号码',
},
],
}, },
{ {
field: 'phone', field: 'phone',
...@@ -139,13 +199,27 @@ export const applicantFormSchema: FormSchema[] = [ ...@@ -139,13 +199,27 @@ export const applicantFormSchema: FormSchema[] = [
required: true, required: true,
}, },
{ {
label: '企业授权文件',
field: 'doc', field: 'doc',
slot: 'doc', slot: 'doc',
required: true, required: true,
rules: [
{
required: true,
message: '请上传企业授权文件',
},
],
}, },
{ {
label: '企业承诺函',
field: 'letter', field: 'letter',
slot: 'letter', slot: 'letter',
required: true, required: true,
rules: [
{
required: true,
message: '请上传企业承诺函',
},
],
}, },
]; ];
...@@ -132,54 +132,88 @@ ...@@ -132,54 +132,88 @@
<div class="des"> 与身份证图片保持一致。 </div> <div class="des"> 与身份证图片保持一致。 </div>
</template> </template>
<template #doc="{ field, model }"> <template #doc="{ field, model }">
<div class="field-item flex"> <div class="field-item">
<div class="label"> <UploadDragger
<div class="required" style="margin-right: 1em">企业授权文件</div> style="width: 350px"
<div>(需要加盖公章)</div> v-model:fileList="licenseList"
</div> name="file"
<div class="flex-1"> :multiple="true"
<UploadDragger >
style="width: 350px" <div class="logo">
v-model:fileList="licenseList" <PlusOutlined class="icon" />
name="file" <div> 上传企业授权书 </div>
:multiple="true"
>
<div class="logo">
<PlusOutlined class="icon" />
<div> 上传企业授权书 </div>
</div>
</UploadDragger>
<div class="des">
请上传pngJPgJPeg格式文件,企业授权委托书,大小为5M以内。
<a-button type="link" @click="handleDownTemp">下载模板</a-button>
</div> </div>
</UploadDragger>
<div class="des">
请上传pngJPgJPeg格式文件,企业授权委托书(需要加盖公章),大小为5M以内。
<a-button type="link" @click="handleDownTemp">下载模板</a-button>
</div> </div>
</div> </div>
<!-- <div class="field-item flex">-->
<!-- <div class="label">-->
<!-- <div class="required" style="margin-right: 1em">企业授权文件</div>-->
<!-- <div></div>-->
<!-- </div>-->
<!-- <div class="flex-1">-->
<!-- <UploadDragger-->
<!-- style="width: 350px"-->
<!-- v-model:fileList="licenseList"-->
<!-- name="file"-->
<!-- :multiple="true"-->
<!-- >-->
<!-- <div class="logo">-->
<!-- <PlusOutlined class="icon" />-->
<!-- <div> 上传企业授权书 </div>-->
<!-- </div>-->
<!-- </UploadDragger>-->
<!-- <div class="des">-->
<!-- 请上传pngJPgJPeg格式文件,企业授权委托书(需要加盖公章),大小为5M以内。-->
<!-- <a-button type="link" @click="handleDownTemp">下载模板</a-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</template> </template>
<template #letter="{ field, model }"> <template #letter="{ field, model }">
<div class="field-item flex"> <div class="field-item">
<div class="label"> <UploadDragger
<div class="required" style="margin-right: 2em">企业承诺函</div> style="width: 350px"
<div>(需要加盖公章)</div> v-model:fileList="licenseList"
</div> name="file"
<div class="flex-1"> :multiple="true"
<UploadDragger >
style="width: 350px" <div class="logo">
v-model:fileList="licenseList" <PlusOutlined class="icon" />
name="file" <div> 上传企业承诺函 </div>
:multiple="true"
>
<div class="logo">
<PlusOutlined class="icon" />
<div> 上传企业承诺函 </div>
</div>
</UploadDragger>
<div class="des">
请上传pmgJPg.jPeg格式文件,数据安全承诺书,大小为5M以内。
<a-button type="link" @click="handleDownTemp">下载模板</a-button>
</div> </div>
</UploadDragger>
<div class="des">
请上传pmgJPg.jPeg格式文件,数据安全承诺书(需要加盖公章),大小为5M以内。
<a-button type="link" @click="handleDownTemp">下载模板</a-button>
</div> </div>
</div> </div>
<!-- <div class="field-item flex">-->
<!-- <div class="label">-->
<!-- <div class="required" style="margin-right: 2em">企业承诺函</div>-->
<!-- <div></div>-->
<!-- </div>-->
<!-- <div class="flex-1">-->
<!-- <UploadDragger-->
<!-- style="width: 350px"-->
<!-- v-model:fileList="licenseList"-->
<!-- name="file"-->
<!-- :multiple="true"-->
<!-- >-->
<!-- <div class="logo">-->
<!-- <PlusOutlined class="icon" />-->
<!-- <div> 上传企业承诺函 </div>-->
<!-- </div>-->
<!-- </UploadDragger>-->
<!-- <div class="des">-->
<!-- 请上传pmgJPg.jPeg格式文件,数据安全承诺书(需要加盖公章),大小为5M以内。-->
<!-- <a-button type="link" @click="handleDownTemp">下载模板</a-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</template> </template>
</BasicForm> </BasicForm>
</div> </div>
...@@ -250,10 +284,11 @@ ...@@ -250,10 +284,11 @@
createMessage.warning('请阅读并勾选平台协议!'); createMessage.warning('请阅读并勾选平台协议!');
return; return;
} }
// await Promise.all([identityValidate(), enterpriseValidate(), applicantValidate()]); await Promise.all([identityValidate(), enterpriseValidate(), applicantValidate()]);
createMessage.success('提交成功!'); createMessage.success('提交成功!');
} }
function handleSave() { async function handleSave() {
await Promise.all([identityValidate(), enterpriseValidate(), applicantValidate()]);
createMessage.success('保存成功!'); createMessage.success('保存成功!');
} }
/** /**
...@@ -267,7 +302,6 @@ ...@@ -267,7 +302,6 @@
actionColOptions: { actionColOptions: {
span: 23, span: 23,
}, },
} as FormProps); } as FormProps);
const [enterpriseForm, { validate: enterpriseValidate }] = useForm({ const [enterpriseForm, { validate: enterpriseValidate }] = useForm({
labelWidth: 150, labelWidth: 150,
......
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