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 = 数据资产管理系统
# VITE_API_BASEURL = https://swzl-test.csbr.cn/api
# VITE_API_BASEURL = http://localhost:9000
VITE_API_BASEURL = http://192.168.6.20:28052/
# 平台用户 接口请地址
VITE_APP_USER_API_BASEURL = gateway-server
......@@ -13,21 +14,31 @@ VITE_APP_AUTH_URL = 'ms-daop-auth-service'
# 系统管理 接口地址
VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
# #配置服务
# VITE_APP_CONFIG_URL = 'ms-daop-configure-service'
# 文件上传请求地址
VITE_APP_ADD_FILE = ms-daop-import-data-service
# 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
# 是否开启代理
VITE_OPEN_PROXY = true
# vite serve base
VITE_SERVE_BASE = /
# 流程设计访问地址
VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
#流程服务
VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
# 数据标准、元数据、数据目录 接口地址
VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
#数据质量接口地址
VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
......@@ -44,20 +55,26 @@ VITE_APP_CONFIG_URL = 'ms-daop-configure-service'
# 文件上传下载接口地址
VITE_APP_COMMON_URL = 'ms-daop-common-service'
#camunda服务
VITE_APP_CAMUNDA_URL = 'ms-daop-camunda-server'
#门户接口
VITE_API_PORTALURL = https://swzl-test.zgsjzc.com/portal
#数据资产接口地址
VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
#数据同步接口地址
VITE_API_DATA_SYNC = ms-swzl-data-sync-service
#消息接口
VITE_API_MESSAGE = ms-swzl-message-notification-service
#新门户接口
VITE_API_NEW_PORTAL = ms-daop-zcgl-asset-dam-service
#企业信息接口
VITE_API_PERSONEL_SERVICE = ms-daop-personel-service
# 是否在打包时生成 sourcemap
VITE_BUILD_SOURCEMAP = false
......
.env.product
......@@ -3,22 +3,31 @@ VITE_APP_TITLE = 数据资产管理系统
# 接口域名
VITE_API_BASEURL = http://192.168.6.20:28052/
# VITE_API_BASEURL = http://49.4.26.201:31709/
# # 平台用户 接口请地址
# VITE_APP_USER_API_BASEURL = gateway-server
# # 系统管理 接口地址
# VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
# # 文件上传请求地址
# VITE_APP_ADD_FILE = ms-daop-import-data-service
# # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
# VITE_APP_DEBUG_TOOL =
# # 是否开启代理
# VITE_OPEN_PROXY = true
# # vite serve base
# VITE_SERVE_BASE = /
# # 流程设计访问地址
# VITE_BPMN_URL = https://workflow.zgsjzc.com
# # 数据标准、元数据、数据目录 接口地址
# VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service
# #数据质量接口地址
# VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
......@@ -27,10 +36,13 @@ VITE_APP_TITLE = 数据资产管理系统
# #数据资产接口地址
# VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
# #数据同步接口地址
# VITE_API_DATA_SYNC = ms-swzl-data-sync-service
# #消息接口
# VITE_API_MESSAGE = ms-swzl-message-notification-service
# 平台用户 接口请地址
VITE_APP_USER_API_BASEURL = gateway-server
......@@ -42,16 +54,25 @@ VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
# 文件上传请求地址
VITE_APP_ADD_FILE = ms-daop-import-data-service
# 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
# 是否开启代理
VITE_OPEN_PROXY = true
# vite serve base
VITE_SERVE_BASE = /
# 流程设计访问地址
VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
#流程服务
VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
# 数据标准、元数据、数据目录 接口地址
VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
#数据质量接口地址
VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
......@@ -68,15 +89,24 @@ VITE_APP_DATA_SOURCE_URL = ms-daop-data-source-service
# 文件上传下载接口地址
VITE_APP_COMMON_URL = 'ms-daop-common-service'
#camunda服务
VITE_APP_CAMUNDA_URL = 'ms-daop-camunda-server'
#门户接口
VITE_API_PORTALURL = https://swzl-test.zgsjzc.com/portal
#数据资产接口地址
VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
#数据同步接口地址
VITE_API_DATA_SYNC = ms-swzl-data-sync-service
#消息接口
VITE_API_MESSAGE = ms-swzl-message-notification-service
#企业信息接口
VITE_API_PERSONEL_SERVICE = ms-daop-personel-service
# 是否在打包时生成 sourcemap
VITE_BUILD_SOURCEMAP = false
# 是否在打包时开启压缩，支持 gzip 和 brotli
......
components.d.ts
......@@ -9,6 +9,7 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
ApprovalProcess: typeof import('./src/components/ApprovalProcess/src/ApprovalProcess.vue')['default']
Auth: typeof import('./src/components/Auth/index.vue')['default']
AuthAll: typeof import('./src/components/AuthAll/index.vue')['default']
ContentWrap: typeof import('./src/components/ContentWrap/src/ContentWrap.vue')['default']
......@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' {
ImageUpload: typeof import('./src/components/ImageUpload/index.vue')['default']
LineageGraph: typeof import('./src/components/LineageGraph/index.vue')['default']
ListPanel: typeof import('./src/components/ListPanel/index.vue')['default']
LookBpmn: typeof import('./src/components/ApprovalProcess/src/components/LookBpmn.vue')['default']
Month: typeof import('./src/components/Schedule/component/month.vue')['default']
NotAllowed: typeof import('./src/components/NotAllowed/index.vue')['default']
PageHeader: typeof import('./src/components/PageHeader/index.vue')['default']
......
package.json
......@@ -22,7 +22,11 @@
"@vueuse/integrations": "^10.1.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"ant-design-vue": "^3.2.20",
"axios": "^1.4.0",
"bpmn-js": "^8.10.0",
"bpmn-js-token-simulation": "^0.10.0",
"camunda-bpmn-moddle": "^4.4.0",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.7",
"echarts": "^5.4.3",
......@@ -32,6 +36,7 @@
"hotkeys-js": "^3.10.2",
"html2canvas": "^1.4.1",
"insert-css": "^2.0.0",
"jquery": "^3.7.1",
"lodash-es": "^4.17.21",
"md5": "^2.3.0",
"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({
method: 'get',
params
})
// 获取资产/价值评估机构数据
export const getSingleList = (params) => request({
url: `${import.meta.env.VITE_API_PERSONEL_SERVICE}/tenant/singlePage`,
method: 'post',
data: params
})
// 获取当前登录人信息
export const getCurrentUserInfo = (params) => {
return request({
url: `${import.meta.env.VITE_API_PERSONEL_SERVICE}/staff/data/get-current-staff`,
method: "post",
params
});
};
......
src/api/modules/workFlowService.ts 0 → 100644
import request from "@/utils/request";
import useUserStore from "@/store/modules/user";
const userStore = useUserStore()
const userData = JSON.parse(userStore.userData)
// 获取流程详情。
export const getProcessFlowDetail = (params) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/detail/?approvalGuid=${params}`,
method: 'post',
})
// 审批通过
export const passFlowData = (params) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/allow-flow`,
method: 'post',
data: params
})
// 审批驳回
export const rejectFlowData = (params) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/backup-flow`,
method: 'post',
data: params
})
// 审批撤销
export const revokeFlowData = (params) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow`,
method: 'post',
data: params
})
// 删除流程
export const deleteFlowData = (params) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/del`,
method: 'post',
params
})
export const getFlowData = (params) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/page-list`,
method: 'post',
data: params
})
export const getCamundaDeploymentId = (flowType) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/get-camunda-deployment-id`,
method: 'post',
data: {
tenantGuid: userData.tenantGuid,
flowType:flowType,
staffGuid: userData.staffGuid,
}
})
export const getDetailDataPromise = (deploymentId)=> request({
url: `${import.meta.env.VITE_APP_CAMUNDA_URL}/process-definition/get-detail?deploymentId=${deploymentId}`,
method: 'get',
})
export const getProcessNodesPromise = (params)=>request({
url: `${import.meta.env.VITE_APP_CAMUNDA_URL}/process-definition/get-process-nodes`,
method: 'post',
data: params
})
src/components/ApprovalProcess/index.ts 0 → 100644
import ApprovalProcess from './src/ApprovalProcess.vue'
export { ApprovalProcess }
src/components/ApprovalProcess/src/ApprovalProcess.vue 0 → 100644
<script setup lang="tsx">
import LookBpmn from "./components/LookBpmn.vue";
import useProcessStore from '@/store/modules/process'
import { cloneDeep } from 'lodash-es';
import { getProcessNodesPromise } from "@/api/modules/workFlowService"
const processStore = useProcessStore()
const props = defineProps({
deploymentId: {
type: String,
default: ''
},
processInstanceId: {
type: String,
default: ''
},
});
const tableData = ref<any>([])
const lookBpmnRef = ref()
// const contentRef = ref();
// const { height: contentHeight } = useElementSize(contentRef);
const renderProcessNodes = () => {
let param = {
deploymentId: props.deploymentId || null,
processInstanceId: props.processInstanceId || null,
};
getProcessNodesPromise(param).then((res:any) => {
if (res.code === "00000") {
let data = res.data;
if (data) {
data.forEach((i, index) => {
i.id = i.activityId;
i.staffName = "";
if (i.staffVOS && i.staffVOS.length > 1) {
i.staffVOS.forEach((j) => {
j.id = j.staffGuid;
j.processName = i.processName;
if (j.approvalState) {
i.approvalState = j.approvalState;
i.approvalSuggest = j.approvalSuggest;
i.approvalTime = j.approvalTime;
i.staffName = j.staffName;
}
});
i.children = i.staffVOS;
} else {
if (i.staffVOS) {
i.approvalState = i.staffVOS[i.staffVOS.length - 1].approvalState;
i.approvalSuggest =
i.staffVOS[i.staffVOS.length - 1].approvalSuggest;
i.approvalTime = i.staffVOS[i.staffVOS.length - 1].approvalTime;
i.staffName = i.staffVOS[i.staffVOS.length - 1].staffName;
} else {
if (i.organisationVOS) {
i.approvalState = "";
i.approvalSuggest = "";
i.approvalTime = "";
if (i.organisationVOS.length > 1) {
i.staffName =
i.organisationVOS[0].organisationName +
"等" +
i.organisationVOS.length +
"个部门";
} else {
i.staffName = i.organisationVOS[0].organisationName;
}
} else if (i.positionVOS != null && i.positionVOS.length > 0) {
i.approvalState = "";
i.approvalSuggest = "";
i.approvalTime = "";
if (i.positionVOS.length > 1) {
if (i.staffName) {
i.staffName =
i.staffName +
"," +
i.positionVOS[0].positionName +
"等" +
i.positionVOS.length +
"个岗位";
} else {
i.staffName = i.positionVOS[0].positionName;
}
} else {
if (i.staffName) {
i.staffName =
i.staffName + "," + i.positionVOS[0].positionName;
} else {
i.staffName = i.positionVOS[0].positionName;
}
}
} else if (i.candidateUsers != null && i.candidateUsers != "") {
i.approvalState = "";
i.approvalSuggest = "";
i.approvalTime = "";
if (i.candidateUsers.length > 1) {
i.staffName =
i.candidateUsers[0].staffName +
"等" +
i.candidateUsers.length +
"个人员";
if (i.candidateUsers) {
i.candidateUsers.forEach((j) => {
j.id = j.staffGuid;
j.processName = i.processName;
});
}
i.children = i.candidateUsers;
} else {
i.staffName = i.candidateUsers[0].staffName;
}
}
}
}
});
}
tableData.value = data
processStore.processNodes = cloneDeep(tableData.value)
localStorage.setItem('processTableData',JSON.stringify(tableData.value));
nextTick(()=>{
setTimeout(()=>{
getSpecialEventUserTaskList()
})
})
}
});
};
const getApprovalState = (val: string) => {
if (!val) {
return "-";
} else {
if (val == "W") {
return (val = "待提交");
} else if (val == "N") {
return (val = "初始");
} else if (val == "A") {
return (val = "审批中");
} else if (val == "Y") {
return (val = "已通过");
} else if (val == "F") {
return (val = "已完成");
} else if (val == "R") {
return (val = "已驳回");
} else if (val == "C") {
return (val = "已撤销");
} else {
return (val = "");
}
}
}
const getSpecialEventUserTaskList = () => {
lookBpmnRef.value.getDetailData(props.deploymentId)
};
onBeforeRouteLeave((to, from) =>{
processStore.clearStore()
})
onMounted(() => {
renderProcessNodes()
});
defineExpose({
renderProcessNodes
})
</script>
<template>
<div>
<!-- <Table :columns="columns" :data="tableData" :border="false"></Table> -->
<el-table tooltip-effect="light" :data="tableData" :border="false" >
<el-table-column type="index" label="节点" :width="140" align="left" >
<template #default="scope">
{{ scope.row.processName ||'-' }}
</template>
</el-table-column>
<el-table-column type="index" label="处理对象" :width="140" align="left" show-overflow-tooltip>
<template #default="scope">
{{ scope.row.staffName ||'-' }}
</template>
</el-table-column>
<el-table-column type="index" label="操作时间" :width="180" align="left" show-overflow-tooltip >
<template #default="scope">
{{ scope.row.approvalTime||'-'}}
</template>
</el-table-column>
<!-- <el-table-column type="index" label="申请人" :width="100" align="left" >
<template #default="scope">
{{ scope.row.applyName||'-'}}
</template>
</el-table-column>
<el-table-column label="申请时间" :width="180" align="left" >
<template #default="scope">
{{ scope.row.time||'-'}}
</template>
</el-table-column> -->
<el-table-column label="审批状态" :width="140" align="left" show-overflow-tooltip>
<template #default="scope">
<div v-if="scope.row.approvalState === 'A'" class='state-sty'>{{ getApprovalState(scope.row.approvalState) }}</div>
<div v-else-if="scope.row.approvalState === 'Y'" class='state-sty1'>{{getApprovalState(scope.row.approvalState) }}</div>
<div v-else-if="scope.row.approvalState === 'R'" class='state-sty2'>{{ getApprovalState(scope.row.approvalState) }}</div>
<div v-else>{{getApprovalState(scope.row.approvalState)}}</div>
</template>
</el-table-column>
<el-table-column label="审批原因" align="left" >
<template #default="scope">
{{ scope.row.approvalSuggest||'-'}}
</template>
</el-table-column>
</el-table>
<div class="bpmn-sty pt-20px" style="margin-top: 20px">
<span style="font-size:16px;color:#666">{{ '审批流程' }}</span>
<el-divider style="margin-bottom:10px!important;margin-top:10px!important" />
<LookBpmn ref="lookBpmnRef"></LookBpmn>
</div>
</div>
</template>
<style lang="scss" scoped>
.iframe-sty {
width: 100%;
border: none;
// height: 600px;
}
:deep(.el-table) {
.state-sty {
width: 52px;
height: 21px;
text-align: center;
line-height: 21px;
background: #FFEEE3;
border-radius: 3px;
color: #FF8623;
}
.state-sty1 {
width: 52px;
height: 21px;
text-align: center;
line-height: 21px;
background: #E3F0F0;
border-radius: 3px;
color: #4FA1A4;
}
.state-sty2 {
width: 52px;
height: 21px;
text-align: center;
line-height: 21px;
background: #FFE4E2;
border-radius: 3px;
color: #FE4638;
}
.state-sty3 {
width: 52px;
height: 21px;
text-align: center;
line-height: 21px;
background: #E3E3E3;
border-radius: 3px;
color: #323233;
}
}
</style>
src/router/modules/dataAssetRegistry.ts
......@@ -3,7 +3,7 @@ function Layout() {
return import('@/layouts/index.vue')
}
const routes: RouteRecordRaw[] = [
{
{
path: '/data-asset-register/register-managemant',
component: Layout,
meta: {
......@@ -35,14 +35,8 @@ const routes: RouteRecordRaw[] = [
reuse: true
},
beforeEnter: (to, from) => {
if (to.query.type) {
to.meta.title = `详情-`;
return;
}
if (to.query.guid) {
to.meta.title = `编辑-`;
to.meta.editPage = true;
}
to.meta.title = to.query.type == 'edit' ? `编辑-${to.query.name}` : '新建资产登记';
to.meta.editPage = true;
}
},
{
......@@ -55,11 +49,14 @@ const routes: RouteRecordRaw[] = [
breadcrumb: false,
cache: true,
reuse: true
},
beforeEnter: (to, from) => {
to.meta.title = `详情-${to.query.name}`;
}
}
],
},
{
{
path: '/data-asset-register/quality-evaluate',
component: Layout,
meta: {
......@@ -92,7 +89,7 @@ const routes: RouteRecordRaw[] = [
}
],
},
{
{
path: '/data-asset-register/value-evaluate',
component: Layout,
meta: {
......
src/store/modules/process.ts 0 → 100644
const useProcessStore = defineStore(
// 唯一ID
'process',
() => {
const processNodes = ref([])
const staffVOS = computed(() => { // 最后审批node
return processNodes.value.find((item:any) => item.approvalState)
})
const clearStore = () => {
processNodes.value = []
}
return {
processNodes,
staffVOS,
clearStore
}
},
{
persist:{
storage: sessionStorage,
paths: ['processNodes','staffVOS']
}
}
)
export default useProcessStore
\ No newline at end of file
src/store/modules/user.ts
......@@ -4,7 +4,7 @@ import router from '@/router'
import { ElMessage } from 'element-plus'
import apiUser from '@/api/modules/user'
import { getCurrentTime } from '@/utils/common'
import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface } from '@/api/modules/queryService'
import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface, getCurrentUserInfo } from '@/api/modules/queryService'
const useUserStore = defineStore(
// 唯一ID
......@@ -29,47 +29,49 @@ const useUserStore = defineStore(
/* idass的登录页面url，退出登录需要跳转到登录页。*/
const idassLoginUrl = 'https://idaas-test.csbr.cn/login';
const timer: any = ref(null);
//获取token.
//获取token.
function getToken(data, state) {
data.platformGuid = "7f16f697aec111ef8656fa163e60becd";
data.userType = 2;
data.validateUri = location.origin == 'http://localhost:9000' ? 'http://localhost:9000/' : location.origin + '/';
return getTokenPromise.value = getTokenByCode(data).then((res: any) => {
getTokenPromise.value = null;
console.log(res);
if (res.code == '00000') {
console.log(res.data);
isLogin.value = true;
localStorage.setItem('code', `${data.code}`);
localStorage.setItem('state', state);
localStorage.setItem('token', res.data.token || "");
token.value = res.data.access_token;
localStorage.setItem('refresh_token', res.data.refreshToken || "");
const expiresIn = (Date.now() + 1700000) + "";
localStorage.setItem('expiresIn', expiresIn);
refreshUserToken();
//获取用户信息
account.value = res.data.logonUser
userId.value = res.data.userId
userName.value = res.data.userName
// userData.value = JSON.stringify(res.data.data);
currentTenantGuid.value = res.data.tenantInfoList && res.data.tenantInfoList.length ? res.data.tenantInfoList[0].guid : '';
localStorage.setItem('currentTenantGuid', currentTenantGuid.value);
let currentTenant = res.data.tenantInfoList?.[0];
return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => {
if (info.code == '00000') {
localStorage.setItem('userName', currentTenant?.name)
localStorage.setItem('userInfoData', JSON.stringify(info.data));
userInfoData.value = info.data;
} else {
ElMessage.error(info.msg)
}
})
} else {
isLogin.value = false;
// ElMessage.error(res.msg);//授权码被重复使用，不抛出异常。
}
});
data.platformGuid = "7f16f697aec111ef8656fa163e60becd";
data.userType = 2;
data.validateUri = location.origin == 'http://localhost:9000' ? 'http://localhost:9000/' : location.origin + '/';
return getTokenPromise.value = getTokenByCode(data).then((res: any) => {
getTokenPromise.value = null;
console.log(res);
if (res.code == '00000') {
console.log(res.data);
isLogin.value = true;
localStorage.setItem('code', `${data.code}`);
localStorage.setItem('state', state);
localStorage.setItem('token', res.data.token || "");
token.value = res.data.access_token;
localStorage.setItem('refresh_token', res.data.refreshToken || "");
const expiresIn = (Date.now() + 1700000) + "";
localStorage.setItem('expiresIn', expiresIn);
refreshUserToken();
//获取用户信息
account.value = res.data.logonUser
userId.value = res.data.userId
userName.value = res.data.userName
currentTenantGuid.value = res.data.tenantInfoList && res.data.tenantInfoList.length ? res.data.tenantInfoList[0].guid : '';
localStorage.setItem('currentTenantGuid', currentTenantGuid.value);
let currentTenant = res.data.tenantInfoList?.[0];
return getCurrentUserInfo({ tenantGuid: currentTenantGuid.value }).then((result: any) => {
return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => {
if (info.code == '00000') {
localStorage.setItem('userName', currentTenant?.name)
localStorage.setItem('userInfoData', JSON.stringify(info.data));
userInfoData.value = info.data;
localStorage.setItem('userData', JSON.stringify(result.data));
} else {
ElMessage.error(info.msg)
}
})
})
} else {
isLogin.value = false;
// ElMessage.error(res.msg);//授权码被重复使用，不抛出异常。
}
});
}
function refreshUserToken() {
......@@ -80,11 +82,11 @@ const useUserStore = defineStore(
const process = async () => {
if (parseInt(expiresIn) - Date.now() < 600000) {
const refreshing = localStorage.getItem('refreshing');
let now = new Date();
let now = new Date();
if (!refreshing || new Date(refreshing) < now) {//确保多个页面只刷新一次。
localStorage.setItem('refreshing', now.toISOString());
await refresh();
localStorage.removeItem('refreshing');
localStorage.setItem('refreshing', now.toISOString());
await refresh();
localStorage.removeItem('refreshing');
}
}
}
......@@ -100,14 +102,14 @@ const useUserStore = defineStore(
refreshToken: localStorage.getItem('refresh_token')
}).then((resInfo: any) => {
getTokenPromise.value = null;
if (resInfo.code == '00000'){
localStorage.setItem('token',resInfo.data.accessToken);
if (resInfo.code == '00000') {
localStorage.setItem('token', resInfo.data.accessToken);
token.value = resInfo.data.accessToken;
localStorage.setItem('refresh_token',resInfo.data.refreshToken);
localStorage.setItem('refresh_token', resInfo.data.refreshToken);
const expiresIn = (Date.now() + 1700000) + "";
localStorage.setItem('expiresIn', expiresIn);
} else {
//会出现同步刷新token就退出登录的问题，去掉这个代码。
//会出现同步刷新token就退出登录的问题，去掉这个代码。
//logout(true)
}
}).catch(() => {
......@@ -151,23 +153,23 @@ const useUserStore = defineStore(
// 登出
async function logout(isErrorReturn = false, redirect = router.currentRoute.value.fullPath) {
if (!isErrorReturn && localStorage.getItem('code')) {
isLoginOut.value = true;
loginOut().then(() => {
localStorage.clear()
account.value = ''
userId.value = ''
userName.value = ''
userData.value = ''
token.value = '';
timer.value && clearInterval(timer.value);
isLogin.value = false;
userInfoData.value = [];
routeStore.removeRoutes()
menuStore.setActived(0)
tabbar.value = []
tabbarMap.value = {}
window.location.href = idassLoginUrl + '?logout=1';
});
isLoginOut.value = true;
loginOut().then(() => {
localStorage.clear()
account.value = ''
userId.value = ''
userName.value = ''
userData.value = ''
token.value = '';
timer.value && clearInterval(timer.value);
isLogin.value = false;
userInfoData.value = [];
routeStore.removeRoutes()
menuStore.setActived(0)
tabbar.value = []
tabbarMap.value = {}
window.location.href = idassLoginUrl + '?logout=1';
});
} else {
let hasCode = localStorage.getItem('code');
isLoginOut.value = true;
......@@ -228,7 +230,7 @@ const useUserStore = defineStore(
mark = 'data-sync'
} else if (item.meta.title == '数据质量') {
mark = 'data-quality'
} else if (item.meta.title == '数据盘点') {
} else if (item.meta.title == '数据盘点') {
mark = 'data-inventory'
} else if (item.meta.title == '首页') {
mark = 'data-asset-index'
......
src/types/components.d.ts
......@@ -9,6 +9,7 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
ApprovalProcess: typeof import('./../components/ApprovalProcess/src/ApprovalProcess.vue')['default']
Auth: typeof import('./../components/Auth/index.vue')['default']
AuthAll: typeof import('./../components/AuthAll/index.vue')['default']
ContentWrap: typeof import('./../components/ContentWrap/src/ContentWrap.vue')['default']
......@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' {
ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
LineageGraph: typeof import('./../components/LineageGraph/index.vue')['default']
ListPanel: typeof import('./../components/ListPanel/index.vue')['default']
LookBpmn: typeof import('./../components/ApprovalProcess/src/components/LookBpmn.vue')['default']
Month: typeof import('./../components/Schedule/component/month.vue')['default']
NotAllowed: typeof import('./../components/NotAllowed/index.vue')['default']
PageHeader: typeof import('./../components/PageHeader/index.vue')['default']
......
src/views/data_asset/importTableField.vue
......@@ -5,7 +5,6 @@
<script lang="ts" setup name="importTableField">
import { ref } from 'vue';
import {
getDataTypeList,
getParamsList
} from "@/api/modules/dataAsset";
import { pinyin } from 'pinyin-pro';
......@@ -80,7 +79,7 @@ const handleFileDataChange = (fileFields, files, sheetName, data) => {
}
const getFieldTypeList = () => {
getDataTypeList({
getParamsList({
dictType: "字段类型"
}).then((res: any) => {
fieldTypes.value = [];
......
src/views/data_asset/registerCatalogCreate.vue
......@@ -10,8 +10,7 @@ import {
getAreaData
} from "@/api/modules/queryService";
import {
getDamTypesList,
getSubjectDoaminList,
getParamsList,
dataSourcesList,
registerCatalogSave,
existDamName,
......@@ -570,7 +569,7 @@ onBeforeMount(() => {
}
return data;
}
getDamTypesList({
getParamsList({
dictType: "资产类型",
}).then((res: any) => {
if (res.code == proxy.$passCode) {
......@@ -582,7 +581,7 @@ onBeforeMount(() => {
proxy.$ElMessage.error(res.msg);
}
})
getSubjectDoaminList({
getParamsList({
dictType: "数据资产目录主题名称",
}).then((res: any) => {
if (res.code == proxy.$passCode) {
......
src/views/data_asset/registerCatalogManagement.vue
......@@ -9,8 +9,7 @@ import { ElMessageBox } from "element-plus";
import { useRouter, useRoute } from "vue-router";
import { MoreFilled } from "@element-plus/icons-vue";
import {
getSubjectDoaminList,
getDamTypesList,
getParamsList,
getDamCatalogTable,
registerCatalogDelete
} from "@/api/modules/dataAsset";
......@@ -217,7 +216,7 @@ onActivated(() => {
});
onBeforeMount(() => {
getDamTypesList({
getParamsList({
dictType: "资产类型",
}).then((res: any) => {
if (res.code == proxy.$passCode) {
......@@ -229,7 +228,7 @@ onBeforeMount(() => {
proxy.$ElMessage.error(res.msg);
}
})
getSubjectDoaminList({
getParamsList({
dictType: "数据资产目录主题名称",
}).then((res: any) => {
if (res.code == proxy.$passCode) {
......
src/views/data_asset/registerDetail.vue
......@@ -258,13 +258,14 @@ const getDetailInfo = () => {
const data = res.data || {};
detailInfo.value = data;
assetDetailInfo.value = data;
if (fullPath === route.fullPath) {
document.title = `详情-${data.daName}`;
}
let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
if (tab) {
tab.meta.title = `详情-${data.daName}`;
}
deploymentId.value = data.camundaDeploymentId;
// if (fullPath === route.fullPath) {
// document.title = `详情-${data.daName}`;
// }
// let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
// if (tab) {
// tab.meta.title = `详情-${data.daName}`;
// }
isTextTruncated();
} else {
ElMessage.error(res.msg);
......@@ -293,11 +294,11 @@ onBeforeMount(() => {
});
onActivated(() => {
if (assetDetailInfo.value?.daName) {
if (fullPath === route.fullPath) {
document.title = `详情-${assetDetailInfo.value?.daName}`;
}
}
// if (assetDetailInfo.value?.daName) {
// if (fullPath === route.fullPath) {
// document.title = `详情-${assetDetailInfo.value?.daName}`;
// }
// }
});
onMounted(() => {
......@@ -399,7 +400,7 @@ const approveTableInfo: any = ref({
show: false
}
});
const deploymentId = ref('');
const tenantDetail: any = ref({});
/** 获取当前登录会员，服务商，企业等详情。 */
......@@ -490,7 +491,7 @@ const btnClick = (btn) => {
qualityEvaluateFormItems.value[1].disabled = true;
} else {
qualityEvaluateFormItems.value[1].default = null;
qualityEvaluateFormItems.value[1].disabled = false;
qualityEvaluateFormItems.value[1].disabled = false;
}
} else if (type == 'reject') {
rejectDialogInfo.value.visible = true;
......@@ -1593,7 +1594,9 @@ const handleClickDamCatalogDetail = () => {
</ContentWrap>
<ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
:isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v">
<Table :tableInfo="approveTableInfo" />
<!-- <Table :tableInfo="approveTableInfo" /> -->
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
</ApprovalProcess>
</ContentWrap>
<ContentWrap id="id-certificate" v-if="tabsInfo.tabs.find(t => t.name == 'certificate')" title="证件信息"
expandSwicth style="margin-top: 15px" :isExpand="certificateExpand" @expand="(v) => certificateExpand = v">
......@@ -2065,4 +2068,4 @@ const handleClickDamCatalogDetail = () => {
}
}
}
</style>
\ No newline at end of file
</style>
......
src/views/data_inventory/dictionary.vue
......@@ -23,7 +23,6 @@ import {
exportDictionary,
showDictionary,
getDataBaseList,
getDataTypeList,
getCoderuleList,
saveDictionaryData,
getDictionaryFileds,
......@@ -608,7 +607,7 @@ const getDataType = (type) => {
let params = {
paramCode: type
}
getDataTypeList(params).then((res: any) => {
getParamsList(params).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data
if (type == 'DATA_TYPE') {
......
src/views/data_product/productDemandsDetail.vue
......@@ -12,7 +12,7 @@ import Dialog from "@/components/Dialog/index.vue";
import useUserStore from "@/store/modules/user";
import useDataAssetStore from "@/store/modules/dataAsset";
import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getSubjectDoaminList } from "@/api/modules/dataAsset";
import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList } from "@/api/modules/dataAsset";
import { getDemandDetail, demandSave, competitionSave, marketSave, demandUpdate, competitionUpdate, marketUpdate, checkDemandName, getParamsDataList, getProductTypeList } from "@/api/modules/dataProduct";
import { getMatchDetail } from "@/api/modules/dataFinance";
import { useValidator } from '@/hooks/useValidator';
......@@ -353,7 +353,7 @@ const algorithmFormItem = ref([
block: true,
clearable: true,
required: true,
},
},
// {
// label: '赛事图片',
// tip: '支持扩展名：.jpg .png .jpeg',
......@@ -431,7 +431,7 @@ const elementFormItems = ref([
clearable: true,
required: true,
},
{
{
label: '产品类别',
type: 'tree-select',
placeholder: '请选择',
......@@ -464,7 +464,7 @@ const elementFormItems = ref([
clearable: true,
disabled: false,
required: true,
},
},
{
label: '产品预算',
type: 'checkbox-input-item',
......@@ -860,7 +860,7 @@ const submitForm = (btn, formEl, tosub = false) => {
ElMessage.error(res.msg);
}
})
}
}
}
} else {
nextTick(() => {
......@@ -1112,7 +1112,7 @@ const initMethodByInterfaceType = ref({
proxy.$ElMessage.error(res.msg);
}
})
getSubjectDoaminList().then((res: any) => {
getParamsList({dictType: 'SUBJECT-DOMAIN'}).then((res: any) => {
if (res.code == proxy.$passCode) {
subjectDomainListData.value = res.data || [];
let item = demandFormItems.value.find(item => item.field == 'subjectDomain');
......
src/views/data_product/productListing.vue
......@@ -15,7 +15,7 @@ import { TableColumnWidth } from '@/utils/enum';
import TableTools from "@/components/Tools/table_tools.vue";
import Table from "@/components/Table/index.vue";
import Dialog from "@/components/Dialog/index.vue";
import { getDamTypesList } from "@/api/modules/dataAsset";
import { getParamsList } from "@/api/modules/dataAsset";
const { proxy } = getCurrentInstance() as any;
const router = useRouter();
......@@ -284,7 +284,7 @@ onBeforeMount(() => {
// proxy.$ElMessage.error(res.msg);
// }
// })
getDamTypesList({
getParamsList({
dictType: "资产类型",
}).then((res: any) => {
if (res.code == proxy.$passCode) {
......
src/views/data_product/productListingDetail.vue
......@@ -14,7 +14,7 @@ import useDataAssetStore from "@/store/modules/dataAsset";
import { changeNum } from '@/utils/common';
import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
import { getAreaData, getServiceTenants } from "@/api/modules/queryService";
import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getSubjectDoaminList, getServiceDetail } from "@/api/modules/dataAsset";
import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList, getServiceDetail } from "@/api/modules/dataAsset";
import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, getParamsDataList } from "@/api/modules/dataProduct";
import { getMatchDetail } from "@/api/modules/dataFinance";
import { useValidator } from '@/hooks/useValidator';
......@@ -1062,7 +1062,7 @@ onBeforeMount(() => {
// ElMessage.error(res.msg);
// }
// });
getSubjectDoaminList({
getParamsList({
dictType: "数据资产目录主题名称",
}).then((res: any) => {
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!