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({ ...@@ -10,6 +10,15 @@ export const getProductList = (params) => request({
10 method: 'get', 10 method: 'get',
11 params 11 params
12 }) 12 })
13 /** 获取数交所产品
14 * @param {Object} params
15 * path: /dam-catalog-table/data-exchange/get-table-select
16 */
17 export const getDataExchangeProductList = (params) => request({
18 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select`,
19 method: 'get',
20 params
21 })
13 22
14 /** 获取已添加的数据产品列表 */ 23 /** 获取已添加的数据产品列表 */
15 export const getAddedProductList = (params) => request({ 24 export const getAddedProductList = (params) => request({
...@@ -25,6 +34,13 @@ export const getListingList = (params) => request({ ...@@ -25,6 +34,13 @@ export const getListingList = (params) => request({
25 data: params 34 data: params
26 }) 35 })
27 36
37 /**获取产品上架数量 */
38 export const getListingCount = () => request({
39 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/product-num`,
40 method: 'post',
41 })
42
43
28 /** 获取数据产品上架详情 */ 44 /** 获取数据产品上架详情 */
29 export const getListingDetail = (params) => request({ 45 export const getListingDetail = (params) => request({
30 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/detail`, 46 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/detail`,
...@@ -54,6 +70,13 @@ export const listingUpdate = (params) => request({ ...@@ -54,6 +70,13 @@ export const listingUpdate = (params) => request({
54 data: params 70 data: params
55 }); 71 });
56 72
73 /**门户更新 */
74 export const listingUpdateGateway = (params) => request({
75 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/update-gateway`,
76 method: 'post',
77 data: params
78 });
79
57 /** 删除数据产品上架信息 */ 80 /** 删除数据产品上架信息 */
58 export const listingDelete = (params) => request({ 81 export const listingDelete = (params) => request({
59 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/delete`, 82 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/delete`,
......
src/components/Form/index.vue
...@@ -1353,36 +1353,70 @@ const panelChange = (scope, row) => { ...@@ -1353,36 +1353,70 @@ const panelChange = (scope, row) => {
1353 </template> 1353 </template>
1354 <template #file="{ file }"> 1354 <template #file="{ file }">
1355 <div class="file-operate"> 1355 <div class="file-operate">
1356 <template 1356 <!-- <template
1357 v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xls' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xlsx'"> 1357 v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xls' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xlsx'">
1358 <img class="file-img" src="../../assets/images/excel.png" /> 1358 <img class="file-img" src="../../assets/images/excel.png" />
1359 </template> 1359 </template>
1360 <template 1360 <template
1361 v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'doc' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'docx'"> 1361 v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'doc' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'docx'">
1362 <img class="file-img" src="../../assets/images/word.png" /> 1362 <img class="file-img" src="../../assets/images/word.png" />
1363 </template> 1363 </template>
1364 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'zip'"> 1364 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'zip'">
1365 <img class="file-img" src="../../assets/images/zip.png" /> 1365 <img class="file-img" src="../../assets/images/zip.png" />
1366 </template> 1366 </template>
1367 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'rar'"> 1367 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'rar'">
1368 <img class="file-img" src="../../assets/images/RAR.png" /> 1368 <img class="file-img" src="../../assets/images/RAR.png" />
1369 </template> 1369 </template>
1370 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf'"> 1370 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf'">
1371 <img class="file-img" src="../../assets/images/PDF.png" /> 1371 <img class="file-img" src="../../assets/images/PDF.png" />
1372 </template> 1372 </template>
1373 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png'"> 1373 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png'">
1374 <img class="file-img" src="../../assets/images/png.png" /> 1374 <img class="file-img" src="../../assets/images/png.png" />
1375 </template> 1375 </template>
1376 <template 1376 <template
1377 v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"> 1377 v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
1378 <img class="file-img" src="../../assets/images/jpg.png" /> 1378 <img class="file-img" src="../../assets/images/jpg.png" />
1379 </template> 1379 </template>
1380 <div class="file-name">
1381 <ellipsis-tooltip :content="file.name" class-name="w100f" :refName="'tooltipOver' + file.name"></ellipsis-tooltip>
1382 </div>
1383 <div :style="{ right: '72px' }" class="file-preview"
1384 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'"
1385 @click="onUploadFilePreview(file, item)">查看</div>
1386 <div :style="{ right: '36px' }" class="file-preview" @click="onUploadFileDownload(file, item)">下载
1387 </div>
1388 <div v-if="!item.disabled" :style="{ right: 0 }" class="file-preview" @click="handleUploadFileRemove(file, item)">删除
1389 </div> -->
1390 <template
1391 v-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xls' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xlsx'">
1392 <img class="file-img" src="../../assets/images/excel.png" />
1393 </template>
1394 <template
1395 v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'doc' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'docx'">
1396 <img class="file-img" src="../../assets/images/word.png" />
1397 </template>
1398 <template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'zip'">
1399 <img class="file-img" src="../../assets/images/zip.png" />
1400 </template>
1401 <template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'rar'">
1402 <img class="file-img" src="../../assets/images/RAR.png" />
1403 </template>
1404 <template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'pdf'">
1405 <img class="file-img" src="../../assets/images/PDF.png" />
1406 </template>
1407 <template v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'png'">
1408 <img class="file-img" src="../../assets/images/png.png" />
1409 </template>
1410 <template
1411 v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'jpg' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'jpeg'">
1412 <img class="file-img" src="../../assets/images/jpg.png" />
1413 </template>
1380 <div class="file-name"> 1414 <div class="file-name">
1381 <ellipsis-tooltip :content="file.name" class-name="w100f" 1415 <ellipsis-tooltip :content="file?.name ?? ''" class-name="w100f"
1382 :refName="'tooltipOver' + file.name"></ellipsis-tooltip> 1416 :refName="'tooltipOver' + file?.name"></ellipsis-tooltip>
1383 </div> 1417 </div>
1384 <div :style="{ right: '72px' }" class="file-preview" 1418 <div :style="{ right: '72px' }" class="file-preview"
1385 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'" 1419 v-if="['pdf', 'png', 'jpg', 'jpeg'].includes(file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() ?? '')"
1386 @click="onUploadFilePreview(file, item)">查看</div> 1420 @click="onUploadFilePreview(file, item)">查看</div>
1387 <div :style="{ right: '36px' }" class="file-preview" @click="onUploadFileDownload(file, item)">下载 1421 <div :style="{ right: '36px' }" class="file-preview" @click="onUploadFileDownload(file, item)">下载
1388 </div> 1422 </div>
......
src/views/data_inventory/classifyGradeCatalogue.vue
...@@ -28,7 +28,7 @@ import { ...@@ -28,7 +28,7 @@ import {
28 import { TableColumnWidth } from "@/utils/enum"; 28 import { TableColumnWidth } from "@/utils/enum";
29 import router from "@/router"; 29 import router from "@/router";
30 import { download } from "@/utils/common"; 30 import { download } from "@/utils/common";
31 import { da, sl } from "element-plus/es/locale"; 31
32 32
33 33
34 const currentPath = ref<string[]>([]); 34 const currentPath = ref<string[]>([]);
...@@ -146,7 +146,7 @@ onMounted(async () => { ...@@ -146,7 +146,7 @@ onMounted(async () => {
146 execGuid: execGuidInfo.value.execGuid, 146 execGuid: execGuidInfo.value.execGuid,
147 classifyDetail: classifyDetailGuidInfo.value 147 classifyDetail: classifyDetailGuidInfo.value
148 }); 148 });
149 getDictionaryList(); 149 // getDictionaryList();
150 getSearchTableList(); 150 getSearchTableList();
151 // getLabelListData(); 151 // getLabelListData();
152 getGradeData(refGradeGuid.value); 152 getGradeData(refGradeGuid.value);
...@@ -900,21 +900,22 @@ const classEditFormItems = ref<any>([{ ...@@ -900,21 +900,22 @@ const classEditFormItems = ref<any>([{
900 clearable: true, 900 clearable: true,
901 block: true, 901 block: true,
902 visible: true, 902 visible: true,
903 }, {
904 label: '关联字典',
905 field: 'dictionaryGuid',
906 type: 'select',
907 placeholder: '请选择',
908 default: '',
909 options: [],
910 props: {
911 label: "chName",
912 value: "guid",
913 },
914 filterable: true,
915 clearable: true,
916 required: false
917 }, 903 },
904 //{
905 // label: '关联字典',
906 // field: 'dictionaryGuid',
907 // type: 'select',
908 // placeholder: '请选择',
909 // default: '',
910 // options: [],
911 // props: {
912 // label: "chName",
913 // value: "guid",
914 // },
915 // filterable: true,
916 // clearable: true,
917 // required: false
918 // },
918 { 919 {
919 label: '字段取值范围', 920 label: '字段取值范围',
920 type: 'input', 921 type: 'input',
...@@ -1052,7 +1053,7 @@ const drawerBtnClick = async (btn, info) => { ...@@ -1052,7 +1053,7 @@ const drawerBtnClick = async (btn, info) => {
1052 } else { 1053 } else {
1053 btn.loading = true; 1054 btn.loading = true;
1054 console.log('drawerBtnClick', info); 1055 console.log('drawerBtnClick', info);
1055 const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, dictionaryGuid, isUnique, notNull } = info; 1056 const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, isUnique, notNull } = info;
1056 // 判断长度orderNumLength，orderNum 要么都有值，要么都没有值，不能只有一个有值，一个没有值精确提醒 1057 // 判断长度orderNumLength，orderNum 要么都有值，要么都没有值，不能只有一个有值，一个没有值精确提醒
1057 let fieldLengthCondition: any = ''; 1058 let fieldLengthCondition: any = '';
1058 if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) { 1059 if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) {
...@@ -1091,7 +1092,6 @@ const drawerBtnClick = async (btn, info) => { ...@@ -1091,7 +1092,6 @@ const drawerBtnClick = async (btn, info) => {
1091 if (fieldValueRange) { 1092 if (fieldValueRange) {
1092 param = { 1093 param = {
1093 fieldPrecision, 1094 fieldPrecision,
1094 dictionaryGuid,
1095 isUnique, 1095 isUnique,
1096 notNull, 1096 notNull,
1097 fieldLengthCondition, 1097 fieldLengthCondition,
...@@ -1102,7 +1102,6 @@ const drawerBtnClick = async (btn, info) => { ...@@ -1102,7 +1102,6 @@ const drawerBtnClick = async (btn, info) => {
1102 } else { 1102 } else {
1103 param = { 1103 param = {
1104 fieldPrecision, 1104 fieldPrecision,
1105 dictionaryGuid,
1106 isUnique, 1105 isUnique,
1107 notNull, 1106 notNull,
1108 fieldLengthCondition, 1107 fieldLengthCondition,
......
src/views/data_inventory/configureRules.vue
...@@ -87,7 +87,7 @@ const getDictionaryList = () => { ...@@ -87,7 +87,7 @@ const getDictionaryList = () => {
87 onMounted(async () => { 87 onMounted(async () => {
88 await getFieldTypeData() 88 await getFieldTypeData()
89 await getBizRuleConfigDetailData() 89 await getBizRuleConfigDetailData()
90 getDictionaryList() 90 // getDictionaryList()
91 }) 91 })
92 92
93 93
...@@ -335,7 +335,7 @@ const saveData = async () => { ...@@ -335,7 +335,7 @@ const saveData = async () => {
335 execGuid: router.currentRoute.value.query.execGuid, 335 execGuid: router.currentRoute.value.query.execGuid,
336 fieldLengthCondition: fieldLengthCondition, 336 fieldLengthCondition: fieldLengthCondition,
337 fieldPrecision: item.fieldPrecision, 337 fieldPrecision: item.fieldPrecision,
338 dictionaryGuid: item.dictionaryGuid, 338 // dictionaryGuid: item.dictionaryGuid,
339 isUnique: item.isUnique, 339 isUnique: item.isUnique,
340 notNull: item.notNull, 340 notNull: item.notNull,
341 fieldValueRange: item.fieldValueRange 341 fieldValueRange: item.fieldValueRange
...@@ -348,7 +348,7 @@ const saveData = async () => { ...@@ -348,7 +348,7 @@ const saveData = async () => {
348 execGuid: router.currentRoute.value.query.execGuid, 348 execGuid: router.currentRoute.value.query.execGuid,
349 fieldLengthCondition: fieldLengthCondition, 349 fieldLengthCondition: fieldLengthCondition,
350 fieldPrecision: item.fieldPrecision, 350 fieldPrecision: item.fieldPrecision,
351 dictionaryGuid: item.dictionaryGuid, 351 // dictionaryGuid: item.dictionaryGuid,
352 isUnique: item.isUnique, 352 isUnique: item.isUnique,
353 notNull: item.notNull, 353 notNull: item.notNull,
354 startValue: item.startValue, 354 startValue: item.startValue,
...@@ -627,7 +627,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null ...@@ -627,7 +627,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
627 </el-table-column> 627 </el-table-column>
628 628
629 <!-- 关联字典（可编辑）el-tree-select 形式下拉形式 --> 629 <!-- 关联字典（可编辑）el-tree-select 形式下拉形式 -->
630 <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip> 630 <!-- <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip>
631 <template #default="scope"> 631 <template #default="scope">
632 <span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid 632 <span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid
633 ? dictionaryList.find((item: any) => item.guid === scope.row.dictionaryGuid)?.chName : '--' }}</span> 633 ? 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 ...@@ -636,7 +636,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
636 </el-select> 636 </el-select>
637 </template> 637 </template>
638 638
639 </el-table-column> 639 </el-table-column> -->
640 640
641 <!-- 数据是否唯一（可编辑） --> 641 <!-- 数据是否唯一（可编辑） -->
642 <el-table-column prop="isUnique" label="数据是否唯一" width="150" align="left" show-overflow-tooltip> 642 <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!