Skip to content

B
bigDataSystem
Commit f8bb995d authored by LiXuyang's avatar LiXuyang
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 18532319 bdd4178a
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 58 deletions
src/router/routes/index.ts
View file @ f8bb995d
......@@ -101,6 +101,14 @@ export const PCFontRoute: AppRouteRecordRaw = {
title: '',
},
},
{
path: '/aaaFont/nationalPolicy/details',
name: 'nationalPolicyDetail',
component: () => import('@/views/AAAFont/nationalPolicy/details/index.vue'),
meta: {
title: '',
},
},
{
path: '/aaaFont/dataRegistration',
name: 'dataRegistration',
......
src/views/AAAFont/front/index.vue
View file @ f8bb995d
......@@ -24,14 +24,16 @@
<el-row class="mt-5" :gutter="20">
<el-col :span="8">
<el-card>
<div slot="header">
<div style="display: flex; align-items: center">
<img :src="cardLogo" />
<span class="ml-4" style="font-size: 20px; font-weight: 550"
>阀类需求弹性分析数据</span
>
<template #header>
<div>
<div style="display: flex; align-items: center">
<img :src="cardLogo" />
<span class="ml-4" style="font-size: 20px; font-weight: 550"
>阀类需求弹性分析数据</span
>
</div>
</div>
</div>
</template>
<div class="card-row">
<div class="card-left">
<p>申请人</p>
......@@ -58,14 +60,16 @@
</el-col>
<el-col :span="8">
<el-card>
<div slot="header">
<div style="display: flex; align-items: center">
<img :src="cardLogo" />
<span class="ml-4" style="font-size: 20px; font-weight: 550"
>大学食堂销量预测</span
>
<template #header>
<div>
<div style="display: flex; align-items: center">
<img :src="cardLogo" />
<span class="ml-4" style="font-size: 20px; font-weight: 550"
>大学食堂销量预测</span
>
</div>
</div>
</div>
</template>
<div class="card-row">
<div class="card-left">
<p>申请人</p>
......@@ -92,14 +96,16 @@
</el-col>
<el-col :span="8">
<el-card>
<div slot="header">
<div style="display: flex; align-items: center">
<img :src="cardLogo" />
<span class="ml-4" style="font-size: 20px; font-weight: 550"
>销售量对价格变化的反应研究</span
>
<template #header>
<div>
<div style="display: flex; align-items: center">
<img :src="cardLogo" />
<span class="ml-4" style="font-size: 20px; font-weight: 550"
>销售量对价格变化的反应研究</span
>
</div>
</div>
</div>
</template>
<div class="card-row">
<div class="card-left">
<p>申请人</p>
......@@ -129,7 +135,7 @@
</el-tabs>
<el-button-group>
<el-button plain class="back-button" type="text">
查看更多&nbsp;<Icon :size="24" icon="icon-park-solid:right-c"></Icon>
查看更多&nbsp;<Icon :size="24" icon="icon-park-solid:right-c" />
</el-button>
</el-button-group>
</div>
......@@ -283,9 +289,9 @@
<span class="table-span">{{ scope.row.address }}</span>
</template>
</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-column prop="name" width="350" label="申请人" />
<el-table-column prop="applicationDate" label="申请日期" />
<el-table-column prop="upDate" label="更新日期" />
</el-table>
</el-tab-pane>
<el-tab-pane name="second">
......@@ -308,9 +314,9 @@
<span class="table-span">{{ scope.row.address }}</span>
</template>
</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-column prop="name" width="350" label="申请人" />
<el-table-column prop="applicationDate" label="申请日期" />
<el-table-column prop="upDate" label="更新日期" />
</el-table>
</el-tab-pane>
<el-tab-pane name="third">
......@@ -333,9 +339,9 @@
<span class="table-span">{{ scope.row.address }}</span>
</template>
</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-column prop="name" width="350" label="申请人" />
<el-table-column prop="applicationDate" label="申请日期" />
<el-table-column prop="upDate" label="更新日期" />
</el-table>
</el-tab-pane>
<el-tab-pane name="fourth">
......@@ -358,37 +364,33 @@
<span class="table-span">{{ scope.row.address }}</span>
</template>
</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-column prop="name" width="350" label="申请人" />
<el-table-column prop="applicationDate" label="申请日期" />
<el-table-column prop="upDate" label="更新日期" />
</el-table>
</el-tab-pane>
</div>
</el-tabs>
<el-button-group>
<el-button plain class="back-button" type="text">
查看更多&nbsp;<Icon :size="24" icon="icon-park-solid:right-c"></Icon>
查看更多&nbsp;<Icon :size="24" icon="icon-park-solid:right-c" />
</el-button>
</el-button-group>
</div>
</div>
<div class="row-footer">
<div class="footer-title">
<span>大数据服务平台上线啦~</span>
</div>
<el-button plain class="footer-button" type="text" @click="toBackstage()">
立即前往<Icon class="ml-3" :size="20" icon="icon-park-solid:right-c"></Icon>
立即前往<Icon class="ml-3" :size="20" icon="icon-park-solid:right-c" />
</el-button>
</div>
</div>
</div>
</template>
<script>
import Icon from '@/components/Icon/Icon.vue';
import { getToken } from '@/utils/auth';
......@@ -630,30 +632,28 @@
margin-left: 80px;
}
.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;
}
}
</style>
src/views/AAAFont/nationalPolicy/detail.vue 0 → 100644
View file @ f8bb995d
<template>1111111111</template>
<script>
export default {
name: 'detail',
};
</script>
<style scoped></style>
src/views/AAAFont/nationalPolicy/index.vue
View file @ f8bb995d
......@@ -140,8 +140,8 @@
});
});
function handleClick() {
console.log('clickpush');
router.push('/aaaFont/nationalPolicy/details');
console.log('click');
window.open('/#/aaaFont/nationalPolicy/details', '_blank');
}
</script>
<style scoped lang="scss">
......
src/views/personalCenter/myRegistration/index.vue
View file @ f8bb995d
......@@ -32,6 +32,7 @@
// },
{
label: '处理',
ifShow: record.isObjection === '是',
onClick: handleObjection.bind(null, record),
},
]"
......
src/views/personalCenter/myRegistration/objectionModal.vue
View file @ f8bb995d
......@@ -6,12 +6,6 @@
:title="getTitle"
@ok="handleSubmit"
>
<Alert
show-icon
type="info"
message="请根据数据对比情况谨慎处理异议"
style="margin-bottom: 20px"
/>
<div class="flex" style="margin-bottom: 20px">
<div style="margin-top: 4px">异议内容：</div>
<div
......@@ -20,7 +14,7 @@
><span>有抄袭行为</span></div
>
</div>
<div class="flex">
<div>
<Descriptions style="margin-left: 20px" class="w-8/9" :column="1">
<Descriptions.Item label="相关证明材料" />
<Descriptions.Item label="申请人">宏源技术科技有限公司</Descriptions.Item>
......@@ -34,6 +28,16 @@
>
<Descriptions.Item label="发布时间">2024.01.03</Descriptions.Item>
</Descriptions>
<Upload
:style="{ pointerEvents: status === 'detail' ? 'none' : null }"
style="width: 45%; margin-left: 5px"
v-model:file-list="fileList"
>
<a-button>
<UploadOutlined />
重新上传文件
</a-button>
</Upload>
</div>
</BasicModal>
</template>
......@@ -42,11 +46,19 @@
import BasicModal from '@/components/Modal/src/BasicModal.vue';
import { useModalInner } from '@/components/Modal';
import { FormProps, useForm } from '@/components/Form';
import { Descriptions, Alert } from 'ant-design-vue';
import { Descriptions, Alert, Upload } 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';
import { UploadOutlined } from '@ant-design/icons-vue';
const fileList = [
{
uid: 1,
name: '证明材料.pdf',
status: 'done',
},
];
const getTitle = '处理异议';
const { createMessage } = useMessage();
......
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