Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
f3704a8e by xukangle
Options

Merge branch 'develop' into dev_20241202_xukangle

2 parents 465c4e8e 470e3796
Expand all
Inline Side-by-side
Showing 12 changed files with 161 additions and 104 deletions
.env.development
...@@ -25,7 +25,7 @@ VITE_SERVE_BASE = / ...@@ -25,7 +25,7 @@ VITE_SERVE_BASE = /
25 # 流程设计访问地址 25 # 流程设计访问地址
26 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn 26 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
27 # 数据标准、元数据、数据目录 接口地址 27 # 数据标准、元数据、数据目录 接口地址
28 VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service 28 VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
29 #数据质量接口地址 29 #数据质量接口地址
30 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service 30 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
31 31
...@@ -33,6 +33,9 @@ VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service ...@@ -33,6 +33,9 @@ VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
33 # VITE_APP_CHECK_BASEURL = /mock 33 # VITE_APP_CHECK_BASEURL = /mock
34 VITE_APP_CHECK_BASEURL = ms-daop-zcgl-data-inventory 34 VITE_APP_CHECK_BASEURL = ms-daop-zcgl-data-inventory
35 35
36 #数据源接口地址
37 VITE_APP_DATA_SOURCE_URL = ms-daop-data-source-service
38
36 # 数据字典接口地址 39 # 数据字典接口地址
37 VITE_APP_CONFIG_URL = 'ms-daop-configure-service' 40 VITE_APP_CONFIG_URL = 'ms-daop-configure-service'
38 41
......
.env.product
...@@ -51,7 +51,7 @@ VITE_SERVE_BASE = / ...@@ -51,7 +51,7 @@ VITE_SERVE_BASE = /
51 # 流程设计访问地址 51 # 流程设计访问地址
52 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn 52 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
53 # 数据标准、元数据、数据目录 接口地址 53 # 数据标准、元数据、数据目录 接口地址
54 VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service 54 VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
55 #数据质量接口地址 55 #数据质量接口地址
56 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service 56 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
57 57
...@@ -62,6 +62,9 @@ VITE_APP_CHECK_BASEURL = ms-daop-zcgl-data-inventory ...@@ -62,6 +62,9 @@ VITE_APP_CHECK_BASEURL = ms-daop-zcgl-data-inventory
62 # 数据字典接口地址 62 # 数据字典接口地址
63 VITE_APP_CONFIG_URL = 'ms-daop-configure-service' 63 VITE_APP_CONFIG_URL = 'ms-daop-configure-service'
64 64
65 #数据源接口地址
66 VITE_APP_DATA_SOURCE_URL = ms-daop-data-source-service
67
65 # 文件上传下载接口地址 68 # 文件上传下载接口地址
66 VITE_APP_COMMON_URL = 'ms-daop-common-service' 69 VITE_APP_COMMON_URL = 'ms-daop-common-service'
67 70
......
src/assets/icons/icon-tip.svg 0 → 100644
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="32px" height="32.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512 40.533333C251.613867 40.533333 40.533333 251.613867 40.533333 512S251.613867 983.466667 512 983.466667 983.466667 772.386133 983.466667 512 772.386133 40.533333 512 40.533333z m26.581333 724.2496c-8.7296 8.004267-18.926933 12.381867-31.300266 12.381867-12.381867 0-22.5792-4.386133-31.325867-12.381867-8.772267-8.746667-12.381867-18.935467-12.381867-31.3344 0-12.381867 3.6096-22.5792 12.381867-30.583466 8.738133-8.746667 18.944-12.381867 31.325867-12.381867 12.373333 0 23.287467 3.6352 32.0256 12.381867 8.021333 8.004267 12.373333 18.2016 12.373333 30.583466 0 13.115733-4.343467 23.3216-13.098667 31.3344z m104.891734-291.387733c-7.287467 8.7296-26.9312 27.665067-58.9824 56.072533-16.034133 13.8496-26.965333 26.965333-34.2528 40.081067-9.454933 16.017067-13.841067 33.518933-13.841067 53.162667v16.768H478.122667v-16.768c0-24.029867 4.386133-45.149867 13.124266-63.368534 10.180267-21.853867 34.218667-49.544533 73.565867-84.5056 11.639467-11.648 20.386133-20.4032 24.763733-26.2144 14.574933-18.218667 21.870933-37.154133 21.870934-57.5488 0-29.149867-8.763733-51.720533-24.763734-67.746133-16.776533-17.4848-40.797867-25.4976-71.3984-25.4976-36.420267 0-63.3856 11.665067-80.8704 35.703467-16.0256 20.394667-24.021333 48.085333-24.021333 83.7632h-57.5744c0-50.986667 13.866667-91.784533 42.999467-122.376534 29.149867-32.059733 69.9136-48.0768 122.3936-48.0768 46.609067 0 83.754667 12.381867 112.1792 38.596267 26.9312 24.763733 40.797867 59.008 40.797866 102.715733-0.008533 32.785067-9.480533 61.184-27.716266 85.239467z" fill="#8a8a8a" /></svg>
...\ No newline at end of file ...\ No newline at end of file
src/router/modules/dataInventory.ts
...@@ -58,10 +58,13 @@ const routes: RouteRecordRaw[] = [ ...@@ -58,10 +58,13 @@ const routes: RouteRecordRaw[] = [
58 activeMenu: '/data-inventory/classify-grade-manage/task-config' 58 activeMenu: '/data-inventory/classify-grade-manage/task-config'
59 }, 59 },
60 beforeEnter: (to, from) => { 60 beforeEnter: (to, from) => {
61 if (to.query.type == 'confirm') { 61 const taksExecGuid = sessionStorage.getItem('taksExecGuid') || '';
62 to.meta.title = `${to.query.name}-结果确认`; 62 if(taksExecGuid){
63 to.meta.title = `${to.query.name}-${to.query.status == 'Y'?'查看结果':'结果确认'}`;
64 to.meta.editPage = to.query.status == 'Y'? false: true;
63 } else { 65 } else {
64 to.meta.title = `${to.query.name}-结果修改`; 66 to.meta.title = `${to.query.name}-${to.query.type == 'confirm'?'结果确认':'结果修改'}`;
67 to.meta.editPage = true;
65 } 68 }
66 } 69 }
67 }, 70 },
......
src/router/modules/dataMeta.ts
...@@ -93,46 +93,46 @@ const routes: RouteRecordRaw[] = [ ...@@ -93,46 +93,46 @@ const routes: RouteRecordRaw[] = [
93 }, 93 },
94 ], 94 ],
95 }, 95 },
96 // { 96 {
97 // path: '/data-meta/metadata-lineage', 97 path: '/data-meta/metadata-lineage',
98 // component: Layout, 98 component: Layout,
99 // meta: { 99 meta: {
100 // title: '元数据血缘', 100 title: '元数据血缘',
101 // icon: 'ep:grid', 101 icon: 'ep:grid',
102 // }, 102 },
103 // children: [ 103 children: [
104 // { 104 {
105 // path: 'analysis-view', 105 path: 'analysis-view',
106 // name: 'analysisView', 106 name: 'analysisView',
107 // component: () => import('@/views/data_meta/analysisView.vue'), 107 component: () => import('@/views/data_meta/analysisView.vue'),
108 // meta: { 108 meta: {
109 // title: '查看血缘', 109 title: '查看血缘',
110 // breadcrumb: false, 110 breadcrumb: false,
111 // cache: true 111 cache: true
112 // }, 112 },
113 // }, 113 },
114 // { 114 {
115 // path: 'change-detection', 115 path: 'change-detection',
116 // name: 'changeDetection', 116 name: 'changeDetection',
117 // component: () => import('@/views/data_meta/changeDetection.vue'), 117 component: () => import('@/views/data_meta/changeDetection.vue'),
118 // meta: { 118 meta: {
119 // title: '血缘变更检测', 119 title: '血缘变更检测',
120 // breadcrumb: false, 120 breadcrumb: false,
121 // cache: true 121 cache: true
122 // }, 122 },
123 // }, 123 },
124 // { 124 {
125 // path: 'analysis-reports', 125 path: 'analysis-reports',
126 // name: 'analysisReports', 126 name: 'analysisReports',
127 // component: () => import('@/views/data_meta/analysisReports.vue'), 127 component: () => import('@/views/data_meta/analysisReports.vue'),
128 // meta: { 128 meta: {
129 // title: '血缘关系解析', 129 title: '血缘关系解析',
130 // breadcrumb: false, 130 breadcrumb: false,
131 // cache: true 131 cache: true
132 // }, 132 },
133 // }, 133 },
134 // ], 134 ],
135 // }, 135 },
136 ] 136 ]
137 137
138 export default routes 138 export default routes
......
src/views/data_inventory/taskConfig.vue
...@@ -99,7 +99,7 @@ const getTableData = () => { ...@@ -99,7 +99,7 @@ const getTableData = () => {
99 if (res.code == proxy.$passCode) { 99 if (res.code == proxy.$passCode) {
100 let data = res.data.records || []; 100 let data = res.data.records || [];
101 data.map(item => { 101 data.map(item => {
102 item.cellClass = item.confirmCnt>0?'':'is-regular' 102 item.cellClass = item.confirmCnt > 0 ? '' : 'is-regular'
103 }) 103 })
104 tableInfo.value.data = data; 104 tableInfo.value.data = data;
105 } else { 105 } else {
...@@ -160,12 +160,13 @@ const toPath = (type) => { ...@@ -160,12 +160,13 @@ const toPath = (type) => {
160 }, 160 },
161 }); 161 });
162 } else if (type == 'confirm' || type == 'modify') { 162 } else if (type == 'confirm' || type == 'modify') {
163 sessionStorage.setItem('taksExecGuid', '');
163 router.push({ 164 router.push({
164 name: "taskDetail", 165 name: "taskDetail",
165 query: { 166 query: {
166 guid: currTableData.value.guid, 167 guid: currTableData.value.guid,
167 name: currTableData.value.taskName, 168 name: currTableData.value.taskName,
168 execGuid: currTableData.value.execGuid, 169 status: currTableData.value.confirmStatus,
169 type 170 type
170 }, 171 },
171 }); 172 });
...@@ -223,7 +224,13 @@ onBeforeMount(() => { ...@@ -223,7 +224,13 @@ onBeforeMount(() => {
223 <template> 224 <template>
224 <div class="container_wrap" v-loading="loading"> 225 <div class="container_wrap" v-loading="loading">
225 <div class="table_tool_wrap" v-if="tableInfo.data.length"> 226 <div class="table_tool_wrap" v-if="tableInfo.data.length">
226 <div class="table_title">分类分级任务</div> 227 <div class="table_title">
228 <span>分类分级任务</span>
229 <div class="title_tool">
230 <el-button @click="getTableData" v-preReClick>刷新结果</el-button>
231 <span class="tips_text">刷新查看任务最新执行结果</span>
232 </div>
233 </div>
227 </div> 234 </div>
228 <div class="table_panel_wrap" v-if="tableInfo.data.length"> 235 <div class="table_panel_wrap" v-if="tableInfo.data.length">
229 <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" /> 236 <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
...@@ -247,6 +254,19 @@ onBeforeMount(() => { ...@@ -247,6 +254,19 @@ onBeforeMount(() => {
247 font-weight: 600; 254 font-weight: 600;
248 font-size: 16px; 255 font-size: 16px;
249 color: #212121; 256 color: #212121;
257 display: flex;
258
259 .title_tool {
260 display: flex;
261 margin-left: 16px;
262 align-items: center;
263
264 .tips_text {
265 margin-left: 16px;
266 font-size: 14px;
267 color: #b2b2b2;
268 }
269 }
250 } 270 }
251 } 271 }
252 272
......
src/views/data_inventory/taskDetail.vue
...@@ -31,9 +31,10 @@ const route = useRoute(); ...@@ -31,9 +31,10 @@ const route = useRoute();
31 const userStore = useUserStore(); 31 const userStore = useUserStore();
32 const fullPath = route.fullPath; 32 const fullPath = route.fullPath;
33 const assetStore = useDataAssetStore(); 33 const assetStore = useDataAssetStore();
34 const showBtns = route.meta.editPage;
35 const execGuid = sessionStorage.getItem('taksExecGuid');
34 36
35 const loading = ref(false); 37 const loading = ref(false);
36 const showBtns = ref(true);
37 const gradeList = ref([]); 38 const gradeList = ref([]);
38 const treeData = ref([ 39 const treeData = ref([
39 { 40 {
...@@ -157,6 +158,22 @@ const fieldItemList = ref([ ...@@ -157,6 +158,22 @@ const fieldItemList = ref([
157 disabled: true 158 disabled: true
158 }, 159 },
159 { 160 {
161 type: "select",
162 label: "",
163 placeholder: '分类情况',
164 field: 'isClassify',
165 default: '',
166 options: [
167 { label: '已分类', value: 'Y' },
168 { label: '未分类', value: 'N' },
169 ],
170 props: {
171 // label: 'name',
172 // value: 'dbGuid'
173 },
174 clearable: true,
175 },
176 {
160 type: "cascader", 177 type: "cascader",
161 label: "", 178 label: "",
162 placeholder: '分类', 179 placeholder: '分类',
...@@ -380,7 +397,7 @@ const getTaskDetail = (param) => { ...@@ -380,7 +397,7 @@ const getTaskDetail = (param) => {
380 loading.value = false; 397 loading.value = false;
381 if (res.code == proxy.$passCode) { 398 if (res.code == proxy.$passCode) {
382 taskDetail.value = res.data || {}; 399 taskDetail.value = res.data || {};
383 taskDetail.value.confirmStatus != 'Y' && (showBtns.value = true); 400 // taskDetail.value.confirmStatus != 'Y' && (showBtns.value = true);
384 getFieldCount() 401 getFieldCount()
385 getSheetFieldList({ type: 1 }); 402 getSheetFieldList({ type: 1 });
386 getFieldTree() 403 getFieldTree()
...@@ -437,17 +454,13 @@ const getFieldTree = () => { ...@@ -437,17 +454,13 @@ const getFieldTree = () => {
437 getTaskExeTreeList({ execGuid: taskDetail.value.execGuid }).then((res: any) => { 454 getTaskExeTreeList({ execGuid: taskDetail.value.execGuid }).then((res: any) => {
438 // treeInfo.value.loading = false; 455 // treeInfo.value.loading = false;
439 if (res.code == proxy.$passCode) { 456 if (res.code == proxy.$passCode) {
440 const data = res.data || []; 457 const data: any = res.data || [];
441 const children: any = [ 458 treeData.value[0].children.push(...data);
442 { classifyName: '未分类', classifyDetailGuid: 'unclassified' },
443 ...data
444 ]
445 treeData.value[0].children = children;
446 treeInfo.value.data = treeData.value; 459 treeInfo.value.data = treeData.value;
447 treeInfo.value.expandedKey = ['all']; 460 treeInfo.value.expandedKey = ['all'];
448 treeInfoRef.value.setCurrentKey('all'); 461 treeInfoRef.value.setCurrentKey('all');
449 formItems.value[0].options = JSON.parse(JSON.stringify(data)); 462 formItems.value[0].options = JSON.parse(JSON.stringify(data));
450 fieldItemList.value[4].options = JSON.parse(JSON.stringify(children)); 463 fieldItemList.value[5].options = JSON.parse(JSON.stringify(data));
451 fieldTableInfo.value.fields[4].options = JSON.parse(JSON.stringify(data)); 464 fieldTableInfo.value.fields[4].options = JSON.parse(JSON.stringify(data));
452 } else { 465 } else {
453 ElMessage.error(res.msg); 466 ElMessage.error(res.msg);
...@@ -496,13 +509,14 @@ const tabChange = (val) => { ...@@ -496,13 +509,14 @@ const tabChange = (val) => {
496 const nodeClick = (data, node) => { 509 const nodeClick = (data, node) => {
497 currTreeNode.value = data; 510 currTreeNode.value = data;
498 if (data.classifyDetailGuid == 'all') { 511 if (data.classifyDetailGuid == 'all') {
499 fieldItemList.value[4].default = []; 512 fieldItemList.value[4].default = '';
513 fieldItemList.value[5].default = [];
500 getFieldTableData() 514 getFieldTableData()
501 } else { 515 } else {
502 const parentGuids = data.parentGuids || []; 516 const parentGuids = data.parentGuids || [];
503 parentGuids.push(data.classifyDetailGuid) 517 parentGuids.push(data.classifyDetailGuid)
504 fieldItemList.value[4].default = parentGuids; 518 fieldItemList.value[4].default = 'Y';
505 console.log('tree', parentGuids) 519 fieldItemList.value[5].default = parentGuids;
506 getFieldTableData(); 520 getFieldTableData();
507 } 521 }
508 } 522 }
...@@ -545,7 +559,7 @@ const getFieldTableData = () => { ...@@ -545,7 +559,7 @@ const getFieldTableData = () => {
545 isMergeClassify: checked1.value ? 'Y' : 'N' 559 isMergeClassify: checked1.value ? 'Y' : 'N'
546 } 560 }
547 const classifyName = params.classifyName?.at(-1) || undefined; 561 const classifyName = params.classifyName?.at(-1) || undefined;
548 params.isClassify = classifyName === undefined ? '' : classifyName == 'unclassified' ? 'N' : 'Y'; 562 // params.isClassify = classifyName === undefined ? '' : classifyName == 'unclassified' ? 'N' : 'Y';
549 if (classifyName && classifyName != 'unclassified') { 563 if (classifyName && classifyName != 'unclassified') {
550 params.classifyDetail = classifyName; 564 params.classifyDetail = classifyName;
551 } 565 }
...@@ -613,6 +627,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -613,6 +627,7 @@ const tableBtnClick = (scope, btn) => {
613 const params = [ 627 const params = [
614 { 628 {
615 guid: row.guid, 629 guid: row.guid,
630 fieldGuid: row.fieldGuid,
616 classifyDetailGuid: row.classifyDetailGuid, 631 classifyDetailGuid: row.classifyDetailGuid,
617 classifyDetailName: row.classifyDetailName, 632 classifyDetailName: row.classifyDetailName,
618 gradeDetailGuid: row.gradeDetailGuid, 633 gradeDetailGuid: row.gradeDetailGuid,
...@@ -767,7 +782,7 @@ const selectChange = (val, item, scope = null) => { ...@@ -767,7 +782,7 @@ const selectChange = (val, item, scope = null) => {
767 let row = scope.row; 782 let row = scope.row;
768 row.gradeGuid = val || ''; 783 row.gradeGuid = val || '';
769 row.gradeDetailName = val ? item.options.find(i => i.guid == val)?.gradeName : ''; 784 row.gradeDetailName = val ? item.options.find(i => i.guid == val)?.gradeName : '';
770 } else { 785 } else if (item.field == 'databaseGuid' || item.field == 'tableGuid') {
771 const params: any = scope; 786 const params: any = scope;
772 if (tabsInfo.value.activeName == 'sheet') { 787 if (tabsInfo.value.activeName == 'sheet') {
773 if (!val) { 788 if (!val) {
...@@ -808,7 +823,7 @@ const selectChange = (val, item, scope = null) => { ...@@ -808,7 +823,7 @@ const selectChange = (val, item, scope = null) => {
808 params.fieldGuid = ''; 823 params.fieldGuid = '';
809 } 824 }
810 825
811 if (val && item.field != "fieldGuid") { 826 if (val) {
812 const params = { 827 const params = {
813 type: item.field == "databaseGuid" ? 2 : 3, 828 type: item.field == "databaseGuid" ? 2 : 3,
814 dbGuid: val || '' 829 dbGuid: val || ''
...@@ -816,6 +831,13 @@ const selectChange = (val, item, scope = null) => { ...@@ -816,6 +831,13 @@ const selectChange = (val, item, scope = null) => {
816 getSheetFieldList(params) 831 getSheetFieldList(params)
817 } 832 }
818 } 833 }
834 } else if (item.field == 'isClassify') {
835 fieldItemList.value[5].default = [];
836 fieldItemList.value[6].default = '';
837 treeInfo.value.expandedKey = ['all'];
838 treeInfoRef.value.setCurrentKey('all');
839 fieldItemList.value[4].default = val || '';
840 getFieldTableData();
819 } 841 }
820 } 842 }
821 843
...@@ -827,6 +849,7 @@ const dialogBtnClick = (btn, info) => { ...@@ -827,6 +849,7 @@ const dialogBtnClick = (btn, info) => {
827 selectRowData.value.map((item: any) => { 849 selectRowData.value.map((item: any) => {
828 const param = { 850 const param = {
829 guid: item.guid, 851 guid: item.guid,
852 fieldGuid: item.fieldGuid,
830 classifyDetailGuid: cascaderData[0].value, 853 classifyDetailGuid: cascaderData[0].value,
831 classifyDetailName: cascaderData[0].label, 854 classifyDetailName: cascaderData[0].label,
832 gradeDetailGuid: info.gradeGuid, 855 gradeDetailGuid: info.gradeGuid,
...@@ -846,9 +869,8 @@ onActivated(() => { ...@@ -846,9 +869,8 @@ onActivated(() => {
846 }) 869 })
847 870
848 onBeforeMount(() => { 871 onBeforeMount(() => {
849 if (route.query.type == 'log') { 872 if (execGuid) {
850 showBtns.value = false; 873 getTaskDetail({ guid: route.query.guid, execGuid: execGuid });
851 getTaskDetail({ guid: route.query.guid, execGuid: route.query.execGuid });
852 } else { 874 } else {
853 getTaskDetail({ guid: route.query.guid }); 875 getTaskDetail({ guid: route.query.guid });
854 } 876 }
...@@ -946,14 +968,19 @@ onMounted(() => { ...@@ -946,14 +968,19 @@ onMounted(() => {
946 <TableTools ref="fieldSearchRef" :searchItems="fieldItemList" :searchId="'field-search'" :init="false" 968 <TableTools ref="fieldSearchRef" :searchItems="fieldItemList" :searchId="'field-search'" :init="false"
947 @selectChange="selectChange" @cascaderChange="cascaderChange" @search="searchField" /> 969 @selectChange="selectChange" @cascaderChange="cascaderChange" @search="searchField" />
948 <div class="tools_btns"> 970 <div class="tools_btns">
949 <div class="btns"> 971 <div class="btns" v-if="showBtns" >
950 <el-button type="primary" plain @click="btnClick({ value: 'batch' })">批量变更分类分级</el-button> 972 <el-button type="primary" plain @click="btnClick({ value: 'batch' })">批量变更分类分级</el-button>
951 <el-button type="primary" plain @click="btnClick({ value: 'status' })">批量确认</el-button> 973 <el-button type="primary" plain @click="btnClick({ value: 'status' })">批量确认</el-button>
952 <el-button plain @click="btnClick({ value: 'export' })">导出</el-button> 974 <!-- <el-button plain @click="btnClick({ value: 'export' })">导出</el-button> -->
953 </div>
954 <div class="checkboxs">
955 <el-checkbox v-model="checked1" @change="getFieldTableData()">仅看多分级分类</el-checkbox>
956 </div> 975 </div>
976 <!-- <div class="checkboxs">
977 <el-checkbox v-model="checked1" @change="getFieldTableData()">仅看多分类</el-checkbox>
978 <el-tooltip effect="light" placement="top" content="一个字段只能有一个分类，多分类的字段需要人工确定分类">
979 <el-icon style="margin-left: 8px;">
980 <svg-icon name="icon-tip" />
981 </el-icon>
982 </el-tooltip>
983 </div> -->
957 </div> 984 </div>
958 </div> 985 </div>
959 <div class="table_panel_wrap panel" :style="{ height: 'calc(100% - ' + toolH + 'px)' }"> 986 <div class="table_panel_wrap panel" :style="{ height: 'calc(100% - ' + toolH + 'px)' }">
...@@ -998,7 +1025,7 @@ onMounted(() => { ...@@ -998,7 +1025,7 @@ onMounted(() => {
998 </span> 1025 </span>
999 </template> 1026 </template>
1000 </el-table-column> 1027 </el-table-column>
1001 <el-table-column label="操作" :width="fieldTableInfo.actionInfo.width" fixed="right"> 1028 <el-table-column label="操作" :width="fieldTableInfo.actionInfo.width" fixed="right" v-if="showBtns">
1002 <template #default="scope"> 1029 <template #default="scope">
1003 <span class="text_btn" 1030 <span class="text_btn"
1004 @click="tableBtnClick(scope, { value: scope.row['STATE'] === 'Running' ? 'save' : 'edit' })" 1031 @click="tableBtnClick(scope, { value: scope.row['STATE'] === 'Running' ? 'save' : 'edit' })"
......
src/views/data_inventory/taskLog.vue
...@@ -46,7 +46,7 @@ const tableInfo = ref({ ...@@ -46,7 +46,7 @@ const tableInfo = ref({
46 label: "结果状态", field: "status", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { 46 label: "结果状态", field: "status", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
47 return filterVal(scope.row.status, 'confirmStatus'); 47 return filterVal(scope.row.status, 'confirmStatus');
48 }, tagType: (scope) => { 48 }, tagType: (scope) => {
49 return scope.row.confirmStatus == 'Y' ? 'success' : 'warning'; 49 return scope.row.status == 'Y' ? 'success' : 'warning';
50 } 50 }
51 }, 51 },
52 ], 52 ],
...@@ -100,13 +100,14 @@ const tableBtnClick = (scope, btn) => { ...@@ -100,13 +100,14 @@ const tableBtnClick = (scope, btn) => {
100 }; 100 };
101 101
102 const toPath = (type) => { 102 const toPath = (type) => {
103 sessionStorage.setItem('taksExecGuid', currTableData.value.guid);
103 router.push({ 104 router.push({
104 name: "taskDetail", 105 name: "taskDetail",
105 query: { 106 query: {
106 guid: currTableData.value.taskGuid, 107 guid: currTableData.value.taskGuid,
107 name: currTableData.value.taskName, 108 name: currTableData.value.taskName,
108 execGuid: currTableData.value.guid, 109 status: currTableData.value.status,
109 type 110 type: currTableData.value.status == 'Y'? 'modify':'confirm'
110 }, 111 },
111 }); 112 });
112 } 113 }
......
src/views/data_meta/collectorTask.vue
...@@ -104,7 +104,7 @@ const tableInfo = ref({ ...@@ -104,7 +104,7 @@ const tableInfo = ref({
104 actionInfo: { 104 actionInfo: {
105 label: "操作", 105 label: "操作",
106 type: "btn", 106 type: "btn",
107 width: 210, 107 width: 230,
108 fixed: 'right', 108 fixed: 'right',
109 btns: (scope) => { 109 btns: (scope) => {
110 const row = scope.row 110 const row = scope.row
...@@ -114,7 +114,7 @@ const tableInfo = ref({ ...@@ -114,7 +114,7 @@ const tableInfo = ref({
114 } else { 114 } else {
115 btnsArr.splice(0, 0, { label: "立即执行", value: "carry", disabled: row.taskState === 0 || row.execState == 1 }) 115 btnsArr.splice(0, 0, { label: "立即执行", value: "carry", disabled: row.taskState === 0 || row.execState == 1 })
116 } 116 }
117 // btnsArr.push({ label: "编辑", value: "edit", disabled: row.taskState === 1 || row.isCarry || row.execState == 1 }); 117 btnsArr.push({ label: "编辑", value: "edit", disabled: row.taskState === 1 || row.isCarry || row.execState == 1 });
118 btnsArr.push({ label: "删除", value: "delete", disabled: row.isCarry || row.taskState === 1 || row.execState == 1 }); 118 btnsArr.push({ label: "删除", value: "delete", disabled: row.isCarry || row.taskState === 1 || row.execState == 1 });
119 btnsArr.push({ label: "执行日志", value: "log" }); 119 btnsArr.push({ label: "执行日志", value: "log" });
120 return btnsArr 120 return btnsArr
...@@ -472,19 +472,18 @@ const setDetailInfo = (row) => { ...@@ -472,19 +472,18 @@ const setDetailInfo = (row) => {
472 } 472 }
473 473
474 const getDataSourceList = () => { 474 const getDataSourceList = () => {
475 // TODO 475 getDatabase({ connectStatus: 1 }).then((res: any) => {
476 // getDatabase({ connectStatus: 1 }).then((res: any) => { 476 if (res.code == proxy.$passCode) {
477 // if (res.code == proxy.$passCode) { 477 dataSourceList.value = res.data || [];
478 // dataSourceList.value = res.data || []; 478 formItems.value[1].options = dataSourceList.value;
479 // formItems.value[1].options = dataSourceList.value; 479 searchItemList.value[1].options = dataSourceList.value;
480 // searchItemList.value[1].options = dataSourceList.value; 480 } else {
481 // } else { 481 proxy.$ElMessage({
482 // proxy.$ElMessage({ 482 type: "error",
483 // type: "error", 483 message: res.msg,
484 // message: res.msg, 484 });
485 // }); 485 }
486 // } 486 })
487 // })
488 } 487 }
489 488
490 const radioGroupChange = (val, info) => { 489 const radioGroupChange = (val, info) => {
...@@ -598,7 +597,7 @@ onBeforeMount(() => { ...@@ -598,7 +597,7 @@ onBeforeMount(() => {
598 <!-- 头部搜索 --> 597 <!-- 头部搜索 -->
599 <TableTools :searchItems="searchItemList" :searchId="'data-source-search'" @search="toSearch" :init="false" /> 598 <TableTools :searchItems="searchItemList" :searchId="'data-source-search'" @search="toSearch" :init="false" />
600 <div class="tools_btns"> 599 <div class="tools_btns">
601 <!-- <el-button type="primary" @click="loadDrawer">新建</el-button> --> 600 <el-button type="primary" @click="loadDrawer">新建</el-button>
602 <el-button @click="importMeta">导入</el-button> 601 <el-button @click="importMeta">导入</el-button>
603 </div> 602 </div>
604 </div> 603 </div>
......
src/views/data_meta/metaSheet.vue
...@@ -60,8 +60,8 @@ const tabsInfo = ref({ ...@@ -60,8 +60,8 @@ const tabsInfo = ref({
60 activeName: '', 60 activeName: '',
61 tabs: [ 61 tabs: [
62 { label: '基础信息', name: 'first' }, 62 { label: '基础信息', name: 'first' },
63 // / { label: '数据血缘', name: 'second' }, 63 { label: '数据血缘', name: 'second' },
64 //{ label: '变更记录', name: 'third' } 64 { label: '变更记录', name: 'third' }
65 ] 65 ]
66 }) 66 })
67 /** 切换布局 */ 67 /** 切换布局 */
...@@ -192,13 +192,13 @@ const tabsPaneMap = ref({ ...@@ -192,13 +192,13 @@ const tabsPaneMap = ref({
192 tableInfo: fieldTableInfo.value, 192 tableInfo: fieldTableInfo.value,
193 show: true 193 show: true
194 }, 194 },
195 // { 195 {
196 // title: '索引信息', 196 title: '索引信息',
197 // type: 'table', 197 type: 'table',
198 // isIndex: true, 198 isIndex: true,
199 // tableInfo: indexTableInfo.value, 199 tableInfo: indexTableInfo.value,
200 // show: true 200 show: true
201 // }, 201 },
202 ], 202 ],
203 second: [ 203 second: [
204 { 204 {
...@@ -310,10 +310,10 @@ const lineageDataLoading = ref(true); ...@@ -310,10 +310,10 @@ const lineageDataLoading = ref(true);
310 const getDetailInfo = () => { 310 const getDetailInfo = () => {
311 getSheetDetail() 311 getSheetDetail()
312 getSheetField() 312 getSheetField()
313 // getSheetKeys() 313 getSheetKeys()
314 logPage.value.curr = 1 314 logPage.value.curr = 1
315 //getSheetLog(); 315 getSheetLog();
316 // getTableLineageMap(); 316 getTableLineageMap();
317 } 317 }
318 318
319 const getSheetDetail = () => { 319 const getSheetDetail = () => {
......
src/views/importFile.vue
...@@ -403,7 +403,7 @@ const importData = (info) => { ...@@ -403,7 +403,7 @@ const importData = (info) => {
403 uploadFiles.value.forEach((item: any, index: number) => { 403 uploadFiles.value.forEach((item: any, index: number) => {
404 params.append("uploadFile", item.raw); 404 params.append("uploadFile", item.raw);
405 }); 405 });
406 paramUrl = `${import.meta.env.VITE_APP_CHECK_BASEURL}/meta-collect-task/meta-collect-import?staffGuid=${userData.staffGuid}&databaseNameZh=${info.databaseNameZh}&databaseNameEn=${info.databaseNameEn}&isCover=${info.isCover}` 406 paramUrl = `${import.meta.env.VITE_APP_PLAN_BASEURL}/meta-collect-task/meta-collect-import?staffGuid=${userData.staffGuid}&databaseNameZh=${info.databaseNameZh}&databaseNameEn=${info.databaseNameEn}&isCover=${info.isCover}`
407 } else { 407 } else {
408 uploadFiles.value.forEach((item: any, index: number) => { 408 uploadFiles.value.forEach((item: any, index: number) => {
409 params.append("file", item.raw); 409 params.append("file", item.raw);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!