diff --git a/apps/web-antd/.env.production b/apps/web-antd/.env.production index 9b61c3f..dbca724 100644 --- a/apps/web-antd/.env.production +++ b/apps/web-antd/.env.production @@ -21,3 +21,8 @@ VITE_INJECT_APP_LOADING=true # 打包后是否生成dist.zip VITE_ARCHIVER=true + +# 默认登录用户名 +VITE_APP_DEFAULT_USERNAME= +# 默认登录密码 +VITE_APP_DEFAULT_PASSWORD= diff --git a/apps/web-antd/src/api/license/comment/index.ts b/apps/web-antd/src/api/license/comment/index.ts index c0be6e2..e96e118 100644 --- a/apps/web-antd/src/api/license/comment/index.ts +++ b/apps/web-antd/src/api/license/comment/index.ts @@ -18,6 +18,10 @@ export namespace CommentApi { content?: string; // 评论内容 children?: Comment[]; // 子评论 projectName?: string; // 项目名称 + status?: string; + serialNo?: string; + businessOwner?: string; + technicalOwnerA?: string; } } diff --git a/apps/web-antd/src/api/license/customer/index.ts b/apps/web-antd/src/api/license/customer/index.ts index 512bdb8..ecfae1d 100644 --- a/apps/web-antd/src/api/license/customer/index.ts +++ b/apps/web-antd/src/api/license/customer/index.ts @@ -22,6 +22,7 @@ export namespace CustomerApi { projectCount: number; licenseCount: number; userCount: number; + contractCount: number; } } diff --git a/apps/web-antd/src/locales/langs/en-US/project.json b/apps/web-antd/src/locales/langs/en-US/project.json index 166d038..2745cb7 100644 --- a/apps/web-antd/src/locales/langs/en-US/project.json +++ b/apps/web-antd/src/locales/langs/en-US/project.json @@ -20,5 +20,7 @@ "name": "Project Name", "envInfoFile": "Environment Info Attachment", "list": "Project List", - "progress": "Progress" + "progress": "Comment", + "updateTime": "Last Modified Time", + "commentNum": "Comment Count" } diff --git a/apps/web-antd/src/locales/langs/zh-CN/project.json b/apps/web-antd/src/locales/langs/zh-CN/project.json index 31a2bbe..96d78aa 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/project.json +++ b/apps/web-antd/src/locales/langs/zh-CN/project.json @@ -2,7 +2,7 @@ "project": "项目", "operation": "操作", "creationTime": "创建时间", - "remarks": "备注", + "remarks": "软件版本信息", "envInfo": "环境信息", "status": "项目状态", "endTime": "项目结束时间", @@ -20,5 +20,7 @@ "name": "项目名称", "envInfoFile": "环境信息附件", "list": "项目列表", - "progress": "进展" + "progress": "评论", + "updateTime": "最后修改时间", + "commentNum": "评论数" } diff --git a/apps/web-antd/src/views/alert/index.vue b/apps/web-antd/src/views/alert/index.vue index 78f7c3f..2902d21 100644 --- a/apps/web-antd/src/views/alert/index.vue +++ b/apps/web-antd/src/views/alert/index.vue @@ -1,12 +1,16 @@ diff --git a/apps/web-antd/src/views/license/license/index.vue b/apps/web-antd/src/views/license/license/index.vue index 5d68ad3..7d85cf8 100644 --- a/apps/web-antd/src/views/license/license/index.vue +++ b/apps/web-antd/src/views/license/license/index.vue @@ -172,7 +172,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('license.applyAction', ['License']), type: 'primary', icon: ACTION_ICON.ADD, - auth: ['license:license:create'], + auth: ['license:license:apply'], onClick: onCreate, }, { @@ -186,7 +186,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('ui.actionTitle.import', ['License']), type: 'primary', icon: ACTION_ICON.UPLOAD, - auth: ['license:license:export'], + auth: ['license:license:import'], onClick: handleImport, }, ]" @@ -199,6 +199,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: $t('license.detail'), type: 'link', + auth: ['license:license:query'], onClick: onDetail.bind(null, row), }, { @@ -231,7 +232,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('license.reapply'), type: 'link', ifShow: row.status === 3, - auth: ['license:license:query'], + auth: ['license:license:reapply'], onClick: onReapply.bind(null, row), }, { diff --git a/apps/web-antd/src/views/license/project/comment/child-comment.vue b/apps/web-antd/src/views/license/project/comment/child-comment.vue index 28aba1c..59fdfbd 100644 --- a/apps/web-antd/src/views/license/project/comment/child-comment.vue +++ b/apps/web-antd/src/views/license/project/comment/child-comment.vue @@ -83,8 +83,8 @@ const formatContent = computed(() => {