Skip to content

I
Imagedx
Commit ff21f4a3 authored by yzm's avatar yzm
Browse files
Options

bug

parent ec0b1e82
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 222 deletions
src/main/java/im/zhaojun/system/model/Code.java
View file @ ff21f4a3
...@@ -11,7 +11,7 @@ public class Code implements Serializable { ...@@ -11,7 +11,7 @@ public class Code implements Serializable {
private Integer rectifytime ; private Integer rectifytime ;
private Integer manualchecktime; private Integer manualchecktime;
private Integer pushchecktime ; private Integer pushchecktime ;
private Integer maxnum; private Integer maxnumvalue;
private Integer alarmnum; private Integer alarmnum;
public String getKey() { public String getKey() {
...@@ -70,12 +70,12 @@ public class Code implements Serializable { ...@@ -70,12 +70,12 @@ public class Code implements Serializable {
this.pushchecktime = pushchecktime; this.pushchecktime = pushchecktime;
} }
public Integer getMaxnum() { public Integer getMaxnumvalue() {
return maxnum; return maxnumvalue;
} }
public void setMaxnum(Integer maxnum) { public void setMaxnumvalue(Integer maxnumvalue) {
this.maxnum = maxnum; this.maxnumvalue = maxnumvalue;
} }
public Integer getAlarmnum() { public Integer getAlarmnum() {
......
src/main/java/im/zhaojun/system/model/CodeData.java
View file @ ff21f4a3
...@@ -47,6 +47,7 @@ public class CodeData implements Serializable { ...@@ -47,6 +47,7 @@ public class CodeData implements Serializable {
this.alarmlevel = alarmlevel; this.alarmlevel = alarmlevel;
} }
/** /**
* 部门ID * 部门ID
*/ */
...@@ -64,4 +65,23 @@ public class CodeData implements Serializable { ...@@ -64,4 +65,23 @@ public class CodeData implements Serializable {
private String alarmlevel; private String alarmlevel;
private Integer maxnumvalue;
private Integer alarmnum;
public Integer getMaxnumvalue() {
return maxnumvalue;
}
public void setMaxnumvalue(Integer maxnumvalue) {
this.maxnumvalue = maxnumvalue;
}
public Integer getAlarmnum() {
return alarmnum;
}
public void setAlarmnum(Integer alarmnum) {
this.alarmnum = alarmnum;
}
} }
\ No newline at end of file
src/main/java/im/zhaojun/system/model/TraffalarmrecordstatParams.java
View file @ ff21f4a3
package im.zhaojun.system.model; package im.zhaojun.system.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class TraffalarmrecordstatParams extends Traffalarmrecordstate { public class TraffalarmrecordstatParams extends Traffalarmrecordstate {
private String starttime; private String starttime;
...@@ -14,4 +10,51 @@ public class TraffalarmrecordstatParams extends Traffalarmrecordstate { ...@@ -14,4 +10,51 @@ public class TraffalarmrecordstatParams extends Traffalarmrecordstate {
private Integer page; private Integer page;
private Integer limit; private Integer limit;
public String getStarttime() {
return starttime;
}
public void setStarttime(String starttime) {
this.starttime = starttime;
}
public String getEndtime() {
return endtime;
}
public void setEndtime(String endtime) {
this.endtime = endtime;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public Integer getCheckstatus() {
return checkstatus;
}
public void setCheckstatus(Integer checkstatus) {
this.checkstatus = checkstatus;
}
public Integer getPage() {
return page;
}
public void setPage(Integer page) {
this.page = page;
}
public Integer getLimit() {
return limit;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
} }
src/main/resources/application.properties
View file @ ff21f4a3
spring.profiles.active=dev spring.profiles.active=dev
server.port=8084 server.port=8082
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=123456
#spring.datasource.url=jdbc:mysql://172.16.24.153:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false spring.datasource.url=jdbc:mysql://172.16.24.29:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
spring.datasource.url=jdbc:mysql://localhost:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://192.168.168.212:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.filters= stat spring.datasource.filters= stat
...@@ -47,7 +47,7 @@ spring.thymeleaf.cache=false ...@@ -47,7 +47,7 @@ spring.thymeleaf.cache=false
shiro-action.log.operation = false shiro-action.log.operation = false
shiro-action.log.login = false shiro-action.log.login = false
shiro-action.session-timeout=259200 shiro-action.session-timeout=518400
shiro-action.perms-cache-timeout=518400 shiro-action.perms-cache-timeout=518400
shiro-action.super-admin-username=admin shiro-action.super-admin-username=admin
......
src/main/resources/mapper/CodeMapper.xml
View file @ ff21f4a3
...@@ -10,26 +10,32 @@ ...@@ -10,26 +10,32 @@
<result column="rectifytime" jdbcType="INTEGER" property="rectifytime" /> <result column="rectifytime" jdbcType="INTEGER" property="rectifytime" />
<result column="manualchecktime" jdbcType="INTEGER" property="manualchecktime" /> <result column="manualchecktime" jdbcType="INTEGER" property="manualchecktime" />
<result column="pushchecktime" jdbcType="INTEGER" property="pushchecktime" /> <result column="pushchecktime" jdbcType="INTEGER" property="pushchecktime" />
<result column="maxnum" jdbcType="INTEGER" property="maxnum" /> <result column="maxnumvalue" jdbcType="INTEGER" property="maxnumvalue" />
<result column="alarmnum" jdbcType="INTEGER" property="alarmnum" /> <result column="alarmnum" jdbcType="INTEGER" property="alarmnum" />
</resultMap> </resultMap>
<update id="updatecode" parameterType="java.util.List"> <update id="updatecode" parameterType="java.util.List">
<foreach collection="list" item="item" index="index" open="" close="" separator=";"> <foreach collection="list" item="item" index="index" open="" close="" separator=";">
UPDATE t_code UPDATE t_code t
<set> <set>
<if test="item.alarmlevel != null"> <if test="item.alarmlevel != null">
alarmlevel = #{item.alarmlevel,jdbcType=VARCHAR}, alarmlevel = #{item.alarmlevel,jdbcType=VARCHAR},
</if> </if>
<if test="item.maxnumvalue != null">
maxnumvalue = #{item.maxnumvalue,jdbcType=INTEGER},
</if>
<if test="item.alarmnum != null">
alarmnum = #{item.alarmnum,jdbcType=INTEGER},
</if>
</set> </set>
where key = #{item.key,jdbcType=VARCHAR} where t.key = #{item.key,jdbcType=VARCHAR}
</foreach> </foreach>
</update> </update>
<update id="updatetime" parameterType="java.util.List"> <update id="updatetime" parameterType="java.util.List">
<foreach collection="list" item="item" index="index" open="begin" close=";end;" separator=";"> <foreach collection="list" item="item" index="index" open="begin" close=";end;" separator=";">
UPDATE t_code UPDATE t_code t
<set> <set>
<if test="item.rectifytime != null"> <if test="item.rectifytime != null">
rectifytime = #{item.rectifytime,jdbcType=INTEGER}, rectifytime = #{item.rectifytime,jdbcType=INTEGER},
...@@ -41,28 +47,28 @@ ...@@ -41,28 +47,28 @@
pushchecktime = #{item.pushchecktime,jdbcType=INTEGER}, pushchecktime = #{item.pushchecktime,jdbcType=INTEGER},
</if> </if>
</set> </set>
where key = #{item.key,jdbcType=VARCHAR} where t.key = #{item.key,jdbcType=VARCHAR}
</foreach> </foreach>
</update> </update>
<select id="selectAllWithKey" resultMap="BaseResultMap"> <select id="selectAllWithKey" resultMap="BaseResultMap">
select * from t_code where type=2 select * from t_code t where t.type=2
</select> </select>
<select id="selectAllWithType" resultMap="BaseResultMap"> <select id="selectAllWithType" resultMap="BaseResultMap">
select * from t_code where type=#{typeid,jdbcType=VARCHAR} select * from t_code t where t.type=#{typeid,jdbcType=VARCHAR}
</select> </select>
<update id="updateNameByCodeID"> <update id="updateNameByCodeID">
update t_code set name=#{envalue,jdbcType=VARCHAR} where key=#{codeid,jdbcType=VARCHAR} update t_code t set name=#{envalue,jdbcType=VARCHAR} where t.key=#{codeid,jdbcType=VARCHAR}
</update> </update>
<update id="updatemanualcode"> <update id="updatemanualcode">
update t_code set name=#{name ,jdbcType=VARCHAR},alarmlevel=#{alarmlevel,jdbcType=VARCHAR} where key='send' update t_code t set name=#{name ,jdbcType=VARCHAR},alarmlevel=#{alarmlevel,jdbcType=VARCHAR} where t.key='send'
</update> </update>
<select id="selectalarmNum" resultMap="BaseResultMap"> <select id="selectalarmNum" resultMap="BaseResultMap">
select * from t_code where type=2 and key=#{key,jdbcType=VARCHAR} select * from t_code t where t.type=2 and t.key=#{key,jdbcType=VARCHAR}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/TrafficStatisticsMapper.xml
View file @ ff21f4a3
...@@ -535,7 +535,7 @@ ...@@ -535,7 +535,7 @@
<select id="selectAlarmsByTime" resultMap="AlarmResultMap"> <select id="selectAlarmsByTime" resultMap="AlarmResultMap">
select a.*,b.name "typename",c.tdmc videoname,c.qymc deptname select a.*,b.name "typename",c.tdmc videoname,c.qymc deptname
from traffalarmrecord a,t_code b,sbtdspsr c from traffalarmrecord a,t_code b,sbtdspsr c
where a.recordtype=b.key and b.type=1 and a.fdid =c.sbbh and a.channelid=c.tdbh where a.recordtype=b.key and b.type=2 and a.fdid =c.sbbh and a.channelid=c.tdbh
<if test="starttime != null and starttime != '' "> <if test="starttime != null and starttime != '' ">
and recordtime >= STR_TO_DATE( #{starttime}, '%Y-%m-%d %H:%i:%s' ) and recordtime >= STR_TO_DATE( #{starttime}, '%Y-%m-%d %H:%i:%s' )
</if> </if>
...@@ -571,11 +571,14 @@ ...@@ -571,11 +571,14 @@
<result column="total" jdbcType="VARCHAR" property="total"/> <result column="total" jdbcType="VARCHAR" property="total"/>
<result column="other" jdbcType="VARCHAR" property="other"/> <result column="other" jdbcType="VARCHAR" property="other"/>
</resultMap> </resultMap>
<resultMap id="CodeResultMap" type="im.zhaojun.system.model.CodeData"> <resultMap id="CodeResultMap" type="im.zhaojun.system.model.CodeData">
<id column="key" jdbcType="VARCHAR" property="key"/> <id column="key" jdbcType="VARCHAR" property="key"/>
<result column="name" jdbcType="VARCHAR" property="name"/> <result column="name" jdbcType="VARCHAR" property="name"/>
<result column="type" jdbcType="VARCHAR" property="type"/> <result column="type" jdbcType="VARCHAR" property="type"/>
<result column="alarmlevel" jdbcType="VARCHAR" property="alarmlevel"/> <result column="alarmlevel" jdbcType="VARCHAR" property="alarmlevel"/>
<result column="maxnumvalue" jdbcType="INTEGER" property="maxnumvalue"/>
<result column="alarmnum" jdbcType="INTEGER" property="alarmnum"/>
</resultMap> </resultMap>
<resultMap id="onMonthtraffRecordsResultMap" type="im.zhaojun.system.model.RecordResult"> <resultMap id="onMonthtraffRecordsResultMap" type="im.zhaojun.system.model.RecordResult">
...@@ -593,7 +596,7 @@ ...@@ -593,7 +596,7 @@
<result column="severeweather" jdbcType="VARCHAR" property="severeweather"/> <result column="severeweather" jdbcType="VARCHAR" property="severeweather"/>
</resultMap> </resultMap>
<select id="selectCodeByCodeid" resultMap="CodeResultMap"> <select id="selectCodeByCodeid" resultMap="CodeResultMap">
select * from t_code where type=#{codeid} select * from t_code t where t.type=#{codeid}
<if test="level != '' and level != null "> <if test="level != '' and level != null ">
and alarmlevel = #{level} and alarmlevel = #{level}
</if> </if>
...@@ -662,21 +665,26 @@ ...@@ -662,21 +665,26 @@
<select id="queryTraffalarmrecordByPage" resultType="im.zhaojun.system.model.TraffpictureParam"> <select id="queryTraffalarmrecordByPage" resultType="im.zhaojun.system.model.TraffpictureParam">
SELECT TA.*,TA.createtime recordtime, A.tdmc,
(select dept_name from dept b where b.dept_id=TA.areaid limit 1 )xzmc,
b.name recordname, b.alarmlevel recordlevel
FROM traffpicture TA
inner join (select b.videoid, lower(recordtype)recordtype
from videoerecordtype b
inner join role_videoerecordtype c
on b.id = c.videorecordtypeid inner join user_role d
on c.roleid = d.role_id
and d.user_id =#{userId} ) b
on TA.fdid || '_' || TA.channelid = b.videoid and TA.recordtype=b.recordtype
LEFT JOIN sbtdspsr A ON TA.fdid = A.sbbh AND TA.channelid = A.tdbh
LEFT JOIN t_code b ON TA.recordtype =LOWER(b.key) and b.type=1
<where> SELECT
TA.*,
TA.createtime recordtime,
(select tdmc from sbtdspsr where sbbh=fdid and tdbh=channelid limit 1)tdmc,
( SELECT dept_name FROM dept b WHERE b.dept_id = TA.areaid LIMIT 1 ) xzmc,
( SELECT b.NAME FROM t_code b where TA.recordtype = LOWER( b.KEY ) and type=2 LIMIT 1 ) recordname,
( SELECT b.alarmlevel FROM t_code b where TA.recordtype = LOWER( b.KEY ) and type=2 LIMIT 1) recordlevel
FROM
traffpicture TA
where (TA.fdid, TA.channelid, recordtype) in(
select
SUBSTRING_INDEX(videoid,'_',1)sbbh,
SUBSTRING_INDEX(videoid,'_',-1)tdbh,
lower( recordtype ) recordtype
FROM
videoerecordtype b
INNER JOIN role_videoerecordtype c ON b.id = c.videorecordtypeid
INNER JOIN user_role d ON c.roleid = d.role_id
AND d.user_id =#{userId})
<if test="recordtype!=null and recordtype != ''"> <if test="recordtype!=null and recordtype != ''">
AND TA.recordtype = #{recordtype} AND TA.recordtype = #{recordtype}
</if> </if>
...@@ -708,21 +716,6 @@ ...@@ -708,21 +716,6 @@
<if test="construction!=null and construction==2"> <if test="construction!=null and construction==2">
AND TA.recordtype not in ('roadworks_out_of_line','roadworks') AND TA.recordtype not in ('roadworks_out_of_line','roadworks')
</if> </if>
<!--<if test='rectificationtype !=null and rectificationtype=="1"'>-->
<!--AND rectificationtype='1'-->
<!--</if>-->
<!--<if test='rectificationtype !=null and rectificationtype=="0"'>-->
<!--AND (rectificationtype is null or rectificationtype='')-->
<!--</if>-->
<!--<if test='pushstatus !=null and pushstatus=="1"'>-->
<!--AND (manualstatus =1)-->
<!--</if>-->
<!--<if test='pushstatus !=null and pushstatus=="0"'>-->
<!--AND (manualstatus is null or manualstatus=0)-->
<!--</if>-->
<if test="deptid!=null and deptid != ''"> <if test="deptid!=null and deptid != ''">
AND TA.areaid in ( AND TA.areaid in (
...@@ -744,15 +737,6 @@ ...@@ -744,15 +737,6 @@
( TA.fdid || '_'|| TA.channelid = #{item} ) ( TA.fdid || '_'|| TA.channelid = #{item} )
</foreach> </foreach>
</if> </if>
<!--<if test="objlables!=null and objlables.size>0">-->
<!--AND-->
<!--<foreach collection="objlables" open="(" close=")" separator=" OR " item="item">-->
<!--( objlable= #{item} )-->
<!--</foreach>-->
<!--</if>-->
</where>
ORDER BY TA.createtime DESC ORDER BY TA.createtime DESC
</select> </select>
......
src/main/resources/static/js/jgsbgl/jgsbgl.js
View file @ ff21f4a3
//行政目录 //行政目录
// let vue_tree = new Vue({ let vue_tree = new Vue({
// el: '.left-nav', el: '.left-nav',
// data: { data: {
// searchText: '', searchText: '',
// }, },
// methods: { methods: {
// fastSearch: function () { fastSearch: function () {
// $("#tree-xzxq").treeview('search', [this.searchText, { $("#tree-xzxq").treeview('search', [this.searchText, {
// ignoreCase: true, // case insensitive ignoreCase: true, // case insensitive
// exactMatch: false, // like or equals exactMatch: false, // like or equals
// revealResults: true, // reveal matching nodes revealResults: true, // reveal matching nodes
// }]); }]);
// } }
// }, },
// mounted(){ mounted(){
// $.ajax({ $.ajax({
// url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"), url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
// dataType: "json", dataType: "json",
// type: "GET", type: "GET",
// data: {}, data: {},
// success: function (result) { success: function (result) {
// if (result.code == 0) { if (result.code == 0) {
// let parIds = result.data[0].parentId; let parIds = result.data[0].parentId;
// $.ajax({ $.ajax({
// url: "/dept/listvideo", url: "/dept/listvideo",
// dataType: "json", dataType: "json",
// type: "GET", type: "GET",
// data: { data: {
// deptId: getCookie("bjpt_deptId"), deptId: getCookie("bjpt_deptId"),
// username: getCookie("bjpt_realName"), username: getCookie("bjpt_realName"),
// tdmc:'', tdmc:'',
// }, },
// success: function (result) { success: function (result) {
// let defaultData = []; let defaultData = [];
// if (result.code == 0) { if (result.code == 0) {
// defaultData = toTree(result.data, parIds + ''); defaultData = toTree(result.data, parIds + '');
// $('#tree-xzxq').treeview({ $('#tree-xzxq').treeview({
// expandIcon: 'glyphicon glyphicon-triangle-right selected-span', expandIcon: 'glyphicon glyphicon-triangle-right selected-span',
// collapseIcon: 'glyphicon glyphicon-triangle-bottom selected-span', collapseIcon: 'glyphicon glyphicon-triangle-bottom selected-span',
// nodeIcon: 'glyphicon glyphicon-folder-open selected-span', nodeIcon: 'glyphicon glyphicon-folder-open selected-span',
// selectedBackColor: '#ff000000', selectedBackColor: '#ff000000',
// selectedColor: '#368ff3', selectedColor: '#368ff3',
// onhoverColor: '#73a5ff26', onhoverColor: '#73a5ff26',
// showBorder: false, showBorder: false,
// data: defaultData data: defaultData
// }); });
// $('#tree-xzxq').on('nodeSelected', function (event, data) { $('#tree-xzxq').on('nodeSelected', function (event, data) {
// vue_right.xz_jg = data.href; vue_right.xz_jg = data.href;
// vue_right.level = data.level; vue_right.level = data.level;
// vue_myjgModal1.data_s.qybh = data.href; vue_myjgModal1.data_s.qybh = data.href;
// vue_myjgModal1.data_s.qymc = data.text; vue_myjgModal1.data_s.qymc = data.text;
// // alert('点击选中'); // alert('点击选中');
// }); });
// $('#tree-xzxq').on('nodeUnselected', function (event, data) { $('#tree-xzxq').on('nodeUnselected', function (event, data) {
//
// // alert('取消选择'); // alert('取消选择');
// }); });
// } }
// } }
// }); });
// } }
// } }
// }); });
// $.ajax({ // $.ajax({
// url: "/dept/tree", // url: "/dept/tree",
// dataType: "json", // dataType: "json",
...@@ -96,18 +96,17 @@ ...@@ -96,18 +96,17 @@
// } // }
// } // }
// }); // });
// } }
// }); });
let vue_right = new Vue({ let vue_right = new Vue({
el: '#jgsb', el: '.right-nav',
data: { data: {
data_table_monitor: [], data_table_monitor: [],
xz_jg: getCookie("bjpt_deptId"), xz_jg: getCookie("bjpt_deptId"),
count: '', count: '',
level: '', level: '',
fy_select:20, fy_select:20,
searchText: '',
}, },
methods: { methods: {
add: function () { add: function () {
...@@ -132,7 +131,7 @@ let vue_right = new Vue({ ...@@ -132,7 +131,7 @@ let vue_right = new Vue({
vue_myjgModal1_edit.data_s.xzbh = item.xzbh, vue_myjgModal1_edit.data_s.xzbh = item.xzbh,
vue_myjgModal1_edit.data_s.qymc = item.qymc, vue_myjgModal1_edit.data_s.qymc = item.qymc,
vue_myjgModal1_edit.data_s.squrllj = item.squrllj vue_myjgModal1_edit.data_s.squrllj = item.squrllj
$("#myjgModal1_edit").modal("show"); $("#myjgModal1_edit").modal("show");
}, },
del: function (item) { del: function (item) {
if (!confirm("确认删除监控吗？")) { if (!confirm("确认删除监控吗？")) {
...@@ -200,73 +199,9 @@ let vue_right = new Vue({ ...@@ -200,73 +199,9 @@ let vue_right = new Vue({
getChange:function () { getChange:function () {
// alert(this.fy_select); // alert(this.fy_select);
this.queryRY(1,true); this.queryRY(1,true);
}, }
xzml: function () {
$.ajax({
url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
dataType: "json",
type: "GET",
data: {},
success: function (result) {
if (result.code == 0) {
let parIds = result.data[0].parentId;
$.ajax({
url: "/dept/listvideo",
dataType: "json",
type: "GET",
data: {
deptId: getCookie("bjpt_deptId"),
username: getCookie("bjpt_realName"),
tdmc: vue_right.searchText,
},
success: function (result) {
let defaultData = [];
vue_sjcx.jk_arr = [];
if (result.code == 0) {
vue_sjcx.jk_arr = result.data;
defaultData = toTree(result.data, parIds + '');
$('#tree-xzxq').treeview({
expandIcon: 'glyphicon glyphicon-triangle-right selected-span',
collapseIcon: 'glyphicon glyphicon-triangle-bottom selected-span',
nodeIcon: 'glyphicon glyphicon-folder-open selected-span',
selectedBackColor: '#ff000000',
selectedColor: '#368ff3',
onhoverColor: '#73a5ff26',
showBorder: false,
data: defaultData,
multiSelect: false,
level: 2,
showCheckbox: 1,//复选框设置，也可以是true
onNodeChecked: function (event, node) { //选中节点
let selectNodes = getChildNodeIdArr(node); //获取所有子节点
if (selectNodes) { //子节点不为空，则选中所有子节点
$(this).treeview('checkNode', [selectNodes, {silent: true}]);
}
//如果当前节点的子节点都被选中了。则父节点也应该要选中
setParentNodeCheck(node);
}, onNodeUnchecked: function (event, node) { //取消选中节点
let selectNodes = getChildNodeIdArr(node); //获取所有子节点
if (selectNodes) { //子节点不为空，则取消选中所有子节点
$(this).treeview('uncheckNode', [selectNodes, {silent: true}]);
}
}, onNodeExpanded: function (event, data) {
}, onNodeSelected: function (event, node) {
}
});
this.queryRY(1, true);
}
}
});
}
}
});
},
}, },
mounted(){ mounted(){
this.xzml();
this.queryRY(1, true); this.queryRY(1, true);
} }
}); });
...@@ -409,4 +344,4 @@ function toTree(list, parId) { ...@@ -409,4 +344,4 @@ function toTree(list, parId) {
} }
return loop(parId) return loop(parId)
} }
\ No newline at end of file
src/main/resources/static/js/jkgl/jkgl.js
View file @ ff21f4a3
...@@ -266,7 +266,7 @@ let vue_tree = new Vue({ ...@@ -266,7 +266,7 @@ let vue_tree = new Vue({
dataType: "json", dataType: "json",
type: "GET", type: "GET",
data: { data: {
codeid: 1, codeid: 2,
alarmlevel: '', alarmlevel: '',
}, },
success: function (result) { success: function (result) {
......
src/main/resources/static/js/sjcx/sjcx.js
View file @ ff21f4a3
...@@ -837,14 +837,19 @@ wss.onmessage = function (evt) { ...@@ -837,14 +837,19 @@ wss.onmessage = function (evt) {
//事件等级 //事件等级
let sjdj = ''; let sjdj = '';
vue_sjcx.data_sjlxs.forEach((item, index) => { vue_sjcx.data_sjlxs.forEach((item, index) => {
if (item.id.toLowerCase() == data.recordtype.toLowerCase() if (item.id.toLowerCase() == data.recordtype.toLowerCase())
)
{ {
bjlx = item.name; bjlx = item.name;
sjdj = item.alarmlevel; sjdj = item.alarmlevel;
} }
}) });
; vue_sjcx.data_sjlxs1.forEach((item, index) => {
if (item.id.toLowerCase() == data.recordtype.toLowerCase())
{
bjlx = item.name;
sjdj = item.alarmlevel;
}
} );
//监控名称 //监控名称
let jkmc = ''; let jkmc = '';
......
src/main/resources/static/js/tsgl/tstj.js
View file @ ff21f4a3
...@@ -121,7 +121,7 @@ let vue_sjcx = new Vue({ ...@@ -121,7 +121,7 @@ let vue_sjcx = new Vue({
dataType: "json", dataType: "json",
type: "GET", type: "GET",
data: { data: {
codeid: 1, codeid: 2,
alarmlevel: '', alarmlevel: '',
}, },
success: function (result) { success: function (result) {
......
src/main/resources/static/js/xtgl/sjdj.js
View file @ ff21f4a3
...@@ -38,7 +38,7 @@ let vue_sjcx1 = new Vue({ ...@@ -38,7 +38,7 @@ let vue_sjcx1 = new Vue({
dataType: "json", dataType: "json",
type: "GET", type: "GET",
data: { data: {
codeid: 1, codeid: 2,
alarmlevel: this.clzt_select, alarmlevel: this.clzt_select,
}, },
success: function (result) { success: function (result) {
...@@ -59,7 +59,7 @@ let vue_sjcx1 = new Vue({ ...@@ -59,7 +59,7 @@ let vue_sjcx1 = new Vue({
dataType: "json", dataType: "json",
type: "GET", type: "GET",
data: { data: {
codeid: 1, codeid: 2,
alarmlevel: '', alarmlevel: '',
}, },
success: function (result) { success: function (result) {
......
src/main/resources/templates/page/jksj.html
View file @ ff21f4a3
...@@ -57,7 +57,56 @@ ...@@ -57,7 +57,56 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<form onsubmit="return false;" class="form-horizontal" role="form" onkeydown="if(event.keyCode==13){return false;}">
<div class="modal-dialog" role="document" style="width: 510px;">
<div class="modal-content" style="color: #e6eaef;width: 510px;">
<div class="modal-header" style="background-color: rgb(48, 53, 72);">
<button type="button" click="add_sjlx()" id="add" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true" style="color: white;">&times;</span></button>
<h6 class="modal-title" >新增监控事件</h6>
</div>
<div class="modal-body" style="height:360px;">
<div class="form-group">
<label class="col-sm-3 control-label">事件类型</label>
<div class="col-sm-10">
<select class="form-control" id="recordtype">
<option th:value="1" >
周界入侵
</option>
<option th:value="2" >
人群密度
</option>
<option th:value="3" >
周界越线
</option>
<option th:value="4">
非机动车未戴头盔
</option>
<option th:value="5" >
非机动车载人
</option>
<option th:value="6">
结构化统计
</option>
</select>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-sm" data-dismiss="modal" style="color: #2f2f2f;">关闭</button>
<button type="button submit" class="btn btn-sm btn-info" style="background-color: #368ff3" @click="define">确定
</button>
</div>
</div>
</div>
</form>
</div>
<script type="text/html" id="toolbar"> <script type="text/html" id="toolbar">
<shiro:hasPermission name="menu:add"> <shiro:hasPermission name="menu:add">
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add"> <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add">
...@@ -281,15 +330,28 @@ ...@@ -281,15 +330,28 @@
} }
function add(parentId) { function add(parentId) {
layer.open({
content: "/menu?parentId=" + parentId, $("#myModal2").modal("show");
title: "添加子菜单", vue_sjcx1.cxsjlx();
area: ['40%', '85%'], }
type: 2,
maxmin: true, function define () {
shadeClose: true, if ($("#recordtype").val() == '') {
end: function () { return;
refresh(); }
$.ajax({
url: "/code/update",
dateType: 'json',
type: "POST",
contentType: 'application/json',
data: JSON.stringify(arr),
success: function (result) {
if (result.code == 0) {
vue_sjcx1.query();
info_new("事件类型添加成功");
window.setTimeout("$('#info-warning-new').modal('hide')", 2000);
$("#myModal2").modal("hide");
}
} }
}); });
} }
......
src/main/resources/templates/page/sjcx.html
View file @ ff21f4a3
...@@ -48,14 +48,15 @@ ...@@ -48,14 +48,15 @@
<option value="2">误检</option> <option value="2">误检</option>
<option value="2">重复事件</option> <option value="2">重复事件</option>
</select> </select>
<span class="pub-span" style="margin-left: 10px;">自动刷新</span> <span class="pub-span" style="margin-left: 10px;">自动刷新
<input type="checkbox" id="push" @click="zdsx" style="width: 17px;height: 17px;margin-top: 16px;"/> <input type="checkbox" id="push" @click="zdsx" style="width: 17px;height: 17px;margin-top: 16px;" checked />
</span> </span>
<span class="glyphicon glyphicon-th-list table-class" <span class="glyphicon glyphicon-th-list table-class"
:style="{'color':!show?'#368ff3 !important':''}" @click="qh_tab(1)"></span> :style="{'color':!show?'#368ff3 !important':''}" @click="qh_tab(1)"></span>
<span class="glyphicon glyphicon-th table-class" <span class="glyphicon glyphicon-th table-class"
:style="{'color':show?'#368ff3 !important':''}" @click="qh_tab(2)"></span> :style="{'color':show?'#368ff3 !important':''}" @click="qh_tab(2)"></span>
<span class="pub-span" style="margin-left: 10px;">自动弹窗 <span class="pub-span" style="margin-left: 10px;">自动弹窗
<input id="status" type="checkbox" @click="zdtx" checked> <input id="status" type="checkbox" @click="zdtx" checked>
</span> </span>
</span> <div> </span> <div>
...@@ -431,13 +432,13 @@ ...@@ -431,13 +432,13 @@
</div> </div>
<div class="pub-div-span" v-show="dataface!=null && dataface.id!=null"> <div class="pub-div-span" v-show="dataface!=null && dataface.id!=null">
<span>年龄：</span> <span>年龄：</span>
<span v-text="dataface.age"></span> <span v-text="dataface.age==null?'':dataface.age"></span>
<span class="leftspan">性别：</span> <span class="leftspan">性别：</span>
<span v-text="dataface.gender"></span> <span v-text="dataface.gender"></span>
</div> </div>
<div class="pub-div-span" v-show="dataface!=null && dataface.id!=null"> <div class="pub-div-span" v-show="dataface!=null && dataface.id!=null">
<span>发型：</span> <span>发型：</span>
<span v-text="dataface.hairStyle"></span> <span v-text="dataface.hairStyle"></span>==null?'':dataface.gender
<span class="leftspan">有无戴眼镜：</span> <span class="leftspan">有无戴眼镜：</span>
<span v-text="dataface.hasGlasses=='0'?'无':'有'"></span> <span v-text="dataface.hasGlasses=='0'?'无':'有'"></span>
</div> </div>
...@@ -451,7 +452,7 @@ ...@@ -451,7 +452,7 @@
<span>年龄：</span> <span>年龄：</span>
<span v-text="datapede.age"></span> <span v-text="datapede.age"></span>
<span class="leftspan">性别：</span> <span class="leftspan">性别：</span>
<span v-text="datapede.gender"></span> <span v-text="datapede.gendera==null?'':datapede.gender"></span>
</div> </div>
<div class="pub-div-span" v-show="datapede!=null && datapede.id!=null"> <div class="pub-div-span" v-show="datapede!=null && datapede.id!=null">
<span>有无帽子：</span> <span>有无帽子：</span>
......
src/main/resources/templates/page/sjdj.html
View file @ ff21f4a3
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
<td>序号</td> <td>序号</td>
<td>事件类型</td> <td>事件类型</td>
<td>等级</td> <td>等级</td>
<td>最大值</td>
<td>告警临界值</td>
<td>操作</td> <td>操作</td>
</tr> </tr>
</thead> </thead>
...@@ -40,6 +42,8 @@ ...@@ -40,6 +42,8 @@
<td v-text="index+1"></td> <td v-text="index+1"></td>
<td v-text="item.name"></td> <td v-text="item.name"></td>
<td v-text="item.alarmlevel=='1'?'一级':item.alarmlevel=='2'?'二级':item.alarmlevel=='3'?'三级':''"></td> <td v-text="item.alarmlevel=='1'?'一级':item.alarmlevel=='2'?'二级':item.alarmlevel=='3'?'三级':''"></td>
<td v-text="item.maxnumvalue==null?0:item.maxnumvalue"></td>
<td v-text="item.alarmnum==null?0:item.alarmnum"></td>
<td> <td>
<button type="button" class="btn btn-sm btn-danger" <button type="button" class="btn btn-sm btn-danger"
style="margin-left: 5px;margin-top: 0px;padding: 2px 7px;" @click="del(item)">删除 style="margin-left: 5px;margin-top: 0px;padding: 2px 7px;" @click="del(item)">删除
...@@ -66,7 +70,7 @@ ...@@ -66,7 +70,7 @@
</div> </div>
<div class="modal-body" style="height:360px;"> <div class="modal-body" style="height:360px;">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">等级</label> <label class="col-sm-3 control-label">告警类型</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="form-control selectpicker" v-model="clzt_select1" id="dj" required title="请选择"> <select class="form-control selectpicker" v-model="clzt_select1" id="dj" required title="请选择">
<option value="1">一级</option> <option value="1">一级</option>
...@@ -84,6 +88,26 @@ ...@@ -84,6 +88,26 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">最大值</label>
<div class="col-sm-9">
<input type="text" id="maxnumvalue" name="maxnumvalue" v-model="item.maxnumvalue==null?'0':item.maxnumvalue"
lay-verify="required" lay-vertype="tips"
autocomplete="off" placeholder="请输入密度检测最大值" class="layui-input">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">告警临界值</label>
<div class="col-sm-9">
<input type="text" id="alarmnum" name="alarmnum" v-model="item.alarmnum===null?'0':item.alarmnum"
lay-verify="required" lay-vertype="tips"
autocomplete="off" placeholder="请输入密度检测告警临界值" class="layui-input">
</div>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-sm" data-dismiss="modal" style="color: #2f2f2f;">关闭</button> <button type="button" class="btn btn-sm" data-dismiss="modal" style="color: #2f2f2f;">关闭</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment