Skip to content

B
bigDataSystem
Commit dc881f89 authored by liangjingpeng's avatar liangjingpeng
Browse files
Options

首页,交易市场-bug修复

parent a450b4fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1777 additions and 83 deletions
src/views/AAAFont/front/index.vue
View file @ dc881f89
......@@ -169,7 +169,7 @@
<span class="table-span-label">{{ scope.column.label }}</span>
</template>
<template #default="scope">
<span class="table-span">{{ scope.row.address }}</span>
<span class="table-span" @click="handleListDataSet">{{ scope.row.address }}</span>
</template>
</el-table-column>
<el-table-column prop="name" width="350" label="申请人" />
......@@ -191,7 +191,7 @@
>
<el-table-column prop="address" width="500" label="数据集产权名称">
<template #header="scope">
<span class="table-span-label">{{ scope.column.label }}</span>
<span class="table-span-label" @click="handleListFile">{{ scope.column.label }}</span>
</template>
<template #default="scope">
<span class="table-span">{{ scope.row.address }}</span>
......@@ -219,7 +219,7 @@
<span class="table-span-label">{{ scope.column.label }}</span>
</template>
<template #default="scope">
<span class="table-span">{{ scope.row.address }}</span>
<span class="table-span" @click="handleListApi">{{ scope.row.address }}</span>
</template>
</el-table-column>
<el-table-column prop="name" width="350" label="申请人" />
......@@ -442,6 +442,21 @@
path: '/aaaFont/dataRegistration/enrollPublicObjection',
});
},
handleListApi(){
this.$router.push({
path: '/aaaFont/tradingMarket/details/api',
});
},
handleListFile(){
this.$router.push({
path: '/aaaFont/tradingMarket/details/file',
});
},
handleListDataSet(){
this.$router.push({
path: '/aaaFont/tradingMarket/details/dataSet',
});
},
// 进入后台方法
toBackstage() {
......
src/views/AAAFont/register/RegisterForm.vue
View file @ dc881f89
......@@ -47,8 +47,8 @@
<FormItem class="enter-x" name="policy">
<!-- No logic, you need to deal with it yourself -->
<Checkbox v-model:checked="formData.policy" size="small">
{{ t('sys.login.policy') }}
</Checkbox>
我同意xxx
</Checkbox><slot name="policy"></slot>
</FormItem>
<Button
......
src/views/AAAFont/register/index.vue
View file @ dc881f89
......@@ -2,7 +2,7 @@
<div id="register">
<el-container>
<el-header class="header">
<div @click="handleTitle" class="official-title"> 数据要素交易服务平台 </div>
<div @click="handleTitle" class="official-title"> 数据要素交易服务平台</div>
<div class="分割线"></div>
<div class="title-right">注册</div>
</el-header>
......@@ -12,10 +12,25 @@
<div class="register-title">
<span class="register-title-text">欢迎注册</span>
</div>
<RegisterForm />
<RegisterForm>
<template #policy>
<a @click="dialogVisible = true">隐私政策</a>
</template>
</RegisterForm>
</div>
</div>
</div>
<el-dialog
top="2%"
v-model="dialogVisible"
width="90%"
>
<privacy/>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
</span>
</el-dialog>
</el-container>
</div>
</template>
......@@ -23,12 +38,16 @@
<script>
import Icon from '@/components/Icon/Icon.vue';
import RegisterForm from './RegisterForm.vue';
import Privacy from "@/views/AAAFont/register/privacy.vue";
export default {
name: 'Register',
components: { RegisterForm, Icon },
components: {Privacy, RegisterForm, Icon },
data() {
return {};
return {
dialogVisible: false,
};
},
methods: {
handleClick(tab, event) {
......@@ -37,6 +56,13 @@
handleTitle() {
this.$router.replace('/aaaFont/font');
},
handleClose(done) {
this.$confirm('确认关闭？')
.then((_) => {
done();
})
.catch((_) => {});
},
},
};
</script>
......@@ -44,6 +70,7 @@
body {
margin: 0;
}
#register {
min-width: 1366px;
width: auto;
......@@ -51,6 +78,7 @@
/*transform: translate(0, 0);*/
background-color: #eff3fa;
}
.header {
/*position: fixed;*/
z-index: 999;
......@@ -83,6 +111,7 @@
/*justify-content: center;*/
position: relative;
}
.official-title::before {
content: '';
position: absolute;
......
src/views/AAAFont/register/privacy.vue 0 → 100644
View file @ dc881f89
This diff is collapsed.
src/views/AAAFont/tradingMarket/details/api.vue
View file @ dc881f89
......@@ -20,7 +20,13 @@
<div class="title">API</div>
<div class="path">API日志记录</div>
</div>
<div class="buttonGroup"> </div>
<div class="buttonGroup">
<a-button
style="color: #486fe1; background-color: #dce5f9"
type="link"
@click="handleSubmit"
>提交订单</a-button>
</div>
</div>
</template>
<div class="desc-wrap">
......@@ -29,14 +35,18 @@
size="middle"
:bordered="false"
:column="2"
:data="basicData"
:schema="basicSchema"
:data="basicDataApi"
:schema="basicSchemaApi"
:labelStyle="{ fontSize: '16px' }"
:contentStyle="{ fontSize: '16px' }"
/>
<step-header class="mt-5" title="列信息" />
<BasicTable @register="registerTable" />
<step-header class="mt-5" title="API详情" />
<BasicTable @register="apiConfigTable" />
<BasicTable @register="apiBackTable" />
<!-- <BasicTable @register="registerTable" />-->
</div>
<ModelSubmit @register="registerModal" />
</PageWrapper>
</template>
......@@ -48,13 +58,25 @@ 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 { searchEditFormSchema, informationColumns, basicSchemaApi} from './data';
import { basicDataApi, informationTableList} from './dataFileData';
import { BasicTable, useTable } from '@/components/Table';
import BasicTitle from "@/components/Basic/src/BasicTitle.vue";
import StepHeader from "@/components/stepHeader.vue";
import {useModal} from "@/components/Modal";
import ModelSubmit from "@/views/AAAFont/tradingMarket/details/modelSubmit.vue";
import {
apiBackTableData,
apiConfigTableData
} from "./data";
import {
apiBackTableColumn,
apiConfigTableColumn
} from "./dataFileData";
defineOptions({ name: 'AccountDetail' });
defineOptions({ name: 'api' });
const [registerModal, { openModal }] = useModal();
const { createMessage, createConfirm } = useMessage();
const ATabs = Tabs;
......@@ -87,7 +109,54 @@ const [registerTable] = useTable({
return info;
},
});
const [apiConfigTable] = useTable({
title: '请求参数',
api: async (params) => {
const response = {
pageNu: '1',
pageSize: '10',
pages: '1',
total: apiConfigTableData.length,
code: '',
message: '',
data: apiConfigTableData,
};
return { ...response };
},
columns: apiConfigTableColumn,
useSearchForm: false,
showTableSetting: false,
showIndexColumn: false,
bordered: true,
scroll: { y: 300 },
});
const [apiBackTable] = useTable({
title: '返回参数',
api: async (params) => {
const response = {
pageNu: '1',
pageSize: '10',
pages: '1',
total: apiBackTableData.length,
code: '',
message: '',
data: apiBackTableData,
};
return { ...response };
},
columns: apiBackTableColumn,
useSearchForm: false,
showTableSetting: false,
showIndexColumn: false,
bordered: true,
scroll: { y: 300 },
});
function handleSubmit(record: Recordable) {
openModal(true, {
record,
});
}
function goBack() {
router.back();
}
......
src/views/AAAFont/tradingMarket/details/data.ts
View file @ dc881f89
......@@ -20,6 +20,14 @@ export const basicSchema: DescItem[] = [
field: 'description',
label: '描述',
},
{
field: 'numbering',
label: '存证公证编号',
},
{
field: 'platform',
label: '存证公证平台',
},
{
field: 'tags',
label: '业务标签',
......@@ -41,6 +49,113 @@ export const basicSchema: DescItem[] = [
label: '来源',
},
];
export const basicSchemaApi: DescItem[] = [
{
field: 'name',
label: '资源名称',
},
{
field: 'description',
label: '描述',
},
{
field: 'numbering',
label: '存证公证编号',
},
{
field: 'platform',
label: '存证公证平台',
},
{
field: 'tags',
label: '业务标签',
},
{
field: 'owner',
label: '权属机构',
},
{
field: 'sensitiveStatus',
label: '敏感状态',
},
{
field: 'permissions',
label: '开放权限',
},
];
export const basicSchema1: DescItem[] = [
{
field: 'name',
label: '资源名称',
},
{
field: 'description',
label: '描述',
},
{
field: 'numbering',
label: '存证公证编号',
},
{
field: 'platform',
label: '存证公证平台',
},
{
field: 'illustrate',
label: '算法规则简要说明',
},
{
field: 'owner',
label: '权属机构',
},
{
field: 'applicationScenarios',
label: '应用场景',
},
{
field: 'sceneType',
label: '场景类型',
},
{
field: 'source',
label: '数据来源',
},
];
export const ordersBasicSchema: DescItem[] = [
{
label: '订单名称',
field: 'name',
},
{
label: '订单类型',
field: 'type',
},
{
label: '版本号',
field: 'version',
},
{
label: '发布人',
field: 'uploadPerson',
},
{
label: '交易金额',
field: 'money',
},
{
label: '交易发起时间',
field: 'startTime',
},
{
label: '交易结束时间',
field: 'endTime',
},
{
label: '交易进度',
field: 'progress',
},
];
export const informationColumns: BasicColumn[] = [
{
title: '字段',
......@@ -84,6 +199,87 @@ export const informationColumns: BasicColumn[] = [
},
];
export const apiConfigTableData = [
{
field: 'product_name',
code: 'PROD001',
type: 'string',
remark: '商品名称',
required: 'true',
value: '无线鼠标',
examValue: '有线键盘',
},
{
field: 'product_id',
code: 'PROD002',
type: 'string',
remark: '商品ID',
required: 'true',
value: 'P12345',
examValue: 'P67890',
},
{
field: 'price',
code: 'PROD003',
type: 'float',
remark: '商品价格',
required: 'true',
value: '199.99',
examValue: '299.99',
},
{
field: 'stock_quantity',
code: 'PROD004',
type: 'integer',
remark: '商品库存数量',
required: 'true',
value: '50',
examValue: '100',
},
{
field: 'category',
code: 'PROD005',
type: 'string',
remark: '商品类别',
required: 'true',
value: '电子产品',
examValue: '办公文具',
},
];
export const apiBackTableData = [
{
field: 'product_name',
code: 'PROD001',
type: 'string',
remark: '成功返回：商品名称',
},
{
field: 'product_id',
code: 'PROD002',
type: 'string',
remark: '成功返回：商品ID',
},
{
field: 'price',
code: 'PROD003',
type: 'float',
remark: '成功返回：商品价格',
},
{
field: 'stock_quantity',
code: 'PROD004',
type: 'integer',
remark: '成功返回：商品库存数量',
},
{
field: 'category',
code: 'PROD005',
type: 'string',
remark: '成功返回：商品类别',
},
];
export const applyInfoData: any[]= {
enrollCode: 'DIP2024000084573',
enrollDate: '2016-05-02',
......
src/views/AAAFont/tradingMarket/details/dataFileData.ts
View file @ dc881f89
import {BasicColumn} from "@/components/Table";
export const basicData = {
name: 'wyx_contact',
description: '联系人信息',
numbering: '23342124511',
platform: '测试平台',
tags: '测试',
owner: '数据平台治理部',
sensitiveStatus: '敏感',
version: 'V1.0',
source: '元数据',
};
export const basicDataApi = {
name: 'wyx_contact',
description: '联系人信息',
numbering: '23342124511',
platform: '测试平台',
tags: '测试',
owner: '数据平台治理部',
sensitiveStatus: '敏感',
permissions: '元数据',
};
export const basicData1 = {
name: 'wyx_contact',
description: '联系人信息',
numbering: '23342124511',
platform: '测试平台',
illustrate: '测试1111',
owner: '数据平台治理部',
applicationScenarios: '场景场景',
sceneType: '测试测试长字段测试',
source: '元数据',
};
export const ordersData = {
name: '年度财务报告',
type: '数据集',
version: 'v1.2',
uploadPerson: '张伟',
money: 10000,
startTime: '2024-12-01',
endTime: '-',
progress: '待支付',
};
export const informationTableList: any[] = [
{
field: 'name',
......@@ -91,6 +125,56 @@ export const informationTableList: any[] = [
},
];
export const apiBackTableColumn: BasicColumn[] = [
{
title: '列名',
dataIndex: 'field',
},
{
title: '参数code',
dataIndex: 'code',
},
{
title: '参数类型',
dataIndex: 'type',
},
{
title: '注释',
dataIndex: 'remark',
},
];
export const apiConfigTableColumn: BasicColumn[] = [
{
title: '列名',
dataIndex: 'field',
},
{
title: '参数code',
dataIndex: 'code',
},
{
title: '参数类型',
dataIndex: 'type',
},
{
title: '注释',
dataIndex: 'remark',
},
{
title: '是否必填',
dataIndex: 'required',
},
{
title: '默认值',
dataIndex: 'value',
},
{
title: '示例值',
dataIndex: 'examValue',
},
];
export const applyInfo: any[]= [
{
span: 12,
......
src/views/AAAFont/tradingMarket/details/dataSet.vue
View file @ dc881f89
......@@ -20,7 +20,12 @@
<div class="title">数据服务</div>
<div class="path">党建工作总结</div>
</div>
<div class="buttonGroup"> </div>
<div class="buttonGroup"><a-button
style="color: #486fe1; background-color: #dce5f9"
type="link"
@click="handleSubmit"
>提交订单</a-button>
</div>
</div>
</template>
<div class="desc-wrap">
......@@ -37,6 +42,7 @@
<step-header class="mt-5" title="列信息" />
<BasicTable @register="registerTable" />
</div>
<ModelSubmit @register="registerModal" />
</PageWrapper>
</template>
......@@ -53,9 +59,12 @@
import { BasicTable, useTable } from '@/components/Table';
import BasicTitle from "@/components/Basic/src/BasicTitle.vue";
import StepHeader from "@/components/stepHeader.vue";
import {useModal} from "@/components/Modal";
import ModelSubmit from "@/views/AAAFont/tradingMarket/details/modelSubmit.vue";
defineOptions({ name: 'AccountDetail' });
const [registerModal, { openModal }] = useModal();
const { createMessage, createConfirm } = useMessage();
const ATabs = Tabs;
const ATabPane = Tabs.TabPane;
......@@ -92,6 +101,12 @@
router.back();
}
function handleSubmit(record: Recordable) {
openModal(true, {
record,
});
}
onMounted(() => {});
</script>
......
src/views/AAAFont/tradingMarket/details/file.vue
View file @ dc881f89
......@@ -20,74 +20,55 @@
<div class="title">数据集</div>
<div class="path">用户认证日志</div>
</div>
<div class="buttonGroup"> </div>
<div class="buttonGroup"><a-button
style="color: #486fe1; background-color: #dce5f9"
type="link"
@click="handleSubmit"
>提交订单</a-button>
</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>-->
<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>
<div class="desc-wrap">
<step-header title="基本信息" />
<Description
size="middle"
:bordered="false"
:column="2"
:data="basicData1"
:schema="basicSchema1"
:labelStyle="{ fontSize: '16px' }"
:contentStyle="{ fontSize: '16px' }"
/>
<step-header class="mt-5" title="列信息" />
<BasicTable @register="registerTable" />
</div>
<ModelSubmit @register="registerModal" />
</PageWrapper>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { PageWrapper } from '@/components/Page';
import {Col, Row, Tabs} from 'ant-design-vue';
import { 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,applyInfoData } from './data';
import { basicData, informationTableList,applyInfo } from './dataFileData';
import { basicSchema1, searchEditFormSchema, informationColumns } from './data';
import { basicData1, informationTableList } from './dataFileData';
import { BasicTable, useTable } from '@/components/Table';
import BasicTitle from "@/components/Basic/src/BasicTitle.vue";
import StepHeader from "@/components/stepHeader.vue";
import {useModal} from "@/components/Modal";
import ModelSubmit from "@/views/AAAFont/tradingMarket/details/modelSubmit.vue";
defineOptions({ name: 'AccountDetail' });
const [registerModal, { openModal }] = useModal();
const { createMessage, createConfirm } = useMessage();
const ATabs = Tabs;
const ATabPane = Tabs.TabPane;
const [registerTable] = useTable({
api: async () => {
const response = {
......@@ -120,6 +101,12 @@ function goBack() {
router.back();
}
function handleSubmit(record: Recordable) {
openModal(true, {
record,
});
}
onMounted(() => {});
</script>
......@@ -153,23 +140,4 @@ 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/details/modelSubmit.vue 0 → 100644
View file @ dc881f89
<template>
<BasicModal
width="40%"
v-bind="$attrs"
@register="registerModal"
:title="getTitle"
@ok="handleSubmit"
>
<Description
size="middle"
:bordered="false"
:column="2"
:data="ordersData"
:schema="ordersBasicSchema"
:labelStyle="{ fontSize: '16px' }"
:contentStyle="{ fontSize: '16px' }"
/>
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, computed, unref } from 'vue';
import { BasicModal, useModalInner } from '@/components/Modal';
import { useMessage } from '@/hooks/web/useMessage';
import { router } from '@/router';
import {ordersData} from "./dataFileData";
import {ordersBasicSchema} from "./data";
import {Description} from "@/components/Description";
defineOptions({ name: 'ModelSubmit' });
const emit = defineEmits(['success', 'register']);
const { createMessage } = useMessage();
const isUpdate = ref(true);
const isMove = ref(false);
const rowId = ref('');
//获取接口数据并放在下拉框里（这里是打开了一个弹框）
//初始化弹框
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
resetFields();
setModalProps({ confirmLoading: false });
isUpdate.value = !!data?.isUpdate;
isMove.value = !!data?.isMove;
if (unref(isUpdate)) {
// 获取行数据的id
rowId.value = data.record.businessId;
// 塞值
setFieldsValue({
...data.record,
});
}
console.log('treeList', treeList);
updateSchema([
{
field: 'modelId',
componentProps: {
treeData: treeList,
},
},
]);
});
const getTitle = computed(() => '订单信息');
/**确定按钮*/
function handleSubmit() {
// router.push({
// path: '/metaModel/physicsModel/EditRowTable',
// query: {},
// });
// router.back();
//弹出提交成功信息
createMessage.success('订单提交成功');
closeModal();
}
</script>
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