Commit c2ad7ca8 authored by chenjiahao's avatar chenjiahao

修复已知问题

parent 1a3fcda7
...@@ -288,7 +288,20 @@ ...@@ -288,7 +288,20 @@
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 { Col, Row } from 'ant-design-vue'; import { Col, Row } from 'ant-design-vue';
import cardLogo from '@/assets/images/mallHome/biaoqian.png';
import industryImg from '@/assets/images/mallHome/行业动态.png';
import dynamicImg from '@/assets/images/mallHome/hangyedongtai.png';
const items = [
{
id: '1',
url: new URL('@/assets/images/mallHome/banner1.png', import.meta.url).href,
},
{
id: '2',
url: new URL('@/assets/images/mallHome/banner.png', import.meta.url).href,
},
];
export default { export default {
name: 'Front', name: 'Front',
components: { Row, Col, Icon }, components: { Row, Col, Icon },
...@@ -337,19 +350,10 @@ ...@@ -337,19 +350,10 @@
activeName2: 'first', activeName2: 'first',
enrollNotice: '1', enrollNotice: '1',
isDetail: false, isDetail: false,
cardLogo: 'src/assets/images/mallHome/biaoqian.png', cardLogo,
industryImg: 'src/assets/images/mallHome/行业动态.png', industryImg,
dynamicImg: 'src/assets/images/mallHome/hangyedongtai.png', dynamicImg,
items: [ items,
{
id: '1',
url: 'src/assets/images/mallHome/banner1.png',
},
{
id: '2',
url: 'src/assets/images/mallHome/banner.png',
},
],
formSchema1: [ formSchema1: [
{ {
label: '申请人', label: '申请人',
......
...@@ -101,21 +101,22 @@ ...@@ -101,21 +101,22 @@
import Icon from '@/components/Icon/Icon.vue'; import Icon from '@/components/Icon/Icon.vue';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
const items = [
{
id: '1',
url: new URL('@/assets/images/mallHome/banner1.png', import.meta.url).href,
},
{
id: '2',
url: new URL('@/assets/images/mallHome/banner.png', import.meta.url).href,
},
];
export default { export default {
name: 'DemandHall', name: 'DemandHall',
components: { Icon }, components: { Icon },
data() { data() {
return { return {
items: [ items,
{
id: '1',
url: 'src/assets/images/mallHome/banner1.png',
},
{
id: '2',
url: 'src/assets/images/mallHome/banner.png',
},
],
tabSelect: 0, tabSelect: 0,
tabList: [ tabList: [
{ {
......
...@@ -47,9 +47,15 @@ ...@@ -47,9 +47,15 @@
>注册</el-button >注册</el-button
> >
</div> </div>
<div v-else> <div v-else style="display: flex;align-items: center">
<a-button class="long_btn" type="link"> </a-button> <a-button class="long_btn" type="link" />
<a-button class="long_btn" type="link" @click="toBackstage"> 个人中心 </a-button> <a-button
style="color: #486fe1; background-color: #dce5f9"
type="link"
@click="toBackstage"
>
<span style="text-align: center">个人中心</span>
</a-button>
</div> </div>
</div> </div>
<!-- </div>--> <!-- </div>-->
......
...@@ -670,6 +670,17 @@ ...@@ -670,6 +670,17 @@
import { BasicTable, useTable, TableAction } from '@/components/Table'; import { BasicTable, useTable, TableAction } from '@/components/Table';
import { columns } from './tableSchema'; import { columns } from './tableSchema';
const items = [
{
id: '1',
url: new URL('@/assets/images/mallHome/banner1.png', import.meta.url).href,
},
{
id: '2',
url: new URL('@/assets/images/mallHome/banner.png', import.meta.url).href,
},
];
const fileType = ref(''); // 文件下载后缀 const fileType = ref(''); // 文件下载后缀
const choseFile = ref({}); // 选择文件对象 const choseFile = ref({}); // 选择文件对象
const downloadType = ref(''); // 1是本地文件下载,2是oss文件下载 const downloadType = ref(''); // 1是本地文件下载,2是oss文件下载
...@@ -721,16 +732,6 @@ ...@@ -721,16 +732,6 @@
console.log('clickpush'); console.log('clickpush');
router.push('/aaaFont/nationalPolicy/details'); router.push('/aaaFont/nationalPolicy/details');
} }
const items = [
{
id: '1',
url: 'src/assets/images/mallHome/banner1.png',
},
{
id: '2',
url: 'src/assets/images/mallHome/banner.png',
},
];
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
/* 报名参赛按钮 */ /* 报名参赛按钮 */
......
...@@ -32,19 +32,19 @@ ...@@ -32,19 +32,19 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div v-if="tabChildren" class="right-tab">--> <!-- <div v-if="tabChildren" class="right-tab">-->
<!-- <div--> <!-- <div-->
<!-- v-show="tabChildren"--> <!-- v-show="tabChildren"-->
<!-- v-for="(tab, index) in tabChildren"--> <!-- v-for="(tab, index) in tabChildren"-->
<!-- :key="tab"--> <!-- :key="tab"-->
<!-- :class="{ active: tabChildrenSelect === index }"--> <!-- :class="{ active: tabChildrenSelect === index }"-->
<!-- @click="tabChildrenSelect = index"--> <!-- @click="tabChildrenSelect = index"-->
<!-- >--> <!-- >-->
<!-- <div class="tab">--> <!-- <div class="tab">-->
<!-- {{ tab.name }}--> <!-- {{ tab.name }}-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
</div> </div>
<div class="type1"> <div class="type1">
...@@ -71,207 +71,241 @@ ...@@ -71,207 +71,241 @@
</div> </div>
</div> </div>
<div class="tab-pane"> <div class="tab-pane">
<el-tabs v-model="activeName2" @tab-click="handleClick"> <el-tabs v-model="activeName2" @tab-click="handleClick">
<div class="custom-table"> <div class="custom-table">
<el-tab-pane name="first"> <el-tab-pane name="first">
<template #label> <template #label>
<span class="mb-4 tab-label">数据集</span> <span class="mb-4 tab-label">数据集</span>
</template> </template>
<el-row class="mt-5 w-365" :gutter="20"> <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-col
<el-card class="card-box"> @click="handleDetail(0)"
<template #header> class="mb-4"
<div style="display: flex; justify-content: space-between"> :span="6"
<div style="display: flex; align-items: center"> v-for="card in cardsData"
<Icon icon="ant-design:exception-outlined" :color="'#9d00ae'" :size="26" /> :key="card.title"
<span class="ml-4" style="font-size: 20px; font-weight: 550" >
>{{card.title}}</span> <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>
<el-tag type="danger">{{card.tag}}</el-tag>
</div> </div>
</template> <div class="card_bottom">
<div class="card-row"> <span style="color: #ec7520; font-size: 24px">面议</span>
<div class="card-right"> <el-button style="padding: 0; border: none; box-shadow: none" round>
<!-- <p>{{card.applicant}}</p>--> <Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{ card.look }}
<!-- <p>{{card.dataSource}}</p>--> </el-button>
<!-- <p>{{card.applicationScenarios}}</p>-->
<p>{{card.illustrate}}</p>
</div> </div>
</div> </el-card>
<div class="card_bottom"> </el-col>
<span style="color: #ec7520;font-size: 24px">面议</span> </el-row>
<el-button </el-tab-pane>
style="padding: 0; border: none; box-shadow: none" <el-tab-pane name="second">
round> <template #label>
<Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{card.look}} <span class="mb-4 tab-label">文件</span>
</el-button> </template>
</div> <el-row class="mt-5 w-365" :gutter="20">
</el-card> <el-col
</el-col> @click="handleDetail(1)"
</el-row> class="mb-4"
:span="6"
</el-tab-pane> v-for="card in cardsData1"
<el-tab-pane name="second"> :key="card.title"
<template #label> >
<span class="mb-4 tab-label">文件</span> <el-card class="card-box">
</template> <template #header>
<el-row class="mt-5 w-365" :gutter="20"> <div style="display: flex; justify-content: space-between">
<el-col @click="handleDetail(1)" class="mb-4" :span="6" v-for="card in cardsData1" :key="card.title"> <div style="display: flex; align-items: center">
<el-card class="card-box"> <Icon
<template #header> icon="ant-design:exception-outlined"
<div style="display: flex; justify-content: space-between"> :color="'#9d00ae'"
<div style="display: flex; align-items: center"> :size="26"
<Icon icon="ant-design:exception-outlined" :color="'#9d00ae'" :size="26" /> />
<span class="ml-4" style="font-size: 20px; font-weight: 550" <span class="ml-4" style="font-size: 20px; font-weight: 550">{{
>{{card.title}}</span> 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>
<el-tag type="danger">{{card.tag}}</el-tag>
</div> </div>
</template> <div class="card_bottom">
<div class="card-row"> <span style="color: #ec7520; font-size: 24px">面议</span>
<div class="card-right"> <el-button style="padding: 0; border: none; box-shadow: none" round>
<!-- <p>{{card.applicant}}</p>--> <Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{ card.look }}
<!-- <p>{{card.dataSource}}</p>--> </el-button>
<!-- <p>{{card.applicationScenarios}}</p>-->
<p>{{card.illustrate}}</p>
</div> </div>
</div> </el-card>
<div class="card_bottom"> </el-col>
<span style="color: #ec7520;font-size: 24px">面议</span> </el-row>
<el-button </el-tab-pane>
style="padding: 0; border: none; box-shadow: none" <el-tab-pane name="third">
round> <template #label>
<Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{card.look}} <span class="mb-4 tab-label">API</span>
</el-button> </template>
</div> <el-row class="mt-5 w-365" :gutter="20">
</el-card> <el-col
</el-col> @click="handleDetail(2)"
</el-row> class="mb-4"
:span="6"
</el-tab-pane> v-for="card in cardsData2"
<el-tab-pane name="third"> :key="card.title"
<template #label> >
<span class="mb-4 tab-label">API</span> <el-card class="card-box">
</template> <template #header>
<el-row class="mt-5 w-365" :gutter="20"> <div style="display: flex; justify-content: space-between">
<el-col @click="handleDetail(2)" class="mb-4" :span="6" v-for="card in cardsData2" :key="card.title"> <div style="display: flex; align-items: center">
<el-card class="card-box"> <Icon
<template #header> icon="ant-design:exception-outlined"
<div style="display: flex; justify-content: space-between"> :color="'#9d00ae'"
<div style="display: flex; align-items: center"> :size="26"
<Icon icon="ant-design:exception-outlined" :color="'#9d00ae'" :size="26" /> />
<span class="ml-4" style="font-size: 20px; font-weight: 550" <span class="ml-4" style="font-size: 20px; font-weight: 550">{{
>{{card.title}}</span> 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>
<el-tag type="danger">{{card.tag}}</el-tag>
</div> </div>
</template> <div class="card_bottom">
<div class="card-row"> <span style="color: #ec7520; font-size: 24px">面议</span>
<div class="card-right"> <el-button style="padding: 0; border: none; box-shadow: none" round>
<!-- <p>{{card.applicant}}</p>--> <Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{ card.look }}
<!-- <p>{{card.dataSource}}</p>--> </el-button>
<!-- <p>{{card.applicationScenarios}}</p>-->
<p>{{card.illustrate}}</p>
</div> </div>
</div> </el-card>
<div class="card_bottom"> </el-col>
<span style="color: #ec7520;font-size: 24px">面议</span> </el-row>
<el-button
style="padding: 0; border: none; box-shadow: none" <el-table
round> class="mt-5"
<Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{card.look}} :fits="true"
</el-button> :row-style="{ height: '60px' }"
</div> :header-cell-style="{ background: '#E4ECFA', color: '#3F3F3F', height: '60px' }"
</el-card> :data="tableData"
</el-col> style="width: 1440px; font-size: 18px"
</el-row> >
<el-table-column prop="address" width="500" label="API产权名称">
<el-table <template #header="scope">
class="mt-5" <span class="table-span-label">{{ scope.column.label }}</span>
:fits="true" </template>
:row-style="{ height: '60px' }" <template #default="scope">
:header-cell-style="{ background: '#E4ECFA', color: '#3F3F3F', height: '60px' }" <span class="table-span">{{ scope.row.address }}</span>
:data="tableData" </template>
style="width: 1440px; font-size: 18px" </el-table-column>
> <el-table-column prop="name" width="350" label="申请人"> </el-table-column>
<el-table-column prop="address" width="500" label="API产权名称"> <el-table-column prop="applicationDate" label="申请日期"> </el-table-column>
<template #header="scope"> <el-table-column prop="upDate" label="更新日期"> </el-table-column>
<span class="table-span-label">{{ scope.column.label }}</span> </el-table>
</template> </el-tab-pane>
<template #default="scope"> <el-tab-pane name="fourth">
<span class="table-span">{{ scope.row.address }}</span> <template #label>
</template> <span class="mb-4 tab-label">登记服务</span>
</el-table-column> </template>
<el-table-column prop="name" width="350" label="申请人"> </el-table-column> <el-row class="mt-5 w-365" :gutter="20">
<el-table-column prop="applicationDate" label="申请日期"> </el-table-column> <el-col
<el-table-column prop="upDate" label="更新日期"> </el-table-column> @click="handleDetail(2)"
</el-table> class="mb-4"
</el-tab-pane> :span="6"
<el-tab-pane name="fourth"> v-for="card in cardsData3"
<template #label> :key="card.title"
<span class="mb-4 tab-label">登记服务</span> >
</template> <el-card class="card-box">
<el-row class="mt-5 w-365" :gutter="20"> <template #header>
<el-col @click="handleDetail(2)" class="mb-4" :span="6" v-for="card in cardsData3" :key="card.title"> <div style="display: flex; justify-content: space-between">
<el-card class="card-box"> <div style="display: flex; align-items: center">
<template #header> <Icon
<div style="display: flex; justify-content: space-between"> icon="ant-design:exception-outlined"
<div style="display: flex; align-items: center"> :color="'#9d00ae'"
<Icon icon="ant-design:exception-outlined" :color="'#9d00ae'" :size="26" /> :size="26"
<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>
<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>
<el-tag type="danger">{{card.tag}}</el-tag>
</div> </div>
</template> <div class="card_bottom">
<div class="card-row"> <span style="color: #ec7520; font-size: 24px">面议</span>
<div class="card-right"> <el-button style="padding: 0; border: none; box-shadow: none" round>
<!-- <p>{{card.applicant}}</p>--> <Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{ card.look }}
<!-- <p>{{card.dataSource}}</p>--> </el-button>
<!-- <p>{{card.applicationScenarios}}</p>-->
<p>{{card.illustrate}}</p>
</div> </div>
</div> </el-card>
<div class="card_bottom"> </el-col>
<span style="color: #ec7520;font-size: 24px">面议</span> </el-row>
<el-button
style="padding: 0; border: none; box-shadow: none" <el-table
round> class="mt-5"
<Icon icon="icon-park-outline:eyes" />&nbsp;&nbsp;{{card.look}} :fits="true"
</el-button> :row-style="{ height: '60px' }"
</div> :header-cell-style="{ background: '#E4ECFA', color: '#3F3F3F', height: '60px' }"
</el-card> :data="tableData"
</el-col> style="width: 1440px; font-size: 18px"
</el-row> >
<el-table-column prop="address" width="500" label="登记产品产权名称">
<el-table <template #header="scope">
class="mt-5" <span class="table-span-label">{{ scope.column.label }}</span>
:fits="true" </template>
:row-style="{ height: '60px' }" <template #default="scope">
:header-cell-style="{ background: '#E4ECFA', color: '#3F3F3F', height: '60px' }" <span class="table-span">{{ scope.row.address }}</span>
:data="tableData" </template>
style="width: 1440px; font-size: 18px" </el-table-column>
> <el-table-column prop="name" width="350" label="申请人"> </el-table-column>
<el-table-column prop="address" width="500" label="登记产品产权名称"> <el-table-column prop="applicationDate" label="申请日期"> </el-table-column>
<template #header="scope"> <el-table-column prop="upDate" label="更新日期"> </el-table-column>
<span class="table-span-label">{{ scope.column.label }}</span> </el-table>
</template> </el-tab-pane>
<template #default="scope"> </div>
<span class="table-span">{{ scope.row.address }}</span> </el-tabs>
</template> </div>
</el-table-column>
<el-table-column prop="name" width="350" label="申请人"> </el-table-column>
<el-table-column prop="applicationDate" label="申请日期"> </el-table-column>
<el-table-column prop="upDate" label="更新日期"> </el-table-column>
</el-table>
</el-tab-pane>
</div>
</el-tabs>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</template> </template>
...@@ -503,7 +537,6 @@ ...@@ -503,7 +537,6 @@
state: '已发布', state: '已发布',
tag: '办公室', tag: '办公室',
}, },
], ],
cardsData1: [ cardsData1: [
{ {
...@@ -542,7 +575,6 @@ ...@@ -542,7 +575,6 @@
look: '123', look: '123',
tag: '宣传中心', tag: '宣传中心',
}, },
], ],
cardsData2: [ cardsData2: [
{ {
...@@ -590,8 +622,6 @@ ...@@ -590,8 +622,6 @@
look: '11', look: '11',
tag: '运维', tag: '运维',
}, },
], ],
cardsData3: [ cardsData3: [
{ {
...@@ -639,8 +669,6 @@ ...@@ -639,8 +669,6 @@
look: '121', look: '121',
tag: '运维', tag: '运维',
}, },
], ],
}; };
}, },
...@@ -654,24 +682,24 @@ ...@@ -654,24 +682,24 @@
this.tabChildren = tab.children; this.tabChildren = tab.children;
this.tabChildrenSelect = 0; this.tabChildrenSelect = 0;
}, },
handleDetail(i){ handleDetail(i) {
if (i === 0){ if (i === 0) {
this.$router.push({ this.$router.push({
path: '/aaaFont/tradingMarket/details/dataSet', path: '/aaaFont/tradingMarket/details/dataSet',
query: '', query: '',
}) });
} else if (i === 1){ } else if (i === 1) {
this.$router.push({ this.$router.push({
path: '/aaaFont/tradingMarket/details/file', path: '/aaaFont/tradingMarket/details/file',
query: '', query: '',
}) });
} else if (i === 2){ } else if (i === 2) {
this.$router.push({ this.$router.push({
path: '/aaaFont/tradingMarket/details/api', path: '/aaaFont/tradingMarket/details/api',
query: '', query: '',
}) });
} }
} },
}, },
}; };
</script> </script>
...@@ -773,7 +801,6 @@ ...@@ -773,7 +801,6 @@
} }
} }
.tab-pane { .tab-pane {
position: relative; position: relative;
margin-top: 80px; margin-top: 80px;
...@@ -791,20 +818,20 @@ ...@@ -791,20 +818,20 @@
color: #3a5cde; color: #3a5cde;
} }
.card-box:hover{ .card-box:hover {
box-shadow: 3px 2px 15px rgba(0, 0, 0, 0.2); box-shadow: 3px 2px 15px rgba(0, 0, 0, 0.2);
} }
.card-row { .card-row {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
font-size: 18px; font-size: 18px;
text-align: left; text-align: left;
margin-bottom: 40px; margin-bottom: 40px;
p { p {
margin-top: 18px; margin-top: 18px;
height: 20px; height: 20px;
} }
.card-right { .card-right {
width: 90%; width: 90%;
...@@ -822,10 +849,8 @@ ...@@ -822,10 +849,8 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
font-weight: 500; font-weight: 500;
} }
.custom-table { .custom-table {
margin-bottom: 72px; margin-bottom: 72px;
} }
......
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