Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
0d25a0b8 by lxs
Options

Merge branch 'release-test' of http://117.78.60.236:8000/csbr-daop/fe-data-asset… 

…-management into release-test
2 parents d0f9b24a eae96494
Inline Side-by-side
Showing 7 changed files with 24 additions and 14 deletions
src/views/data_asset/registerCatalogDetail.vue
......@@ -828,7 +828,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......
src/views/data_asset/registerCatalogManagement.vue
......@@ -38,6 +38,7 @@ const isRegisterOptions = ref<any>([
const damTypesOptions = ref<any>([
{ label: "自建", value: 1 },
{ label: "加工交付", value: 2 },
{ label: "专区", value: 3 },
])
const searchItemList = ref([
{
......@@ -181,7 +182,7 @@ const tableBtnClick = (scope, btn) => {
};
const handleDataClick = (item) => {
if (item.isRegister == "N") {
if (item.isRegister == "N" && item.foundMode != 3) {
router.push({
name: "registerCatalogCreate",
query: { guid: item.guid, damName: item.damName, foundMode: item.foundMode },
......@@ -435,7 +436,7 @@ const handleWindowResize = () => {
</div>
<div class="mid-content">
<div class="left">产品来源</div>
<div class="right">{{ item.foundMode ? (item.foundMode === 1 ? '自建' : '加工交付') : '--'
<div class="right">{{ item.foundMode ? (item.foundMode === 1 ? '自建' : (item.foundMode == 3 ? '专区' : '加工交付')) : '--'
}}</div>
</div>
<div class="mid-content">
......@@ -444,10 +445,10 @@ const handleWindowResize = () => {
</div>
</div>
<div class="v-bottom">
<el-button plain v-if="!(item.isRegister == 'Y' || item.foundMode == 2)"
<el-button plain v-if="!(item.isRegister == 'Y' || item.foundMode == 2) && item.foundMode != 3"
@click.stop="tableBtnClick(item, 'delete')">删除</el-button>
<el-button plain v-if="!(item.isRegister == 'Y')" @click.stop="handleDataClick(item)">编辑</el-button>
<el-button plain @click.stop="handleDataClick(item)" v-if="(item.isRegister == 'Y')">详情</el-button>
<el-button plain v-if="!(item.isRegister == 'Y') && item.foundMode != 3" @click.stop="handleDataClick(item)">编辑</el-button>
<el-button plain @click.stop="handleDataClick(item)" v-if="(item.isRegister == 'Y' || item.foundMode == 3)">详情</el-button>
</div>
</div>
</div>
......
src/views/data_asset/registerDetail.vue
......@@ -1220,7 +1220,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......
src/views/data_asset/valueEvaluate.vue
......@@ -22,6 +22,7 @@ import {
import useUserStore from "@/store/modules/user";
import useDataAssetStore from "@/store/modules/dataAsset";
import { getCamundaDeploymentId, getProcessNodesPromise, passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from '@/api/modules/workFlowService';
import { changeNum } from '@/utils/common';
const assetStore = useDataAssetStore();
......@@ -328,10 +329,10 @@ const tableBtnClick = (scope, btn) => {
formItems.value[0].visible = false;
formItems.value[0].default = row.damGuid;
formItems.value[1].default = row.costAssessmentFile || [];
formItems.value[2].default = row.qualityScore;
// formItems.value[2].default = row.qualityScore;
formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : '';
formItems.value[4].default = row.evaluationNote;
formItems.value[5].default = row.evaluationFile || [];
// formItems.value[4].default = row.evaluationNote;
// formItems.value[5].default = row.evaluationFile || [];
dialogInfo.value.type = 'reSubmit';
dialogInfo.value.visible = true;
}
......@@ -343,6 +344,10 @@ const tableBtnClick = (scope, btn) => {
formItems.value[0].visible = false;
formItems.value[0].default = row.damGuid;
formItems.value[1].default = row.costAssessmentFile || [];
formItems.value[2].default = changeNum(row.qualityScore || 0, 2);
formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : '';
formItems.value[4].default = row.evaluationNote;
formItems.value[5].default = row.evaluationFile || [];
dialogInfo.value.type = 'reSubmit';
dialogInfo.value.visible = true;
}
......@@ -1060,7 +1065,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......@@ -1097,7 +1102,7 @@ const rejectDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......@@ -1117,7 +1122,7 @@ const rejectDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid
}
rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
rejectDialogInfo.value.footer.btns[1].loading = true;
rejectDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('驳回成功');
......
src/views/data_inventory/classifyGradeCatalogue.vue
......@@ -1906,6 +1906,9 @@ const selectChange = (val, row, info) => {
// 这里应该是onActivated 钩子,路由从configure-路由从configure-rules跳转过来要重新请求数据、
onActivated(async () => {
if (localStorage.getItem('shouldReloadData') === 'true') {
if (activeName.value == '数据库目录') {
getDataBaseTreeData();
}
await getDataBaseTableData({
exexGuid: execGuidInfo.value.execGuid
});
......
src/views/data_product/productListing.vue
......@@ -1069,6 +1069,7 @@ const rejectDialogBtnClick = (btn, info) => {
font-size: 16px;
color: #212121;
font-weight: 600;
width: calc(100% - 28px);
}
}
......
src/views/indexNewBigScreen.vue
......@@ -902,7 +902,7 @@ const handleChangeTime = (val) => {
<div class="row-sum">
<div class="header">
<div class="left-pd"></div>
<div class="header-title">数据服务资产情况</div>
<div class="header-title">数据资产服务情况</div>
</div>
<div style="height: calc(100% - 80px);">
<Table class="drak-table" ref="assetTableRef" v-show="!assetTableInfo.loading1" :tableInfo="assetTableInfo"
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!