Skip to content

B
bigdatainterservice
Commit 394e2f4d by wangling
Options

20190617---wangling---修改界面展示bug

parent f36f8a4a
Showing with 21 additions and 150 deletions
src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml
......@@ -240,8 +240,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and td.ZJHM is null </if>
<if test='sfbs =="1"'>and td.ZJHM is not null </if>
<if test='sfbs =="0"'> and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'> and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
<if test="bscscount!=null and bscscount!=''"> and t.COUNT =#{bscscount} </if>
</select>
......@@ -288,8 +288,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and td.ZJHM is null </if>
<if test='sfbs =="1"'>and td.ZJHM is not null </if>
<if test='sfbs =="0"'> and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'> and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
<if test="bscscount!=null and bscscount!=''"> and t.COUNT =#{bscscount} </if>
order by t.COUNT desc
......
src/main/resources/static/js/skgjbasjgzs.js
var dataCsrq;
$(function () {
doQuery();
$(document).on("click",".searchConfigChecks li input",function(){
......@@ -172,7 +173,7 @@ function doQueryFL(){
flStr="伴随次数";
}
$("#fldh").append(
"<div class='newNav'>" +
"<div class='newNav newNav"+index2+"' >" +
"<div class='newNavTop' id='newNavTop'>"+flStr+"分类</div>" +
"<div class='newNavbody' id='newNavbody"+index2+"'>" +
......@@ -212,6 +213,10 @@ function doQueryFL(){
}
}else{
//除了出生日期外，其他分类去掉class为current-icon的第一个span的onclick事件
$(".newNav"+index2).find(".current-icon").eq(0).removeAttr("onclick");
$(".newNav"+index2).find(".current-icon").eq(0).css({"color":"#666","cursor":"default"});//去掉onclick事件，则置灰内容
//除出生日期外其他分类循环部分begin
$("#newNavbody"+index2).append(
"<div class='newNavInfo' isshowed='false' id='flnr"+index2+"'>" +
......@@ -308,6 +313,8 @@ function flclick(obj,value,index,object_type){
var d="";
$.each(dataCsrq, function(i, item) {
var str=item.NAMES+"("+item.COUNTS+")";
str=str.replace('年','-');
str=str.replace('月','-');
if(item.VALS.length==7&&item.VALS.substring(0,4)==value){
m+= "<a class='newNavA' style='text-decoration:none;' href='javascript:void(0)' onclick=flclick(this,'"+item.NAMES+"','"+index+"','"+item.VALS+"')>"+str+"</a>";
}else if(item.VALS.length==10&&item.VALS.substring(0,7)==value){
......@@ -335,6 +342,7 @@ function flclick(obj,value,index,object_type){
"</div>"
);
//点击月时候 显示对应的“<<值”
value=value.replace("年","-")
$(obj).parents(".newNavbody").find(".current-icon").eq(1).show();
$(obj).parents(".newNavbody").find(".current-text").eq(1).html(value);
......@@ -342,6 +350,8 @@ function flclick(obj,value,index,object_type){
if(value.length==10){
//点击日时候 显示对应的“<<值”
$(obj).parents(".newNavbody").find(".current-icon").eq(2).show();
value=value.replace("年","-")
value=value.replace("月","-")
$(obj).parents(".newNavbody").find(".current-text").eq(2).html(value);
}
//点击出生日期的分类时候移除固定高度
......@@ -372,7 +382,7 @@ function flclick(obj,value,index,object_type){
$("#birthday").val(object_type);
}else if(index=="SFBS"){
$("#sfbs").val(object_type);
}else if(index=="XB"){
}else if("XB"){
$("#sex").val(object_type);
}else if(index=="BSCS"){
$("#bscscount").val(object_type);
......@@ -402,59 +412,13 @@ function goBackMd(obj,index){
}
$(".newLayoutDiv").siblings().hide();
$(".newNavInfo-"+index).show();
$("#birthday").val($(obj).find(".current-text").text());
var val=$(obj).find(".current-text").text();
val=val.replace(/-/,'年');
val=val.replace('-','月');
$("#birthday").val(val);
doQuery();
}
function openDialog(arr){
console.log(arr)
$('#w').dialog({
buttons:[{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
handler:function(){
$('#w').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#w').dialog('close');
$(document).unbind("scroll");
}
}],
onClose: function () {
$(document).unbind("scroll");
}
});
$('#w').show().dialog('open');
$("#w").window('center');
var tops = $(document).scrollTop();//当页面滚动时，把当前距离赋值给页面，这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops);})
myEcharts();
}
function myEcharts(){
var dom = document.getElementById("echarts-wrap");
var myChart = echarts.init(dom);
var app = {};
option = null;
option = {
xAxis: {
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
},
yAxis: {
type: 'value'
},
series: [{
data: [120, 200, 150, 80, 70, 110, 130],
type: 'bar'
}]
};
;
if (option && typeof option === "object") {
myChart.setOption(option, true);
}
}
/**
* 将表单序列化
*/
......@@ -470,99 +434,6 @@ function serializeObject(form){
return o;
}
function getCzColumn(row){
var str="<a href=\"javascript:;\" onclick=\"toZstp('"+row.xzzDzmc+"','"+row.sjhm+"','"+row.age+"','"+row.objectValue+"','"+row.objectTypeName+"','"+row.objectType+"','"+row.ryzpStr+"','"+row.name+"','"+row.birthday+"','"+row.zjlx+"','"+row.zjhm+"');\" class=\"cz\"><span>结果显示</span></a>";
return str;
}
function toZstp(xzzDzmc,sjhm,age,objectValue,objectTypeName,objectType,ryzpStrs,name,birthday,zjlx,zjhm){
var cllxArr = ["6424","6422","6423","7888"];
var ryzpStr = "";
if(ryzpStrs != "null" && ryzpStrs !=''){
ryzpStr = "<img src=\"data:image/gif;base64," + ryzpStrs + "\"/>";
}else {
ryzpStr = "<img src=\"/images/timg.jpg\" style = \"height:121px;width:100px;\"/>";
}
var objValue = objectValue== "null"?"":objectValue;
var objTypeName = objectTypeName=="null"?"":objectTypeName;
var zjlxx = zjlx=="null"?"":zjlx;
var zjhmm = zjhm=="null"?"":zjhm;
var agee = age=="null"?"":age;
var namee = name=="null"?"":name;
var birth = birthday=="null"?"":birthday;
var sj = sjhm=="null"?"":sjhm;
var xzz = xzzDzmc=="null"?"":xzzDzmc;
if(cllxArr.indexOf(objectType) > -1){
//车辆
$("#clRyzp").html(ryzpStr);
$("#cph").text(objValue);
$("#cllx").text(objTypeName);
$("#clZjlx").text(zjlxx);
$("#clZjhm").text(zjhmm);
openClxx();
}else {
//人员
$("#ryzp").html(ryzpStr);
$("#ryName").text(namee);
$("#ryAge").text(agee);
$("#rySfzh").text(zjhmm);
$("#ryCsrq").text(birth);
$("#ryDhhm").text(sj);
$("#imsi").text(objValue);
$("#ryAddress").text(xzz);
openRyxx();
}
}
function openRyxx(){
$('#ryjgzs').dialog({
buttons:[{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
handler:function(){
$('#ryjgzs').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#ryjgzs').dialog('close');
$(document).unbind("scroll");
}
}],
onClose: function () {
$(document).unbind("scroll");
}
});
$('#ryjgzs').show().dialog('open');
$("#ryjgzs").window('center');
var tops = $(document).scrollTop();//当页面滚动时，把当前距离赋值给页面，这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops); });
}
function openClxx(){
$('#clxxzs').dialog({
buttons:[{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
handler:function(){
$('#clxxzs').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#clxxzs').dialog('close');
$(document).unbind("scroll");
}
}],
onClose: function () {
$(document).unbind("scroll");
}
});
$('#clxxzs').show().dialog('open');
$("#clxxzs").window('center');
var tops = $(document).scrollTop();//当页面滚动时，把当前距离赋值给页面，这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops); });
}
//分类导航
function checkAllNav(obj){
isChecked = obj.getAttribute("flag") !== "false";
......
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