Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
72f8f1fe by lihua
Options

登录接口联调

1 parent 083b1ac3
Expand all
Inline Side-by-side
Showing 18 changed files with 189 additions and 105 deletions
.env.development
...@@ -4,10 +4,16 @@ VITE_APP_TITLE = 可信数据服务平台 ...@@ -4,10 +4,16 @@ VITE_APP_TITLE = 可信数据服务平台
4 # VITE_API_BASEURL = https://www.zgsjzc.com/api 4 # VITE_API_BASEURL = https://www.zgsjzc.com/api
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:58052/ 7 VITE_API_BASEURL = http://10.4.82.30:58053/
8 8
9 VITE_IDASS_BASEURL = https://idaas-test.csbr.cn/login 9 VITE_IDASS_BASEURL = https://idaas-test.csbr.cn/login
10 10
11 # idaas测试环境
12 VITE_API_IDAAS_URL = http://114.115.131.96:18080
13
14 # 可信空间连接器通用的平台用户接口地址
15 VITE_API_COMMON_URL = ms-connector-trust-data-space-service
16
11 # 平台用户 接口请地址 17 # 平台用户 接口请地址
12 VITE_APP_USER_API_BASEURL = gateway-server 18 VITE_APP_USER_API_BASEURL = gateway-server
13 19
......
package.json
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
49 "pinia-plugin-persistedstate": "^2.2.0", 49 "pinia-plugin-persistedstate": "^2.2.0",
50 "pinyin-pro": "^3.24.2", 50 "pinyin-pro": "^3.24.2",
51 "sortablejs": "^1.15.1", 51 "sortablejs": "^1.15.1",
52 "uuid": "^13.0.0",
52 "vant": "^4.9.8", 53 "vant": "^4.9.8",
53 "vue": "^3.2.47", 54 "vue": "^3.2.47",
54 "vue-router": "^4.1.6", 55 "vue-router": "^4.1.6",
......
pnpm-lock.yaml
...@@ -107,6 +107,9 @@ dependencies: ...@@ -107,6 +107,9 @@ dependencies:
107 sortablejs: 107 sortablejs:
108 specifier: ^1.15.1 108 specifier: ^1.15.1
109 version: 1.15.4 109 version: 1.15.4
110 uuid:
111 specifier: ^13.0.0
112 version: 13.0.0
110 vant: 113 vant:
111 specifier: ^4.9.8 114 specifier: ^4.9.8
112 version: 4.9.9(vue@3.5.13) 115 version: 4.9.9(vue@3.5.13)
...@@ -9347,6 +9350,11 @@ packages: ...@@ -9347,6 +9350,11 @@ packages:
9347 base64-arraybuffer: 1.0.2 9350 base64-arraybuffer: 1.0.2
9348 dev: false 9351 dev: false
9349 9352
9353 /uuid@13.0.0:
9354 resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}
9355 hasBin: true
9356 dev: false
9357
9350 /v8flags@4.0.1: 9358 /v8flags@4.0.1:
9351 resolution: {integrity: sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==} 9359 resolution: {integrity: sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==}
9352 engines: {node: '>= 10.13.0'} 9360 engines: {node: '>= 10.13.0'}
......
src/api/modules/dataAsset.ts
...@@ -280,7 +280,7 @@ export const getParamsList = (params) => request({ ...@@ -280,7 +280,7 @@ export const getParamsList = (params) => request({
280 }) 280 })
281 281
282 export const getDamTypesList = (params) => request({ 282 export const getDamTypesList = (params) => request({
283 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/dam/get-by-dictType`, 283 url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/dam/get-by-dictType`,
284 method: 'get', 284 method: 'get',
285 params 285 params
286 }) 286 })
......
src/api/modules/dataDelivery.ts
...@@ -3,98 +3,98 @@ import request from "@/utils/request"; ...@@ -3,98 +3,98 @@ import request from "@/utils/request";
3 /** 数据交付 */ 3 /** 数据交付 */
4 4
5 export const getPageList = (params) => request({ 5 export const getPageList = (params) => request({
6 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/page-list`, 6 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/page-list`,
7 method: 'post', 7 method: 'post',
8 data: params 8 data: params
9 }) 9 })
10 10
11 export const deleteDeliveryContract = (params) => request({ 11 export const deleteDeliveryContract = (params) => request({
12 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/delete`, 12 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/delete`,
13 method: 'delete', 13 method: 'delete',
14 data: params 14 data: params
15 }); 15 });
16 16
17 /** 获取查看核验信息明细接口 */ 17 /** 获取查看核验信息明细接口 */
18 export const getDeliveryVerifyDetail = (guid) => request({ 18 export const getDeliveryVerifyDetail = (guid) => request({
19 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/verify-detail?deliveryGuid=${guid}`, 19 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/verify-detail?deliveryGuid=${guid}`,
20 method: 'get' 20 method: 'get'
21 }); 21 });
22 22
23 /** 检验是否通过的提示 */ 23 /** 检验是否通过的提示 */
24 export const verifyDetailStatusChange = (guid) => request({ 24 export const verifyDetailStatusChange = (guid) => request({
25 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/verify-is-reject?deliveryGuid=${guid}`, 25 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/verify-is-reject?deliveryGuid=${guid}`,
26 method: 'get' 26 method: 'get'
27 }); 27 });
28 28
29 /** 更新核验状态 */ 29 /** 更新核验状态 */
30 export const verifyStatusChange = (params) => request({ 30 export const verifyStatusChange = (params) => request({
31 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/verify-status-change`, 31 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/verify-status-change`,
32 method: 'post', 32 method: 'post',
33 data: params 33 data: params
34 }) 34 })
35 35
36 /** 交付合约 */ 36 /** 交付合约 */
37 export const deliveryContract = (guid) => request({ 37 export const deliveryContract = (guid) => request({
38 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/delivery?deliveryGuid=${guid}`, 38 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/delivery?deliveryGuid=${guid}`,
39 method: 'post' 39 method: 'post'
40 }) 40 })
41 41
42 /** 数据使用 */ 42 /** 数据使用 */
43 export const getDataUsePageList = (params) => request({ 43 export const getDataUsePageList = (params) => request({
44 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/page-list`, 44 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/page-list`,
45 method: 'post', 45 method: 'post',
46 data: params 46 data: params
47 }) 47 })
48 48
49 /** 删除数据使用 */ 49 /** 删除数据使用 */
50 export const deleteDataUse = (params) => request({ 50 export const deleteDataUse = (params) => request({
51 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/delete`, 51 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/delete`,
52 method: 'delete', 52 method: 'delete',
53 data: params 53 data: params
54 }); 54 });
55 55
56 /** 下载数据 */ 56 /** 下载数据 */
57 export const downloadTableData = (params) => request({ 57 export const downloadTableData = (params) => request({
58 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/download?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`, 58 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/download?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
59 method: 'get', 59 method: 'get',
60 responseType: 'blob' 60 responseType: 'blob'
61 }); 61 });
62 62
63 /** 下载数据前的检查 */ 63 /** 下载数据前的检查 */
64 export const downloadTableDataCheck = (params) => request({ 64 export const downloadTableDataCheck = (params) => request({
65 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/download-check?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`, 65 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/download-check?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
66 method: 'get' 66 method: 'get'
67 }); 67 });
68 68
69 /** 数据使用中查看资产表的数据 */ 69 /** 数据使用中查看资产表的数据 */
70 export const queryUseData = (params) => request({ 70 export const queryUseData = (params) => request({
71 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/read?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`, 71 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/read?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
72 method: 'get' 72 method: 'get'
73 }); 73 });
74 74
75 75
76 /** 数据使用中复制 */ 76 /** 数据使用中复制 */
77 export const queryCopyData = (params) => request({ 77 export const queryCopyData = (params) => request({
78 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/copy?userGuid=${params.userGuid}`, 78 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/copy?userGuid=${params.userGuid}`,
79 method: 'get' 79 method: 'get'
80 }); 80 });
81 81
82 /** 分发连接器 */ 82 /** 分发连接器 */
83 export const distributeContract = (params) => request({ 83 export const distributeContract = (params) => request({
84 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/distribute`, 84 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/distribute`,
85 method: 'post', 85 method: 'post',
86 data: params 86 data: params
87 }) 87 })
88 88
89 /** 分发提前校验接口 */ 89 /** 分发提前校验接口 */
90 export const checkDistributeContract = (params) => request({ 90 export const checkDistributeContract = (params) => request({
91 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/check-distribute`, 91 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/check-distribute`,
92 method: 'post', 92 method: 'post',
93 data: params 93 data: params
94 }) 94 })
95 95
96 /** 获取数据使用对应的策略信息 */ 96 /** 获取数据使用对应的策略信息 */
97 export const getContractStrategy = (useGuid ) => request({ 97 export const getContractStrategy = (useGuid ) => request({
98 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/get-policy?useGuid=${useGuid}`, 98 url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/get-policy?useGuid=${useGuid}`,
99 method: 'get' 99 method: 'get'
100 }); 100 });
...\ No newline at end of file ...\ No newline at end of file
......
src/api/modules/dataIdentify.ts
...@@ -5,49 +5,49 @@ import request from "@/utils/request"; ...@@ -5,49 +5,49 @@ import request from "@/utils/request";
5 /** 企业认证 **/ 5 /** 企业认证 **/
6 // 企业认证分页 6 // 企业认证分页
7 export const getEnterpriseList = (params) => request({ 7 export const getEnterpriseList = (params) => request({
8 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/page-list`, 8 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/page-list`,
9 method: 'post', 9 method: 'post',
10 data: params 10 data: params
11 }) 11 })
12 12
13 // 企业认证详情 13 // 企业认证详情
14 export const getEnterpriseDetail = (params) => request({ 14 export const getEnterpriseDetail = (params) => request({
15 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail`, 15 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail`,
16 method: 'get', 16 method: 'get',
17 params 17 params
18 }) 18 })
19 19
20 // 企业认证新增 20 // 企业认证新增
21 export const enterpriseSave = (params) => request({ 21 export const enterpriseSave = (params) => request({
22 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/save`, 22 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/save`,
23 method: 'post', 23 method: 'post',
24 data: params 24 data: params
25 }) 25 })
26 26
27 // 企业认证修改 27 // 企业认证修改
28 export const enterpriseUpdate = (params) => request({ 28 export const enterpriseUpdate = (params) => request({
29 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/update`, 29 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/update`,
30 method: 'put', 30 method: 'put',
31 data: params 31 data: params
32 }) 32 })
33 33
34 // 企业认证删除 34 // 企业认证删除
35 export const enterpriseDelete = (params) => request({ 35 export const enterpriseDelete = (params) => request({
36 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/delete`, 36 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/delete`,
37 method: 'delete', 37 method: 'delete',
38 data: params 38 data: params
39 }) 39 })
40 40
41 // 企业认证变更删除 41 // 企业认证变更删除
42 export const enterpriseChangeDelete = (params) => request({ 42 export const enterpriseChangeDelete = (params) => request({
43 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/change/delete`, 43 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/change/delete`,
44 method: 'delete', 44 method: 'delete',
45 data: params 45 data: params
46 }) 46 })
47 47
48 // 企业认证最后一级审批 48 // 企业认证最后一级审批
49 export const enterpriseApprove = (params) => request({ 49 export const enterpriseApprove = (params) => request({
50 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/last-approve`, 50 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/last-approve`,
51 method: 'post', 51 method: 'post',
52 data: params 52 data: params
53 }) 53 })
...@@ -75,7 +75,7 @@ export const getTaskExecutionLog = (params) => request({ ...@@ -75,7 +75,7 @@ export const getTaskExecutionLog = (params) => request({
75 75
76 // 获取企业认证流程列表 76 // 获取企业认证流程列表
77 export const getFlowEnterpriseList = (params) => request({ 77 export const getFlowEnterpriseList = (params) => request({
78 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/flow/page-list`, 78 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/flow/page-list`,
79 method: 'post', 79 method: 'post',
80 data: params 80 data: params
81 }) 81 })
...@@ -89,14 +89,14 @@ export const getUserTenant = () => request({ ...@@ -89,14 +89,14 @@ export const getUserTenant = () => request({
89 89
90 // 获取企业信息 90 // 获取企业信息
91 export const getEnterpriseData = (params) => request({ 91 export const getEnterpriseData = (params) => request({
92 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`, 92 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail-by-logonUser`,
93 method: 'get', 93 method: 'get',
94 params 94 params
95 }) 95 })
96 96
97 // 修改需求上架状态 97 // 修改需求上架状态
98 export const updateDemandGrounding = (params) => request({ 98 export const updateDemandGrounding = (params) => request({
99 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/demand/update-grounding-pick`, 99 url: `${import.meta.env.VITE_API_COMMON_URL}/demand/update-grounding-pick`,
100 method: 'post', 100 method: 'post',
101 data: params 101 data: params
102 }) 102 })
......
src/api/modules/dataRequire.ts
...@@ -2,7 +2,7 @@ import request from "@/utils/request"; ...@@ -2,7 +2,7 @@ import request from "@/utils/request";
2 2
3 // 最后一级节点审批通过 3 // 最后一级节点审批通过
4 export const contractApprove = (params, serviceTenantGuid:any = null) => request({ 4 export const contractApprove = (params, serviceTenantGuid:any = null) => request({
5 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/data-contract/submit-flow${serviceTenantGuid?`?serviceTenantGuid=${serviceTenantGuid}`:''}`, 5 url: `${import.meta.env.VITE_API_COMMON_URL}/data-contract/submit-flow${serviceTenantGuid?`?serviceTenantGuid=${serviceTenantGuid}`:''}`,
6 method: 'post', 6 method: 'post',
7 data: params 7 data: params
8 }) 8 })
...@@ -10,49 +10,49 @@ export const contractApprove = (params, serviceTenantGuid:any = null) => request ...@@ -10,49 +10,49 @@ export const contractApprove = (params, serviceTenantGuid:any = null) => request
10 /** 企业认证 **/ 10 /** 企业认证 **/
11 // 企业认证分页 11 // 企业认证分页
12 export const getEnterpriseList = (params) => request({ 12 export const getEnterpriseList = (params) => request({
13 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/page-list`, 13 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/page-list`,
14 method: 'post', 14 method: 'post',
15 data: params 15 data: params
16 }) 16 })
17 17
18 // 企业认证详情 18 // 企业认证详情
19 export const getEnterpriseDetail = (params) => request({ 19 export const getEnterpriseDetail = (params) => request({
20 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail`, 20 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail`,
21 method: 'get', 21 method: 'get',
22 params 22 params
23 }) 23 })
24 24
25 // 企业认证新增 25 // 企业认证新增
26 export const enterpriseSave = (params) => request({ 26 export const enterpriseSave = (params) => request({
27 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/save`, 27 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/save`,
28 method: 'post', 28 method: 'post',
29 data: params 29 data: params
30 }) 30 })
31 31
32 // 企业认证修改 32 // 企业认证修改
33 export const enterpriseUpdate = (params) => request({ 33 export const enterpriseUpdate = (params) => request({
34 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/update`, 34 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/update`,
35 method: 'put', 35 method: 'put',
36 data: params 36 data: params
37 }) 37 })
38 38
39 // 企业认证删除 39 // 企业认证删除
40 export const enterpriseDelete = (params) => request({ 40 export const enterpriseDelete = (params) => request({
41 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/delete`, 41 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/delete`,
42 method: 'delete', 42 method: 'delete',
43 data: params 43 data: params
44 }) 44 })
45 45
46 // 企业认证变更删除 46 // 企业认证变更删除
47 export const enterpriseChangeDelete = (params) => request({ 47 export const enterpriseChangeDelete = (params) => request({
48 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/change/delete`, 48 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/change/delete`,
49 method: 'delete', 49 method: 'delete',
50 data: params 50 data: params
51 }) 51 })
52 52
53 // 企业认证最后一级审批 53 // 企业认证最后一级审批
54 export const enterpriseApprove = (params) => request({ 54 export const enterpriseApprove = (params) => request({
55 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/last-approve`, 55 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/last-approve`,
56 method: 'post', 56 method: 'post',
57 data: params 57 data: params
58 }) 58 })
...@@ -80,7 +80,7 @@ export const getTaskExecutionLog = (params) => request({ ...@@ -80,7 +80,7 @@ export const getTaskExecutionLog = (params) => request({
80 80
81 // 获取企业认证流程列表 81 // 获取企业认证流程列表
82 export const getFlowEnterpriseList = (params) => request({ 82 export const getFlowEnterpriseList = (params) => request({
83 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/flow/page-list`, 83 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/flow/page-list`,
84 method: 'post', 84 method: 'post',
85 data: params 85 data: params
86 }) 86 })
...@@ -94,7 +94,7 @@ export const getUserTenant = () => request({ ...@@ -94,7 +94,7 @@ export const getUserTenant = () => request({
94 94
95 // 获取企业信息 95 // 获取企业信息
96 export const getEnterpriseData = (params) => request({ 96 export const getEnterpriseData = (params) => request({
97 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`, 97 url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail-by-logonUser`,
98 method: 'get', 98 method: 'get',
99 params 99 params
100 }) 100 })
...@@ -103,47 +103,47 @@ export const getEnterpriseData = (params) => request({ ...@@ -103,47 +103,47 @@ export const getEnterpriseData = (params) => request({
103 103
104 // 连接器分页 104 // 连接器分页
105 export const getConnectorList = (params) => request({ 105 export const getConnectorList = (params) => request({
106 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/page-list`, 106 url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/page-list`,
107 method: 'post', 107 method: 'post',
108 data: params 108 data: params
109 }) 109 })
110 110
111 /** 保存 */ 111 /** 保存 */
112 export const saveConnector = (params) => request({ 112 export const saveConnector = (params) => request({
113 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/save`, 113 url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/save`,
114 method: 'post', 114 method: 'post',
115 data: params 115 data: params
116 }) 116 })
117 117
118 /** 更新 */ 118 /** 更新 */
119 export const updateConnector = (params) => request({ 119 export const updateConnector = (params) => request({
120 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/update`, 120 url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/update`,
121 method: 'put', 121 method: 'put',
122 data: params 122 data: params
123 }) 123 })
124 124
125 /** 变更的重新提交 */ 125 /** 变更的重新提交 */
126 export const changeSaveConnector = (params) => request({ 126 export const changeSaveConnector = (params) => request({
127 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/change-save`, 127 url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/change-save`,
128 method: 'post', 128 method: 'post',
129 data: params 129 data: params
130 }) 130 })
131 131
132 /** 删除 */ 132 /** 删除 */
133 export const deleteConnector = (params) => request({ 133 export const deleteConnector = (params) => request({
134 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/delete`, 134 url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/delete`,
135 method: 'delete', 135 method: 'delete',
136 data: params 136 data: params
137 }) 137 })
138 138
139 export const getConnectorDetail = (guid) => request({ 139 export const getConnectorDetail = (guid) => request({
140 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/detail?guid=${guid}`, 140 url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/detail?guid=${guid}`,
141 method: 'get' 141 method: 'get'
142 }) 142 })
143 143
144 /** 判断当前用户企业是否已申请连接器 */ 144 /** 判断当前用户企业是否已申请连接器 */
145 export const checkConnector = () => request({ 145 export const checkConnector = () => request({
146 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/check-connector `, 146 url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/check-connector `,
147 method: 'get' 147 method: 'get'
148 }) 148 })
149 149
......
src/api/modules/idaas.ts
...@@ -16,26 +16,46 @@ export const getLoginWebAuthn = () => request({ ...@@ -16,26 +16,46 @@ export const getLoginWebAuthn = () => request({
16 16
17 export const getPictureCode = () => request({ 17 export const getPictureCode = () => request({
18 url: `/user/get-picture-code`, 18 url: `/user/get-picture-code`,
19 method: 'get', 19 method: 'idaasGet',
20 }) 20 })
21 21
22 // 通用图形验证码 22 // 通用图形验证码
23 export const commoncheckImgCode = () => request({ 23 export const commoncheckImgCode = () => request({
24 url: `/ms-daop-user-service/user/validate-code/get`, 24 url: `/user/validate-code/get`,
25 method: 'get', 25 method: 'idaasGet',
26 responseType: 'blob' 26 responseType: 'blob'
27 }) 27 })
28
29 export const sendCode = (params:{
30 logonUser: string,
31 mobileNo: string,
32 validateCodeGuid: string,
33 validateCode: string
34 }) => request({
35 url: `/user/send-msg-code?logonUser=${params.logonUser}&mobileNo=${params.mobileNo}&validateCodeGuid=${params.validateCodeGuid}&validateCode=${params.validateCode}`,
36 method: 'idaasGet',
37 })
38
39 export const resetPwd = (params:{
40 mobileNo: string,
41 smsCode: string,
42 pwd: string,
43 logonUser: string
44 }) => request({
45 url: `/user/reset-pwd?mobileNo=${params.mobileNo}&smsCode=${params.smsCode}&pwd=${params.pwd}&logonUser=${params.logonUser}`,
46 method: 'idaasput',
47 })
28 48
29 // 校验图形验证码 49 // 校验图形验证码
30 export const checkImgCode = (params) => request({ 50 export const checkImgCode = (params) => request({
31 url: `${import.meta.env.VITE_APP_AUTH_URL}/portal/check`, 51 url: `${import.meta.env.VITE_API_COMMON_URL}/portal/check`,
32 method: 'post', 52 method: 'post',
33 data: params 53 data: params
34 }); 54 });
35 55
36 // 获取图形验证码 56 // 获取图形验证码
37 export const getImgCodeSrc = (params) => request({ 57 export const getImgCodeSrc = (params) => request({
38 url: `${import.meta.env.VITE_APP_AUTH_URL}/portal/get-captcha`, 58 url: `${import.meta.env.VITE_API_COMMON_URL}/portal/get-captcha`,
39 method: 'get', 59 method: 'get',
40 params 60 params
41 }); 61 });
...@@ -51,7 +71,7 @@ export const checkDeviceTypeRegist = (params) => request({ ...@@ -51,7 +71,7 @@ export const checkDeviceTypeRegist = (params) => request({
51 * @returns 71 * @returns
52 */ 72 */
53 export const checkLoginUser = (logonUser:string) => request({ 73 export const checkLoginUser = (logonUser:string) => request({
54 url: `/ms-daop-user-service/user/check-login-user-password?logonUser=${logonUser}`, 74 url: `${import.meta.env.VITE_API_COMMON_URL}/user/check-login-user-password?logonUser=${logonUser}`,
55 method: 'get' 75 method: 'get'
56 }); 76 });
57 77
...@@ -68,7 +88,7 @@ export const signUp = (data) => request({ ...@@ -68,7 +88,7 @@ export const signUp = (data) => request({
68 88
69 /** 发送登录验证码到手机 */ 89 /** 发送登录验证码到手机 */
70 export const sendLoginCode = (mobileNo:string) => request({ 90 export const sendLoginCode = (mobileNo:string) => request({
71 url: `/ms-daop-user-service/user/get-login-sms-validate-code?mobileNo=${mobileNo}`, 91 url: `${import.meta.env.VITE_API_COMMON_URL}/user/get-login-sms-validate-code?mobileNo=${mobileNo}`,
72 method: 'get' 92 method: 'get'
73 }); 93 });
74 94
...@@ -76,4 +96,14 @@ export const getWebAuth4jLogin = (data) => request({ ...@@ -76,4 +96,14 @@ export const getWebAuth4jLogin = (data) => request({
76 url: `/webauthn/login`, 96 url: `/webauthn/login`,
77 method: 'idaasPost', 97 method: 'idaasPost',
78 data: data 98 data: data
99 });
100
101 /**
102 * 记录更新密码时间
103 * @param logonUser
104 * @returns
105 */
106 export const recordUpdateTime = (logonUser: string) => request({
107 url: `${import.meta.env.VITE_API_COMMON_URL}/user/record-update-password-time?logonUser=${logonUser}`,
108 method: 'put'
79 }); 109 });
...\ No newline at end of file ...\ No newline at end of file
......
src/api/modules/queryService.ts
...@@ -31,10 +31,10 @@ export const getSystemMenu = (params, isAdmin = false) => { ...@@ -31,10 +31,10 @@ export const getSystemMenu = (params, isAdmin = false) => {
31 url: 31 url:
32 isAdmin 32 isAdmin
33 ? `${ 33 ? `${
34 import.meta.env.VITE_APP_AUTH_URL 34 import.meta.env.VITE_API_COMMON_URL
35 }/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=4149c763d70948b195eb3d4b997c1722` 35 }/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=4149c763d70948b195eb3d4b997c1722`
36 : `${ 36 : `${
37 import.meta.env.VITE_APP_AUTH_URL 37 import.meta.env.VITE_API_COMMON_URL
38 }/product-menu-permission/staff/get-product-menu-template?platformSystemGuid=4149c763d70948b195eb3d4b997c1722&funcPermissionTemplateGuid=${params.roleGuid}`, 38 }/product-menu-permission/staff/get-product-menu-template?platformSystemGuid=4149c763d70948b195eb3d4b997c1722&funcPermissionTemplateGuid=${params.roleGuid}`,
39 method: "get", 39 method: "get",
40 }); 40 });
...@@ -43,7 +43,7 @@ export const getSystemMenu = (params, isAdmin = false) => { ...@@ -43,7 +43,7 @@ export const getSystemMenu = (params, isAdmin = false) => {
43 // 获取当前用户对应的产品和菜单 43 // 获取当前用户对应的产品和菜单
44 export const getUserInfo = () => { 44 export const getUserInfo = () => {
45 return request({ 45 return request({
46 url: `${import.meta.env.VITE_APP_API_BASEURL}/menu/data/get-product-menu-by-currentuser`, 46 url: `${import.meta.env.VITE_API_COMMON_URL}/menu/data/get-product-menu-by-currentuser`,
47 method: 'get' 47 method: 'get'
48 }) 48 })
49 } 49 }
...@@ -99,13 +99,13 @@ export const getTenantInfo = (params) => request({ ...@@ -99,13 +99,13 @@ export const getTenantInfo = (params) => request({
99 }) 99 })
100 // 查看平台会员详情 100 // 查看平台会员详情
101 export const getTenantDetailInfo = (params) => request({ 101 export const getTenantDetailInfo = (params) => request({
102 url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`, 102 url: `${import.meta.env.VITE_API_COMMON_URL}/tenant/getByGuid/${params}`,
103 method: 'get' 103 method: 'get'
104 }) 104 })
105 105
106 // 查看人员详情 106 // 查看人员详情
107 export const getStaffDetailInfo = (params) => request({ 107 export const getStaffDetailInfo = (params) => request({
108 url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/getByGuid/${params}`, 108 url: `${import.meta.env.VITE_API_COMMON_URL}/staff/getByGuid/${params}`,
109 method: 'get' 109 method: 'get'
110 }) 110 })
111 111
...@@ -299,7 +299,7 @@ export const checkDataSourceConnectTest = (params) => request({ ...@@ -299,7 +299,7 @@ export const checkDataSourceConnectTest = (params) => request({
299 }); 299 });
300 300
301 export const getParamsDictList = (dictType) => request({ 301 export const getParamsDictList = (dictType) => request({
302 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/platform/get-by-dictType?dictType=${dictType}`, 302 url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/platform/get-by-dictType?dictType=${dictType}`,
303 method: 'get', 303 method: 'get',
304 }) 304 })
305 305
...@@ -327,7 +327,7 @@ export const exportTemplate = (params) => request({ ...@@ -327,7 +327,7 @@ export const exportTemplate = (params) => request({
327 327
328 /** 获取字典列表数据 */ 328 /** 获取字典列表数据 */
329 export const getParamsList = (params) => request({ 329 export const getParamsList = (params) => request({
330 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/platform/get-by-dictType`, 330 url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/platform/get-by-dictType`,
331 method: 'get', 331 method: 'get',
332 params 332 params
333 }) 333 })
......
src/api/modules/workFlowService.ts
...@@ -22,7 +22,7 @@ export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({ ...@@ -22,7 +22,7 @@ export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({
22 }) 22 })
23 // 审批撤销 23 // 审批撤销
24 export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({ 24 export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({
25 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`, 25 url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
26 method: 'post', 26 method: 'post',
27 data: params 27 data: params
28 }) 28 })
......
src/components/Retrievepassword/index.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <DialogPlus modal-class="auth-user" append-to-body v-model="dialogVisible" @open="openedDialog" width="460px" 3 <DialogPlus modal-class="auth-user" append-to-body v-model="dialogVisible" @open="openedDialog" width="460px"
4 maxHeight="250px" :close-on-click-modal="false" title="用户身份认证"> 4 maxHeight="280px" :close-on-click-modal="false" title="用户身份认证">
5 <div class="select-tenant"> 5 <div class="select-tenant">
6 <el-form v-show="formType == 'validate'" label-position="top" ref="registerFormRef" :model="registerForm" 6 <el-form v-show="formType == 'validate'" label-position="top" ref="registerFormRef" :model="registerForm"
7 :rules="registerRules" class="login-form" auto-complete="on"> 7 :rules="registerRules" class="login-form" auto-complete="on">
...@@ -51,14 +51,16 @@ ...@@ -51,14 +51,16 @@
51 </el-form> 51 </el-form>
52 </div> 52 </div>
53 <template #footer> 53 <template #footer>
54 <el-button @click="closeDialog">取 消</el-button> 54 <div class="dialog-footer">
55 <el-button v-show="formType === 'validate'" :loading="sendCodeLoading" type="primary" 55 <el-button @click="closeDialog">取 消</el-button>
56 @click="handleSendCaptcha">发送验证码至手机</el-button> 56 <el-button v-show="formType === 'validate'" :loading="sendCodeLoading" type="primary"
57 <el-button v-show="formType === 'reset' && timeLeft > 0" :loading="saveLoading" type="primary" 57 @click="handleSendCaptcha">发送验证码至手机</el-button>
58 :disabled="!resetForm.smsCode || !resetForm.pwd || !resetForm.checkPwd" 58 <el-button v-show="formType === 'reset' && timeLeft > 0" :loading="saveLoading" type="primary"
59 @click.prevent="handleReset">修改密码</el-button> 59 :disabled="!resetForm.smsCode || !resetForm.pwd || !resetForm.checkPwd"
60 <el-button v-show="formType === 'reset' && timeLeft == 0" :loading="saveLoading" type="primary" 60 @click.prevent="handleReset">修改密码</el-button>
61 @click.prevent="recertification">重新认证</el-button> 61 <el-button v-show="formType === 'reset' && timeLeft == 0" :loading="saveLoading" type="primary"
62 @click.prevent="recertification">重新认证</el-button>
63 </div>
62 </template> 64 </template>
63 </DialogPlus> 65 </DialogPlus>
64 </div> 66 </div>
...@@ -71,7 +73,10 @@ import type { FormRules } from 'element-plus' ...@@ -71,7 +73,10 @@ import type { FormRules } from 'element-plus'
71 import { propTypes } from '@/utils/propTypes' 73 import { propTypes } from '@/utils/propTypes'
72 import useIdaasStore from '@/store/modules/idaas'; 74 import useIdaasStore from '@/store/modules/idaas';
73 import { 75 import {
74 getPictureCode 76 getPictureCode,
77 sendCode,
78 resetPwd,
79 recordUpdateTime
75 } from "@/api/modules/idaas" 80 } from "@/api/modules/idaas"
76 import useLogin from '@/store/modules/login' 81 import useLogin from '@/store/modules/login'
77 import PasswordStrengthMeter from '../PasswordStrengthMeter/index.vue' 82 import PasswordStrengthMeter from '../PasswordStrengthMeter/index.vue'
...@@ -253,9 +258,11 @@ const refreshPictureCode = () => { ...@@ -253,9 +258,11 @@ const refreshPictureCode = () => {
253 function getPictureCodeInfo() { 258 function getPictureCodeInfo() {
254 promise.value = getPictureCode().then((res: any) => { 259 promise.value = getPictureCode().then((res: any) => {
255 promise.value = null; 260 promise.value = null;
256 if (res.data.code == proxy.$passCode) { 261 if (res?.code == proxy.$passCode) {
257 imgCaptchaBase64.value = res.data.data?.imageBase64 || ""; 262 imgCaptchaBase64.value = res.data?.imageBase64 || "";
258 validateCodeGuid.value = res.data.data?.guid || ""; 263 validateCodeGuid.value = res.data?.guid || "";
264 } else {
265 res?.msg && proxy.$ElMessage.error(res.msg);
259 } 266 }
260 }); 267 });
261 } 268 }
...@@ -266,9 +273,9 @@ const handleSendCaptcha = () => { ...@@ -266,9 +273,9 @@ const handleSendCaptcha = () => {
266 sendCodeLoading.value = true 273 sendCodeLoading.value = true
267 let params: any = { ...registerForm.value }; 274 let params: any = { ...registerForm.value };
268 params.validateCodeGuid = validateCodeGuid.value; 275 params.validateCodeGuid = validateCodeGuid.value;
269 idaasApi.sendCode(params).then((res: any) => { 276 sendCode(params).then((res: any) => {
270 sendCodeLoading.value = false; 277 sendCodeLoading.value = false;
271 if (res?.data.code == proxy.$passCode) { 278 if (res?.code == proxy.$passCode) {
272 proxy.$ElMessage.success('验证码发送成功！'); 279 proxy.$ElMessage.success('验证码发送成功！');
273 loginStore.firstUnmetRequirement = '' 280 loginStore.firstUnmetRequirement = ''
274 formType.value = 'reset'; 281 formType.value = 'reset';
...@@ -290,14 +297,38 @@ async function handleReset() { ...@@ -290,14 +297,38 @@ async function handleReset() {
290 if (!res) return 297 if (!res) return
291 let params = Object.assign({}, resetForm.value, { mobileNo: registerForm.value.mobileNo, logonUser: registerForm.value.logonUser }); 298 let params = Object.assign({}, resetForm.value, { mobileNo: registerForm.value.mobileNo, logonUser: registerForm.value.logonUser });
292 params.pwd = autoSalt(params.pwd, false, false); 299 params.pwd = autoSalt(params.pwd, false, false);
293 idaasApi.resetPwd(params).then((res: any) => { 300 resetPwd(params).then((res: any) => {
294 if (res.data.code == proxy.$passCode) { 301 if (res?.code == proxy.$passCode) {
295 proxy.$ElMessage.success('密码重置成功'); 302 proxy.$ElMessage.success('密码重置成功');
296 dialogVisible.value = false; 303 dialogVisible.value = false;
297 userApi.recordUpdateTime(registerForm.value.logonUser) 304 recordUpdateTime(registerForm.value.logonUser)
305 } else {
306 res?.msg && proxy.$ElMessage.error(res.msg);
298 } 307 }
299 }); 308 });
300 } 309 }
301 310
302 311
303 </script>
...\ No newline at end of file ...\ No newline at end of file
312 </script>
313
314 <style lang="scss" scoped>
315
316 .code-desc {
317 font-size: 12px;
318 color: #999999;
319 letter-spacing: 0;
320 line-height: 17px;
321 font-weight: 400;
322 margin-top: 2px;
323 }
324
325 .h-26px {
326 height: 26px;
327 }
328
329 :deep(.el-form-item) {
330 .el-form-item__label {
331 margin-bottom: 2px !important
332 }
333 }
334 </style>
...\ No newline at end of file ...\ No newline at end of file
......
src/layouts/components/Tools/index.vue
...@@ -142,7 +142,7 @@ const verifyDialogBtnClick = (btn, info) => { ...@@ -142,7 +142,7 @@ const verifyDialogBtnClick = (btn, info) => {
142 {{ userStore.userName }} 142 {{ userStore.userName }}
143 </div> 143 </div>
144 <div class="text-left"> 144 <div class="text-left">
145 账号: {{ userData.mobileNo.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') }} 145 账号: {{ userData.mobileNo?.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') }}
146 </div> 146 </div>
147 </div> 147 </div>
148 </div> 148 </div>
......
src/layouts/index.vue
...@@ -16,13 +16,11 @@ import { ...@@ -16,13 +16,11 @@ import {
16 } from "@element-plus/icons-vue"; 16 } from "@element-plus/icons-vue";
17 import { getAllMessageList, getMessageCount, updateMessageState, updateAllFinish } from '@/api/modules/queryService'; 17 import { getAllMessageList, getMessageCount, updateMessageState, updateAllFinish } from '@/api/modules/queryService';
18 import useUserStore from "@/store/modules/user"; 18 import useUserStore from "@/store/modules/user";
19 import useDataFinanceStore from "@/store/modules/dataFinance";
20 import Moment from 'moment'; 19 import Moment from 'moment';
21 20
22 const router = useRouter() 21 const router = useRouter()
23 const userStore = useUserStore(); 22 const userStore = useUserStore();
24 const userData = JSON.parse(userStore.userData) 23 const userData = JSON.parse(userStore.userData)
25 const financeStore = useDataFinanceStore();
26 const { proxy } = getCurrentInstance() as any; 24 const { proxy } = getCurrentInstance() as any;
27 25
28 const routeInfo = useRoute() 26 const routeInfo = useRoute()
...@@ -167,10 +165,10 @@ const messageJump = (item) => { ...@@ -167,10 +165,10 @@ const messageJump = (item) => {
167 proxy.$ElMessage.error('url地址不对'); 165 proxy.$ElMessage.error('url地址不对');
168 return; 166 return;
169 } 167 }
170 let params = item.jumpUrl.substring(index + 1); 168 // let params = item.jumpUrl.substring(index + 1);
171 let searchParams = new URLSearchParams(params); 169 // let searchParams = new URLSearchParams(params);
172 financeStore.setCircuGUid(searchParams.get("guid") || ''); 170 // financeStore.setCircuGUid(searchParams.get("guid") || '');
173 financeStore.setGoodsName(searchParams.get("goodsName") || ""); 171 // financeStore.setGoodsName(searchParams.get("goodsName") || "");
174 let goPath = item.jumpUrl.substring(0, index); 172 let goPath = item.jumpUrl.substring(0, index);
175 router.push({ 173 router.push({
176 path: goPath 174 path: goPath
......
src/utils/request.ts
...@@ -58,7 +58,10 @@ service.interceptors.request.use( ...@@ -58,7 +58,10 @@ service.interceptors.request.use(
58 } else if (config.method === "idaasGet" || config.method === "idaasget") { 58 } else if (config.method === "idaasGet" || config.method === "idaasget") {
59 config.baseURL = IDaaSBaseURL; 59 config.baseURL = IDaaSBaseURL;
60 config.method = "get"; 60 config.method = "get";
61 } 61 } else if (config.method === "idaasPut" || config.method === "idaasput") {
62 config.baseURL = IDaaSBaseURL;
63 config.method = "put";
64 }
62 if (config.responseType == "blob") { 65 if (config.responseType == "blob") {
63 // 文件流，文件名称相同时会判定同一个请求。 66 // 文件流，文件名称相同时会判定同一个请求。
64 config.headers.Authorization = localStorage.getItem('token'); 67 config.headers.Authorization = localStorage.getItem('token');
......
src/views/data_basic/departmentInfoList.vue
...@@ -229,7 +229,7 @@ const toDetail = (scope) => { ...@@ -229,7 +229,7 @@ const toDetail = (scope) => {
229 const toDelete = (scope) => { 229 const toDelete = (scope) => {
230 proxy.$openMessageBox("数据删除后不可恢复，确定是否删除？", "warning", () => { 230 proxy.$openMessageBox("数据删除后不可恢复，确定是否删除？", "warning", () => {
231 removeOrganisation([scope.row.guid]).then((res: any) => { 231 removeOrganisation([scope.row.guid]).then((res: any) => {
232 if (res.data.code === proxy.$passCode) { 232 if (res?.code === proxy.$passCode) {
233 proxy.$ElMessage({ 233 proxy.$ElMessage({
234 type: 'success', 234 type: 'success',
235 message: '删除成功' 235 message: '删除成功'
...@@ -237,7 +237,7 @@ const toDelete = (scope) => { ...@@ -237,7 +237,7 @@ const toDelete = (scope) => {
237 page.value.curr = 1; 237 page.value.curr = 1;
238 getTableData(); 238 getTableData();
239 } else { 239 } else {
240 proxy.$ElMessage({ 240 res?.msg && proxy.$ElMessage({
241 type: 'error', 241 type: 'error',
242 message: res.msg, 242 message: res.msg,
243 }) 243 })
......
src/views/portal/portalLogin.vue
...@@ -269,7 +269,7 @@ const loginTitle = computed(() => { ...@@ -269,7 +269,7 @@ const loginTitle = computed(() => {
269 return formTypeMap[formType.value] || '注册申请'; 269 return formTypeMap[formType.value] || '注册申请';
270 }); 270 });
271 271
272 const formType = ref(proxy.$route.query.formType || 'beforeLogin'); 272 const formType = ref(route.query.formType || 'beforeLogin');
273 const beforeLoginFormRef = ref() // 登录前表单 273 const beforeLoginFormRef = ref() // 登录前表单
274 const loginFormRef = ref() // 登录表单 274 const loginFormRef = ref() // 登录表单
275 const registerForm = ref() // 注册表单 275 const registerForm = ref() // 注册表单
...@@ -675,8 +675,8 @@ async function getLoginSmsCode() { ...@@ -675,8 +675,8 @@ async function getLoginSmsCode() {
675 let validate = await loginFormRef.value.formValidation(['mobileNo']); 675 let validate = await loginFormRef.value.formValidation(['mobileNo']);
676 if (validate) { 676 if (validate) {
677 let params = await loginFormRef.value.getData() 677 let params = await loginFormRef.value.getData()
678 sendLoginCode(params.mobileNo).then(res=>{ 678 sendLoginCode(params.mobileNo).then((res: any) => {
679 if (res.data.code == proxy.$passCode) { 679 if (res?.code == proxy.$passCode) {
680 sendCodeLoading2.value = true; 680 sendCodeLoading2.value = true;
681 disabledverifyUser.value = false; 681 disabledverifyUser.value = false;
682 loginFormRef.value.formValidation(['smsCode']); 682 loginFormRef.value.formValidation(['smsCode']);
...@@ -765,13 +765,16 @@ async function beforeLogin() { ...@@ -765,13 +765,16 @@ async function beforeLogin() {
765 let validate = await beforeLoginFormRef.value.formValidation(); 765 let validate = await beforeLoginFormRef.value.formValidation();
766 if (!validate) return 766 if (!validate) return
767 let formData = await beforeLoginFormRef.value.getData(); 767 let formData = await beforeLoginFormRef.value.getData();
768 debugger
769 let _logonUser = formData.logonUser; 768 let _logonUser = formData.logonUser;
770 let password = formData.password; 769 let password = formData.password;
771 loginStore.encodePwd = CryptoJS.AES.encrypt(password, sysConfigStore().getConfig('appKey')).toString(); 770 loginStore.encodePwd = CryptoJS.AES.encrypt(password, sysConfigStore().getConfig('appKey')).toString();
771 loading.value = true;
772 let loginRes = await idaasStore.login(formData); 772 let loginRes = await idaasStore.login(formData);
773 loading.value = false;
773 if (!loginRes) return 774 if (!loginRes) return
775 loading.value = true;
774 let res: any = await checkLoginUser(_logonUser) 776 let res: any = await checkLoginUser(_logonUser)
777 loading.value = false;
775 if (res?.code != '00000') { 778 if (res?.code != '00000') {
776 res?.msg && proxy.$message.error(res?.msg); 779 res?.msg && proxy.$message.error(res?.msg);
777 return; 780 return;
...@@ -839,23 +842,23 @@ async function beforeLogin() { ...@@ -839,23 +842,23 @@ async function beforeLogin() {
839 */ 842 */
840 async function handleLogin(params) { 843 async function handleLogin(params) {
841 loading.value = true 844 loading.value = true
842 let client_id = params.client_id = proxy.$route.query.client_id; 845 let client_id = params.client_id = route.query.client_id;
843 let redirect_uri = params.redirect_uri = proxy.$route.query.redirect_uri; 846 let redirect_uri: any = params.redirect_uri = route.query.redirect_uri;
844 loginStore.smsValidateCode = params.smsCode 847 loginStore.smsValidateCode = params.smsCode
845 idaasStore.login(params).then((res: any) => { 848 idaasStore.login(params).then((res: any) => {
846 loading.value = false 849 loading.value = false
847 const result = isJsonString(res) ? JSON.parse(res) : res; 850 //const result = isJsonString(res) ? JSON.parse(res) : res;
848 let scope = result.data.authorities?.map(a => a.authority).join(' '); 851 // let scope = result.data.authorities?.map(a => a.authority).join(' ');
849 if (!client_id) { 852 if (!client_id) {
850 client_id = sysConfigStore().getConfig('appKey'); 853 client_id = sysConfigStore().getConfig('appKey');
851 } 854 }
852 let hrefOrigin = window.location.origin; 855 let hrefOrigin = window.location.origin;
853 if (!redirect_uri) { 856 if (!redirect_uri) {
854 redirect_uri = hrefOrigin + '/login'; 857 redirect_uri = hrefOrigin + '/';
855 } 858 }
856 let state = createStateHashCode(); 859 let state = createStateHashCode();
857 let url = `${hrefOrigin}/idaas/oauth2/authorize?response_type=${LOGINCODE.response_type}&client_id=${client_id}&scope=other&state=${state}&redirect_uri=${encodeURIComponent(redirect_uri)}` 860 let url = `${hrefOrigin}/idaas/oauth2/authorize?response_type=${LOGINCODE.response_type}&client_id=${client_id}&scope=other&state=${state}&redirect_uri=${encodeURIComponent(redirect_uri)}`
858 localStorage.setItem('idaas_code_url', url) 861 // localStorage.setItem('idaas_code_url', url)
859 window.location.href = url 862 window.location.href = url
860 }).catch(() => { 863 }).catch(() => {
861 loading.value = false 864 loading.value = false
...@@ -890,11 +893,11 @@ async function handleLogin(params) { ...@@ -890,11 +893,11 @@ async function handleLogin(params) {
890 // }) 893 // })
891 // } 894 // }
892 895
893 //const logout = ref(proxy.$route.query.logout); 896 //const logout = ref(route.query.logout);
894 897
895 // // 存储跳转其他系统的url参数 898 // // 存储跳转其他系统的url参数
896 // function saveQueryParams() { 899 // function saveQueryParams() {
897 // let query = proxy.$route.query; 900 // let query = route.query;
898 // routeStore.fromUrl = query.fromUrl 901 // routeStore.fromUrl = query.fromUrl
899 // routeStore.toUrl = query.toUrl 902 // routeStore.toUrl = query.toUrl
900 // routeStore.backUrl = query.backUrl 903 // routeStore.backUrl = query.backUrl
...@@ -956,12 +959,14 @@ const passKeySign = async () => { ...@@ -956,12 +959,14 @@ const passKeySign = async () => {
956 let validate = await beforeLoginFormRef.value.submitForm() 959 let validate = await beforeLoginFormRef.value.submitForm()
957 if (validate) { 960 if (validate) {
958 let params = await beforeLoginFormRef.value.getData() 961 let params = await beforeLoginFormRef.value.getData()
962 debugger
963 let platform = navigator.userAgentData?.platform || navigator.platform;
959 checkDeviceTypeRegist({ 964 checkDeviceTypeRegist({
960 logonUser: params.logonUser, 965 logonUser: params.logonUser,
961 platform: navigator.userAgentData.platform 966 platform: platform
962 }).then((response: any) => { 967 }).then((response: any) => {
963 console.log(response) 968 console.log(response)
964 if (response.data.code === '00000') { 969 if (response?.code === '00000') {
965 createCredential().then((credential: any) => { 970 createCredential().then((credential: any) => {
966 console.log(credential) 971 console.log(credential)
967 let userRQVO = { 972 let userRQVO = {
...@@ -971,7 +976,7 @@ const passKeySign = async () => { ...@@ -971,7 +976,7 @@ const passKeySign = async () => {
971 clientDataJSON: Base64url.encodeBase64url(credential.response.clientDataJSON), 976 clientDataJSON: Base64url.encodeBase64url(credential.response.clientDataJSON),
972 attestationObject: Base64url.encodeBase64url(credential.response.attestationObject), 977 attestationObject: Base64url.encodeBase64url(credential.response.attestationObject),
973 clientExtensions: JSON.stringify(credential.getClientExtensionResults()), 978 clientExtensions: JSON.stringify(credential.getClientExtensionResults()),
974 deviceType: navigator.userAgentData.platform 979 deviceType: platform
975 } 980 }
976 } 981 }
977 passKeyRegisterloading.value = true; 982 passKeyRegisterloading.value = true;
...@@ -988,6 +993,8 @@ const passKeySign = async () => { ...@@ -988,6 +993,8 @@ const passKeySign = async () => {
988 passKeyRegisterloading.value = false; 993 passKeyRegisterloading.value = false;
989 }) 994 })
990 }) 995 })
996 } else {
997 response?.msg && proxy.$message.error(response.msg);
991 } 998 }
992 }) 999 })
993 } 1000 }
...@@ -1031,8 +1038,8 @@ const passKeyLogin = () => { ...@@ -1031,8 +1038,8 @@ const passKeyLogin = () => {
1031 passKeyLoginloading.value = false; 1038 passKeyLoginloading.value = false;
1032 const result = typeof res.data == 'string' ? JSON.parse(res.data) : res.data; 1039 const result = typeof res.data == 'string' ? JSON.parse(res.data) : res.data;
1033 if (result.code == '00000') {//第一次初始化登录。 1040 if (result.code == '00000') {//第一次初始化登录。
1034 let client_id = proxy.$route.query.client_id; 1041 let client_id = route.query.client_id;
1035 let redirect_uri = proxy.$route.query.redirect_uri; 1042 let redirect_uri = route.query.redirect_uri;
1036 if (!client_id) { 1043 if (!client_id) {
1037 client_id = sysConfigStore().getConfig('appKey'); 1044 client_id = sysConfigStore().getConfig('appKey');
1038 } 1045 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!