diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue index da43eed1..9eaab4db 100644 --- a/ruoyi-ui/src/App.vue +++ b/ruoyi-ui/src/App.vue @@ -35,9 +35,10 @@ export default { background-image: url("assets/images/app-bgvip.png?v=20230923"); background-size: 100% 100%; } -.nest-menu,.el-submenu__title{ +.el-submenu__title{ position: relative; .todo_num_tips{ + top:20px; position: absolute; right: 36px; background-color: #f56c6c; @@ -56,9 +57,25 @@ export default { display: none; } } -.el-submenu__title{ +.nest-menu{ + position: relative; .todo_num_tips{ - top:20px; + position: absolute; + right: 18px; + background-color: #f56c6c; + border-radius: 10px; + color: #fff; + display: inline-block; + font-size: 12px; + height: 18px; + line-height: 18px; + padding: 0 6px; + text-align: center; + white-space: nowrap; + border: 1px solid #fff; + cursor: pointer; + top: 16px; + display: none; } } \ No newline at end of file diff --git a/ruoyi-ui/src/views/video/aiboxData/index.vue b/ruoyi-ui/src/views/video/aiboxData/index.vue index c2866f82..08028975 100644 --- a/ruoyi-ui/src/views/video/aiboxData/index.vue +++ b/ruoyi-ui/src/views/video/aiboxData/index.vue @@ -229,8 +229,8 @@ export default { this.loading = true; this.queryParams.params = {}; if (null != this.daterangeMarksTime && "" != this.daterangeMarksTime) { - this.queryParams.params["beginMarksTime"] = this.daterangeMarksTime[0]; - this.queryParams.params["endMarksTime"] = this.daterangeMarksTime[1]; + this.queryParams.params["beginTime"] = this.daterangeMarksTime[0]; + this.queryParams.params["endTime"] = this.daterangeMarksTime[1]; } listAiBoxProjectData(this.queryParams).then((response) => { this.dataList = response.rows; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java index 5c2c06e2..0864d91a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java @@ -104,7 +104,7 @@ public class SmzSspProblemmodifyController extends BaseController smzSspProblemmodify.setNowDept(Convert.toStr(getDeptId())); } smzSspProblemmodify.setNowUser(getLoginUser().getUsername()); - List list = smzSspProblemmodifyService.selectSmzSspProblemmodifyListAndUnitName(smzSspProblemmodify); + List list = smzSspProblemmodifyService.selectSmzSspProblemmodifyList(smzSspProblemmodify); List exportList=new ArrayList<>(); for(SmzSspProblemmodify it :list){ exportList.add(SmzSspProblemmodifyExport.newItem(it)); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java index 793b8cd9..673b6d54 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java @@ -166,4 +166,12 @@ public class SmzSspProblemmodifyExport { public void setCreateTime(Date createTime) { this.createTime = createTime; } + + public String getProblemType() { + return problemType; + } + + public void setProblemType(String problemType) { + this.problemType = problemType; + } } diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index ba233a7a..bdfaa419 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -51,11 +51,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, projectId, infoType, problemArea, workParts, changeInfo, lordSent, lordSentUser, copySend, copySendUser, checkState, nickedArea, nickedTime, projectType, processName, projectName, nickedInfo, checkUser, checkUserPhone, isDel, createUser, createTime, updateUser, updateTime, marks_picture, marks_video, smark_url, danger_type,problemType, recheckSend, recheckSendUser, roleType, problemType from smz_ssp_problemmodify + select id, projectId, infoType, problemArea, workParts, changeInfo, lordSent, lordSentUser, copySend, copySendUser, checkState, nickedArea, nickedTime, projectType, processName, projectName, nickedInfo, checkUser, checkUserPhone, isDel, createUser, createTime, updateUser, updateTime, marks_picture, marks_video, smark_url, danger_type, problemType, recheckSend, recheckSendUser, roleType from smz_ssp_problemmodify