Skip to content

I
impnhyw
Commit dcea24ba authored by wangjinjing's avatar wangjinjing
Browse files
Options

监控kz3 is not null and kz3!='1'

parent 1a26ba4f
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 137 deletions
.classpath deleted 100644 → 0
View file @ 1a26ba4f
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="config"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_67">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
<attributes>
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/impnhyw_lib"/>
<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
</classpath>
.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch deleted 100644 → 0
View file @ 1a26ba4f
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.validation.validationbuilder"/>
<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>
.project deleted 100644 → 0
View file @ 1a26ba4f
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>impnhyw</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder.launch</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch</value>
</dictionary>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
WebRoot/frame/assets/easyui/datagrid-detailview.js
View file @ dcea24ba
...@@ -31,7 +31,7 @@ var detailview = $.extend({}, $.fn.datagrid.defaults.view, { ...@@ -31,7 +31,7 @@ var detailview = $.extend({}, $.fn.datagrid.defaults.view, {
var cls = 'class="datagrid-row ' + (i % 2 && opts.striped ? 'datagrid-row-alt ' : ' ') + classValue + '"'; var cls = 'class="datagrid-row ' + (i % 2 && opts.striped ? 'datagrid-row-alt ' : ' ') + classValue + '"';
var style = styleValue ? 'style="' + styleValue + '"' : ''; var style = styleValue ? 'style="' + styleValue + '"' : '';
var rowId = state.rowIdPrefix + '-' + (frozen?1:2) + '-' + i; var rowId = state.rowIdPrefix + '-' + (frozen?1:2) + '-' + i;
table.push('<tr id="' + rowId + '" datagrid-row-index="' + i + '" ' + cls + ' ' + style + '>'); table.push('<tr id="' + rowId + '" datagrid-row-index="' + i + '" ' + cls + '>');
table.push(this.renderRow.call(this, target, fields, frozen, i, rows[i])); table.push(this.renderRow.call(this, target, fields, frozen, i, rows[i]));
table.push('</tr>'); table.push('</tr>');
...@@ -445,7 +445,7 @@ $.extend($.fn.datagrid.methods, { ...@@ -445,7 +445,7 @@ $.extend($.fn.datagrid.methods, {
} }
}, },
onResize: function(){ onResize: function(){
var dg = $(this).children('div.datagrid-view').children('table') var dg = $(this).children('div.datagrid-view').children('table');
setParentHeight(this); setParentHeight(this);
}, },
onResizeColumn: function(field, width){ onResizeColumn: function(field, width){
......
WebRoot/frame/assets/easyui/themes/metro/datagrid.css
View file @ dcea24ba
...@@ -85,9 +85,9 @@ ...@@ -85,9 +85,9 @@
width: 10000px; width: 10000px;
} }
.datagrid-header-row, .datagrid-header-row,
.datagrid-row { /*.datagrid-row {*/
height: 25px; /*height: 25px;*/
} /*}*/
.datagrid-header td, .datagrid-header td,
.datagrid-body td, .datagrid-body td,
.datagrid-footer td { .datagrid-footer td {
......
WebRoot/yw/homepage/homepage.jsp
View file @ dcea24ba
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<script type="text/javascript" src="statisticsGraph.js"></script> <script type="text/javascript" src="statisticsGraph.js"></script>
<%-- <script type="text/javascript" src="../../common/ajax-pushlet-client.js"></script>--%> <%-- <script type="text/javascript" src="../../common/ajax-pushlet-client.js"></script>--%>
<%-- <script type="text/javascript" src="videoTaskPushlet.js"></script>--%> <%-- <script type="text/javascript" src="videoTaskPushlet.js"></script>--%>
<link rel = "stylesheet" type = "text/css" href = "css/videotaskalarm.css" /> <%--<link rel = "stylesheet" type = "text/css" href = "css/videotaskalarm.css" />--%>
<style type="text/css"> <style type="text/css">
#alram{ #alram{
background-color:#f3f3f3; background-color:#f3f3f3;
...@@ -30,62 +30,7 @@ ...@@ -30,62 +30,7 @@
height:110px; height:110px;
width:60%; width:60%;
margin:0 auto; margin:0 auto;
} }
.alarmItem thead td:after{
content:'';
width:10px;
height:10px;
background-color:#27a72d;
position:absolute;
border-radius:10px;
line-height:10px;
text-align:center;
left:26%;
top:15%;
}
.alarmItem thead td:nth-child(2):after{
background-color:#ff7a05;
}
.alarmItem td,tr{position:relative;width:50%; border: 1px solid #efefef; line-height: 20px;}
.alarmItem thead{background-color:#f7f7f7;line-height: 22px;}
.alarmItem table { margin: 0 auto; border: 1px solid #efefef;}
.deviceAnalysisGraphChartBox{
width:50%;
height:90%;
/* float:right;
background: #fff2e1;*/
}
#deviceAnalysisGraphChartBoxTime{
position:absolute;
right: 76px;
top: -15px;
}
#deviceAnalysisGraphChartBoxTime li{
float:left;
margin: 0 1px;
background-color:#e5e5e5;
width:60px;
height:24px;
text-align:center;
line-height:24px;
color:#aaaaaa;
cursor:pointer;
}
#deviceAnalysisGraphChartBoxTime li.active{
color:white;
background-color:#61b760;
}
.searchGridStaticsSplitLine{
position:absolute;
width:1px;
height:380px;
top:10px;
right:30px;
background-color:#e5e5e5;
}
.l-btn-text{line-height:20px !important;}
</style> </style>
</head> </head>
<!-- 设置高度,一行 44px,二行80,三行116--> <!-- 设置高度,一行 44px,二行80,三行116-->
......
WebRoot/yw/homepage/showXHDDetail.js
View file @ dcea24ba
...@@ -13,9 +13,9 @@ function getQueryParams(){ ...@@ -13,9 +13,9 @@ function getQueryParams(){
var sParam = {}; var sParam = {};
sParam.sblb='3'; sParam.sblb='3';
if(obj.deviceType=="xhdOnline"){ if(obj.deviceType=="xhdOnline"){
sParam.tableparam = " and state is not null and state=1 "; sParam.tableparam = " and state is not null and state!=20 ";
}else if(obj.deviceType=="xhdUnOnline"){ }else if(obj.deviceType=="xhdUnOnline"){
sParam.tableparam ='and (state=0 or state is null) '; sParam.tableparam ='and (state=20 or state is null) ';
} }
sParam.LIKExhdmc = $("#LIKExhdmc").textbox("getValue"); sParam.LIKExhdmc = $("#LIKExhdmc").textbox("getValue");
return sParam; return sParam;
......
WebRoot/yw/recordalarm/nhywjtxhdglstate/ywxhdcurrentstate.js
View file @ dcea24ba
...@@ -186,12 +186,12 @@ function initGrid() { ...@@ -186,12 +186,12 @@ function initGrid() {
}, },
{field: 'repairstatename', title: '维修状态', hidden: false, width: 120}, {field: 'repairstatename', title: '维修状态', hidden: false, width: 120},
{ {
field: 'state', title: '当前状态', hidden: false, width: 60, field: 'status', title: '当前状态', hidden: false, width: 60,
formatter: function showClick(value, record, num) { formatter: function showClick(value, record, num) {
if (value == "1") { if (value == "20") {
return "<div style='height:13px;width:13px;background-color:green;border-radius:50%;-moz-border-radius: 50%;-webkit-border-radius: 50%;margin:0 auto;'></div>";
} else {
return "<div style='height:13px;width:13px;background-color:#fe0000;border-radius:50%;-moz-border-radius: 50%;-webkit-border-radius: 50%;margin:0 auto;'></div>"; return "<div style='height:13px;width:13px;background-color:#fe0000;border-radius:50%;-moz-border-radius: 50%;-webkit-border-radius: 50%;margin:0 auto;'></div>";
} else {
return "<div style='height:13px;width:13px;background-color:green;border-radius:50%;-moz-border-radius: 50%;-webkit-border-radius: 50%;margin:0 auto;'></div>";
} }
} }
}, },
......
WebRoot/yw/szmap/business/base/item/iframe/monitor-tab-frame.jsp
View file @ dcea24ba
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
sParam.sblb = $('#lb').combobox('getValue'); sParam.sblb = $('#lb').combobox('getValue');
if($('#state').combobox('getValue')=="0")//不在线包含is null if($('#state').combobox('getValue')=="0")//不在线包含is null
{ {
sParam.tableparam ="and (state =0 or state is null) "; sParam.tableparam ="and (state =20 or state is null) ";
} }
else { else {
sParam.state = String($('#state').combobox('getValue')); sParam.state = String($('#state').combobox('getValue'));
......
WebRoot/yw/szmap/map/MapUtil.js
View file @ dcea24ba
...@@ -230,7 +230,7 @@ MapUtil.addJtxhdPoint = function (data, html) { ...@@ -230,7 +230,7 @@ MapUtil.addJtxhdPoint = function (data, html) {
"height": 20, "height": 20,
"width": 20 "width": 20
}); });
if (data.state === undefined || (data.state != null && data.state == "1")) { if (data.state === undefined || (data.state != null && data.state != "20")) {
symbol.url = "resource/images/icons/jtxhd.png"; symbol.url = "resource/images/icons/jtxhd.png";
} else { } else {
symbol.url = "resource/images/icons/jtxhd-red.png"; symbol.url = "resource/images/icons/jtxhd-red.png";
...@@ -274,7 +274,7 @@ MapUtil.adddetectorPoint = function (data, html) { ...@@ -274,7 +274,7 @@ MapUtil.adddetectorPoint = function (data, html) {
var Graphic = MapAPI.getGraphic(); var Graphic = MapAPI.getGraphic();
var InfoTemplate = MapAPI.getInfoTemplate(); var InfoTemplate = MapAPI.getInfoTemplate();
var symbol = new PictureMarkerSymbol({ var symbol = new PictureMarkerSymbol({
"url": "", "url": "",datagrid-row
"height": 20, "height": 20,
"width": 20 "width": 20
}); });
......
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