Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
8d73b563 by lxs
Options

数据资产登记更新

1 parent 0eaaaefc
Expand all
Inline Side-by-side
Showing 25 changed files with 537 additions and 116 deletions
.env.development
...@@ -5,6 +5,7 @@ VITE_APP_TITLE = 数据资产管理系统 ...@@ -5,6 +5,7 @@ VITE_APP_TITLE = 数据资产管理系统
5 # VITE_API_BASEURL = https://swzl-test.csbr.cn/api 5 # VITE_API_BASEURL = https://swzl-test.csbr.cn/api
6 # VITE_API_BASEURL = http://localhost:9000 6 # VITE_API_BASEURL = http://localhost:9000
7 VITE_API_BASEURL = http://192.168.6.20:28052/ 7 VITE_API_BASEURL = http://192.168.6.20:28052/
8
8 # 平台用户 接口请地址 9 # 平台用户 接口请地址
9 VITE_APP_USER_API_BASEURL = gateway-server 10 VITE_APP_USER_API_BASEURL = gateway-server
10 11
...@@ -13,21 +14,31 @@ VITE_APP_AUTH_URL = 'ms-daop-auth-service' ...@@ -13,21 +14,31 @@ VITE_APP_AUTH_URL = 'ms-daop-auth-service'
13 14
14 # 系统管理 接口地址 15 # 系统管理 接口地址
15 VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service 16 VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
17
16 # #配置服务 18 # #配置服务
17 # VITE_APP_CONFIG_URL = 'ms-daop-configure-service' 19 # VITE_APP_CONFIG_URL = 'ms-daop-configure-service'
18 20
19 # 文件上传请求地址 21 # 文件上传请求地址
20 VITE_APP_ADD_FILE = ms-daop-import-data-service 22 VITE_APP_ADD_FILE = ms-daop-import-data-service
23
21 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 24 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
22 VITE_APP_DEBUG_TOOL = 25 VITE_APP_DEBUG_TOOL =
26
23 # 是否开启代理 27 # 是否开启代理
24 VITE_OPEN_PROXY = true 28 VITE_OPEN_PROXY = true
29
25 # vite serve base 30 # vite serve base
26 VITE_SERVE_BASE = / 31 VITE_SERVE_BASE = /
32
27 # 流程设计访问地址 33 # 流程设计访问地址
28 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn 34 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
35
36 #流程服务
37 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
38
29 # 数据标准、元数据、数据目录 接口地址 39 # 数据标准、元数据、数据目录 接口地址
30 VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service 40 VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
41
31 #数据质量接口地址 42 #数据质量接口地址
32 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service 43 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
33 44
...@@ -44,20 +55,26 @@ VITE_APP_CONFIG_URL = 'ms-daop-configure-service' ...@@ -44,20 +55,26 @@ VITE_APP_CONFIG_URL = 'ms-daop-configure-service'
44 # 文件上传下载接口地址 55 # 文件上传下载接口地址
45 VITE_APP_COMMON_URL = 'ms-daop-common-service' 56 VITE_APP_COMMON_URL = 'ms-daop-common-service'
46 57
58 #camunda服务
59 VITE_APP_CAMUNDA_URL = 'ms-daop-camunda-server'
47 60
48 #门户接口 61 #门户接口
49 VITE_API_PORTALURL = https://swzl-test.zgsjzc.com/portal 62 VITE_API_PORTALURL = https://swzl-test.zgsjzc.com/portal
50 63
51 #数据资产接口地址 64 #数据资产接口地址
52 VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service 65 VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
66
53 #数据同步接口地址 67 #数据同步接口地址
54 VITE_API_DATA_SYNC = ms-swzl-data-sync-service 68 VITE_API_DATA_SYNC = ms-swzl-data-sync-service
69
55 #消息接口 70 #消息接口
56 VITE_API_MESSAGE = ms-swzl-message-notification-service 71 VITE_API_MESSAGE = ms-swzl-message-notification-service
57 72
58 #新门户接口 73 #新门户接口
59 VITE_API_NEW_PORTAL = ms-daop-zcgl-asset-dam-service 74 VITE_API_NEW_PORTAL = ms-daop-zcgl-asset-dam-service
60 75
76 #企业信息接口
77 VITE_API_PERSONEL_SERVICE = ms-daop-personel-service
61 78
62 # 是否在打包时生成 sourcemap 79 # 是否在打包时生成 sourcemap
63 VITE_BUILD_SOURCEMAP = false 80 VITE_BUILD_SOURCEMAP = false
......
.env.product
...@@ -3,22 +3,31 @@ VITE_APP_TITLE = 数据资产管理系统 ...@@ -3,22 +3,31 @@ VITE_APP_TITLE = 数据资产管理系统
3 # 接口域名 3 # 接口域名
4 VITE_API_BASEURL = http://192.168.6.20:28052/ 4 VITE_API_BASEURL = http://192.168.6.20:28052/
5 # VITE_API_BASEURL = http://49.4.26.201:31709/ 5 # VITE_API_BASEURL = http://49.4.26.201:31709/
6
6 # # 平台用户 接口请地址 7 # # 平台用户 接口请地址
7 # VITE_APP_USER_API_BASEURL = gateway-server 8 # VITE_APP_USER_API_BASEURL = gateway-server
9
8 # # 系统管理 接口地址 10 # # 系统管理 接口地址
9 # VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service 11 # VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
12
10 # # 文件上传请求地址 13 # # 文件上传请求地址
11 # VITE_APP_ADD_FILE = ms-daop-import-data-service 14 # VITE_APP_ADD_FILE = ms-daop-import-data-service
15
12 # # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 16 # # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
13 # VITE_APP_DEBUG_TOOL = 17 # VITE_APP_DEBUG_TOOL =
18
14 # # 是否开启代理 19 # # 是否开启代理
15 # VITE_OPEN_PROXY = true 20 # VITE_OPEN_PROXY = true
21
16 # # vite serve base 22 # # vite serve base
17 # VITE_SERVE_BASE = / 23 # VITE_SERVE_BASE = /
24
18 # # 流程设计访问地址 25 # # 流程设计访问地址
19 # VITE_BPMN_URL = https://workflow.zgsjzc.com 26 # VITE_BPMN_URL = https://workflow.zgsjzc.com
27
20 # # 数据标准、元数据、数据目录 接口地址 28 # # 数据标准、元数据、数据目录 接口地址
21 # VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service 29 # VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service
30
22 # #数据质量接口地址 31 # #数据质量接口地址
23 # VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service 32 # VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
24 33
...@@ -27,10 +36,13 @@ VITE_APP_TITLE = 数据资产管理系统 ...@@ -27,10 +36,13 @@ VITE_APP_TITLE = 数据资产管理系统
27 36
28 # #数据资产接口地址 37 # #数据资产接口地址
29 # VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service 38 # VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
39
30 # #数据同步接口地址 40 # #数据同步接口地址
31 # VITE_API_DATA_SYNC = ms-swzl-data-sync-service 41 # VITE_API_DATA_SYNC = ms-swzl-data-sync-service
42
32 # #消息接口 43 # #消息接口
33 # VITE_API_MESSAGE = ms-swzl-message-notification-service 44 # VITE_API_MESSAGE = ms-swzl-message-notification-service
45
34 # 平台用户 接口请地址 46 # 平台用户 接口请地址
35 VITE_APP_USER_API_BASEURL = gateway-server 47 VITE_APP_USER_API_BASEURL = gateway-server
36 48
...@@ -42,16 +54,25 @@ VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service ...@@ -42,16 +54,25 @@ VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
42 54
43 # 文件上传请求地址 55 # 文件上传请求地址
44 VITE_APP_ADD_FILE = ms-daop-import-data-service 56 VITE_APP_ADD_FILE = ms-daop-import-data-service
57
45 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 58 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
46 VITE_APP_DEBUG_TOOL = 59 VITE_APP_DEBUG_TOOL =
60
47 # 是否开启代理 61 # 是否开启代理
48 VITE_OPEN_PROXY = true 62 VITE_OPEN_PROXY = true
63
49 # vite serve base 64 # vite serve base
50 VITE_SERVE_BASE = / 65 VITE_SERVE_BASE = /
66
51 # 流程设计访问地址 67 # 流程设计访问地址
52 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn 68 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
69
70 #流程服务
71 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
72
53 # 数据标准、元数据、数据目录 接口地址 73 # 数据标准、元数据、数据目录 接口地址
54 VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service 74 VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
75
55 #数据质量接口地址 76 #数据质量接口地址
56 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service 77 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
57 78
...@@ -68,15 +89,24 @@ VITE_APP_DATA_SOURCE_URL = ms-daop-data-source-service ...@@ -68,15 +89,24 @@ VITE_APP_DATA_SOURCE_URL = ms-daop-data-source-service
68 # 文件上传下载接口地址 89 # 文件上传下载接口地址
69 VITE_APP_COMMON_URL = 'ms-daop-common-service' 90 VITE_APP_COMMON_URL = 'ms-daop-common-service'
70 91
92 #camunda服务
93 VITE_APP_CAMUNDA_URL = 'ms-daop-camunda-server'
94
71 #门户接口 95 #门户接口
72 VITE_API_PORTALURL = https://swzl-test.zgsjzc.com/portal 96 VITE_API_PORTALURL = https://swzl-test.zgsjzc.com/portal
73 97
74 #数据资产接口地址 98 #数据资产接口地址
75 VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service 99 VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
100
76 #数据同步接口地址 101 #数据同步接口地址
77 VITE_API_DATA_SYNC = ms-swzl-data-sync-service 102 VITE_API_DATA_SYNC = ms-swzl-data-sync-service
103
78 #消息接口 104 #消息接口
79 VITE_API_MESSAGE = ms-swzl-message-notification-service 105 VITE_API_MESSAGE = ms-swzl-message-notification-service
106
107 #企业信息接口
108 VITE_API_PERSONEL_SERVICE = ms-daop-personel-service
109
80 # 是否在打包时生成 sourcemap 110 # 是否在打包时生成 sourcemap
81 VITE_BUILD_SOURCEMAP = false 111 VITE_BUILD_SOURCEMAP = false
82 # 是否在打包时开启压缩，支持 gzip 和 brotli 112 # 是否在打包时开启压缩，支持 gzip 和 brotli
......
components.d.ts
...@@ -9,6 +9,7 @@ export {} ...@@ -9,6 +9,7 @@ export {}
9 9
10 declare module '@vue/runtime-core' { 10 declare module '@vue/runtime-core' {
11 export interface GlobalComponents { 11 export interface GlobalComponents {
12 ApprovalProcess: typeof import('./src/components/ApprovalProcess/src/ApprovalProcess.vue')['default']
12 Auth: typeof import('./src/components/Auth/index.vue')['default'] 13 Auth: typeof import('./src/components/Auth/index.vue')['default']
13 AuthAll: typeof import('./src/components/AuthAll/index.vue')['default'] 14 AuthAll: typeof import('./src/components/AuthAll/index.vue')['default']
14 ContentWrap: typeof import('./src/components/ContentWrap/src/ContentWrap.vue')['default'] 15 ContentWrap: typeof import('./src/components/ContentWrap/src/ContentWrap.vue')['default']
...@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' { ...@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' {
31 ImageUpload: typeof import('./src/components/ImageUpload/index.vue')['default'] 32 ImageUpload: typeof import('./src/components/ImageUpload/index.vue')['default']
32 LineageGraph: typeof import('./src/components/LineageGraph/index.vue')['default'] 33 LineageGraph: typeof import('./src/components/LineageGraph/index.vue')['default']
33 ListPanel: typeof import('./src/components/ListPanel/index.vue')['default'] 34 ListPanel: typeof import('./src/components/ListPanel/index.vue')['default']
35 LookBpmn: typeof import('./src/components/ApprovalProcess/src/components/LookBpmn.vue')['default']
34 Month: typeof import('./src/components/Schedule/component/month.vue')['default'] 36 Month: typeof import('./src/components/Schedule/component/month.vue')['default']
35 NotAllowed: typeof import('./src/components/NotAllowed/index.vue')['default'] 37 NotAllowed: typeof import('./src/components/NotAllowed/index.vue')['default']
36 PageHeader: typeof import('./src/components/PageHeader/index.vue')['default'] 38 PageHeader: typeof import('./src/components/PageHeader/index.vue')['default']
......
package.json
...@@ -22,7 +22,11 @@ ...@@ -22,7 +22,11 @@
22 "@vueuse/integrations": "^10.1.0", 22 "@vueuse/integrations": "^10.1.0",
23 "@wangeditor/editor": "^5.1.23", 23 "@wangeditor/editor": "^5.1.23",
24 "@wangeditor/editor-for-vue": "^5.1.12", 24 "@wangeditor/editor-for-vue": "^5.1.12",
25 "ant-design-vue": "^3.2.20",
25 "axios": "^1.4.0", 26 "axios": "^1.4.0",
27 "bpmn-js": "^8.10.0",
28 "bpmn-js-token-simulation": "^0.10.0",
29 "camunda-bpmn-moddle": "^4.4.0",
26 "crypto-js": "^4.2.0", 30 "crypto-js": "^4.2.0",
27 "dayjs": "^1.11.7", 31 "dayjs": "^1.11.7",
28 "echarts": "^5.4.3", 32 "echarts": "^5.4.3",
...@@ -32,6 +36,7 @@ ...@@ -32,6 +36,7 @@
32 "hotkeys-js": "^3.10.2", 36 "hotkeys-js": "^3.10.2",
33 "html2canvas": "^1.4.1", 37 "html2canvas": "^1.4.1",
34 "insert-css": "^2.0.0", 38 "insert-css": "^2.0.0",
39 "jquery": "^3.7.1",
35 "lodash-es": "^4.17.21", 40 "lodash-es": "^4.17.21",
36 "md5": "^2.3.0", 41 "md5": "^2.3.0",
37 "mitt": "^3.0.0", 42 "mitt": "^3.0.0",
......
pnpm-lock.yaml
This diff could not be displayed because it is too large.
src/api/modules/queryService.ts
...@@ -268,3 +268,17 @@ export const getAllFlowData = (params) => request({ ...@@ -268,3 +268,17 @@ export const getAllFlowData = (params) => request({
268 method: 'get', 268 method: 'get',
269 params 269 params
270 }) 270 })
271 // 获取资产/价值评估机构数据
272 export const getSingleList = (params) => request({
273 url: `${import.meta.env.VITE_API_PERSONEL_SERVICE}/tenant/singlePage`,
274 method: 'post',
275 data: params
276 })
277 // 获取当前登录人信息
278 export const getCurrentUserInfo = (params) => {
279 return request({
280 url: `${import.meta.env.VITE_API_PERSONEL_SERVICE}/staff/data/get-current-staff`,
281 method: "post",
282 params
283 });
284 };
......
src/api/modules/workFlowService.ts 0 → 100644
1 import request from "@/utils/request";
2 import useUserStore from "@/store/modules/user";
3 const userStore = useUserStore()
4 const userData = JSON.parse(userStore.userData)
5
6 // 获取流程详情。
7 export const getProcessFlowDetail = (params) => request({
8 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/detail/?approvalGuid=${params}`,
9 method: 'post',
10 })
11 // 审批通过
12 export const passFlowData = (params) => request({
13 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/allow-flow`,
14 method: 'post',
15 data: params
16 })
17 // 审批驳回
18 export const rejectFlowData = (params) => request({
19 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/backup-flow`,
20 method: 'post',
21 data: params
22 })
23 // 审批撤销
24 export const revokeFlowData = (params) => request({
25 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow`,
26 method: 'post',
27 data: params
28 })
29 // 删除流程
30 export const deleteFlowData = (params) => request({
31 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/del`,
32 method: 'post',
33 params
34 })
35
36 export const getFlowData = (params) => request({
37 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/page-list`,
38 method: 'post',
39 data: params
40 })
41 export const getCamundaDeploymentId = (flowType) => request({
42 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/get-camunda-deployment-id`,
43 method: 'post',
44 data: {
45 tenantGuid: userData.tenantGuid,
46 flowType:flowType,
47 staffGuid: userData.staffGuid,
48 }
49 })
50
51 export const getDetailDataPromise = (deploymentId)=> request({
52 url: `${import.meta.env.VITE_APP_CAMUNDA_URL}/process-definition/get-detail?deploymentId=${deploymentId}`,
53 method: 'get',
54 })
55
56 export const getProcessNodesPromise = (params)=>request({
57 url: `${import.meta.env.VITE_APP_CAMUNDA_URL}/process-definition/get-process-nodes`,
58 method: 'post',
59 data: params
60 })
src/components/ApprovalProcess/index.ts 0 → 100644
1 import ApprovalProcess from './src/ApprovalProcess.vue'
2
3 export { ApprovalProcess }
src/components/ApprovalProcess/src/ApprovalProcess.vue 0 → 100644
1 <script setup lang="tsx">
2 import LookBpmn from "./components/LookBpmn.vue";
3 import useProcessStore from '@/store/modules/process'
4 import { cloneDeep } from 'lodash-es';
5 import { getProcessNodesPromise } from "@/api/modules/workFlowService"
6 const processStore = useProcessStore()
7 const props = defineProps({
8 deploymentId: {
9 type: String,
10 default: ''
11 },
12 processInstanceId: {
13 type: String,
14 default: ''
15 },
16 });
17 const tableData = ref<any>([])
18 const lookBpmnRef = ref()
19 // const contentRef = ref();
20 // const { height: contentHeight } = useElementSize(contentRef);
21 const renderProcessNodes = () => {
22 let param = {
23 deploymentId: props.deploymentId || null,
24 processInstanceId: props.processInstanceId || null,
25 };
26 getProcessNodesPromise(param).then((res:any) => {
27 if (res.code === "00000") {
28 let data = res.data;
29 if (data) {
30 data.forEach((i, index) => {
31 i.id = i.activityId;
32 i.staffName = "";
33 if (i.staffVOS && i.staffVOS.length > 1) {
34 i.staffVOS.forEach((j) => {
35 j.id = j.staffGuid;
36 j.processName = i.processName;
37 if (j.approvalState) {
38 i.approvalState = j.approvalState;
39 i.approvalSuggest = j.approvalSuggest;
40 i.approvalTime = j.approvalTime;
41 i.staffName = j.staffName;
42 }
43 });
44
45 i.children = i.staffVOS;
46 } else {
47 if (i.staffVOS) {
48 i.approvalState = i.staffVOS[i.staffVOS.length - 1].approvalState;
49 i.approvalSuggest =
50 i.staffVOS[i.staffVOS.length - 1].approvalSuggest;
51 i.approvalTime = i.staffVOS[i.staffVOS.length - 1].approvalTime;
52 i.staffName = i.staffVOS[i.staffVOS.length - 1].staffName;
53 } else {
54 if (i.organisationVOS) {
55 i.approvalState = "";
56 i.approvalSuggest = "";
57 i.approvalTime = "";
58 if (i.organisationVOS.length > 1) {
59 i.staffName =
60 i.organisationVOS[0].organisationName +
61 "等" +
62 i.organisationVOS.length +
63 "个部门";
64 } else {
65 i.staffName = i.organisationVOS[0].organisationName;
66 }
67 } else if (i.positionVOS != null && i.positionVOS.length > 0) {
68 i.approvalState = "";
69 i.approvalSuggest = "";
70 i.approvalTime = "";
71 if (i.positionVOS.length > 1) {
72 if (i.staffName) {
73 i.staffName =
74 i.staffName +
75 "," +
76 i.positionVOS[0].positionName +
77 "等" +
78 i.positionVOS.length +
79 "个岗位";
80 } else {
81 i.staffName = i.positionVOS[0].positionName;
82 }
83 } else {
84 if (i.staffName) {
85 i.staffName =
86 i.staffName + "," + i.positionVOS[0].positionName;
87 } else {
88 i.staffName = i.positionVOS[0].positionName;
89 }
90 }
91 } else if (i.candidateUsers != null && i.candidateUsers != "") {
92 i.approvalState = "";
93 i.approvalSuggest = "";
94 i.approvalTime = "";
95 if (i.candidateUsers.length > 1) {
96 i.staffName =
97 i.candidateUsers[0].staffName +
98 "等" +
99 i.candidateUsers.length +
100 "个人员";
101 if (i.candidateUsers) {
102 i.candidateUsers.forEach((j) => {
103 j.id = j.staffGuid;
104 j.processName = i.processName;
105 });
106 }
107 i.children = i.candidateUsers;
108 } else {
109 i.staffName = i.candidateUsers[0].staffName;
110 }
111 }
112 }
113 }
114 });
115 }
116 tableData.value = data
117 processStore.processNodes = cloneDeep(tableData.value)
118 localStorage.setItem('processTableData',JSON.stringify(tableData.value));
119 nextTick(()=>{
120 setTimeout(()=>{
121 getSpecialEventUserTaskList()
122 })
123 })
124 }
125 });
126 };
127 const getApprovalState = (val: string) => {
128 if (!val) {
129 return "-";
130 } else {
131 if (val == "W") {
132 return (val = "待提交");
133 } else if (val == "N") {
134 return (val = "初始");
135 } else if (val == "A") {
136 return (val = "审批中");
137 } else if (val == "Y") {
138 return (val = "已通过");
139 } else if (val == "F") {
140 return (val = "已完成");
141 } else if (val == "R") {
142 return (val = "已驳回");
143 } else if (val == "C") {
144 return (val = "已撤销");
145 } else {
146 return (val = "");
147 }
148 }
149 }
150 const getSpecialEventUserTaskList = () => {
151 lookBpmnRef.value.getDetailData(props.deploymentId)
152 };
153
154 onBeforeRouteLeave((to, from) =>{
155 processStore.clearStore()
156 })
157 onMounted(() => {
158 renderProcessNodes()
159 });
160 defineExpose({
161 renderProcessNodes
162 })
163 </script>
164
165 <template>
166 <div>
167 <!-- <Table :columns="columns" :data="tableData" :border="false"></Table> -->
168 <el-table tooltip-effect="light" :data="tableData" :border="false" >
169 <el-table-column type="index" label="节点" :width="140" align="left" >
170 <template #default="scope">
171 {{ scope.row.processName ||'-' }}
172 </template>
173 </el-table-column>
174 <el-table-column type="index" label="处理对象" :width="140" align="left" show-overflow-tooltip>
175 <template #default="scope">
176 {{ scope.row.staffName ||'-' }}
177 </template>
178 </el-table-column>
179 <el-table-column type="index" label="操作时间" :width="180" align="left" show-overflow-tooltip >
180 <template #default="scope">
181 {{ scope.row.approvalTime||'-'}}
182 </template>
183 </el-table-column>
184
185 <!-- <el-table-column type="index" label="申请人" :width="100" align="left" >
186 <template #default="scope">
187 {{ scope.row.applyName||'-'}}
188 </template>
189 </el-table-column>
190
191 <el-table-column label="申请时间" :width="180" align="left" >
192 <template #default="scope">
193 {{ scope.row.time||'-'}}
194 </template>
195 </el-table-column> -->
196 <el-table-column label="审批状态" :width="140" align="left" show-overflow-tooltip>
197 <template #default="scope">
198 <div v-if="scope.row.approvalState === 'A'" class='state-sty'>{{ getApprovalState(scope.row.approvalState) }}</div>
199 <div v-else-if="scope.row.approvalState === 'Y'" class='state-sty1'>{{getApprovalState(scope.row.approvalState) }}</div>
200 <div v-else-if="scope.row.approvalState === 'R'" class='state-sty2'>{{ getApprovalState(scope.row.approvalState) }}</div>
201 <div v-else>{{getApprovalState(scope.row.approvalState)}}</div>
202 </template>
203 </el-table-column>
204
205 <el-table-column label="审批原因" align="left" >
206 <template #default="scope">
207 {{ scope.row.approvalSuggest||'-'}}
208 </template>
209 </el-table-column>
210 </el-table>
211 <div class="bpmn-sty pt-20px" style="margin-top: 20px">
212 <span style="font-size:16px;color:#666">{{ '审批流程' }}</span>
213 <el-divider style="margin-bottom:10px!important;margin-top:10px!important" />
214 <LookBpmn ref="lookBpmnRef"></LookBpmn>
215 </div>
216 </div>
217 </template>
218
219 <style lang="scss" scoped>
220 .iframe-sty {
221 width: 100%;
222 border: none;
223 // height: 600px;
224 }
225 :deep(.el-table) {
226 .state-sty {
227 width: 52px;
228 height: 21px;
229 text-align: center;
230 line-height: 21px;
231 background: #FFEEE3;
232 border-radius: 3px;
233 color: #FF8623;
234 }
235 .state-sty1 {
236 width: 52px;
237 height: 21px;
238 text-align: center;
239 line-height: 21px;
240 background: #E3F0F0;
241 border-radius: 3px;
242 color: #4FA1A4;
243 }
244 .state-sty2 {
245 width: 52px;
246 height: 21px;
247 text-align: center;
248 line-height: 21px;
249 background: #FFE4E2;
250 border-radius: 3px;
251 color: #FE4638;
252 }
253 .state-sty3 {
254 width: 52px;
255 height: 21px;
256 text-align: center;
257 line-height: 21px;
258 background: #E3E3E3;
259 border-radius: 3px;
260 color: #323233;
261 }
262 }
263 </style>
src/router/modules/dataAssetRegistry.ts
...@@ -3,7 +3,7 @@ function Layout() { ...@@ -3,7 +3,7 @@ function Layout() {
3 return import('@/layouts/index.vue') 3 return import('@/layouts/index.vue')
4 } 4 }
5 const routes: RouteRecordRaw[] = [ 5 const routes: RouteRecordRaw[] = [
6 { 6 {
7 path: '/data-asset-register/register-managemant', 7 path: '/data-asset-register/register-managemant',
8 component: Layout, 8 component: Layout,
9 meta: { 9 meta: {
...@@ -35,14 +35,8 @@ const routes: RouteRecordRaw[] = [ ...@@ -35,14 +35,8 @@ const routes: RouteRecordRaw[] = [
35 reuse: true 35 reuse: true
36 }, 36 },
37 beforeEnter: (to, from) => { 37 beforeEnter: (to, from) => {
38 if (to.query.type) { 38 to.meta.title = to.query.type == 'edit' ? `编辑-${to.query.name}` : '新建资产登记';
39 to.meta.title = `详情-`; 39 to.meta.editPage = true;
40 return;
41 }
42 if (to.query.guid) {
43 to.meta.title = `编辑-`;
44 to.meta.editPage = true;
45 }
46 } 40 }
47 }, 41 },
48 { 42 {
...@@ -55,11 +49,14 @@ const routes: RouteRecordRaw[] = [ ...@@ -55,11 +49,14 @@ const routes: RouteRecordRaw[] = [
55 breadcrumb: false, 49 breadcrumb: false,
56 cache: true, 50 cache: true,
57 reuse: true 51 reuse: true
52 },
53 beforeEnter: (to, from) => {
54 to.meta.title = `详情-${to.query.name}`;
58 } 55 }
59 } 56 }
60 ], 57 ],
61 }, 58 },
62 { 59 {
63 path: '/data-asset-register/quality-evaluate', 60 path: '/data-asset-register/quality-evaluate',
64 component: Layout, 61 component: Layout,
65 meta: { 62 meta: {
...@@ -92,7 +89,7 @@ const routes: RouteRecordRaw[] = [ ...@@ -92,7 +89,7 @@ const routes: RouteRecordRaw[] = [
92 } 89 }
93 ], 90 ],
94 }, 91 },
95 { 92 {
96 path: '/data-asset-register/value-evaluate', 93 path: '/data-asset-register/value-evaluate',
97 component: Layout, 94 component: Layout,
98 meta: { 95 meta: {
......
src/store/modules/process.ts 0 → 100644
1 const useProcessStore = defineStore(
2 // 唯一ID
3 'process',
4 () => {
5 const processNodes = ref([])
6 const staffVOS = computed(() => { // 最后审批node
7 return processNodes.value.find((item:any) => item.approvalState)
8 })
9 const clearStore = () => {
10 processNodes.value = []
11 }
12 return {
13 processNodes,
14 staffVOS,
15 clearStore
16 }
17 },
18 {
19 persist:{
20 storage: sessionStorage,
21 paths: ['processNodes','staffVOS']
22 }
23 }
24 )
25
26 export default useProcessStore
27
...\ No newline at end of file ...\ No newline at end of file
src/store/modules/user.ts
...@@ -4,7 +4,7 @@ import router from '@/router' ...@@ -4,7 +4,7 @@ import router from '@/router'
4 import { ElMessage } from 'element-plus' 4 import { ElMessage } from 'element-plus'
5 import apiUser from '@/api/modules/user' 5 import apiUser from '@/api/modules/user'
6 import { getCurrentTime } from '@/utils/common' 6 import { getCurrentTime } from '@/utils/common'
7 import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface } from '@/api/modules/queryService' 7 import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface, getCurrentUserInfo } from '@/api/modules/queryService'
8 8
9 const useUserStore = defineStore( 9 const useUserStore = defineStore(
10 // 唯一ID 10 // 唯一ID
...@@ -29,47 +29,49 @@ const useUserStore = defineStore( ...@@ -29,47 +29,49 @@ const useUserStore = defineStore(
29 /* idass的登录页面url，退出登录需要跳转到登录页。*/ 29 /* idass的登录页面url，退出登录需要跳转到登录页。*/
30 const idassLoginUrl = 'https://idaas-test.csbr.cn/login'; 30 const idassLoginUrl = 'https://idaas-test.csbr.cn/login';
31 const timer: any = ref(null); 31 const timer: any = ref(null);
32 //获取token. 32 //获取token.
33 function getToken(data, state) { 33 function getToken(data, state) {
34 data.platformGuid = "7f16f697aec111ef8656fa163e60becd"; 34 data.platformGuid = "7f16f697aec111ef8656fa163e60becd";
35 data.userType = 2; 35 data.userType = 2;
36 data.validateUri = location.origin == 'http://localhost:9000' ? 'http://localhost:9000/' : location.origin + '/'; 36 data.validateUri = location.origin == 'http://localhost:9000' ? 'http://localhost:9000/' : location.origin + '/';
37 return getTokenPromise.value = getTokenByCode(data).then((res: any) => { 37 return getTokenPromise.value = getTokenByCode(data).then((res: any) => {
38 getTokenPromise.value = null; 38 getTokenPromise.value = null;
39 console.log(res); 39 console.log(res);
40 if (res.code == '00000') { 40 if (res.code == '00000') {
41 console.log(res.data); 41 console.log(res.data);
42 isLogin.value = true; 42 isLogin.value = true;
43 localStorage.setItem('code', `${data.code}`); 43 localStorage.setItem('code', `${data.code}`);
44 localStorage.setItem('state', state); 44 localStorage.setItem('state', state);
45 localStorage.setItem('token', res.data.token || ""); 45 localStorage.setItem('token', res.data.token || "");
46 token.value = res.data.access_token; 46 token.value = res.data.access_token;
47 localStorage.setItem('refresh_token', res.data.refreshToken || ""); 47 localStorage.setItem('refresh_token', res.data.refreshToken || "");
48 const expiresIn = (Date.now() + 1700000) + ""; 48 const expiresIn = (Date.now() + 1700000) + "";
49 localStorage.setItem('expiresIn', expiresIn); 49 localStorage.setItem('expiresIn', expiresIn);
50 refreshUserToken(); 50 refreshUserToken();
51 //获取用户信息 51 //获取用户信息
52 account.value = res.data.logonUser 52 account.value = res.data.logonUser
53 userId.value = res.data.userId 53 userId.value = res.data.userId
54 userName.value = res.data.userName 54 userName.value = res.data.userName
55 // userData.value = JSON.stringify(res.data.data); 55 currentTenantGuid.value = res.data.tenantInfoList && res.data.tenantInfoList.length ? res.data.tenantInfoList[0].guid : '';
56 currentTenantGuid.value = res.data.tenantInfoList && res.data.tenantInfoList.length ? res.data.tenantInfoList[0].guid : ''; 56 localStorage.setItem('currentTenantGuid', currentTenantGuid.value);
57 localStorage.setItem('currentTenantGuid', currentTenantGuid.value); 57 let currentTenant = res.data.tenantInfoList?.[0];
58 let currentTenant = res.data.tenantInfoList?.[0]; 58 return getCurrentUserInfo({ tenantGuid: currentTenantGuid.value }).then((result: any) => {
59 return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => { 59 return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => {
60 if (info.code == '00000') { 60 if (info.code == '00000') {
61 localStorage.setItem('userName', currentTenant?.name) 61 localStorage.setItem('userName', currentTenant?.name)
62 localStorage.setItem('userInfoData', JSON.stringify(info.data)); 62 localStorage.setItem('userInfoData', JSON.stringify(info.data));
63 userInfoData.value = info.data; 63 userInfoData.value = info.data;
64 } else { 64 localStorage.setItem('userData', JSON.stringify(result.data));
65 ElMessage.error(info.msg) 65 } else {
66 } 66 ElMessage.error(info.msg)
67 }) 67 }
68 } else { 68 })
69 isLogin.value = false; 69 })
70 // ElMessage.error(res.msg);//授权码被重复使用，不抛出异常。 70 } else {
71 } 71 isLogin.value = false;
72 }); 72 // ElMessage.error(res.msg);//授权码被重复使用，不抛出异常。
73 }
74 });
73 } 75 }
74 76
75 function refreshUserToken() { 77 function refreshUserToken() {
...@@ -80,11 +82,11 @@ const useUserStore = defineStore( ...@@ -80,11 +82,11 @@ const useUserStore = defineStore(
80 const process = async () => { 82 const process = async () => {
81 if (parseInt(expiresIn) - Date.now() < 600000) { 83 if (parseInt(expiresIn) - Date.now() < 600000) {
82 const refreshing = localStorage.getItem('refreshing'); 84 const refreshing = localStorage.getItem('refreshing');
83 let now = new Date(); 85 let now = new Date();
84 if (!refreshing || new Date(refreshing) < now) {//确保多个页面只刷新一次。 86 if (!refreshing || new Date(refreshing) < now) {//确保多个页面只刷新一次。
85 localStorage.setItem('refreshing', now.toISOString()); 87 localStorage.setItem('refreshing', now.toISOString());
86 await refresh(); 88 await refresh();
87 localStorage.removeItem('refreshing'); 89 localStorage.removeItem('refreshing');
88 } 90 }
89 } 91 }
90 } 92 }
...@@ -100,14 +102,14 @@ const useUserStore = defineStore( ...@@ -100,14 +102,14 @@ const useUserStore = defineStore(
100 refreshToken: localStorage.getItem('refresh_token') 102 refreshToken: localStorage.getItem('refresh_token')
101 }).then((resInfo: any) => { 103 }).then((resInfo: any) => {
102 getTokenPromise.value = null; 104 getTokenPromise.value = null;
103 if (resInfo.code == '00000'){ 105 if (resInfo.code == '00000') {
104 localStorage.setItem('token',resInfo.data.accessToken); 106 localStorage.setItem('token', resInfo.data.accessToken);
105 token.value = resInfo.data.accessToken; 107 token.value = resInfo.data.accessToken;
106 localStorage.setItem('refresh_token',resInfo.data.refreshToken); 108 localStorage.setItem('refresh_token', resInfo.data.refreshToken);
107 const expiresIn = (Date.now() + 1700000) + ""; 109 const expiresIn = (Date.now() + 1700000) + "";
108 localStorage.setItem('expiresIn', expiresIn); 110 localStorage.setItem('expiresIn', expiresIn);
109 } else { 111 } else {
110 //会出现同步刷新token就退出登录的问题，去掉这个代码。 112 //会出现同步刷新token就退出登录的问题，去掉这个代码。
111 //logout(true) 113 //logout(true)
112 } 114 }
113 }).catch(() => { 115 }).catch(() => {
...@@ -151,23 +153,23 @@ const useUserStore = defineStore( ...@@ -151,23 +153,23 @@ const useUserStore = defineStore(
151 // 登出 153 // 登出
152 async function logout(isErrorReturn = false, redirect = router.currentRoute.value.fullPath) { 154 async function logout(isErrorReturn = false, redirect = router.currentRoute.value.fullPath) {
153 if (!isErrorReturn && localStorage.getItem('code')) { 155 if (!isErrorReturn && localStorage.getItem('code')) {
154 isLoginOut.value = true; 156 isLoginOut.value = true;
155 loginOut().then(() => { 157 loginOut().then(() => {
156 localStorage.clear() 158 localStorage.clear()
157 account.value = '' 159 account.value = ''
158 userId.value = '' 160 userId.value = ''
159 userName.value = '' 161 userName.value = ''
160 userData.value = '' 162 userData.value = ''
161 token.value = ''; 163 token.value = '';
162 timer.value && clearInterval(timer.value); 164 timer.value && clearInterval(timer.value);
163 isLogin.value = false; 165 isLogin.value = false;
164 userInfoData.value = []; 166 userInfoData.value = [];
165 routeStore.removeRoutes() 167 routeStore.removeRoutes()
166 menuStore.setActived(0) 168 menuStore.setActived(0)
167 tabbar.value = [] 169 tabbar.value = []
168 tabbarMap.value = {} 170 tabbarMap.value = {}
169 window.location.href = idassLoginUrl + '?logout=1'; 171 window.location.href = idassLoginUrl + '?logout=1';
170 }); 172 });
171 } else { 173 } else {
172 let hasCode = localStorage.getItem('code'); 174 let hasCode = localStorage.getItem('code');
173 isLoginOut.value = true; 175 isLoginOut.value = true;
...@@ -228,7 +230,7 @@ const useUserStore = defineStore( ...@@ -228,7 +230,7 @@ const useUserStore = defineStore(
228 mark = 'data-sync' 230 mark = 'data-sync'
229 } else if (item.meta.title == '数据质量') { 231 } else if (item.meta.title == '数据质量') {
230 mark = 'data-quality' 232 mark = 'data-quality'
231 } else if (item.meta.title == '数据盘点') { 233 } else if (item.meta.title == '数据盘点') {
232 mark = 'data-inventory' 234 mark = 'data-inventory'
233 } else if (item.meta.title == '首页') { 235 } else if (item.meta.title == '首页') {
234 mark = 'data-asset-index' 236 mark = 'data-asset-index'
......
src/types/components.d.ts
...@@ -9,6 +9,7 @@ export {} ...@@ -9,6 +9,7 @@ export {}
9 9
10 declare module '@vue/runtime-core' { 10 declare module '@vue/runtime-core' {
11 export interface GlobalComponents { 11 export interface GlobalComponents {
12 ApprovalProcess: typeof import('./../components/ApprovalProcess/src/ApprovalProcess.vue')['default']
12 Auth: typeof import('./../components/Auth/index.vue')['default'] 13 Auth: typeof import('./../components/Auth/index.vue')['default']
13 AuthAll: typeof import('./../components/AuthAll/index.vue')['default'] 14 AuthAll: typeof import('./../components/AuthAll/index.vue')['default']
14 ContentWrap: typeof import('./../components/ContentWrap/src/ContentWrap.vue')['default'] 15 ContentWrap: typeof import('./../components/ContentWrap/src/ContentWrap.vue')['default']
...@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' { ...@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' {
31 ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default'] 32 ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
32 LineageGraph: typeof import('./../components/LineageGraph/index.vue')['default'] 33 LineageGraph: typeof import('./../components/LineageGraph/index.vue')['default']
33 ListPanel: typeof import('./../components/ListPanel/index.vue')['default'] 34 ListPanel: typeof import('./../components/ListPanel/index.vue')['default']
35 LookBpmn: typeof import('./../components/ApprovalProcess/src/components/LookBpmn.vue')['default']
34 Month: typeof import('./../components/Schedule/component/month.vue')['default'] 36 Month: typeof import('./../components/Schedule/component/month.vue')['default']
35 NotAllowed: typeof import('./../components/NotAllowed/index.vue')['default'] 37 NotAllowed: typeof import('./../components/NotAllowed/index.vue')['default']
36 PageHeader: typeof import('./../components/PageHeader/index.vue')['default'] 38 PageHeader: typeof import('./../components/PageHeader/index.vue')['default']
......
src/views/data_asset/importTableField.vue
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
5 <script lang="ts" setup name="importTableField"> 5 <script lang="ts" setup name="importTableField">
6 import { ref } from 'vue'; 6 import { ref } from 'vue';
7 import { 7 import {
8 getDataTypeList,
9 getParamsList 8 getParamsList
10 } from "@/api/modules/dataAsset"; 9 } from "@/api/modules/dataAsset";
11 import { pinyin } from 'pinyin-pro'; 10 import { pinyin } from 'pinyin-pro';
...@@ -80,7 +79,7 @@ const handleFileDataChange = (fileFields, files, sheetName, data) => { ...@@ -80,7 +79,7 @@ const handleFileDataChange = (fileFields, files, sheetName, data) => {
80 } 79 }
81 80
82 const getFieldTypeList = () => { 81 const getFieldTypeList = () => {
83 getDataTypeList({ 82 getParamsList({
84 dictType: "字段类型" 83 dictType: "字段类型"
85 }).then((res: any) => { 84 }).then((res: any) => {
86 fieldTypes.value = []; 85 fieldTypes.value = [];
......
src/views/data_asset/registerCatalogCreate.vue
...@@ -10,8 +10,7 @@ import { ...@@ -10,8 +10,7 @@ import {
10 getAreaData 10 getAreaData
11 } from "@/api/modules/queryService"; 11 } from "@/api/modules/queryService";
12 import { 12 import {
13 getDamTypesList, 13 getParamsList,
14 getSubjectDoaminList,
15 dataSourcesList, 14 dataSourcesList,
16 registerCatalogSave, 15 registerCatalogSave,
17 existDamName, 16 existDamName,
...@@ -570,7 +569,7 @@ onBeforeMount(() => { ...@@ -570,7 +569,7 @@ onBeforeMount(() => {
570 } 569 }
571 return data; 570 return data;
572 } 571 }
573 getDamTypesList({ 572 getParamsList({
574 dictType: "资产类型", 573 dictType: "资产类型",
575 }).then((res: any) => { 574 }).then((res: any) => {
576 if (res.code == proxy.$passCode) { 575 if (res.code == proxy.$passCode) {
...@@ -582,7 +581,7 @@ onBeforeMount(() => { ...@@ -582,7 +581,7 @@ onBeforeMount(() => {
582 proxy.$ElMessage.error(res.msg); 581 proxy.$ElMessage.error(res.msg);
583 } 582 }
584 }) 583 })
585 getSubjectDoaminList({ 584 getParamsList({
586 dictType: "数据资产目录主题名称", 585 dictType: "数据资产目录主题名称",
587 }).then((res: any) => { 586 }).then((res: any) => {
588 if (res.code == proxy.$passCode) { 587 if (res.code == proxy.$passCode) {
......
src/views/data_asset/registerCatalogManagement.vue
...@@ -9,8 +9,7 @@ import { ElMessageBox } from "element-plus"; ...@@ -9,8 +9,7 @@ import { ElMessageBox } from "element-plus";
9 import { useRouter, useRoute } from "vue-router"; 9 import { useRouter, useRoute } from "vue-router";
10 import { MoreFilled } from "@element-plus/icons-vue"; 10 import { MoreFilled } from "@element-plus/icons-vue";
11 import { 11 import {
12 getSubjectDoaminList, 12 getParamsList,
13 getDamTypesList,
14 getDamCatalogTable, 13 getDamCatalogTable,
15 registerCatalogDelete 14 registerCatalogDelete
16 } from "@/api/modules/dataAsset"; 15 } from "@/api/modules/dataAsset";
...@@ -217,7 +216,7 @@ onActivated(() => { ...@@ -217,7 +216,7 @@ onActivated(() => {
217 }); 216 });
218 217
219 onBeforeMount(() => { 218 onBeforeMount(() => {
220 getDamTypesList({ 219 getParamsList({
221 dictType: "资产类型", 220 dictType: "资产类型",
222 }).then((res: any) => { 221 }).then((res: any) => {
223 if (res.code == proxy.$passCode) { 222 if (res.code == proxy.$passCode) {
...@@ -229,7 +228,7 @@ onBeforeMount(() => { ...@@ -229,7 +228,7 @@ onBeforeMount(() => {
229 proxy.$ElMessage.error(res.msg); 228 proxy.$ElMessage.error(res.msg);
230 } 229 }
231 }) 230 })
232 getSubjectDoaminList({ 231 getParamsList({
233 dictType: "数据资产目录主题名称", 232 dictType: "数据资产目录主题名称",
234 }).then((res: any) => { 233 }).then((res: any) => {
235 if (res.code == proxy.$passCode) { 234 if (res.code == proxy.$passCode) {
......
src/views/data_asset/registerDetail.vue
...@@ -258,13 +258,14 @@ const getDetailInfo = () => { ...@@ -258,13 +258,14 @@ const getDetailInfo = () => {
258 const data = res.data || {}; 258 const data = res.data || {};
259 detailInfo.value = data; 259 detailInfo.value = data;
260 assetDetailInfo.value = data; 260 assetDetailInfo.value = data;
261 if (fullPath === route.fullPath) { 261 deploymentId.value = data.camundaDeploymentId;
262 document.title = `详情-${data.daName}`; 262 // if (fullPath === route.fullPath) {
263 } 263 // document.title = `详情-${data.daName}`;
264 let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath); 264 // }
265 if (tab) { 265 // let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
266 tab.meta.title = `详情-${data.daName}`; 266 // if (tab) {
267 } 267 // tab.meta.title = `详情-${data.daName}`;
268 // }
268 isTextTruncated(); 269 isTextTruncated();
269 } else { 270 } else {
270 ElMessage.error(res.msg); 271 ElMessage.error(res.msg);
...@@ -293,11 +294,11 @@ onBeforeMount(() => { ...@@ -293,11 +294,11 @@ onBeforeMount(() => {
293 }); 294 });
294 295
295 onActivated(() => { 296 onActivated(() => {
296 if (assetDetailInfo.value?.daName) { 297 // if (assetDetailInfo.value?.daName) {
297 if (fullPath === route.fullPath) { 298 // if (fullPath === route.fullPath) {
298 document.title = `详情-${assetDetailInfo.value?.daName}`; 299 // document.title = `详情-${assetDetailInfo.value?.daName}`;
299 } 300 // }
300 } 301 // }
301 }); 302 });
302 303
303 onMounted(() => { 304 onMounted(() => {
...@@ -399,7 +400,7 @@ const approveTableInfo: any = ref({ ...@@ -399,7 +400,7 @@ const approveTableInfo: any = ref({
399 show: false 400 show: false
400 } 401 }
401 }); 402 });
402 403 const deploymentId = ref('');
403 const tenantDetail: any = ref({}); 404 const tenantDetail: any = ref({});
404 405
405 /** 获取当前登录会员，服务商，企业等详情。 */ 406 /** 获取当前登录会员，服务商，企业等详情。 */
...@@ -490,7 +491,7 @@ const btnClick = (btn) => { ...@@ -490,7 +491,7 @@ const btnClick = (btn) => {
490 qualityEvaluateFormItems.value[1].disabled = true; 491 qualityEvaluateFormItems.value[1].disabled = true;
491 } else { 492 } else {
492 qualityEvaluateFormItems.value[1].default = null; 493 qualityEvaluateFormItems.value[1].default = null;
493 qualityEvaluateFormItems.value[1].disabled = false; 494 qualityEvaluateFormItems.value[1].disabled = false;
494 } 495 }
495 } else if (type == 'reject') { 496 } else if (type == 'reject') {
496 rejectDialogInfo.value.visible = true; 497 rejectDialogInfo.value.visible = true;
...@@ -1593,7 +1594,9 @@ const handleClickDamCatalogDetail = () => { ...@@ -1593,7 +1594,9 @@ const handleClickDamCatalogDetail = () => {
1593 </ContentWrap> 1594 </ContentWrap>
1594 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px" 1595 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
1595 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v"> 1596 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v">
1596 <Table :tableInfo="approveTableInfo" /> 1597 <!-- <Table :tableInfo="approveTableInfo" /> -->
1598 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
1599 </ApprovalProcess>
1597 </ContentWrap> 1600 </ContentWrap>
1598 <ContentWrap id="id-certificate" v-if="tabsInfo.tabs.find(t => t.name == 'certificate')" title="证件信息" 1601 <ContentWrap id="id-certificate" v-if="tabsInfo.tabs.find(t => t.name == 'certificate')" title="证件信息"
1599 expandSwicth style="margin-top: 15px" :isExpand="certificateExpand" @expand="(v) => certificateExpand = v"> 1602 expandSwicth style="margin-top: 15px" :isExpand="certificateExpand" @expand="(v) => certificateExpand = v">
...@@ -2065,4 +2068,4 @@ const handleClickDamCatalogDetail = () => { ...@@ -2065,4 +2068,4 @@ const handleClickDamCatalogDetail = () => {
2065 } 2068 }
2066 } 2069 }
2067 } 2070 }
2068 </style>
...\ No newline at end of file ...\ No newline at end of file
2071 </style>
......
src/views/data_inventory/dictionary.vue
...@@ -23,7 +23,6 @@ import { ...@@ -23,7 +23,6 @@ import {
23 exportDictionary, 23 exportDictionary,
24 showDictionary, 24 showDictionary,
25 getDataBaseList, 25 getDataBaseList,
26 getDataTypeList,
27 getCoderuleList, 26 getCoderuleList,
28 saveDictionaryData, 27 saveDictionaryData,
29 getDictionaryFileds, 28 getDictionaryFileds,
...@@ -608,7 +607,7 @@ const getDataType = (type) => { ...@@ -608,7 +607,7 @@ const getDataType = (type) => {
608 let params = { 607 let params = {
609 paramCode: type 608 paramCode: type
610 } 609 }
611 getDataTypeList(params).then((res: any) => { 610 getParamsList(params).then((res: any) => {
612 if (res.code == proxy.$passCode) { 611 if (res.code == proxy.$passCode) {
613 const data = res.data 612 const data = res.data
614 if (type == 'DATA_TYPE') { 613 if (type == 'DATA_TYPE') {
......
src/views/data_product/productDemandsDetail.vue
...@@ -12,7 +12,7 @@ import Dialog from "@/components/Dialog/index.vue"; ...@@ -12,7 +12,7 @@ import Dialog from "@/components/Dialog/index.vue";
12 import useUserStore from "@/store/modules/user"; 12 import useUserStore from "@/store/modules/user";
13 import useDataAssetStore from "@/store/modules/dataAsset"; 13 import useDataAssetStore from "@/store/modules/dataAsset";
14 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common'; 14 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
15 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getSubjectDoaminList } from "@/api/modules/dataAsset"; 15 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList } from "@/api/modules/dataAsset";
16 import { getDemandDetail, demandSave, competitionSave, marketSave, demandUpdate, competitionUpdate, marketUpdate, checkDemandName, getParamsDataList, getProductTypeList } from "@/api/modules/dataProduct"; 16 import { getDemandDetail, demandSave, competitionSave, marketSave, demandUpdate, competitionUpdate, marketUpdate, checkDemandName, getParamsDataList, getProductTypeList } from "@/api/modules/dataProduct";
17 import { getMatchDetail } from "@/api/modules/dataFinance"; 17 import { getMatchDetail } from "@/api/modules/dataFinance";
18 import { useValidator } from '@/hooks/useValidator'; 18 import { useValidator } from '@/hooks/useValidator';
...@@ -353,7 +353,7 @@ const algorithmFormItem = ref([ ...@@ -353,7 +353,7 @@ const algorithmFormItem = ref([
353 block: true, 353 block: true,
354 clearable: true, 354 clearable: true,
355 required: true, 355 required: true,
356 }, 356 },
357 // { 357 // {
358 // label: '赛事图片', 358 // label: '赛事图片',
359 // tip: '支持扩展名：.jpg .png .jpeg', 359 // tip: '支持扩展名：.jpg .png .jpeg',
...@@ -431,7 +431,7 @@ const elementFormItems = ref([ ...@@ -431,7 +431,7 @@ const elementFormItems = ref([
431 clearable: true, 431 clearable: true,
432 required: true, 432 required: true,
433 }, 433 },
434 { 434 {
435 label: '产品类别', 435 label: '产品类别',
436 type: 'tree-select', 436 type: 'tree-select',
437 placeholder: '请选择', 437 placeholder: '请选择',
...@@ -464,7 +464,7 @@ const elementFormItems = ref([ ...@@ -464,7 +464,7 @@ const elementFormItems = ref([
464 clearable: true, 464 clearable: true,
465 disabled: false, 465 disabled: false,
466 required: true, 466 required: true,
467 }, 467 },
468 { 468 {
469 label: '产品预算', 469 label: '产品预算',
470 type: 'checkbox-input-item', 470 type: 'checkbox-input-item',
...@@ -860,7 +860,7 @@ const submitForm = (btn, formEl, tosub = false) => { ...@@ -860,7 +860,7 @@ const submitForm = (btn, formEl, tosub = false) => {
860 ElMessage.error(res.msg); 860 ElMessage.error(res.msg);
861 } 861 }
862 }) 862 })
863 } 863 }
864 } 864 }
865 } else { 865 } else {
866 nextTick(() => { 866 nextTick(() => {
...@@ -1112,7 +1112,7 @@ const initMethodByInterfaceType = ref({ ...@@ -1112,7 +1112,7 @@ const initMethodByInterfaceType = ref({
1112 proxy.$ElMessage.error(res.msg); 1112 proxy.$ElMessage.error(res.msg);
1113 } 1113 }
1114 }) 1114 })
1115 getSubjectDoaminList().then((res: any) => { 1115 getParamsList({dictType: 'SUBJECT-DOMAIN'}).then((res: any) => {
1116 if (res.code == proxy.$passCode) { 1116 if (res.code == proxy.$passCode) {
1117 subjectDomainListData.value = res.data || []; 1117 subjectDomainListData.value = res.data || [];
1118 let item = demandFormItems.value.find(item => item.field == 'subjectDomain'); 1118 let item = demandFormItems.value.find(item => item.field == 'subjectDomain');
......
src/views/data_product/productListing.vue
...@@ -15,7 +15,7 @@ import { TableColumnWidth } from '@/utils/enum'; ...@@ -15,7 +15,7 @@ import { TableColumnWidth } from '@/utils/enum';
15 import TableTools from "@/components/Tools/table_tools.vue"; 15 import TableTools from "@/components/Tools/table_tools.vue";
16 import Table from "@/components/Table/index.vue"; 16 import Table from "@/components/Table/index.vue";
17 import Dialog from "@/components/Dialog/index.vue"; 17 import Dialog from "@/components/Dialog/index.vue";
18 import { getDamTypesList } from "@/api/modules/dataAsset"; 18 import { getParamsList } from "@/api/modules/dataAsset";
19 19
20 const { proxy } = getCurrentInstance() as any; 20 const { proxy } = getCurrentInstance() as any;
21 const router = useRouter(); 21 const router = useRouter();
...@@ -284,7 +284,7 @@ onBeforeMount(() => { ...@@ -284,7 +284,7 @@ onBeforeMount(() => {
284 // proxy.$ElMessage.error(res.msg); 284 // proxy.$ElMessage.error(res.msg);
285 // } 285 // }
286 // }) 286 // })
287 getDamTypesList({ 287 getParamsList({
288 dictType: "资产类型", 288 dictType: "资产类型",
289 }).then((res: any) => { 289 }).then((res: any) => {
290 if (res.code == proxy.$passCode) { 290 if (res.code == proxy.$passCode) {
......
src/views/data_product/productListingDetail.vue
...@@ -14,7 +14,7 @@ import useDataAssetStore from "@/store/modules/dataAsset"; ...@@ -14,7 +14,7 @@ import useDataAssetStore from "@/store/modules/dataAsset";
14 import { changeNum } from '@/utils/common'; 14 import { changeNum } from '@/utils/common';
15 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common'; 15 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
16 import { getAreaData, getServiceTenants } from "@/api/modules/queryService"; 16 import { getAreaData, getServiceTenants } from "@/api/modules/queryService";
17 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getSubjectDoaminList, getServiceDetail } from "@/api/modules/dataAsset"; 17 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList, getServiceDetail } from "@/api/modules/dataAsset";
18 import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, getParamsDataList } from "@/api/modules/dataProduct"; 18 import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, getParamsDataList } from "@/api/modules/dataProduct";
19 import { getMatchDetail } from "@/api/modules/dataFinance"; 19 import { getMatchDetail } from "@/api/modules/dataFinance";
20 import { useValidator } from '@/hooks/useValidator'; 20 import { useValidator } from '@/hooks/useValidator';
...@@ -1062,7 +1062,7 @@ onBeforeMount(() => { ...@@ -1062,7 +1062,7 @@ onBeforeMount(() => {
1062 // ElMessage.error(res.msg); 1062 // ElMessage.error(res.msg);
1063 // } 1063 // }
1064 // }); 1064 // });
1065 getSubjectDoaminList({ 1065 getParamsList({
1066 dictType: "数据资产目录主题名称", 1066 dictType: "数据资产目录主题名称",
1067 }).then((res: any) => { 1067 }).then((res: any) => {
1068 if (res.code == proxy.$passCode) { 1068 if (res.code == proxy.$passCode) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!