From 79cfcf9c6dcff44eb8a9242032044341b48534a8 Mon Sep 17 00:00:00 2001 From: tangweijie <877588133@qq.com> Date: Tue, 20 Jan 2026 12:13:13 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat(report):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=8A=A5=E5=91=8A=E5=89=8D=E7=AB=AF=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 优化 DimensionAnalysisPanel 维度分析面板 - 更新 LlmResultPanel LLM 结果展示组件 - 完善 PromptEditor 提示词编辑器功能 - 改进 ReportForm 报告表单交互 - 优化 ReportEditDrawer 报告编辑抽屉 - 调整 prisoner 页面显示 - 更新 evaluation-report 和 report API Co-Authored-By: Claude --- src/api/prison/evaluation-report/index.ts | 29 +- src/api/prison/report/index.ts | 30 +- .../report/DimensionAnalysisPanel.vue | 653 ++++++++++++++---- .../evaluation-mgmt/report/LlmResultPanel.vue | 129 +++- .../evaluation-mgmt/report/PromptEditor.vue | 103 ++- .../evaluation-mgmt/report/ReportForm.vue | 103 ++- .../report/ReportEditDrawer.vue | 57 +- .../evaluation-report/template/index.vue | 2 +- src/views/prison/prisoner/index.vue | 28 +- 9 files changed, 855 insertions(+), 279 deletions(-) diff --git a/src/api/prison/evaluation-report/index.ts b/src/api/prison/evaluation-report/index.ts index 8f3d0d19..6cbd342b 100644 --- a/src/api/prison/evaluation-report/index.ts +++ b/src/api/prison/evaluation-report/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import { getAccessToken } from '@/utils/auth' export interface TemplateVO { id?: number @@ -72,10 +73,15 @@ export interface ReportVO { templateName?: string title?: string evaluationDate?: string + evaluationType?: number + evaluationCycle?: number riskLevel?: number conclusion?: string suggestions?: string // 与后端一致 areaName?: string // 与后端一致 + areaId?: number + evaluatorId?: number + evaluatorName?: string status: number aiStatus?: number auditorId?: number @@ -86,6 +92,17 @@ export interface ReportVO { createTime?: string } +// 报告更新请求VO - 只包含需要更新的字段 +export interface ReportUpdateReqVO { + id: number + dimensions?: string // 维度内容，JSON格式 + conclusion?: string + suggestions?: string + riskLevel?: number + status?: number + remark?: string +} + export interface ReportPageReqVO { pageNo: number pageSize: number @@ -109,6 +126,7 @@ export interface DimensionDataVO { modifiedTime?: string dataSource?: string rawData?: string + createTime?: string } export interface CommentVO { @@ -318,7 +336,8 @@ export interface DimensionDataSourcesVO { // ========== 流式生成 API ========== export const StreamApi = { // 流式生成维度内容 - streamGenerateDimension: async (dimensionId: number, prisonerId: number, customPrompt?: string): Promise => { + // 注意：EventSource API 不支持自定义 HTTP Header，所以需要通过 URL 参数传递 token + streamGenerateDimension: async (dimensionId: number, prisonerId: number, customPrompt?: string, systemPrompt?: string): Promise => { const baseUrl = import.meta.env.VITE_BASE_URL || '' const url = new URL(`${baseUrl}/admin-api/prison/evaluation-report/dimension/stream-generate`, window.location.origin) url.searchParams.set('dimensionId', dimensionId.toString()) @@ -326,6 +345,14 @@ export const StreamApi = { if (customPrompt) { url.searchParams.set('customPrompt', customPrompt) } + if (systemPrompt) { + url.searchParams.set('systemPrompt', systemPrompt) + } + // 添加 token 参数用于认证（EventSource 不支持 Header） + const token = getAccessToken() + if (token) { + url.searchParams.set('token', token) + } return new EventSource(url.toString()) } } diff --git a/src/api/prison/report/index.ts b/src/api/prison/report/index.ts index a80c1fcb..410e447c 100644 --- a/src/api/prison/report/index.ts +++ b/src/api/prison/report/index.ts @@ -1,5 +1,8 @@ import request from '@/config/axios' +// 导入评估报告更新请求类型 +import type { ReportUpdateReqVO } from '../evaluation-report' + // ============ 评估报告模板相关类型 ============ /** 评估报告模板分页参数 */ @@ -63,6 +66,8 @@ export interface ReportDimensionContent { aiGenerateTime?: string // AI生成时间 lastModifyTime?: string // 最后修改时间 lastModifyBy?: string // 最后修改人 + enableAi?: boolean + sort?: number } /** 评估报告 */ @@ -72,6 +77,8 @@ export interface Report { prisonerId: number // 罪犯ID prisonerNo: string // 罪犯编号 prisonerName?: string // 罪犯姓名 + areaId?: number // 监区ID + areaName?: string // 监区名称 templateId: number // 模板ID templateName?: string // 模板名称 title: string // 报告标题 @@ -97,6 +104,23 @@ export interface Report { createTime?: string } +/** 报告创建请求 */ +export interface ReportCreateReqVO { + prisonerId: number + templateId: number + title: string + reportDate?: string + evaluationDate?: string + evaluationCycle?: number + evaluationType?: number + prisonerNo?: string + prisonerName?: string + areaId?: number + areaName?: string + status?: number + dimensions?: ReportDimensionContent[] +} + // ============ 快捷评语相关类型 ============ /** 快捷评语分类 */ @@ -201,12 +225,12 @@ export const ReportApi = { }, // 新增报告 - createReport: async (data: Report) => { + createReport: async (data: ReportCreateReqVO) => { return await request.post({ url: '/prison/evaluation-report/report/create', data }) }, - // 修改报告 - updateReport: async (data: Report) => { + // 修改报告 - 只传递需要更新的字段 + updateReport: async (data: ReportUpdateReqVO) => { return await request.put({ url: '/prison/evaluation-report/report/update', data }) }, diff --git a/src/views/prison/evaluation-mgmt/report/DimensionAnalysisPanel.vue b/src/views/prison/evaluation-mgmt/report/DimensionAnalysisPanel.vue index e240d4d7..b4e9f9b4 100644 --- a/src/views/prison/evaluation-mgmt/report/DimensionAnalysisPanel.vue +++ b/src/views/prison/evaluation-mgmt/report/DimensionAnalysisPanel.vue @@ -1,60 +1,81 @@ diff --git a/src/views/prison/evaluation-mgmt/report/LlmResultPanel.vue b/src/views/prison/evaluation-mgmt/report/LlmResultPanel.vue index e0a181a3..97461971 100644 --- a/src/views/prison/evaluation-mgmt/report/LlmResultPanel.vue +++ b/src/views/prison/evaluation-mgmt/report/LlmResultPanel.vue @@ -26,6 +26,24 @@ 生成结果
+ + + {{ isEditing ? '取消编辑' : '手动编辑' }} + + + + 应用 + 复制 @@ -33,16 +51,42 @@
-
- +
+
+
+ + 分析过程 +
+
+ +
+
+ +
+
+ +
+ +
- + + 手动编辑 +
-
- +
+ 保存到评估 @@ -55,7 +99,8 @@ diff --git a/src/views/prison/questionnaire/QuestionnaireForm.vue b/src/views/prison/questionnaire/QuestionnaireForm.vue index 65e367a2..4d1360e9 100644 --- a/src/views/prison/questionnaire/QuestionnaireForm.vue +++ b/src/views/prison/questionnaire/QuestionnaireForm.vue @@ -21,7 +21,7 @@ - + @@ -104,7 +104,12 @@ const open = async (type: string, id?: number) => { if (id) { formLoading.value = true try { - formData.value = await QuestionnaireApi.getQuestionnaire(id) + const data = await QuestionnaireApi.getQuestionnaire(id) + // 处理 coverImage 可能为 null 的情况 + if (data.coverImage === null) { + data.coverImage = [] + } + formData.value = data } finally { formLoading.value = false } diff --git a/src/views/prison/risk/index.vue b/src/views/prison/risk/index.vue index b57d0883..b5fa9ab0 100644 --- a/src/views/prison/risk/index.vue +++ b/src/views/prison/risk/index.vue @@ -204,7 +204,7 @@ const queryParams = reactive({ const queryFormRef = ref() // 字典数据 -const assessmentTypeOptions = getIntDictOptions(DICT_TYPE.PRISON_ASSESSMENT_TYPE) +const assessmentTypeOptions = getIntDictOptions(DICT_TYPE.PRISON_RISK_ASSESSMENT_TYPE) const riskLevelOptions = getIntDictOptions(DICT_TYPE.PRISON_RISK_LEVEL) /** 根据得分返回样式类名 */ diff --git a/src/views/prison/riskassessment/RiskAssessmentForm.vue b/src/views/prison/riskassessment/RiskAssessmentForm.vue index 6f3908b8..cebf3821 100644 --- a/src/views/prison/riskassessment/RiskAssessmentForm.vue +++ b/src/views/prison/riskassessment/RiskAssessmentForm.vue @@ -29,7 +29,7 @@ @@ -207,7 +207,7 @@ const queryFormRef = ref() const exportLoading = ref(false) // 使用字典获取选项 -const assessmentTypeOptions = getIntDictOptions(DICT_TYPE.PRISON_ASSESSMENT_TYPE) +const assessmentTypeOptions = getIntDictOptions(DICT_TYPE.PRISON_RISK_ASSESSMENT_TYPE) const riskLevelOptions = getIntDictOptions(DICT_TYPE.PRISON_RISK_LEVEL) const statusOptions = getIntDictOptions(DICT_TYPE.PRISON_SCORE_STATUS) From 7b9026826e32b9572317dc78a8006bf8d441fb75 Mon Sep 17 00:00:00 2001 From: tangweijie <877588133@qq.com> Date: Tue, 20 Jan 2026 20:21:00 +0800 Subject: [PATCH 03/10] chore: clean up debug artifacts and improve table scrolling - Remove console.log statements from axios service - Remove debugger statements from decorate.vue - Add horizontal scroll support to prison management tables --- src/config/axios/service.ts | 2 -- src/views/mall/promotion/diy/template/decorate.vue | 2 -- src/views/prison/questionnaire/index.vue | 1 + src/views/prison/risk/index.vue | 2 ++ src/views/prison/riskassessment/index.vue | 1 + 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 9ae5e93f..27015102 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -115,7 +115,6 @@ service.interceptors.request.use( }, (error: AxiosError) => { // Do something with request error - console.log(error) // for debug return Promise.reject(error) } ) @@ -235,7 +234,6 @@ service.interceptors.response.use( } }, (error: AxiosError) => { - console.log('err' + error) // for debug let { message } = error const { t } = useI18n() if (message === 'Network Error') { diff --git a/src/views/mall/promotion/diy/template/decorate.vue b/src/views/mall/promotion/diy/template/decorate.vue index 63f39318..c10eec6c 100644 --- a/src/views/mall/promotion/diy/template/decorate.vue +++ b/src/views/mall/promotion/diy/template/decorate.vue @@ -169,12 +169,10 @@ const DIY_PAGE_INDEX_KEY = 'diy_page_index' // 1. 记录 function storePageIndex() { - debugger return sessionStorage.setItem(DIY_PAGE_INDEX_KEY, `${selectedTemplateItem.value}`) } // 2. 恢复 const recoverPageIndex = () => { - debugger // 恢复重置前的页面，默认是第一个页面 const pageIndex = toNumber(sessionStorage.getItem(DIY_PAGE_INDEX_KEY)) || 0 // 移除标记 diff --git a/src/views/prison/questionnaire/index.vue b/src/views/prison/questionnaire/index.vue index dc35a386..474af14f 100644 --- a/src/views/prison/questionnaire/index.vue +++ b/src/views/prison/questionnaire/index.vue @@ -91,6 +91,7 @@ highlight-current-row @current-change="handleCurrentChange" @selection-change="handleRowCheckboxChange" + :scroll-x="true" > diff --git a/src/views/prison/risk/index.vue b/src/views/prison/risk/index.vue index b5fa9ab0..d5d9070a 100644 --- a/src/views/prison/risk/index.vue +++ b/src/views/prison/risk/index.vue @@ -97,6 +97,8 @@ :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange" + :scroll-x="true" + style="width: 100%; min-width: 1200px" > diff --git a/src/views/prison/riskassessment/index.vue b/src/views/prison/riskassessment/index.vue index e6ee9121..c73d8fa6 100644 --- a/src/views/prison/riskassessment/index.vue +++ b/src/views/prison/riskassessment/index.vue @@ -110,6 +110,7 @@ v-loading="loading" :data="list" @selection-change="handleRowCheckboxChange" + :scroll-x="true" > From 88fe4674b60a05fa35023f6326603bed77d224cb Mon Sep 17 00:00:00 2001 From: tangweijie <877588133@qq.com> Date: Tue, 20 Jan 2026 20:36:05 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84rem=E6=A8=A1=E5=9D=97=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/index.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 8b1fbc90..5689bcaa 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -536,9 +536,6 @@ export const subString = (str: string, start: number, end: number) => { return str } -// rem 移动端适配 -export { initRem, getRem } from './rem' - /** * HTML转义 - 防止XSS攻击 * @param str 需要转义的HTML字符串 From 6c6c946b04c0fe514ae7aa468f64c80b5cbb0560 Mon Sep 17 00:00:00 2001 From: tangweijie <877588133@qq.com> Date: Wed, 21 Jan 2026 00:15:15 +0800 Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=E7=AE=80=E5=8C=96=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 隐藏租户选择、记住密码切换按钮 - 移除手机/二维码/注册/三方登录/忘记密码 - Logo 添加苹果风格圆角矩形 - 开发环境开启自动填充，生产环境关闭 --- src/views/Login/Login.vue | 22 +++++------- src/views/Login/components/LoginForm.vue | 44 +++++++++++------------- 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 30af14f6..acc53739 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -9,7 +9,7 @@ >
- + {{ underlineToHump(appStore.getTitle) }}
@@ -21,7 +21,7 @@ >
{{ t('login.welcome') }}
-
+ @@ -51,16 +51,6 @@ > - - - - - - - - - -
@@ -75,7 +65,7 @@ import { useAppStore } from '@/store/modules/app' import { ThemeSwitch } from '@/layout/components/ThemeSwitch' import { LocaleDropdown } from '@/layout/components/LocaleDropdown' -import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue, ForgetPasswordForm } from './components' +import { LoginForm } from './components' defineOptions({ name: 'Login' }) @@ -106,6 +96,12 @@ $prefix-cls: #{$namespace}-login; } } } + +.login-message { + columns: 2; + column-gap: 20px; + line-height: 1.8; +}