sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-05-20 22:37:25 +08:00
parent b3e68ed85b
commit faa9c0110c
6 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-ui/src/App.vue
View File

@ -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;
}
}
</style>

4
ruoyi-ui/src/views/video/aiboxData/index.vue
View File

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

2
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java
View File

@ -104,7 +104,7 @@ public class SmzSspProblemmodifyController extends BaseController
smzSspProblemmodify.setNowDept(Convert.toStr(getDeptId()));
}
smzSspProblemmodify.setNowUser(getLoginUser().getUsername());
List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSmzSspProblemmodifyListAndUnitName(smzSspProblemmodify);
List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSmzSspProblemmodifyList(smzSspProblemmodify);
List<SmzSspProblemmodifyExport> exportList=new ArrayList<>();
for(SmzSspProblemmodify it :list){
exportList.add(SmzSspProblemmodifyExport.newItem(it));

8
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
View File

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

4
yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
View File

@ -51,11 +51,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSmzSspProblemmodifyVo">
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
</sql>
<select id="selectSmzSspProblemmodifyList" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
select ssp.id, ssp.projectId, ssp.infoType, sp.projectName as problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, su.nick_name as createBy
select ssp.id, ssp.projectId, ssp.infoType, sp.projectName as problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.problemType, su.nick_name as createBy
from vw_smz_ssp_problemmodify_audit ssp
left join sur_project sp on ssp.projectId = sp.id
left join sys_user su ON su.phonenumber = ssp.createUser

1
yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml
View File

@ -72,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
</if>
<if test="params.date != null"> and date(dapd.create_time) = date(#{params.date})</if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(dapd.create_time) between #{params.beginTime} and #{params.endTime}</if>
</where>
order by dapd.create_time desc
</select>