diff --git a/ruoyi-ui/src/api/project/videoConfig.js b/ruoyi-ui/src/api/project/videoConfig.js new file mode 100644 index 00000000..b31085a7 --- /dev/null +++ b/ruoyi-ui/src/api/project/videoConfig.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询视频配置列表 +export function listVideoConfig(query) { + return request({ + url: '/project/videoConfig/list', + method: 'get', + params: query + }) +} + +// 查询视频配置详细 +export function getVideoConfig(id) { + return request({ + url: '/project/videoConfig/' + id, + method: 'get' + }) +} + +// 新增视频配置 +export function addVideoConfig(data) { + return request({ + url: '/project/videoConfig', + method: 'post', + data: data + }) +} + +// 修改视频配置 +export function updateVideoConfig(data) { + return request({ + url: '/project/videoConfig', + method: 'put', + data: data + }) +} + +// 删除视频配置 +export function delVideoConfig(id) { + return request({ + url: '/project/videoConfig/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index f93ce7dd..07ad4463 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -38,6 +38,20 @@ /> + + + + + + + + - + + + - @@ -226,12 +227,23 @@ > + + + + + - - - @@ -339,7 +351,7 @@ export default { components: { ElImageViewer, }, - dicts: ["project_measure_type", "project_checking_result"], + dicts: ["project_measure_type", "project_checking_result", "project_measure_info_type"], data() { return { showViewer: false, @@ -357,10 +369,7 @@ export default { { required: true, message: "请输入测量部位", trigger: "blur" }, { max: 100, message: "测量部位最多100字符", trigger: "blur" }, ], - measureInfo: [ - { required: true, message: "请输入测量内容", trigger: "blur" }, - { max: 100, message: "测量内容最多100字符", trigger: "blur" }, - ], + measureInfo: [{ required: true, message: "请选择测量内容", trigger: "blur" }], measurePointPosition: [ { required: true, message: "请输入测量点位", trigger: "blur" }, { max: 100, message: "测量点位最多100字符", trigger: "blur" }, diff --git a/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue b/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue index 046f7b0f..cbc6bea0 100644 --- a/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue +++ b/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue @@ -128,6 +128,7 @@ 10) { + this.$message.error("请选择下级节点数据,当前数据节点未查询到相关人员!"); + return false; + } if (note && note.id) { this.form.deptId = note.id; this.getUserList(note.id); diff --git a/ruoyi-ui/src/views/project/videoConfig/index.vue b/ruoyi-ui/src/views/project/videoConfig/index.vue new file mode 100644 index 00000000..abe70cdd --- /dev/null +++ b/ruoyi-ui/src/views/project/videoConfig/index.vue @@ -0,0 +1,431 @@ + + + diff --git a/ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue b/ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue new file mode 100644 index 00000000..86fc9234 --- /dev/null +++ b/ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue @@ -0,0 +1,465 @@ + + + diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java index 448f7638..eddd067f 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java @@ -7,7 +7,6 @@ import com.ruoyi.common.enums.BusinessType; import com.yanzhu.jh.project.domain.SurProjectChecking; import com.yanzhu.jh.project.service.ISurProjectCheckingService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** diff --git a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml index 50569cd7..2ff604de 100644 --- a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml +++ b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + and spvc.is_del='0' + and spvc.project_id = #{projectId} + and sp.projectName like concat('%', #{projectName}, '%') + and spvc.video_only_type = #{videoOnlyType} + and spvc.video_dvr_number like concat('%', #{videoDvrNumber}, '%') + and spvc.video_dvr_security = #{videoDvrSecurity} + and spvc.video_passage_count = #{videoPassageCount} + and spvc.signal_type = #{signalType} + and spvc.signal_state = #{signalState} + and spvc.signal_code = #{signalCode} + and spvc.is_del = #{isDel} + + and sp.deptId = #{projectDeptId} + + and sp.deptId = #{nowDept} + + and sp.id in (select DISTINCT spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept}) + and sp.id in (select DISTINCT spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0) + + + + + + + insert into sur_project_video_config + + project_id, + video_only_type, + video_dvr_number, + video_dvr_security, + video_passage_count, + signal_type, + signal_state, + signal_code, + is_del, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{projectId}, + #{videoOnlyType}, + #{videoDvrNumber}, + #{videoDvrSecurity}, + #{videoPassageCount}, + #{signalType}, + #{signalState}, + #{signalCode}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update sur_project_video_config + + project_id = #{projectId}, + video_only_type = #{videoOnlyType}, + video_dvr_number = #{videoDvrNumber}, + video_dvr_security = #{videoDvrSecurity}, + video_passage_count = #{videoPassageCount}, + signal_type = #{signalType}, + signal_state = #{signalState}, + signal_code = #{signalCode}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from sur_project_video_config where id = #{id} + + + + delete from sur_project_video_config where id in + + #{id} + + + + + delete from sur_project_video_passage where video_id in + + #{videoId} + + + + + delete from sur_project_video_passage where video_id = #{videoId} + + + + insert into sur_project_video_passage( id, video_id, video_dvr_number, passage_name, passage_value) values + + ( #{item.id}, #{item.videoId}, #{item.videoDvrNumber}, #{item.passageName}, #{item.passageValue}) + + + \ No newline at end of file