Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
1cf03985 by xukangle
Options

Merge branch 'dev_20241202_xukangle' into develop

2 parents 2296e1e9 4b6216c9
Expand all
Inline Side-by-side
Showing 6 changed files with 90 additions and 34 deletions
src/api/modules/dataProduct.ts
......@@ -10,6 +10,15 @@ export const getProductList = (params) => request({
method: 'get',
params
})
/** 获取数交所产品
* @param {Object} params
* path: /dam-catalog-table/data-exchange/get-table-select
*/
export const getDataExchangeProductList = (params) => request({
url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select`,
method: 'get',
params
})
/** 获取已添加的数据产品列表 */
export const getAddedProductList = (params) => request({
......@@ -25,6 +34,13 @@ export const getListingList = (params) => request({
data: params
})
/**获取产品上架数量 */
export const getListingCount = () => request({
url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/product-num`,
method: 'post',
})
/** 获取数据产品上架详情 */
export const getListingDetail = (params) => request({
url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/detail`,
......@@ -54,6 +70,13 @@ export const listingUpdate = (params) => request({
data: params
});
/**门户更新 */
export const listingUpdateGateway = (params) => request({
url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/update-gateway`,
method: 'post',
data: params
});
/** 删除数据产品上架信息 */
export const listingDelete = (params) => request({
url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/delete`,
......
src/components/Form/index.vue
......@@ -1353,36 +1353,70 @@ const panelChange = (scope, row) => {
</template>
<template #file="{ file }">
<div class="file-operate">
<template
<!-- <template
v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xls' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xlsx'">
<img class="file-img" src="../../assets/images/excel.png" />
</template>
<template
<template
v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'doc' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'docx'">
<img class="file-img" src="../../assets/images/word.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'zip'">
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'zip'">
<img class="file-img" src="../../assets/images/zip.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'rar'">
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'rar'">
<img class="file-img" src="../../assets/images/RAR.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf'">
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf'">
<img class="file-img" src="../../assets/images/PDF.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png'">
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png'">
<img class="file-img" src="../../assets/images/png.png" />
</template>
<template
<template
v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
<img class="file-img" src="../../assets/images/jpg.png" />
</template>
<div class="file-name">
<ellipsis-tooltip :content="file.name" class-name="w100f" :refName="'tooltipOver' + file.name"></ellipsis-tooltip>
</div>
<div :style="{ right: '72px' }" class="file-preview"
v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
@click="onUploadFilePreview(file, item)">查看</div>
<div :style="{ right: '36px' }" class="file-preview" @click="onUploadFileDownload(file, item)">下载
</div>
<div v-if="!item.disabled" :style="{ right: 0 }" class="file-preview" @click="handleUploadFileRemove(file, item)">删除
</div> -->
<template
v-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xls' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xlsx'">
<img class="file-img" src="../../assets/images/excel.png" />
</template>
<template
v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'doc' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'docx'">
<img class="file-img" src="../../assets/images/word.png" />
</template>
<template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'zip'">
<img class="file-img" src="../../assets/images/zip.png" />
</template>
<template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'rar'">
<img class="file-img" src="../../assets/images/RAR.png" />
</template>
<template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'pdf'">
<img class="file-img" src="../../assets/images/PDF.png" />
</template>
<template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'png'">
<img class="file-img" src="../../assets/images/png.png" />
</template>
<template
v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'jpg' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'jpeg'">
<img class="file-img" src="../../assets/images/jpg.png" />
</template>
<div class="file-name">
<ellipsis-tooltip :content="file.name" class-name="w100f"
:refName="'tooltipOver' + file.name"></ellipsis-tooltip>
<ellipsis-tooltip :content="file?.name ?? ''" class-name="w100f"
:refName="'tooltipOver' + file?.name"></ellipsis-tooltip>
</div>
<div :style="{ right: '72px' }" class="file-preview"
v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
v-if="['pdf', 'png', 'jpg', 'jpeg'].includes(file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() ?? '')"
@click="onUploadFilePreview(file, item)">查看</div>
<div :style="{ right: '36px' }" class="file-preview" @click="onUploadFileDownload(file, item)">下载
</div>
......
src/views/data_inventory/classifyGradeCatalogue.vue
......@@ -28,7 +28,7 @@ import {
import { TableColumnWidth } from "@/utils/enum";
import router from "@/router";
import { download } from "@/utils/common";
import { da, sl } from "element-plus/es/locale";
const currentPath = ref<string[]>([]);
......@@ -146,7 +146,7 @@ onMounted(async () => {
execGuid: execGuidInfo.value.execGuid,
classifyDetail: classifyDetailGuidInfo.value
});
getDictionaryList();
// getDictionaryList();
getSearchTableList();
// getLabelListData();
getGradeData(refGradeGuid.value);
......@@ -900,21 +900,22 @@ const classEditFormItems = ref<any>([{
clearable: true,
block: true,
visible: true,
}, {
label: '关联字典',
field: 'dictionaryGuid',
type: 'select',
placeholder: '请选择',
default: '',
options: [],
props: {
label: "chName",
value: "guid",
},
filterable: true,
clearable: true,
required: false
},
//{
// label: '关联字典',
// field: 'dictionaryGuid',
// type: 'select',
// placeholder: '请选择',
// default: '',
// options: [],
// props: {
// label: "chName",
// value: "guid",
// },
// filterable: true,
// clearable: true,
// required: false
// },
{
label: '字段取值范围',
type: 'input',
......@@ -1052,7 +1053,7 @@ const drawerBtnClick = async (btn, info) => {
} else {
btn.loading = true;
console.log('drawerBtnClick', info);
const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, dictionaryGuid, isUnique, notNull } = info;
const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, isUnique, notNull } = info;
// 判断长度orderNumLength，orderNum 要么都有值，要么都没有值，不能只有一个有值，一个没有值精确提醒
let fieldLengthCondition: any = '';
if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) {
......@@ -1091,7 +1092,6 @@ const drawerBtnClick = async (btn, info) => {
if (fieldValueRange) {
param = {
fieldPrecision,
dictionaryGuid,
isUnique,
notNull,
fieldLengthCondition,
......@@ -1102,7 +1102,6 @@ const drawerBtnClick = async (btn, info) => {
} else {
param = {
fieldPrecision,
dictionaryGuid,
isUnique,
notNull,
fieldLengthCondition,
......
src/views/data_inventory/configureRules.vue
......@@ -87,7 +87,7 @@ const getDictionaryList = () => {
onMounted(async () => {
await getFieldTypeData()
await getBizRuleConfigDetailData()
getDictionaryList()
// getDictionaryList()
})
......@@ -335,7 +335,7 @@ const saveData = async () => {
execGuid: router.currentRoute.value.query.execGuid,
fieldLengthCondition: fieldLengthCondition,
fieldPrecision: item.fieldPrecision,
dictionaryGuid: item.dictionaryGuid,
// dictionaryGuid: item.dictionaryGuid,
isUnique: item.isUnique,
notNull: item.notNull,
fieldValueRange: item.fieldValueRange
......@@ -348,7 +348,7 @@ const saveData = async () => {
execGuid: router.currentRoute.value.query.execGuid,
fieldLengthCondition: fieldLengthCondition,
fieldPrecision: item.fieldPrecision,
dictionaryGuid: item.dictionaryGuid,
// dictionaryGuid: item.dictionaryGuid,
isUnique: item.isUnique,
notNull: item.notNull,
startValue: item.startValue,
......@@ -627,7 +627,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
</el-table-column>
<!-- 关联字典（可编辑）el-tree-select 形式下拉形式 -->
<el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip>
<!-- <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip>
<template #default="scope">
<span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid
? dictionaryList.find((item: any) => item.guid === scope.row.dictionaryGuid)?.chName : '--' }}</span>
......@@ -636,7 +636,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
</el-select>
</template>
</el-table-column>
</el-table-column> -->
<!-- 数据是否唯一（可编辑） -->
<el-table-column prop="isUnique" label="数据是否唯一" width="150" align="left" show-overflow-tooltip>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!