Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
23f13267 by xukangle
Options

Merge branch 'develop' into release-test

2 parents 3ad99289 be4fd067
Inline Side-by-side
Showing 10 changed files with 48 additions and 33 deletions
src/assets/images/logo.png
src/assets/images/logo.png

8.96 KB | W: | H:

src/assets/images/logo.png

9.52 KB | W: | H:

src/assets/images/logo.png
src/assets/images/logo.png
src/assets/images/logo.png
src/assets/images/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/components/Table/index.vue
...@@ -346,6 +346,12 @@ onMounted(() => { ...@@ -346,6 +346,12 @@ onMounted(() => {
346 <template #default="scope" v-else-if="item.type == 'input'"> 346 <template #default="scope" v-else-if="item.type == 'input'">
347 <el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''"></el-input> 347 <el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''"></el-input>
348 </template> 348 </template>
349 <template #default="scope" v-else-if="item.type == 'approveTag'">
350 <el-tag v-if="scope.row[item.field]" :type="tagType(scope.row.approveVO, 'approveState')">{{
351 tagMethod(scope.row.approveVO, 'approveState')
352 }}</el-tag>
353 <span v-else>{{ '--' }}</span>
354 </template>
349 <template #default="scope" v-else-if="item.type == 'tooltip'"> 355 <template #default="scope" v-else-if="item.type == 'tooltip'">
350 <el-tooltip :placement="item.placement ?? 'bottom-start'" effect="light" popper-class="table_tooltip" 356 <el-tooltip :placement="item.placement ?? 'bottom-start'" effect="light" popper-class="table_tooltip"
351 :trigger="item.trigger"> 357 :trigger="item.trigger">
......
src/layouts/components/Header/index.vue
...@@ -149,8 +149,8 @@ header { ...@@ -149,8 +149,8 @@ header {
149 background-color: inherit; 149 background-color: inherit;
150 150
151 .logo { 151 .logo {
152 width: auto; 152 width: 180px;
153 height: 30px; 153 height: 48px;
154 } 154 }
155 155
156 span { 156 span {
...@@ -278,5 +278,4 @@ header { ...@@ -278,5 +278,4 @@ header {
278 height: 18px; 278 height: 18px;
279 } 279 }
280 } 280 }
281
282 </style> 281 </style>
......
src/utils/common.ts
...@@ -723,7 +723,7 @@ export const tagMethod = (row, type) => { ...@@ -723,7 +723,7 @@ export const tagMethod = (row, type) => {
723 tag = '已撤销' 723 tag = '已撤销'
724 break; 724 break;
725 default: 725 default:
726 tag = row['dataState'] === 1 ? '已提交' : '草稿中' 726 tag = '--'
727 break; 727 break;
728 } 728 }
729 } else if (type == 'standardType') { 729 } else if (type == 'standardType') {
......
src/views/data_asset/qualityEvaluate.vue
...@@ -36,7 +36,7 @@ const tableFields = ref([ ...@@ -36,7 +36,7 @@ const tableFields = ref([
36 { label: "登记时间", field: "registerTime", width: 120 }, 36 { label: "登记时间", field: "registerTime", width: 120 },
37 // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, 37 // { label: "企业名称", field: "tenantName", width: 240, align: "left" },
38 { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" }, 38 { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
39 { label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' }, 39 { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
40 ]); 40 ]);
41 41
42 const deploymentId = ref(''); 42 const deploymentId = ref('');
...@@ -177,10 +177,10 @@ const tableInfo = ref({ ...@@ -177,10 +177,10 @@ const tableInfo = ref({
177 const getTableBtns = (row) => { 177 const getTableBtns = (row) => {
178 let btnsArr: any[] = []; 178 let btnsArr: any[] = [];
179 const approveVO = row.approveVO || {}; 179 const approveVO = row.approveVO || {};
180 const approveState = row.approveState || null; 180 const approveState = row.approveVO.approveState || null;
181 const approveStaffGuids = approveVO.approveStaffGuids || []; 181 const approveStaffGuids = approveVO.approveStaffGuids || [];
182 const staffGuid = approveVO.staffGuid || ''; 182 const staffGuid = approveVO.staffGuid || '';
183 const bizApproveState = row.bizApproveState; 183 const bizApproveState = row.approveState;
184 const currentStaffGuid = userData.staffGuid 184 const currentStaffGuid = userData.staffGuid
185 let isShowCancel = false; 185 let isShowCancel = false;
186 let flowState; 186 let flowState;
......
src/views/data_asset/registerCatalogManagement.vue
...@@ -346,8 +346,8 @@ const handleWindowResize = () => { ...@@ -346,8 +346,8 @@ const handleWindowResize = () => {
346 </div> 346 </div>
347 <div class="table_panel_wrap" :style="{ height: `calc(100% - ${tableToolsHeight + 60}px)` }"> 347 <div class="table_panel_wrap" :style="{ height: `calc(100% - ${tableToolsHeight + 60}px)` }">
348 <div class="data-content" v-loading="listDataLoading" :style="{ height: `calc(100% - ${tableToolsHeight}px)` }"> 348 <div class="data-content" v-loading="listDataLoading" :style="{ height: `calc(100% - ${tableToolsHeight}px)` }">
349 <div class="v-add" @click.stop="handleCreate" v-if="listData.length"> 349 <div class="v-add" @click.stop="handleCreate">
350 <div class="add-img"></div> 350 <div class=" add-img"></div>
351 <div class="add-titile"> 351 <div class="add-titile">
352 新增数据产品 352 新增数据产品
353 </div> 353 </div>
...@@ -430,10 +430,10 @@ const handleWindowResize = () => { ...@@ -430,10 +430,10 @@ const handleWindowResize = () => {
430 </div> 430 </div>
431 </div> 431 </div>
432 </div> 432 </div>
433 <div v-if="!listData.length" class="card-noData"> 433 <!-- <div v-if="listData.length" class="card-noData">
434 <img src="../../assets/images/no-data.png" :style="{ width: '96px', height: '96px' }" /> 434 <img src="../../assets/images/no-data.png" :style="{ width: '96px', height: '96px' }" />
435 <span>暂无数据资源目录</span> 435 <span>暂无数据资源目录</span>
436 </div> 436 </div> -->
437 </div> 437 </div>
438 438
439 </div> 439 </div>
...@@ -467,6 +467,8 @@ const handleWindowResize = () => { ...@@ -467,6 +467,8 @@ const handleWindowResize = () => {
467 position: relative; 467 position: relative;
468 468
469 .card-noData { 469 .card-noData {
470 height: 100%;
471 width: 100%;
470 background: #fafafa; 472 background: #fafafa;
471 display: flex; 473 display: flex;
472 flex-direction: column; 474 flex-direction: column;
...@@ -506,6 +508,7 @@ const handleWindowResize = () => { ...@@ -506,6 +508,7 @@ const handleWindowResize = () => {
506 justify-content: center; 508 justify-content: center;
507 align-items: center; 509 align-items: center;
508 flex-direction: column; 510 flex-direction: column;
511 z-index: 10;
509 512
510 &:hover { 513 &:hover {
511 box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); 514 box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
......
src/views/data_asset/valueEvaluate.vue
...@@ -46,7 +46,7 @@ const tableFields = ref([ ...@@ -46,7 +46,7 @@ const tableFields = ref([
46 // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, 46 // { label: "企业名称", field: "tenantName", width: 240, align: "left" },
47 { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" }, 47 { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
48 { 48 {
49 label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 49 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
50 const approveVO = scope.row.approveVO || {} 50 const approveVO = scope.row.approveVO || {}
51 switch (approveVO.approveState) { 51 switch (approveVO.approveState) {
52 case 'N': 52 case 'N':
...@@ -264,10 +264,10 @@ const tableInfo = ref({ ...@@ -264,10 +264,10 @@ const tableInfo = ref({
264 const getTableBtns = (row) => { 264 const getTableBtns = (row) => {
265 let btnsArr: any[] = []; 265 let btnsArr: any[] = [];
266 const approveVO = row.approveVO || {}; 266 const approveVO = row.approveVO || {};
267 const approveState = row.approveState || null; 267 const approveState = row.approveVO.approveState || null;
268 const approveStaffGuids = approveVO.approveStaffGuids || []; 268 const approveStaffGuids = approveVO.approveStaffGuids || [];
269 const staffGuid = approveVO.staffGuid || ''; 269 const staffGuid = approveVO.staffGuid || '';
270 const bizApproveState = row.bizApproveState; 270 const bizApproveState = row.approveState;
271 const currentStaffGuid = userData.staffGuid 271 const currentStaffGuid = userData.staffGuid
272 let isShowCancel = false; 272 let isShowCancel = false;
273 let flowState; 273 let flowState;
......
src/views/data_inventory/classifyGradeCatalogue.vue
...@@ -46,24 +46,28 @@ const getCgDirTreeData = async () => { ...@@ -46,24 +46,28 @@ const getCgDirTreeData = async () => {
46 const params = { 46 const params = {
47 execGuid: execGuidInfo.value.execGuid 47 execGuid: execGuidInfo.value.execGuid
48 } 48 }
49 if (!execGuidInfo.value.execGuid) {
50 return;
51 }
49 const res: any = await getTaskExeTreeList(params); 52 const res: any = await getTaskExeTreeList(params);
50 if (res.code == proxy.$passCode) { 53 if (res.code == proxy.$passCode) {
51 54
52 const transformedData: any = [{ 55 const transformedData: any = [{
53 classifyDetailGuid: execGuidInfo.value.guid, // 新增字段 GUID 56 classifyDetailGuid: execGuidInfo.value?.guid, // 新增字段 GUID
54 classifyName: execGuidInfo.value.cgDirName, // 新增字段目录名称 57 classifyName: execGuidInfo.value?.cgDirName, // 新增字段目录名称
55 children: res.data, // 将原始数据放入 children 58 children: res.data, // 将原始数据放入 children
56 }]; 59 }];
57 CgDirTreeList.value = transformedData; 60 CgDirTreeList.value = transformedData;
58 treeInfo.value.data = transformedData; 61 treeInfo.value.data = transformedData;
59 currentPath.value = [transformedData[0].classifyName]; 62 currentPath.value = [transformedData[0]?.classifyName];
60 treeInfo.value.expandedKey.push(transformedData[0].classifyDetailGuid); 63 treeInfo.value.expandedKey.push(transformedData[0]?.classifyDetailGuid);
61 treeInfo.value.currentNodeKey = transformedData[0].classifyDetailGuid; 64 treeInfo.value.currentNodeKey = transformedData[0]?.classifyDetailGuid;
62 // classifyDetailGuidInfo.value = res.data[0].classifyDetailGuid; 65 // classifyDetailGuidInfo.value = res.data[0].classifyDetailGuid;
63 searchItemList.value[0].options = res.data || []; 66 searchItemList.value[0].options = res.data || [];
64 refGradeGuid.value = res.data[0].refGradeGuid || ''; 67 refGradeGuid.value = res.data[0]?.refGradeGuid || '';
65 treeInfo.value.loading = false; 68 treeInfo.value.loading = false;
66 } else { 69 } else {
70 treeInfo.value.loading = false;
67 proxy.$ElMessage.error(res.msg); 71 proxy.$ElMessage.error(res.msg);
68 } 72 }
69 } 73 }
...@@ -143,7 +147,7 @@ onMounted(async () => { ...@@ -143,7 +147,7 @@ onMounted(async () => {
143 await getExecGuid(); 147 await getExecGuid();
144 await getCgDirTreeData(); 148 await getCgDirTreeData();
145 await getCgDirFieldPage({ 149 await getCgDirFieldPage({
146 execGuid: execGuidInfo.value.execGuid, 150 execGuid: execGuidInfo.value?.execGuid,
147 classifyDetail: classifyDetailGuidInfo.value 151 classifyDetail: classifyDetailGuidInfo.value
148 }); 152 });
149 // getDictionaryList(); 153 // getDictionaryList();
...@@ -1280,8 +1284,8 @@ const getDataBaseTreeData = async () => { ...@@ -1280,8 +1284,8 @@ const getDataBaseTreeData = async () => {
1280 if (localStorage.getItem("shouldReloadData")) { 1284 if (localStorage.getItem("shouldReloadData")) {
1281 dataBaseTreeInfo.value.expandedKey = []; 1285 dataBaseTreeInfo.value.expandedKey = [];
1282 const info = JSON.parse(localStorage.getItem("onActiveInfo") || '{}'); 1286 const info = JSON.parse(localStorage.getItem("onActiveInfo") || '{}');
1283 dataBaseTreeInfo.value.expandedKey.push(dataArray[info.dbindex].guid); 1287 dataBaseTreeInfo.value.expandedKey.push(dataArray[info.dbindex]?.guid);
1284 dataBaseTreeInfo.value.currentNodeKey = dataArray[info.dbindex].guid; 1288 dataBaseTreeInfo.value.currentNodeKey = dataArray[info.dbindex]?.guid;
1285 dataBaseGuid.value = dataArray[info?.dbindex].databaseGuid; 1289 dataBaseGuid.value = dataArray[info?.dbindex].databaseGuid;
1286 currentDatabasePath.value = info?.path; 1290 currentDatabasePath.value = info?.path;
1287 if (dataArray[info?.dbindex].dicType === 1) { 1291 if (dataArray[info?.dbindex].dicType === 1) {
...@@ -1323,6 +1327,7 @@ const getDataBaseTreeData = async () => { ...@@ -1323,6 +1327,7 @@ const getDataBaseTreeData = async () => {
1323 1327
1324 dataBaseTreeInfo.value.loading = false; 1328 dataBaseTreeInfo.value.loading = false;
1325 } else { 1329 } else {
1330 dataBaseTreeInfo.value.loading = true;
1326 proxy.$ElMessage.error(res.msg); 1331 proxy.$ElMessage.error(res.msg);
1327 } 1332 }
1328 }; 1333 };
......
src/views/data_inventory/dataLabel.vue
...@@ -29,16 +29,16 @@ const getClassifyGradeTree = async () => { ...@@ -29,16 +29,16 @@ const getClassifyGradeTree = async () => {
29 classGradeTreeData.value = transformedData || []; 29 classGradeTreeData.value = transformedData || [];
30 treeInfo.value.data = classGradeTreeData.value; 30 treeInfo.value.data = classGradeTreeData.value;
31 // 默认展开第一级 31 // 默认展开第一级
32 expandedKey.value = classGradeTreeData.value[0].guid; 32 expandedKey.value = classGradeTreeData.value[0]?.guid;
33 treeInfo.value.expandedKey.push(classGradeTreeData.value[0].guid); 33 treeInfo.value.expandedKey.push(classGradeTreeData.value[0]?.guid);
34 // 寻找第一children中guid 34 // 寻找第一children中guid
35 if (classGradeTreeData.value[0].children) { 35 if (classGradeTreeData.value[0].children) {
36 treeInfo.value.currentNodeKey = classGradeTreeData.value[0].children[0].guid; 36 treeInfo.value.currentNodeKey = classGradeTreeData.value[0].children[0]?.guid;
37 // 分类明细guid 37 // 分类明细guid
38 classifyDetailGuid.value = classGradeTreeData.value[0].children[0].guid; 38 classifyDetailGuid.value = classGradeTreeData.value[0].children[0]?.guid;
39 } 39 }
40 // 分别赋值 分类guid 40 // 分别赋值 分类guid
41 classifyGuid.value = classGradeTreeData.value[0].guid; 41 classifyGuid.value = classGradeTreeData.value[0]?.guid;
42 console.log('getClassifyGradeTree', transformedData); 42 console.log('getClassifyGradeTree', transformedData);
43 newCreateGradeFormItems.value[1].options = transformDataForTree([transformedData[0]]) 43 newCreateGradeFormItems.value[1].options = transformDataForTree([transformedData[0]])
44 treeInfo.value.loading = false; 44 treeInfo.value.loading = false;
......
src/views/data_product/productListing.vue
...@@ -80,7 +80,7 @@ const tableInfo = ref({ ...@@ -80,7 +80,7 @@ const tableInfo = ref({
80 }, 80 },
81 { 81 {
82 label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { 82 label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
83 return filterVal(scope.row.approveState, 'approveState'); 83 return filterVal(scope.row.approveVO.approveState, 'approveState');
84 } 84 }
85 }, 85 },
86 { 86 {
...@@ -848,7 +848,7 @@ const formInfo = ref<any>({ ...@@ -848,7 +848,7 @@ const formInfo = ref<any>({
848 <el-button type="primary" @click="toPatn1('add', 'add1')" v-preReClick>新建</el-button> 848 <el-button type="primary" @click="toPatn1('add', 'add1')" v-preReClick>新建</el-button>
849 </div> --> 849 </div> -->
850 </div> 850 </div>
851 <div class="list-content"> 851 <div class="list-content" v-if="demandListData.length > 0">
852 <div class="card-content" v-for="item in demandListData" :key="item.guid"> 852 <div class="card-content" v-for="item in demandListData" :key="item.guid">
853 <div class="header"> 853 <div class="header">
854 <img class="left-img" :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo" 854 <img class="left-img" :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo"
...@@ -868,12 +868,14 @@ const formInfo = ref<any>({ ...@@ -868,12 +868,14 @@ const formInfo = ref<any>({
868 </div> 868 </div>
869 </div> 869 </div>
870 <div class="operator-btn" @click="btnClick(item)"> 870 <div class="operator-btn" @click="btnClick(item)">
871 <!-- <div class="left-btn borderRight" @click="btnClick(item)">更新模板</div> --> 871
872 <div class="left-btn">资产登记</div> 872 <div class="left-btn">资产登记</div>
873 </div> 873 </div>
874 </div> 874 </div>
875 </div> 875 </div>
876 <div class="table_panel_wrap"> 876 <div class="table_panel_wrap" :style="{
877 height: demandListData.length > 0 ? 'calc(100% - 230px)' : 'calc(100% - 54px)'
878 }">
877 <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange" 879 <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange"
878 @tableSwitchBeforeChange="tableSwitchBeforeChange" /> 880 @tableSwitchBeforeChange="tableSwitchBeforeChange" />
879 </div> 881 </div>
...@@ -910,7 +912,7 @@ const formInfo = ref<any>({ ...@@ -910,7 +912,7 @@ const formInfo = ref<any>({
910 912
911 .table_panel_wrap { 913 .table_panel_wrap {
912 width: 100%; 914 width: 100%;
913 height: calc(100% - 230px); 915 // height: calc(100% - 54px);
914 padding: 0px 8px 0; 916 padding: 0px 8px 0;
915 } 917 }
916 918
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!