zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.1.x' into dev

Browse Source
This commit is contained in:
Charles7c 2023-09-02 00:23:15 +08:00
commit c6ae5db826
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -225,6 +225,7 @@ continew-admin
├─ public # 公共静态资源（favicon.ico、logo.svg） ├─ public # 公共静态资源（favicon.ico、logo.svg）
├─ src ├─ src
│ ├─ api # 请求接口 │ ├─ api # 请求接口
│ │ ├─ demo # 示例模块
│ │ ├─ auth # 认证模块 │ │ ├─ auth # 认证模块
│ │ ├─ common # 公共模块 │ │ ├─ common # 公共模块
│ │ ├─ monitor # 系统监控模块 │ │ ├─ monitor # 系统监控模块
@ -247,7 +248,7 @@ continew-admin
│ ├─ types # TypeScript 类型 │ ├─ types # TypeScript 类型
│ ├─ utils # 工具库 │ ├─ utils # 工具库
│ ├─ views # 页面模板 │ ├─ views # 页面模板
│ │ ├─ arco-design # Arco Design 相关示例模块 │ │ ├─ demo # Arco Design 相关示例模块
│ │ ├─ dashboard # 仪表盘模块 │ │ ├─ dashboard # 仪表盘模块
│ │ ├─ login # 登录模块 │ │ ├─ login # 登录模块
│ │ ├─ monitor # 系统监控模块 │ │ ├─ monitor # 系统监控模块

8
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
View File

@ -66,17 +66,17 @@ public class AnnouncementVO extends BaseVO {
* *
* @return 公告状态 * @return 公告状态
*/ */
@Schema(description = "状态（1：已发布，2：已过期）", example = "1") @Schema(description = "状态（1：待发布，2：已发布，3：已过期）", example = "1")
public Integer getStatus() { public Integer getStatus() {
int status = 1; int status = 2;
if (null != this.effectiveTime) { if (null != this.effectiveTime) {
if (this.effectiveTime.isAfter(LocalDateTime.now())) { if (this.effectiveTime.isAfter(LocalDateTime.now())) {
status = 2; status = 1;
} }
} }
if (null != this.terminateTime) { if (null != this.terminateTime) {
if (this.terminateTime.isBefore(LocalDateTime.now())) { if (this.terminateTime.isBefore(LocalDateTime.now())) {
status = 2; status = 3;
} }
} }
return status; return status;

5
continew-admin-ui/src/views/system/announcement/index.vue
View File

@ -135,8 +135,9 @@
</a-table-column> </a-table-column>
<a-table-column title="状态" align="center"> <a-table-column title="状态" align="center">
<template #cell="{ record }"> <template #cell="{ record }">
<a-tag v-if="record.status === 1" color="green">已发布</a-tag> <a-tag v-if="record.status === 1" color="blue">待发布</a-tag>
<a-tag v-else color="orangered">已过期</a-tag> <a-tag v-else-if="record.status === 2" color="green">已发布</a-tag>
<a-tag v-else color="red">已过期</a-tag>
</template> </template>
</a-table-column> </a-table-column>
<a-table-column title="生效时间"> <a-table-column title="生效时间">