From 5c6724175153b1651ac6ac9ae45fe441a9a43d8a Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Tue, 7 Apr 2026 11:30:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=8F=8A=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workbench/components/ContractInfo.vue | 48 +++++++++++++++---- .../workbench/components/ProjectTask.vue | 11 +++-- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue b/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue index 542ae7a..7b8650d 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue @@ -39,7 +39,7 @@ const statusDict = ref([]); const STATUS_COLORS = ['#3B82F6', '#10B981', '#F97316', '#EC4899', '#8B5CF6', '#06B6D4']; - const AMOUNT_LINE_COLOR = '#F59E0B'; + const AMOUNT_LINE_COLOR = '#FBBF24'; let pieChartInstance: echarts.ECharts | null = null; let barChartInstance: echarts.ECharts | null = null; let resizeObserver: ResizeObserver | null = null; @@ -208,7 +208,7 @@ series.push({ name: '空态环', type: 'pie', - radius: ['46%', '72%'], + radius: ['40%', '64%'], center: ['50%', '44%'], silent: true, legendHoverLink: false, @@ -234,7 +234,7 @@ series.push({ name: '合同状态', type: 'pie', - radius: total ? ['46%', '72%'] : [0, 0], + radius: total ? ['40%', '64%'] : [0, 0], center: ['50%', '44%'], avoidLabelOverlap: true, minAngle: total ? 4 : 0, @@ -245,9 +245,9 @@ }, label: { show: total, - formatter: ({ name, value, percent }) => (total ? `${name}\n${value}项 / ${percent}%` : ''), + formatter: ({ name, percent }) => (total && Number(percent) >= 8 ? `${name}\n${percent}%` : ''), color: isDark ? '#e2e8f0' : '#334155', - fontSize: 12, + fontSize: 11, }, emphasis: { scale: true, @@ -257,6 +257,9 @@ silent: !total, labelLine: { show: total, + length: 4, + length2: 3, + maxSurfaceAngle: 80, }, }); @@ -316,7 +319,7 @@ left: 'center', top: '51%', style: { - text: `金额 ${formatAmountWan(totalContractAmount.value, 2)}万元`, + text: ` ${formatAmountWan(totalContractAmount.value, 2)}万元`, fill: isDark ? '#94a3b8' : '#64748b', fontSize: 12, fontWeight: 500, @@ -401,7 +404,7 @@ yAxisIndex: 1, smooth: true, symbol: 'circle', - symbolSize: 6, + symbolSize: 4, itemStyle: { color: AMOUNT_LINE_COLOR, }, @@ -409,6 +412,19 @@ color: AMOUNT_LINE_COLOR, width: 2, }, + areaStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [ + { offset: 0, color: 'rgba(251, 191, 36, 0.28)' }, + { offset: 1, color: 'rgba(251, 191, 36, 0.04)' }, + ], + }, + }, emphasis: { focus: 'series', }, @@ -460,8 +476,16 @@ left: 'center', itemGap: 16, data: [...statusItems.map((item) => item.label), ...(hasData ? ['合同金额'] : [])], + formatter: (name) => (name === '合同金额' ? `{amount|${name}}` : name), textStyle: { color: isDark ? '#e2e8f0' : '#475569', + rich: { + amount: { + color: isDark ? '#94a3b8' : '#64748b', + fontSize: 12, + fontWeight: 400, + }, + }, }, }, xAxis: { @@ -509,12 +533,16 @@ splitLine: { show: false, }, + nameGap: 8, nameTextStyle: { - color: isDark ? '#94a3b8' : '#64748b', - padding: [0, 0, 2, 0], + color: isDark ? 'rgba(148, 163, 184, 0.72)' : 'rgba(100, 116, 139, 0.88)', + padding: [0, 0, 0, 0], + align: 'right', + fontSize: 11, + fontWeight: 400, }, axisLabel: { - color: isDark ? '#94a3b8' : '#64748b', + color: isDark ? 'rgba(148, 163, 184, 0.78)' : 'rgba(100, 116, 139, 0.92)', formatter: (value) => `${value}`, }, }, diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/components/ProjectTask.vue b/web-vue/packages/core/layouts/views/desktop/workbench/components/ProjectTask.vue index 257dc62..d568090 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/components/ProjectTask.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/components/ProjectTask.vue @@ -179,7 +179,7 @@ series.push({ name: '空态环', type: 'pie', - radius: ['46%', '72%'], + radius: ['40%', '64%'], center: ['50%', '44%'], silent: true, legendHoverLink: false, @@ -205,7 +205,7 @@ series.push({ name: '任务状态', type: 'pie', - radius: total ? ['46%', '72%'] : [0, 0], + radius: total ? ['40%', '64%'] : [0, 0], center: ['50%', '44%'], avoidLabelOverlap: true, minAngle: total ? 4 : 0, @@ -216,9 +216,9 @@ }, label: { show: total, - formatter: ({ name, value, percent }) => (total ? `${name}\n${value}项 / ${percent}%` : ''), + formatter: ({ name, percent }) => (total && Number(percent) >= 8 ? `${name}\n${percent}%` : ''), color: isDark ? '#e2e8f0' : '#334155', - fontSize: 12, + fontSize: 11, }, emphasis: { scale: true, @@ -228,6 +228,9 @@ silent: !total, labelLine: { show: total, + length: 4, + length2: 3, + maxSurfaceAngle: 80, }, }); From 265b3ebb252b681c35c7175ad142c0d8128c3cab Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Wed, 8 Apr 2026 14:00:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=8F=8A=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-vue/packages/biz/views/biz/myQuickLogin/form.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-vue/packages/biz/views/biz/myQuickLogin/form.vue b/web-vue/packages/biz/views/biz/myQuickLogin/form.vue index 608da99..27c182e 100644 --- a/web-vue/packages/biz/views/biz/myQuickLogin/form.vue +++ b/web-vue/packages/biz/views/biz/myQuickLogin/form.vue @@ -72,7 +72,7 @@ field: 'systemUrl', component: 'Input', componentProps: { - maxlength: 32, + maxlength: 225, }, required: true, }, @@ -81,7 +81,7 @@ field: 'systemIcon', component: 'Input', componentProps: { - maxlength: 24, + maxlength: 225, }, }, { From e5e006189dc110e3fec5bc521b02d4d503ab3228 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Wed, 8 Apr 2026 15:47:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=8F=8A=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/apps/Module/Table/ErpFlowParams.java | 2 ++ .../com/jeesite/modules/apps/Module/Table/MyProjectParams.java | 2 ++ .../java/com/jeesite/modules/biz/entity/MyMunicipalities.java | 2 ++ .../java/com/jeesite/modules/biz/entity/MyProjectContract.java | 2 ++ .../main/java/com/jeesite/modules/erp/entity/ErpBudgets.java | 2 ++ 5 files changed, 10 insertions(+) diff --git a/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/ErpFlowParams.java b/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/ErpFlowParams.java index 1e89106..53e00c1 100644 --- a/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/ErpFlowParams.java +++ b/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/ErpFlowParams.java @@ -2,9 +2,11 @@ package com.jeesite.modules.apps.Module.Table; import com.jeesite.modules.apps.Module.cPage; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +@EqualsAndHashCode(callSuper = true) @Data public class ErpFlowParams extends cPage implements Serializable { private String accountId; diff --git a/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/MyProjectParams.java b/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/MyProjectParams.java index c5bb508..afeb74e 100644 --- a/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/MyProjectParams.java +++ b/web-api/src/main/java/com/jeesite/modules/apps/Module/Table/MyProjectParams.java @@ -2,9 +2,11 @@ package com.jeesite.modules.apps.Module.Table; import com.jeesite.modules.apps.Module.cPage; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +@EqualsAndHashCode(callSuper = true) @Data public class MyProjectParams extends cPage implements Serializable { diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyMunicipalities.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyMunicipalities.java index 678174e..74ea600 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyMunicipalities.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyMunicipalities.java @@ -16,6 +16,7 @@ import com.jeesite.common.utils.excel.annotation.ExcelField; import com.jeesite.common.utils.excel.annotation.ExcelField.Align; import com.jeesite.common.utils.excel.annotation.ExcelFields; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; @@ -25,6 +26,7 @@ import java.io.Serial; * @author gaoxq * @version 2026-03-27 */ +@EqualsAndHashCode(callSuper = true) @Table(name = "my_municipalities", alias = "a", label = "社区信息", columns = { @Column(name = "municipality_id", attrName = "municipalityId", label = "唯一主键", isPK = true), @Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdateForce = true), diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyProjectContract.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyProjectContract.java index e0db24f..b85c6a5 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyProjectContract.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyProjectContract.java @@ -18,6 +18,7 @@ import com.jeesite.common.utils.excel.annotation.ExcelField; import com.jeesite.common.utils.excel.annotation.ExcelField.Align; import com.jeesite.common.utils.excel.annotation.ExcelFields; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; @@ -27,6 +28,7 @@ import java.io.Serial; * @author gaoxq * @version 2026-04-04 */ +@EqualsAndHashCode(callSuper = true) @Table(name = "my_project_contract", alias = "a", label = "合同信息", columns = { @Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true), @Column(name = "contract_id", attrName = "contractId", label = "唯一主键", isPK = true), diff --git a/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpBudgets.java b/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpBudgets.java index 9e6094e..022daeb 100644 --- a/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpBudgets.java +++ b/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpBudgets.java @@ -19,6 +19,7 @@ import com.jeesite.common.utils.excel.annotation.ExcelField; import com.jeesite.common.utils.excel.annotation.ExcelField.Align; import com.jeesite.common.utils.excel.annotation.ExcelFields; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; @@ -28,6 +29,7 @@ import java.io.Serial; * @author gaoxq * @version 2026-03-22 */ +@EqualsAndHashCode(callSuper = true) @Table(name = "erp_budgets", alias = "a", label = "预算信息", columns = { @Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true), @Column(name = "budget_id", attrName = "budgetId", label = "唯一主键", isPK = true), From 4fe45a55e01a1e7c2e812f24a639657d098e86aa Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Wed, 8 Apr 2026 16:25:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=8F=8A=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/desktop/workbench/components/ContractInfo.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue b/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue index 7b8650d..fa657b0 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue @@ -117,8 +117,8 @@ const monthAmountMap = new Map(); sourceData.value.forEach((item) => { - if (!item.signDate) return; - const date = new Date(item.signDate); + if (!item.createTime) return; + const date = new Date(item.createTime); if (Number.isNaN(date.getTime())) return; const monthLabel = `${date.getMonth() + 1}月`; monthOrderMap.set(monthLabel, date.getMonth() + 1); From 74e5bdeaaa97cfc1547b9747b9a6ccf4dca3da1a Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Thu, 9 Apr 2026 14:37:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=8F=8A=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-vue/packages/biz/views/biz/myScreen/index.vue | 4 ++++ .../core/layouts/views/desktop/workbench/index.vue | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/web-vue/packages/biz/views/biz/myScreen/index.vue b/web-vue/packages/biz/views/biz/myScreen/index.vue index 65dccfc..829cbc9 100644 --- a/web-vue/packages/biz/views/biz/myScreen/index.vue +++ b/web-vue/packages/biz/views/biz/myScreen/index.vue @@ -46,6 +46,10 @@ height: 100%; min-height: 0; padding: 0 !important; + width: calc(100% + 10px); + margin-left: -5px !important; + margin-right: -5px !important; + margin-bottom: 0 !important; overflow: hidden !important; background: transparent !important; } diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/index.vue b/web-vue/packages/core/layouts/views/desktop/workbench/index.vue index 4eeb30b..4abb529 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/index.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/index.vue @@ -15,11 +15,11 @@
- +
- -
+ +
@@ -55,6 +55,10 @@ height: 100%; min-height: 0; padding: 0 !important; + width: calc(100% + 10px); + margin-left: -5px !important; + margin-right: -5px !important; + margin-bottom: 0 !important; overflow: hidden !important; background: transparent !important; } @@ -67,7 +71,7 @@ height: 100%; min-height: 0; margin: 0; - background: rgb(255, 255, 255); + background: transparent; border-radius: @desktop-card-radius; }