diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizQuickLogin.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizQuickLogin.java index 24787cb4..46ddeb58 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizQuickLogin.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizQuickLogin.java @@ -2,6 +2,7 @@ package com.jeesite.modules.biz.entity; import java.io.Serializable; import java.util.Date; + import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.fasterxml.jackson.annotation.JsonFormat; @@ -20,70 +21,73 @@ import java.io.Serial; /** * 系统信息Entity + * * @author gaoxq * @version 2025-11-26 */ @EqualsAndHashCode(callSuper = true) -@Table(name="biz_quick_login", alias="a", label="系统信息信息", columns={ - @Column(name="create_time", attrName="createTime", label="创建时间", isUpdate=false, isUpdateForce=true), - @Column(name="id", attrName="id", label="自增主键", isPK=true), - @Column(name="system_name", attrName="systemName", label="系统名称", queryType=QueryType.LIKE), - @Column(name="homepage_url", attrName="homepageUrl", label="首页地址", isQuery=false), - @Column(name="icon_class", attrName="iconClass", label="图标类名", isQuery=false), - @Column(name="icon_color", attrName="iconColor", label="图标颜色", isQuery=false), - @Column(name="sort_order", attrName="sortOrder", label="排序序号", isQuery=false), - @Column(name="bg_color", attrName="bgColor", label="图标背景色", isQuery=false), - @Column(name="mask_color", attrName="maskColor", label="悬浮遮罩色", isQuery=false), - @Column(name="is_enabled", attrName="isEnabled", label="是否启用", isQuery=false), - @Column(name="update_time", attrName="updateTime", label="更新时间", isQuery=false, isUpdateForce=true), - @Column(name="f_tenant_id", attrName="ftenantId", label="租户id", isUpdate=false, isQuery=false), - @Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false), - @Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false), - @Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true), - }, orderBy="a.create_time DESC" +@Table(name = "biz_quick_login", alias = "a", label = "系统信息信息", columns = { + @Column(name = "create_time", attrName = "createTime", label = "创建时间", isUpdate = false, isUpdateForce = true), + @Column(name = "id", attrName = "id", label = "自增主键", isPK = true), + @Column(name = "system_name", attrName = "systemName", label = "系统名称", queryType = QueryType.LIKE), + @Column(name = "system_type", attrName = "systemType", label = "系统类型"), + @Column(name = "homepage_url", attrName = "homepageUrl", label = "首页地址", isQuery = false), + @Column(name = "icon_class", attrName = "iconClass", label = "图标类名", isQuery = false), + @Column(name = "icon_color", attrName = "iconColor", label = "图标颜色", isQuery = false), + @Column(name = "sort_order", attrName = "sortOrder", label = "排序序号", isQuery = false), + @Column(name = "bg_color", attrName = "bgColor", label = "图标背景色", isQuery = false), + @Column(name = "mask_color", attrName = "maskColor", label = "悬浮遮罩色", isQuery = false), + @Column(name = "is_enabled", attrName = "isEnabled", label = "是否启用", isQuery = false), + @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true), + @Column(name = "f_tenant_id", attrName = "ftenantId", label = "租户id", isUpdate = false, isQuery = false), + @Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false), + @Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false), + @Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true), +}, orderBy = "a.create_time DESC" ) @Data public class BizQuickLogin extends DataEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - private Date createTime; // 创建时间 - private String systemName; // 系统名称 - private String homepageUrl; // 首页地址 - private String iconClass; // 图标类名 - private String iconColor; // 图标颜色 - private Long sortOrder; // 排序序号 - private String bgColor; // 图标背景色 - private String maskColor; // 悬浮遮罩色 - private Long isEnabled; // 是否启用 - private Date updateTime; // 更新时间 - private String ftenantId; // 租户id - private String fflowId; // 流程id - private String fflowTaskId; // 流程任务主键 - private Integer fflowState; // 流程任务状态 - public BizQuickLogin() { - this(null); - } - - public BizQuickLogin(String id){ - super(id); - } - - public Date getCreateTime_gte() { - return sqlMap.getWhere().getValue("create_time", QueryType.GTE); - } + @Serial + private static final long serialVersionUID = 1L; + private Date createTime; // 创建时间 + private String systemName; // 系统名称 + private String systemType; // 系统类型 + private String homepageUrl; // 首页地址 + private String iconClass; // 图标类名 + private String iconColor; // 图标颜色 + private Long sortOrder; // 排序序号 + private String bgColor; // 图标背景色 + private String maskColor; // 悬浮遮罩色 + private Long isEnabled; // 是否启用 + private Date updateTime; // 更新时间 + private String ftenantId; // 租户id + private String fflowId; // 流程id + private String fflowTaskId; // 流程任务主键 + private Integer fflowState; // 流程任务状态 - public void setCreateTime_gte(Date createTime) { - sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); - } - - public Date getCreateTime_lte() { - return sqlMap.getWhere().getValue("create_time", QueryType.LTE); - } + public BizQuickLogin() { + this(null); + } + + public BizQuickLogin(String id) { + super(id); + } + + public Date getCreateTime_gte() { + return sqlMap.getWhere().getValue("create_time", QueryType.GTE); + } + + public void setCreateTime_gte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); + } + + public Date getCreateTime_lte() { + return sqlMap.getWhere().getValue("create_time", QueryType.LTE); + } + + public void setCreateTime_lte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); + } - public void setCreateTime_lte(Date createTime) { - sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); - } - } \ No newline at end of file diff --git a/web-vue/packages/assets/images/mail.png b/web-vue/packages/assets/images/mail.png new file mode 100644 index 00000000..59f5c2e4 Binary files /dev/null and b/web-vue/packages/assets/images/mail.png differ diff --git a/web-vue/packages/biz/api/biz/mailAttachments.ts b/web-vue/packages/biz/api/biz/mailAttachments.ts index f3204ffd..de7ea709 100644 --- a/web-vue/packages/biz/api/biz/mailAttachments.ts +++ b/web-vue/packages/biz/api/biz/mailAttachments.ts @@ -56,4 +56,3 @@ export const bizMailAttachmentsImportData = ( export const bizMailAttachmentsDelete = (params?: BizMailAttachments | any) => defHttp.get({ url: adminPath + '/biz/mailAttachments/delete', params }); - diff --git a/web-vue/packages/biz/api/biz/quickLogin.ts b/web-vue/packages/biz/api/biz/quickLogin.ts index 3d54f050..8df15270 100644 --- a/web-vue/packages/biz/api/biz/quickLogin.ts +++ b/web-vue/packages/biz/api/biz/quickLogin.ts @@ -12,6 +12,7 @@ const { adminPath } = useGlobSetting(); export interface BizQuickLogin extends BasicModel { createTime?: string; // 创建时间 systemName: string; // 系统名称 + systemType: string; // 系统类型 homepageUrl: string; // 首页地址 iconClass: string; // 图标类名 iconColor: string; // 图标颜色 diff --git a/web-vue/packages/biz/views/biz/dataReport/erp/index.vue b/web-vue/packages/biz/views/biz/dataReport/erp/index.vue index ecb1cec2..d3135d81 100644 --- a/web-vue/packages/biz/views/biz/dataReport/erp/index.vue +++ b/web-vue/packages/biz/views/biz/dataReport/erp/index.vue @@ -36,8 +36,6 @@ import ChartLineType from './components/ChartLineType.vue'; import ChartLineRatio from './components/ChartLineRatio.vue'; - - const FormValues = ref>({ cycleType: 'M' }); diff --git a/web-vue/packages/biz/views/biz/quickLogin/form.vue b/web-vue/packages/biz/views/biz/quickLogin/form.vue index 4bddc70a..6fa1dd0e 100644 --- a/web-vue/packages/biz/views/biz/quickLogin/form.vue +++ b/web-vue/packages/biz/views/biz/quickLogin/form.vue @@ -50,8 +50,17 @@ maxlength: 100, }, required: true, - colProps: { md: 24, lg: 24 }, }, + { + label: t('系统类型'), + field: 'systemType', + component: 'Select', + componentProps: { + dictType: 'system_type', + allowClear: true, + }, + required: true, + }, { label: t('首页地址'), field: 'homepageUrl', diff --git a/web-vue/packages/biz/views/biz/quickLogin/list.vue b/web-vue/packages/biz/views/biz/quickLogin/list.vue index 482e33e0..10a470c5 100644 --- a/web-vue/packages/biz/views/biz/quickLogin/list.vue +++ b/web-vue/packages/biz/views/biz/quickLogin/list.vue @@ -99,6 +99,15 @@ align: 'left', slot: 'slotBizKey', }, + { + title: t('系统类型'), + dataIndex: 'systemType', + key: 'a.system_type', + sorter: true, + width: 200, + align: 'left', + dictType: 'system_type' + }, { title: t('首页地址'), dataIndex: 'homepageUrl', diff --git a/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue b/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue index 0434d41c..125c26e5 100644 --- a/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue +++ b/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue @@ -1,8 +1,5 @@