Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
1150f554 by lxs
Options

分级分类任务更新

1 parent 8407c03e
Inline Side-by-side
Showing 5 changed files with 453 additions and 97 deletions
src/utils/request.ts
...@@ -31,7 +31,7 @@ service.interceptors.request.use( ...@@ -31,7 +31,7 @@ service.interceptors.request.use(
31 * 为每一次请求生成一个cancleToken 31 * 为每一次请求生成一个cancleToken
32 */ 32 */
33 const source = axios.CancelToken.source(); 33 const source = axios.CancelToken.source();
34 config.headers.tenant = '6646dcad76c411eea911fa163e419da9'; //会员guid先写死 34 config.headers.tenant = '9e5b9d7bfd8c4f4f8079e05de19bf7e0'; //会员guid先写死
35 config.cancelToken = source.token; 35 config.cancelToken = source.token;
36 if (config.method === "postfile") { 36 if (config.method === "postfile") {
37 config.method = "post"; 37 config.method = "post";
......
src/views/data_inventory/taskConfig.vue
...@@ -349,25 +349,20 @@ const tableInfo = ref({ ...@@ -349,25 +349,20 @@ const tableInfo = ref({
349 id: "mapping-table", 349 id: "mapping-table",
350 fields: [ 350 fields: [
351 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" }, 351 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" },
352 { label: "任务名称", field: "chName", width: 96 }, 352 { label: "任务名称", field: "taskName", width: 96 },
353 { 353 {
354 label: "目录名称", field: "dataTypeValue", width: 120, type: "text_btn", columClass: 'text_btn', click: (scope) => { 354 label: "目录名称", field: "cgDirName", width: 120, type: "text_btn", columClass: 'text_btn', click: (scope) => {
355 router.push({ 355 router.push({
356 name: "templateConfig", 356 name: "templateConfig",
357 query: { guid: scope.row.damGuid }, 357 query: { guid: scope.row.damGuid },
358 }); 358 });
359 } 359 }
360 }, 360 },
361 { label: "分类分级模板", field: "dataTypeValue", width: 200 }, 361 { label: "分类分级模板", field: "cgTemplateName", width: 200 },
362 { label: "元数据", field: "fieldStandardCode", width: 200 }, 362 { label: "元数据", field: "metaNames", width: 200 },
363 // {
364 // label: "是否公共数据", field: "isPublicData", width: 120, getName: (scope) => {
365 // return scope.row.isPublicData == 'Y' ? '是' : '否';
366 // }
367 // },
368 { 363 {
369 label: "执行状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { 364 label: "执行状态", field: "status", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
370 return filterVal(scope.row.approveState, 'approveState'); 365 return filterVal(scope.row.status, 'status');
371 } 366 }
372 }, 367 },
373 { label: "任务修改人", field: "dataCategory", width: 120 }, 368 { label: "任务修改人", field: "dataCategory", width: 120 },
......
src/views/data_inventory/taskDetail.vue
...@@ -8,6 +8,7 @@ import { useRouter, useRoute } from "vue-router"; ...@@ -8,6 +8,7 @@ import { useRouter, useRoute } from "vue-router";
8 import useUserStore from "@/store/modules/user"; 8 import useUserStore from "@/store/modules/user";
9 import { ElMessage, ElMessageBox } from "element-plus"; 9 import { ElMessage, ElMessageBox } from "element-plus";
10 import { Search } from "@element-plus/icons-vue"; 10 import { Search } from "@element-plus/icons-vue";
11 import { setItemsDisabled, tagMethod, tagType, changeNum, } from "@/utils/common";
11 import useDataAssetStore from "@/store/modules/dataAsset"; 12 import useDataAssetStore from "@/store/modules/dataAsset";
12 import TableTools from '@/components/Tools/table_tools.vue'; 13 import TableTools from '@/components/Tools/table_tools.vue';
13 import Table from "@/components/Table/index.vue"; 14 import Table from "@/components/Table/index.vue";
...@@ -18,7 +19,6 @@ const router = useRouter(); ...@@ -18,7 +19,6 @@ const router = useRouter();
18 const userStore = useUserStore(); 19 const userStore = useUserStore();
19 const userData = JSON.parse(userStore.userData); 20 const userData = JSON.parse(userStore.userData);
20 const assetStore = useDataAssetStore(); 21 const assetStore = useDataAssetStore();
21
22 const datas = [ 22 const datas = [
23 { 23 {
24 "updateTime": "2024-07-16 13:17:00", 24 "updateTime": "2024-07-16 13:17:00",
...@@ -331,7 +331,307 @@ const datas = [ ...@@ -331,7 +331,307 @@ const datas = [
331 "ruleType": null 331 "ruleType": null
332 } 332 }
333 ] 333 ]
334 334 const data1 = [
335 {
336 "children": [
337 {
338 "children": null,
339 "parentGuids": [
340 "c32ddd77191ff4afe149538ef4b2e0c3"
341 ],
342 "guid": "9c92df55a19cdce88f61e20a8e1e8a65",
343 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
344 "organisationCode": "11150001",
345 "organisationName": "链享供应链运营一部",
346 "bizState": "Y",
347 "createTime": "2023-10-25 14:23:31",
348 "createUserName": "测试",
349 "parentGuid": "c32ddd77191ff4afe149538ef4b2e0c3",
350 "orderNum": 1,
351 "level": 2,
352 "levelCode": "1.1",
353 "displayCreateTime": "2023-10-25 14:23:31"
354 }
355 ],
356 "parentGuids": null,
357 "guid": "c32ddd77191ff4afe149538ef4b2e0c3",
358 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
359 "organisationCode": "1115004",
360 "organisationName": "链享供应链",
361 "bizState": "Y",
362 "createTime": "2023-08-15 12:59:10",
363 "createUserName": "测试",
364 "parentGuid": "",
365 "orderNum": 2,
366 "level": 0,
367 "levelCode": "1",
368 "displayCreateTime": "2023-08-15 12:59:10"
369 },
370 {
371 "children": [
372 {
373 "children": [
374 {
375 "children": null,
376 "parentGuids": [
377 "e10332122834077907cd5ea61fa576c1",
378 "cdae7bb3cafb560482cad1b89a1e4b78"
379 ],
380 "guid": "16ea472a155c07433a63220f2ae1afe9",
381 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
382 "organisationCode": "11160011",
383 "organisationName": "链享运营一部1组",
384 "bizState": "S",
385 "createTime": "2023-10-25 13:15:57",
386 "createUserName": "测试",
387 "parentGuid": "cdae7bb3cafb560482cad1b89a1e4b78",
388 "orderNum": 1,
389 "level": 2,
390 "levelCode": "2.1.1",
391 "displayCreateTime": "2023-10-25 13:15:57"
392 }
393 ],
394 "parentGuids": [
395 "e10332122834077907cd5ea61fa576c1"
396 ],
397 "guid": "cdae7bb3cafb560482cad1b89a1e4b78",
398 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
399 "organisationCode": "1116001",
400 "organisationName": "链享运营一部",
401 "bizState": "S",
402 "createTime": "2023-10-25 13:14:15",
403 "createUserName": "测试",
404 "parentGuid": "e10332122834077907cd5ea61fa576c1",
405 "orderNum": 1,
406 "level": 1,
407 "levelCode": "2.1",
408 "displayCreateTime": "2023-10-25 13:14:15"
409 },
410 {
411 "children": null,
412 "parentGuids": [
413 "e10332122834077907cd5ea61fa576c1"
414 ],
415 "guid": "d98b44ffb35e4d17cf68f9a922e1c7b7",
416 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
417 "organisationCode": null,
418 "organisationName": "二部",
419 "bizState": "Y",
420 "createTime": "2023-10-26 09:45:36",
421 "createUserName": "测试",
422 "parentGuid": "e10332122834077907cd5ea61fa576c1",
423 "orderNum": 2,
424 "level": 1,
425 "levelCode": "2.2",
426 "displayCreateTime": "2023-10-26 09:45:36"
427 }
428 ],
429 "parentGuids": null,
430 "guid": "e10332122834077907cd5ea61fa576c1",
431 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
432 "organisationCode": "1115005",
433 "organisationName": "链享医药",
434 "bizState": "Y",
435 "createTime": "2023-09-12 15:59:35",
436 "createUserName": "测试",
437 "parentGuid": null,
438 "orderNum": 3,
439 "level": 0,
440 "levelCode": "2",
441 "displayCreateTime": "2023-09-12 15:59:35"
442 },
443 {
444 "children": [
445 {
446 "children": null,
447 "parentGuids": [
448 "9bd46f0f4fcf429518fae6ecb4849a9e"
449 ],
450 "guid": "870f23ae47e036eb88b35f726c31959b",
451 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
452 "organisationCode": null,
453 "organisationName": "运用三部",
454 "bizState": "Y",
455 "createTime": "2024-04-28 16:33:24",
456 "createUserName": "数往知来管理员",
457 "parentGuid": "9bd46f0f4fcf429518fae6ecb4849a9e",
458 "orderNum": 3,
459 "level": 1,
460 "levelCode": "3.3",
461 "displayCreateTime": "2024-04-28 16:33:24"
462 },
463 {
464 "children": null,
465 "parentGuids": [
466 "9bd46f0f4fcf429518fae6ecb4849a9e"
467 ],
468 "guid": "e06049046241dd71b153f227dbe7f801",
469 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
470 "organisationCode": null,
471 "organisationName": "运营二部",
472 "bizState": "Y",
473 "createTime": "2023-11-14 16:01:50",
474 "createUserName": "数往知来管理员",
475 "parentGuid": "9bd46f0f4fcf429518fae6ecb4849a9e",
476 "orderNum": 40,
477 "level": 1,
478 "levelCode": "3.2",
479 "displayCreateTime": "2023-11-14 16:01:50"
480 },
481 {
482 "children": null,
483 "parentGuids": [
484 "9bd46f0f4fcf429518fae6ecb4849a9e"
485 ],
486 "guid": "731cd185c868da8af48b492068ffaed4",
487 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
488 "organisationCode": null,
489 "organisationName": "运营一部",
490 "bizState": "Y",
491 "createTime": "2023-11-14 15:19:35",
492 "createUserName": "测试",
493 "parentGuid": "9bd46f0f4fcf429518fae6ecb4849a9e",
494 "orderNum": 41,
495 "level": 1,
496 "levelCode": "3.1",
497 "displayCreateTime": "2023-11-14 15:19:35"
498 }
499 ],
500 "parentGuids": null,
501 "guid": "9bd46f0f4fcf429518fae6ecb4849a9e",
502 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
503 "organisationCode": null,
504 "organisationName": "药企服务事业部1",
505 "bizState": "Y",
506 "createTime": "2023-11-14 14:49:14",
507 "createUserName": "数往知来管理员",
508 "parentGuid": "",
509 "orderNum": 4,
510 "level": 0,
511 "levelCode": "3",
512 "displayCreateTime": "2023-11-14 14:49:14"
513 },
514 {
515 "children": [
516 {
517 "children": null,
518 "parentGuids": [
519 "23be149ea3167a3f7f2d383023336efe"
520 ],
521 "guid": "e5f2b4958ee2d99309a41e0c6e1447c8",
522 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
523 "organisationCode": null,
524 "organisationName": "智能存储装备部",
525 "bizState": "Y",
526 "createTime": "2023-11-14 16:09:36",
527 "createUserName": "数往知来管理员",
528 "parentGuid": "23be149ea3167a3f7f2d383023336efe",
529 "orderNum": 51,
530 "level": 1,
531 "levelCode": "4.1",
532 "displayCreateTime": "2023-11-14 16:09:36"
533 }
534 ],
535 "parentGuids": null,
536 "guid": "23be149ea3167a3f7f2d383023336efe",
537 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
538 "organisationCode": null,
539 "organisationName": "医药物联网事业部",
540 "bizState": "Y",
541 "createTime": "2023-11-14 15:11:35",
542 "createUserName": "数往知来管理员",
543 "parentGuid": "",
544 "orderNum": 5,
545 "level": 0,
546 "levelCode": "4",
547 "displayCreateTime": "2023-11-14 15:11:35"
548 },
549 {
550 "children": null,
551 "parentGuids": null,
552 "guid": "1d82e875163749ca9ae45809ec432ae8",
553 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
554 "organisationCode": null,
555 "organisationName": "财务管理中心",
556 "bizState": "S",
557 "createTime": "2023-11-14 15:14:07",
558 "createUserName": "数往知来管理员",
559 "parentGuid": "",
560 "orderNum": 6,
561 "level": 0,
562 "levelCode": "6",
563 "displayCreateTime": "2023-11-14 15:14:07"
564 },
565 {
566 "children": null,
567 "parentGuids": null,
568 "guid": "cd9e6a0c76102364a9e88b79b28b0b32",
569 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
570 "organisationCode": null,
571 "organisationName": "资产服务",
572 "bizState": "Y",
573 "createTime": "2024-08-14 11:40:33",
574 "createUserName": "数往知来管理员",
575 "parentGuid": "",
576 "orderNum": 7,
577 "level": 0,
578 "levelCode": "9",
579 "displayCreateTime": "2024-08-14 11:40:33"
580 },
581 {
582 "children": [
583 {
584 "children": null,
585 "parentGuids": [
586 "dac448b77fa35f798bb4a06d8fd86334"
587 ],
588 "guid": "cb76777efe69182cfb2c75d41944553c",
589 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
590 "organisationCode": null,
591 "organisationName": "审批1",
592 "bizState": "Y",
593 "createTime": "2024-01-17 14:28:36",
594 "createUserName": "数往知来管理员",
595 "parentGuid": "dac448b77fa35f798bb4a06d8fd86334",
596 "orderNum": 100,
597 "level": 1,
598 "levelCode": "8.1",
599 "displayCreateTime": "2024-01-17 14:28:36"
600 }
601 ],
602 "parentGuids": null,
603 "guid": "dac448b77fa35f798bb4a06d8fd86334",
604 "tenantGuid": "9e5b9d7bfd8c4f4f8079e05de19bf7e0",
605 "organisationCode": null,
606 "organisationName": "审批组织",
607 "bizState": "Y",
608 "createTime": "2024-01-16 11:38:24",
609 "createUserName": "数往知来管理员",
610 "parentGuid": "",
611 "orderNum": 99,
612 "level": 0,
613 "levelCode": "8",
614 "displayCreateTime": "2024-01-16 11:38:24"
615 }
616 ]
617 const data2 = [
618 {}
619 ]
620 const treeIndex: any = ref({})
621 const treeInfo = ref({
622 id: "data-pickup-tree",
623 filter: true,
624 queryValue: "",
625 queryPlaceholder: "输入组织名称搜索",
626 props: {
627 label: "organisationName",
628 value: "guid",
629 },
630 nodeKey: 'guid',
631 expandedKey: [],
632 expandOnNodeClick: false,
633 data: data1 || [],
634 });
335 635
336 const templateInfo = ref({ 636 const templateInfo = ref({
337 title: '医疗数据分类分级模板', 637 title: '医疗数据分类分级模板',
...@@ -497,10 +797,24 @@ const sheetTableInfo = ref({ ...@@ -497,10 +797,24 @@ const sheetTableInfo = ref({
497 id: "mapping-table", 797 id: "mapping-table",
498 fields: [ 798 fields: [
499 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" }, 799 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" },
500 { label: "标签", field: "damCode", width: 96 }, 800 {
501 { label: "分类", field: "damTypeName", width: 380 }, 801 label: "分类分级变更状态", field: "damCode", width: 140, align: 'center', type: "tag", getName: (scope) => {
502 { label: "分级", field: "damName", width: 55 }, 802 return filterVal(scope.row.status, 'status');
503 { label: "规则", field: "damTypeName", width: 380 }, 803 }
804 },
805 { label: "表中文名", field: "damTypeName", width: 120 },
806 {
807 label: "表英文名", field: "damName", width: 200, type: "text_btn", columClass: 'text_btn', click: (scope) => {
808 router.push({
809 name: "templateConfig",
810 query: { guid: scope.row.damGuid },
811 });
812 }
813 },
814 { label: "数据库名", field: "damTypeName", width: 120 },
815 { label: "字段数", field: "damTypeName", width: 96, align: 'right' },
816 { label: "已分类字段数", field: "damTypeName", width: 120, align: 'right' },
817 { label: "已分级字段数", field: "damTypeName", width: 120, align: 'right' },
504 ], 818 ],
505 loading: false, 819 loading: false,
506 data: datas || [], 820 data: datas || [],
...@@ -518,13 +832,24 @@ const fieldTableInfo = ref({ ...@@ -518,13 +832,24 @@ const fieldTableInfo = ref({
518 id: "metadata-table", 832 id: "metadata-table",
519 fields: [ 833 fields: [
520 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" }, 834 { label: "序号", type: "index", width: 56, align: "center", fixed: "left" },
521 { label: "数据库名称", field: "damCode", width: 200 }, 835 {
522 { label: "数据库名", field: "damTypeName", width: 200 }, 836 label: "分类分级变更状态", field: "approveState", width: 140, align: 'center', type: "tag", getName: (scope) => {
523 { label: "总表数", field: "damName", width: 120, align: "right" }, 837 return filterVal(scope.row.approveState, 'approveState');
524 { label: "存储量(约/MB)", field: "damTypeName", width: 200, align: "right" }, 838 }
839 },
840 { label: "字段名", field: "damTypeName", width: 200 },
841 { label: "字段中文名", field: "damTypeName", width: 200 },
842 { label: "分类", field: "damTypeName", width: 280, type: 'select', columClass: 'edit_cell' },
843 { label: "分级", field: "damTypeName", width: 120, type: 'select', columClass: 'edit_cell' },
844 { label: "标签", field: "damCode", width: 96 },
845 { label: "规则", field: "damCode", width: 200 },
846 { label: "表中文名", field: "damTypeName", width: 120 },
847 { label: "表英文名", field: "damName", width: 200 },
848 { label: "数据库名", field: "damTypeName", width: 120 },
525 ], 849 ],
526 loading: false, 850 loading: false,
527 data: [], 851 data: data2 || [],
852 showPage: true,
528 page: { 853 page: {
529 type: "normal", 854 type: "normal",
530 rows: 0, 855 rows: 0,
...@@ -539,6 +864,10 @@ const tabChange = (val) => { ...@@ -539,6 +864,10 @@ const tabChange = (val) => {
539 tabsInfo.value.activeName = val; 864 tabsInfo.value.activeName = val;
540 } 865 }
541 866
867 const nodeClick = (data) => {
868 treeIndex.value = data
869 }
870
542 const getTableData = () => { 871 const getTableData = () => {
543 tableInfo.value.loading = true; 872 tableInfo.value.loading = true;
544 getListingList( 873 getListingList(
...@@ -703,40 +1032,56 @@ onBeforeMount(() => { ...@@ -703,40 +1032,56 @@ onBeforeMount(() => {
703 <Table :tableInfo="sheetTableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange" /> 1032 <Table :tableInfo="sheetTableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange" />
704 </div> 1033 </div>
705 </div> 1034 </div>
706 <div class="panel" v-show="tabsInfo.activeName == 'field'"> 1035 <div class="panel flex" v-show="tabsInfo.activeName == 'field'">
707 <div class="table_tool_wrap"> 1036 <div class="box_left">
708 <TableTools :searchItems="fieldItemList" :searchId="'template-manage-search'" @search="searchTemplate" /> 1037 <div class="aside_title">分类分级目录</div>
709 <div class="tools_btns"> 1038 <Tree :treeInfo="treeInfo" @nodeClick="nodeClick" />
710 <div class="btns"> 1039 </div>
711 <el-button type="primary" plain @click="btnClick({ value: 'batch' })">批量变量分类分级</el-button> 1040 <div class="box_right">
712 <el-button plain @click="btnClick({ value: 'import' })">导入</el-button> 1041 <div class="table_tool_wrap">
713 <el-button plain @click="btnClick({ value: 'export' })">导出</el-button> 1042 <TableTools :searchItems="fieldItemList" :searchId="'template-manage-search'"
714 </div> 1043 @search="searchTemplate" />
715 <div class="checkboxs"> 1044 <div class="tools_btns">
716 <el-checkbox v-model="checked1">仅看未分级分类</el-checkbox> 1045 <div class="btns">
717 <el-checkbox v-model="checked2">仅看变更</el-checkbox> 1046 <el-button type="primary" plain @click="btnClick({ value: 'batch' })">批量变量分类分级</el-button>
1047 <el-button plain @click="btnClick({ value: 'import' })">导入</el-button>
1048 <el-button plain @click="btnClick({ value: 'export' })">导出</el-button>
1049 </div>
1050 <div class="checkboxs">
1051 <el-checkbox v-model="checked1">仅看未分级分类</el-checkbox>
1052 <el-checkbox v-model="checked2">仅看变更</el-checkbox>
1053 </div>
718 </div> 1054 </div>
719 </div> 1055 </div>
720 </div> 1056 <div class="table_panel_wrap panel">
721 <div class="table_panel_wrap panel"> 1057 <div class="table_panel">
722 <div class="table_panel"> 1058 <el-table ref="costTableRef" :data="fieldTableInfo.data" border :height="'100%'"
723 <el-table ref="costTableRef" :data="fieldTableInfo.data" show-summary border> 1059 style="width: 100%; display: inline-block" :style="{ 'min-height': '100%' }">
724 <el-table-column v-for="(item, i) in fieldTableInfo.fields" :label="item.label" :width="item.width" 1060 <el-table-column v-for="(item, i) in fieldTableInfo.fields" :label="item.label" :width="item.width"
725 :min-width="item.minWidth" :fixed="item.fixed" :align="item.align" 1061 :min-width="item.minWidth" :fixed="item.fixed" :align="item.align"
726 :sortable="item.sortable ?? false" :prop="item.field" :class-name="item.columClass" 1062 :sortable="item.sortable ?? false" :prop="item.field" :class-name="item.columClass"
727 show-overflow-tooltip> 1063 show-overflow-tooltip>
728 <template #default="scope"> 1064 <template #default="scope">
729 <div class="select_cell" v-if="item.type == 'select'"> 1065 <div class="select_cell" v-if="item.type == 'select'">
730 <el-select v-model="scope.row[item.field]" :placeholder="item.placeholder" 1066 <el-select v-model="scope.row[item.field]" :placeholder="item.placeholder"
731 :disabled="item.disabled" :clearable="item.clearable || true" /> 1067 :disabled="item.disabled" :clearable="item.clearable || true" />
732 </div> 1068 </div>
733 <span v-else> 1069 <div v-else-if="item.type == 'tag'">
734 {{ item.getName ? item.getName(scope) : scope.row[item.field] !== 0 && !scope.row[item.field] ? 1070 <el-tag :type="item.tagType ? item.tagType(scope) : tagType(scope.row, item.field)">{{
735 "--" : scope.row[item.field] }} 1071 item.getName ? item.getName(scope) : tagMethod(scope.row, item.field)
736 </span> 1072 }}</el-tag>
737 </template> 1073 </div>
738 </el-table-column> 1074 <span v-else>
739 </el-table> 1075 {{ item.getName ? item.getName(scope) : scope.row[item.field] !== 0 && !scope.row[item.field]
1076 ?
1077 "--" : scope.row[item.field] }}
1078 </span>
1079 </template>
1080 </el-table-column>
1081 </el-table>
1082 <PageNav :class="[fieldTableInfo.page.type, fieldTableInfo.page.col]" :pageInfo="fieldTableInfo.page"
1083 @pageChange="tablePageChange" />
1084 </div>
740 </div> 1085 </div>
741 </div> 1086 </div>
742 </div> 1087 </div>
...@@ -809,6 +1154,7 @@ onBeforeMount(() => { ...@@ -809,6 +1154,7 @@ onBeforeMount(() => {
809 display: flex; 1154 display: flex;
810 flex-direction: column; 1155 flex-direction: column;
811 height: calc(100% - 45px); 1156 height: calc(100% - 45px);
1157 padding: 0 !important;
812 overflow: hidden auto; 1158 overflow: hidden auto;
813 flex: 1; 1159 flex: 1;
814 1160
...@@ -817,7 +1163,7 @@ onBeforeMount(() => { ...@@ -817,7 +1163,7 @@ onBeforeMount(() => {
817 } 1163 }
818 1164
819 .template_panel { 1165 .template_panel {
820 padding: 0 8px; 1166 padding: 0 16px;
821 1167
822 .panel_title { 1168 .panel_title {
823 display: flex; 1169 display: flex;
...@@ -858,23 +1204,56 @@ onBeforeMount(() => { ...@@ -858,23 +1204,56 @@ onBeforeMount(() => {
858 height: 100%; 1204 height: 100%;
859 1205
860 .panel { 1206 .panel {
861 height: calc(100% - 51px); 1207 height: calc(100% - 47px);
1208 padding: 0 16px;
1209
1210 &.flex {
1211 height: calc(100% - 35px);
1212 display: flex;
1213 justify-content: space-between;
1214 flex: 1;
1215
1216 .box_left {
1217 width: 240px;
1218 height: 100%;
1219 border-right: 1px solid #d9d9d9;
1220 margin-left: -16px;
1221
1222 .aside_title {
1223 padding: 0 8px;
1224 height: 40px;
1225 line-height: 40px;
1226 font-size: 14px;
1227 color: #212121;
1228 font-weight: 600;
1229 margin-top: 8px;
1230 }
1231
1232 .tree_panel {
1233 padding: 0;
1234 }
1235 }
1236
1237 .box_right {
1238 width: calc(100% - 240px);
1239 }
1240 }
862 } 1241 }
863 1242
864 :deep(.panel_tabs) { 1243 :deep(.panel_tabs) {
865 .el-tabs__header { 1244 .el-tabs__header {
866 margin-bottom: 8px; 1245 margin-bottom: 0;
867 } 1246 }
868 1247
869 .el-tabs__nav-scroll { 1248 .el-tabs__nav-scroll {
870 // margin: 0 16px; 1249 padding: 0 16px;
871 } 1250 }
872 } 1251 }
873 1252
874 :deep(.table_tool_wrap) { 1253 :deep(.table_tool_wrap) {
875 .table-tools { 1254 .table-tools {
876 .tools_search { 1255 .tools_search {
877 padding-top: 4px; 1256 padding-top: 12px;
878 } 1257 }
879 } 1258 }
880 } 1259 }
...@@ -892,7 +1271,12 @@ onBeforeMount(() => { ...@@ -892,7 +1271,12 @@ onBeforeMount(() => {
892 padding: 4px 0 0; 1271 padding: 4px 0 0;
893 1272
894 &.panel { 1273 &.panel {
895 height: calc(100% - 80px); 1274 height: calc(100% - 135px);
1275
1276 .table_panel {
1277 width: 100%;
1278 height: 100%;
1279 }
896 } 1280 }
897 } 1281 }
898 } 1282 }
......
src/views/data_inventory/taskEdit.vue
...@@ -339,7 +339,7 @@ const currpermissionList: any = ref([ ...@@ -339,7 +339,7 @@ const currpermissionList: any = ref([
339 } 339 }
340 ]) 340 ])
341 const templateInfo = ref({ 341 const templateInfo = ref({
342 title: '医疗数据分类分级模板', 342 title: '医疗数据分类',
343 descGroup: [ 343 descGroup: [
344 { label: '模型确认人', value: '管理员 ' }, 344 { label: '模型确认人', value: '管理员 ' },
345 { label: '模型确认时间', value: '2021-12-12 09:12:13' }, 345 { label: '模型确认时间', value: '2021-12-12 09:12:13' },
...@@ -611,7 +611,7 @@ onBeforeMount(() => { ...@@ -611,7 +611,7 @@ onBeforeMount(() => {
611 <template> 611 <template>
612 <div class="container_wrap full flex"> 612 <div class="container_wrap full flex">
613 <div class="aside_wrap" v-show="step == 0"> 613 <div class="aside_wrap" v-show="step == 0">
614 <div class="aside_title">选择分类分级模板</div> 614 <div class="aside_title">选择分类</div>
615 <div class="aside_search"> 615 <div class="aside_search">
616 <el-input v-model.trim="asideSearchInput" placeholder="请输入关键字" :prefix-icon="Search" clearable 616 <el-input v-model.trim="asideSearchInput" placeholder="请输入关键字" :prefix-icon="Search" clearable
617 @change="querySearch" /> 617 @change="querySearch" />
......
src/views/data_inventory/taskLog.vue
...@@ -360,16 +360,6 @@ const tableInfo = ref({ ...@@ -360,16 +360,6 @@ const tableInfo = ref({
360 }, 360 },
361 { label: "分类分级模板", field: "dataTypeValue", width: 200 }, 361 { label: "分类分级模板", field: "dataTypeValue", width: 200 },
362 { label: "元数据", field: "fieldStandardCode", width: 200 }, 362 { label: "元数据", field: "fieldStandardCode", width: 200 },
363 // {
364 // label: "是否公共数据", field: "isPublicData", width: 120, getName: (scope) => {
365 // return scope.row.isPublicData == 'Y' ? '是' : '否';
366 // }
367 // },
368 {
369 label: "执行状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
370 return filterVal(scope.row.approveState, 'approveState');
371 }
372 },
373 { label: "任务修改人", field: "dataCategory", width: 120 }, 363 { label: "任务修改人", field: "dataCategory", width: 120 },
374 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME }, 364 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
375 { label: "确认次数", field: "fieldLength", width: 96, align: 'right' }, 365 { label: "确认次数", field: "fieldLength", width: 96, align: 'right' },
...@@ -391,14 +381,10 @@ const tableInfo = ref({ ...@@ -391,14 +381,10 @@ const tableInfo = ref({
391 actionInfo: { 381 actionInfo: {
392 label: "操作", 382 label: "操作",
393 type: "btn", 383 type: "btn",
394 width: 280, 384 width: 100,
395 btns: (scope) => { 385 btns: (scope) => {
396 let row = scope.row, btnArr: any = [ 386 let row = scope.row, btnArr: any = [
397 { label: "结果确认", value: "confirm" }, 387 { label: "查看结果", value: "path" },
398 { label: "结果修改", value: "modify" },
399 { label: "编辑", value: "edit" },
400 { label: "日志", value: "log" },
401 { label: "删除", value: "delete" }
402 ]; 388 ];
403 // if (row.approveState == 'Y') { 389 // if (row.approveState == 'Y') {
404 // if (row.listingStatus == 'Y') { 390 // if (row.listingStatus == 'Y') {
...@@ -441,7 +427,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -441,7 +427,7 @@ const tableBtnClick = (scope, btn) => {
441 const type = btn.value; 427 const type = btn.value;
442 const row = scope.row; 428 const row = scope.row;
443 currTableData.value = row; 429 currTableData.value = row;
444 if (type == "detail" || type === "edit") { 430 if (type == "path") {
445 toPath(type); 431 toPath(type);
446 } else if (type === "delete") { 432 } else if (type === "delete") {
447 open("此操作将永久删除，是否继续？", "warning"); 433 open("此操作将永久删除，是否继续？", "warning");
...@@ -449,23 +435,14 @@ const tableBtnClick = (scope, btn) => { ...@@ -449,23 +435,14 @@ const tableBtnClick = (scope, btn) => {
449 }; 435 };
450 436
451 const toPath = (type) => { 437 const toPath = (type) => {
452 if (type == 'add') { 438 router.push({
453 router.push({ 439 name: "taskDetail",
454 name: "taskEdit", 440 query: {
455 query: { 441 guid: currTableData.value.guid,
456 type 442 name: currTableData.value.damName,
457 }, 443 type
458 }); 444 },
459 } else { 445 });
460 router.push({
461 name: "taskEdit",
462 query: {
463 guid: currTableData.value.guid,
464 name: currTableData.value.damName,
465 type
466 },
467 });
468 }
469 } 446 }
470 447
471 const tablePageChange = (info) => { 448 const tablePageChange = (info) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!