From 69c615757a3ffbd07247dfb7acf433c0587a5aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?= <15778543+xufeiyang6017@user.noreply.gitee.com> Date: Tue, 3 Feb 2026 16:27:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=9B=E9=80=89=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/web/entity/Users.java | 18 +++++ web/src/main/resources/static/index.html | 75 ++++++++++++++++--- 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/web/src/main/java/com/example/web/entity/Users.java b/web/src/main/java/com/example/web/entity/Users.java index bce3f15..b9c8122 100644 --- a/web/src/main/java/com/example/web/entity/Users.java +++ b/web/src/main/java/com/example/web/entity/Users.java @@ -39,6 +39,8 @@ public class Users { private String userlog;//用户操作日志 private Integer sync_statuss;//同步状态 private String managerName;//负责人姓名 + private Integer appraisalnum;//点击估价次数 + private Integer comparenum;//点击对比价格次数 public Integer getId() { @@ -256,4 +258,20 @@ public class Users { public void setManagerName(String managerName) { this.managerName = managerName; } + + public Integer getAppraisalnum() { + return appraisalnum; + } + + public void setAppraisalnum(Integer appraisalnum) { + this.appraisalnum = appraisalnum; + } + + public Integer getComparenum() { + return comparenum; + } + + public void setComparenum(Integer comparenum) { + this.comparenum = comparenum; + } } diff --git a/web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html index eb32af8..c28fd1b 100644 --- a/web/src/main/resources/static/index.html +++ b/web/src/main/resources/static/index.html @@ -2128,6 +2128,10 @@ var personalTotalCount = document.getElementById('personalTotalCount'); personalBody.innerHTML = ''; + // 初始化求和变量 + var totalAppraisalnum = 0; + var totalComparenum = 0; + // 检查用户角色，只对管理员显示负责人列和复选框列 var userRole = userInfo.loginInfo.projectName; var isAdmin = userRole === '管理员'; @@ -2237,25 +2241,29 @@ personalTotalCount.textContent = total; } - console.log('加载的数据量:', allPersonalData.length, '总数据量:', total, '总页数:', totalPages); + console.log('加载的数据量:', allPersonalData.length, '筛选后的数据量:', filteredUsers.length, '总数据量:', total, '总页数:', totalPages); - if (allPersonalData.length > 0) { + if (filteredUsers.length > 0) { personalEmpty.style.display = 'none'; - // 直接使用后端返回的数据 - var displayUsers = allPersonalData; + // 使用筛选后的数据 + var displayUsers = filteredUsers; for (var i = 0; i < displayUsers.length; i++) { var user = displayUsers[i]; var responseTime = calculateResponseTime(user.created_at, user.followup_at); var managerCell = ''; + // 累加点击估价次数和点击对比价格次数 + totalAppraisalnum += parseInt(user.appraisalnum) || 0; + totalComparenum += parseInt(user.comparenum) || 0; + // 只对管理员显示负责人信息 - if (userRole === '管理员') { - managerCell = '' + (user.managerName || '-') + ''; - } else { - managerCell = ''; - } + if (userRole === '管理员') { + managerCell = '' + (user.managerName || '-') + ''; + } else { + managerCell = ''; + } // 生成简道云按钮，根据sync_statuss字段决定状态 var jianDaoYunButton = ''; @@ -2294,6 +2302,22 @@ personalPagination.style.display = 'flex'; } + // 添加汇总行 + if (displayUsers.length > 0) { + var summaryCheckboxCell = isAdmin ? '' : ''; + var summaryManagerCell = isAdmin ? '' : ''; + + var summaryRow = '' + + summaryCheckboxCell + + '合计' + + '' + + '' + + summaryManagerCell + + '点击估价次数: ' + totalAppraisalnum + ' | 点击对比价格次数: ' + totalComparenum + '' + + ''; + personalBody.innerHTML += summaryRow; + } + // 渲染分页控件 renderPersonalPagination(personalPage, totalPages, total); } else { @@ -4744,6 +4768,18 @@ +
+
+ 点击估价次数： + +
+
+
+
+ 点击对比价格次数： + +
+
@@ -5315,6 +5351,10 @@ var selectAllPublic = document.getElementById('selectAllPublic'); publicBody.innerHTML = ''; + // 初始化求和变量 + var totalAppraisalnum = 0; + var totalComparenum = 0; + // 检查用户角色，只对管理员显示负责人列和复选框列 var userRole = userInfo.loginInfo.projectName; var isAdmin = userRole === '管理员'; @@ -5439,6 +5479,21 @@ // 有数据时显示分页控件 publicPagination.style.display = 'flex'; } + + // 添加汇总行 + if (filteredUsers.length > 0) { + var summaryManagerCell = isAdmin ? '' : ''; + + var summaryRow = '' + + '' + + '合计' + + '' + + '' + + summaryManagerCell + + '点击估价次数: ' + totalAppraisalnum + ' | 点击对比价格次数: ' + totalComparenum + '' + + ''; + publicBody.innerHTML += summaryRow; + } } else { publicEmpty.style.display = 'block'; // 没有数据时隐藏分页控件 @@ -5887,6 +5942,8 @@ document.getElementById('detailDetailedAddress').textContent = user.detailedaddress || '-'; document.getElementById('detailCompany').textContent = user.company || '-'; document.getElementById('detailDemand').textContent = user.demand || '-'; + document.getElementById('detailAppraisalnum').textContent = user.appraisalnum || '0'; + document.getElementById('detailComparenum').textContent = user.comparenum || '0'; // 显示弹窗 document.getElementById('detailModal').style.display = 'block';