Merge remote-tracking branch 'origin/dev' into dev

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;

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 {
 

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),

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),

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),

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,
       },
     },
     {

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;
   }

web-vue/packages/core/layouts/views/desktop/workbench/components/ContractInfo.vue

@@ -39,7 +39,7 @@
   const statusDict = ref<DictData[]>([]);
 
   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;
@@ -117,8 +117,8 @@
     const monthAmountMap = new Map<string, number>();
 
     sourceData.value.forEach((item) => {
-      if (!item.signDate) return;
+      if (!item.createTime) return;
-      const date = new Date(item.signDate);
+      const date = new Date(item.createTime);
       if (Number.isNaN(date.getTime())) return;
       const monthLabel = `${date.getMonth() + 1}月`;
       monthOrderMap.set(monthLabel, date.getMonth() + 1);
@@ -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',
+            color: isDark ? 'rgba(148, 163, 184, 0.72)' : 'rgba(100, 116, 139, 0.88)',
-            padding: [0, 0, 2, 0],
+            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}`,
           },
         },

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,
       },
     });
 

web-vue/packages/core/layouts/views/desktop/workbench/index.vue

@@ -15,11 +15,11 @@
         </div>
         <div class="workbench-row">
           <div class="workbench-col">
-			  <ProjectTask />
+            <ProjectTask />
           </div>
           <div class="workbench-col">
-			  <ContractInfo />
+            <ContractInfo />
-		  </div>
+          </div>
         </div>
       </div>
     </div>
@@ -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;
   }