diff --git a/screen-vue/src/api/bizNote.js b/screen-vue/src/api/bizNote.js new file mode 100644 index 0000000..08a3dc1 --- /dev/null +++ b/screen-vue/src/api/bizNote.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +/** + * 获取指标信息列表 + */ +export function getNotesList(params) { + return request({ + url: '/biz/notes/list', + method: 'get', + params: params + }) +} + + +/** + * 保存/修改 + */ +export function getNotesSave(data) { + return request({ + url: '/biz/notes/save', + method: 'post', + data + }) +} + + +/** + * 删除 + */ +export function getNotesDelete(params) { + return request({ + url: '/biz/notes/delete', + method: 'post', + params: params + }) +} \ No newline at end of file diff --git a/screen-vue/src/router/index.js b/screen-vue/src/router/index.js index fb15d8c..6787fd9 100644 --- a/screen-vue/src/router/index.js +++ b/screen-vue/src/router/index.js @@ -103,11 +103,6 @@ const routes = [ component: BigScreenWork }, ...generateBigScreenRoutes(), - { - path: '/:pathMatch(.*)*', - name: 'BigScreen404', - component: Page404 - } ] }, { diff --git a/screen-vue/src/views/desktop/components/ChartNote.vue b/screen-vue/src/views/desktop/components/ChartNote.vue index 76552df..3c10d72 100644 --- a/screen-vue/src/views/desktop/components/ChartNote.vue +++ b/screen-vue/src/views/desktop/components/ChartNote.vue @@ -29,12 +29,11 @@ import * as echarts from 'echarts' import { getItemInfoList } from '@/api/bizApi' const tabDict = [ - { key: 'NOTE_YEAR_Y001', label: '类型' }, // 默认选项 + { key: 'NOTE_YEAR_Y001', label: '类型' }, { key: 'NOTE_YEAR_Y002', label: '月份' }, ] -// 响应式数据 -const activeTabKey = ref(tabDict[0].key) // 默认选中第一个 +const activeTabKey = ref(tabDict[0].key) const indexCode = ref(activeTabKey.value) const tableData = ref([]) const chartRef = ref(null) @@ -49,7 +48,6 @@ let seriesStatus = { const currentYear = new Date().getFullYear().toString(); -// 获取数据方法 async function getDataList() { try { const reqParams = { @@ -73,7 +71,6 @@ function switchTab(tabKey) { getDataList() } -// 计算总数 function calculateTotal() { const xAxisData = tableData.value.map(item => item.xaxis || '') const index01Data = tableData.value.map(item => Math.round(Number(item.index01) || 0)) @@ -89,7 +86,6 @@ function calculateTotal() { }) } -// 渲染图表 function renderChart() { if (!chartRef.value || tableData.value.length === 0) return @@ -106,6 +102,11 @@ function renderChart() { const totalData = calculateTotal() const option = { + animationDuration: 1000, + animationEasing: 'cubicOut', + animationDelay: function(idx) { + return idx * 50; + }, legend: { show: true, orient: 'horizontal', @@ -208,6 +209,9 @@ function renderChart() { fontSize: 10, color: '#fff', fontWeight: 'bold' + }, + animationDelay: function(idx) { + return idx * 30; } }, { @@ -224,6 +228,9 @@ function renderChart() { fontSize: 10, color: '#fff', fontWeight: 'bold' + }, + animationDelay: function(idx) { + return idx * 30 + 100; } }, { @@ -240,6 +247,9 @@ function renderChart() { fontSize: 10, color: '#fff', fontWeight: 'bold' + }, + animationDelay: function(idx) { + return idx * 30 + 200; } }, { @@ -258,6 +268,9 @@ function renderChart() { fontSize: 11, color: '#303133', fontWeight: 'bold' + }, + animationDelay: function(idx) { + return idx * 30 + 300; } } ] diff --git a/screen-vue/src/views/myapp/note/form.vue b/screen-vue/src/views/myapp/note/form.vue new file mode 100644 index 0000000..dfd1c20 --- /dev/null +++ b/screen-vue/src/views/myapp/note/form.vue @@ -0,0 +1,260 @@ + + + + + \ No newline at end of file diff --git a/screen-vue/src/views/myapp/note/list.vue b/screen-vue/src/views/myapp/note/list.vue new file mode 100644 index 0000000..47705da --- /dev/null +++ b/screen-vue/src/views/myapp/note/list.vue @@ -0,0 +1,634 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/mini/mybigscreen/Auth/Home/desktopController.java b/src/main/java/com/mini/mybigscreen/Auth/Home/desktopController.java index cf14079..40c47b5 100644 --- a/src/main/java/com/mini/mybigscreen/Auth/Home/desktopController.java +++ b/src/main/java/com/mini/mybigscreen/Auth/Home/desktopController.java @@ -39,7 +39,7 @@ public class desktopController { public Result getNoteList() { LambdaQueryWrapper query = new LambdaQueryWrapper() .notIn(Notes::getUstatus, "done") - .orderByDesc(Notes::getCreateUser); + .orderByDesc(Notes::getCreateTime); return Result.success(notesService.list(query)); } diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java b/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java index 9a224e4..fea9df2 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java @@ -1,7 +1,18 @@ package com.mini.mybigscreen.biz.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.mini.mybigscreen.Model.Message; +import com.mini.mybigscreen.Model.PageResult; +import com.mini.mybigscreen.Model.Result; +import com.mini.mybigscreen.biz.domain.Notes; +import com.mini.mybigscreen.biz.service.NotesService; +import com.mini.mybigscreen.utils.PageUtil; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** *

@@ -15,4 +26,38 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/biz/notes") public class NotesController { + + @Resource + private NotesService notesService; + + + @GetMapping("list") + public Result getList(Integer pageNum, Integer pageSize, + String title, String priority, String ustatus, String type) { + LambdaQueryWrapper query = new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(title), Notes::getTitle, title) + .eq(StrUtil.isNotBlank(priority), Notes::getPriority, priority) + .eq(StrUtil.isNotBlank(ustatus), Notes::getUstatus, ustatus) + .eq(StrUtil.isNotBlank(type), Notes::getType, type) + .orderByDesc(Notes::getCreateTime); + List list = notesService.list(query); + PageUtil util = new PageUtil<>(pageNum, pageSize, list); + PageResult result = new PageResult<>(util.OkData(), pageNum, pageSize, list.size()); + return Result.success(result); + } + + @PostMapping("save") + public Result save(@RequestBody Notes notes) { + boolean success = notes.getIsEdit() + ? notesService.update(notes, + new LambdaUpdateWrapper().eq(Notes::getId, notes.getId()) + ) : notesService.save(notes); + return Result.success(new Message(notes.getIsEdit() ? "数据修改成功" : "数据新增成功", 200)); + } + + @PostMapping("delete") + public Result delete(String id) { + notesService.removeById(id); + return Result.success(new Message("数据删除成功", 200)); + } } diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/HomeModule.java b/src/main/java/com/mini/mybigscreen/biz/domain/HomeModule.java index 917efa1..ef5da68 100644 --- a/src/main/java/com/mini/mybigscreen/biz/domain/HomeModule.java +++ b/src/main/java/com/mini/mybigscreen/biz/domain/HomeModule.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; import lombok.Getter; @@ -22,6 +24,7 @@ import lombok.Setter; @TableName("biz_home_module") public class HomeModule implements Serializable { + @Serial private static final long serialVersionUID = 1L; @TableField("create_time") diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java b/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java index 0224eff..9b2e7ef 100644 --- a/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java +++ b/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -24,6 +26,7 @@ import lombok.Setter; @TableName("biz_home_user") public class HomeUser extends BaseEntity implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/Notes.java b/src/main/java/com/mini/mybigscreen/biz/domain/Notes.java index e34e554..f199b45 100644 --- a/src/main/java/com/mini/mybigscreen/biz/domain/Notes.java +++ b/src/main/java/com/mini/mybigscreen/biz/domain/Notes.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; + +import com.mini.mybigscreen.Model.BaseEntity; import lombok.Getter; import lombok.Setter; @@ -20,8 +24,9 @@ import lombok.Setter; @Getter @Setter @TableName("biz_notes") -public class Notes implements Serializable { +public class Notes extends BaseEntity implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/QuickLogin.java b/src/main/java/com/mini/mybigscreen/biz/domain/QuickLogin.java index 68db846..de96adf 100644 --- a/src/main/java/com/mini/mybigscreen/biz/domain/QuickLogin.java +++ b/src/main/java/com/mini/mybigscreen/biz/domain/QuickLogin.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; + +import com.mini.mybigscreen.Model.BaseEntity; import lombok.Getter; import lombok.Setter; @@ -20,8 +24,9 @@ import lombok.Setter; @Getter @Setter @TableName("biz_quick_login") -public class QuickLogin implements Serializable { +public class QuickLogin extends BaseEntity implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/WarningAlert.java b/src/main/java/com/mini/mybigscreen/biz/domain/WarningAlert.java index 3532f69..99e94a7 100644 --- a/src/main/java/com/mini/mybigscreen/biz/domain/WarningAlert.java +++ b/src/main/java/com/mini/mybigscreen/biz/domain/WarningAlert.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; + +import com.mini.mybigscreen.Model.BaseEntity; import lombok.Getter; import lombok.Setter; @@ -20,8 +24,9 @@ import lombok.Setter; @Getter @Setter @TableName("biz_warning_alert") -public class WarningAlert implements Serializable { +public class WarningAlert extends BaseEntity implements Serializable { + @Serial private static final long serialVersionUID = 1L; /**