Skip to content

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

备注为 survey时，设备当前状态为正常

parent 8fc4920c
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 170 deletions
WebRoot/Test.xml deleted 100644 → 0
View file @ 8fc4920c
<?xml version='1.0' encoding='UTF-8'?>
<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
</faces-config>
\ No newline at end of file
WebRoot/yw/archive/ywarchivevideoinfo/ywarchivevideoinfo.jsp
View file @ 1a26ba4f
......@@ -153,7 +153,7 @@
<input id="LIKElongitude" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEdimension" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/common/queryDemo.jsp
View file @ 1a26ba4f
......@@ -31,7 +31,7 @@
<button type="button" id="search" class="ql-search" onclick="searchAlarm();">查 询</button>
</div>
<div id="countType" class="height40" >
<em style="display:inline-block; font-style: normal;">分析维度：</em>
<em style="display:inline-block; font-style: normal;">分析纬度：</em>
<label><input class="common-checkbox" name="countType" type="radio" checked value="1"> <span class="btn-sm btn-success">告警类型</span></label>
<label><input class="common-checkbox" name="countType" type="radio" value="2"> <span class="btn-sm btn-undefined">告警趋势</span></label>
</div>
......
WebRoot/yw/nhyw/gvd/gvd.js
View file @ 1a26ba4f
......@@ -126,7 +126,7 @@ function initGrid(){
{field:'azsj',title:'安装时间',hidden:false,width:120},
{field:'sszbx',title:'所属坐标系',hidden:false,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
{field:'xhdjj',title:'led简介',hidden:false,width:120},
{field:'cjry',title:'创建人员',hidden:true,width:120},
{field:'cjrq',title:'创建日期',hidden:true,width:120},
......
WebRoot/yw/nhyw/gvd/gvd.jsp
View file @ 1a26ba4f
......@@ -85,7 +85,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/gvd/gvd_show.jsp
View file @ 1a26ba4f
......@@ -102,8 +102,8 @@
<input id="jd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="经度必填项" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
</div>
<div class="form-line clearfix">
......
WebRoot/yw/nhyw/gvd/gvd_show_detail.jsp
View file @ 1a26ba4f
......@@ -68,7 +68,7 @@
<tr>
<td>经度</td>
<td><span id="jd"></span></td>
<td>维度</td>
<td>纬度</td>
<td><span id="wd"></span></td>
</tr>
<tr>
......
WebRoot/yw/nhyw/ksh_kkxx/ksh_kkxx_show_detail.jsp
View file @ 1a26ba4f
......@@ -68,7 +68,7 @@
<tr>
<td>经度</td>
<td><span id="jd"></span></td>
<td>维度</td>
<td>纬度</td>
<td><span id="wd"></span></td>
</tr>
<tr>
......
WebRoot/yw/nhyw/nhywjksbtzxx/nhywjksbtzxx.js
View file @ 1a26ba4f
......@@ -136,7 +136,7 @@ function initGrid(){
{field:'ggxh',title:'规格型号',hidden:false,width:120},
{field:'sszbx',title:'所属坐标系',hidden:false,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
{field:'azsj',title:'安装时间',hidden:false,width:120},
{field:'azdw',title:'安装单位',hidden:false,width:120},
{field:'azfs',title:'安装方式',hidden:false,width:120},
......
WebRoot/yw/nhyw/nhywjksbtzxx/nhywjksbtzxx.jsp
View file @ 1a26ba4f
......@@ -46,7 +46,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/nhywjksbtzxx/nhywjksbtzxx_show.jsp
View file @ 1a26ba4f
......@@ -51,8 +51,8 @@
</div>
<div class="form-line clearfix">
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>安装时间：</span>
......
WebRoot/yw/nhyw/nhywjtbxgl/nhywjtbxgl.js
View file @ 1a26ba4f
......@@ -129,7 +129,7 @@ function initGrid(){
{field:'lxr',title:'管辖联系人',hidden:false,width:120},
{field:'lxdh',title:'管辖联系电话',hidden:false,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
// {field:'sjzp',title:'实景照片',hidden:false,width:120},
{field:'cjry',title:'创建人员',hidden:true,width:120},
{field:'cjrq',title:'创建日期',hidden:true,width:120},
......
WebRoot/yw/nhyw/nhywjtbxgl/nhywjtbxgl.jsp
View file @ 1a26ba4f
......@@ -66,7 +66,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/nhywjtbxgl/nhywjtbxgl_show.jsp
View file @ 1a26ba4f
......@@ -113,8 +113,8 @@
<input id="jd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="经度必填项" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
</div>
<div class="form-line clearfix">
......
WebRoot/yw/nhyw/nhywjtbxgl/nhywjtbxgl_show_detail.jsp
View file @ 1a26ba4f
......@@ -64,7 +64,7 @@
<td><span id="jd"></span></td>
</tr>
<tr>
<td>维度</td>
<td>纬度</td>
<td><span id="wd"></span></td>
<td>简介</td>
<td colspan="5"><span id="bz"></span></td>
......
WebRoot/yw/nhyw/nhywjtbzgl/nhywjtbzgl.js
View file @ 1a26ba4f
......@@ -122,7 +122,7 @@ function initGrid(){
{field:'ggxh',title:'规格型号',hidden:false,width:120},
{field:'sszbx',title:'所属坐标系',hidden:true,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
{field:'azsj',title:'安装时间',hidden:false,width:120},
{field:'azdw',title:'安装单位',hidden:false,width:120},
{field:'azfs',title:'安装方式',hidden:false,width:120},
......
WebRoot/yw/nhyw/nhywjtbzgl/nhywjtbzgl.jsp
View file @ 1a26ba4f
......@@ -53,7 +53,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/nhywjtbzgl/nhywjtbzgl_show.jsp
View file @ 1a26ba4f
......@@ -124,8 +124,8 @@
<input id="jd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="经度必填项" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
</div>
<div class="form-line clearfix">
......
WebRoot/yw/nhyw/nhywjtbzgl/nhywjtbzgl_show_detail.jsp
View file @ 1a26ba4f
......@@ -68,7 +68,7 @@
<tr>
<td>经度</td>
<td><span id="jd"></span></td>
<td>维度</td>
<td>纬度</td>
<td><span id="wd"></span></td>
</tr>
<tr>
......
WebRoot/yw/nhyw/nhywjthlgl/nhywjthlgl.js
View file @ 1a26ba4f
......@@ -127,7 +127,7 @@ function initGrid(){
{field:'hljz',title:'护栏价值',hidden:true,width:120},
{field:'synx',title:'使用年限',hidden:true,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
{field:'sjzp',title:'实景照片',hidden:true,width:120},
{field:'gxdwbm',title:'管辖单位编码',hidden:true,width:120},
{field:'gxdwmc',title:'管辖单位名称',hidden:false,width:120},
......
WebRoot/yw/nhyw/nhywjthlgl/nhywjthlgl.jsp
View file @ 1a26ba4f
......@@ -73,7 +73,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/nhywjthlgl/nhywjthlgl_show.jsp
View file @ 1a26ba4f
......@@ -125,8 +125,8 @@
<input id="jd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="经度必填项" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
</div>
<div class="form-line clearfix">
......@@ -173,7 +173,7 @@ $(function(){
o.id = o.xzbh;
o.pid = o.sjxzbh;
o.start = 0; //iconCls
})
});
var xzfz = {};
xzfz.treeType = "xz";
xzfz.id = "-1";
......
WebRoot/yw/nhyw/nhywjthlgl/nhywjthlgl_show_detail.jsp
View file @ 1a26ba4f
......@@ -74,7 +74,7 @@
<tr>
<td>经度</td>
<td><span id="jd"></span></td>
<td>维度</td>
<td>纬度</td>
<td><span id="wd"></span></td>
</tr>
<tr>
......
WebRoot/yw/nhyw/nhywjtjzwxxb/nhywjtjzwxxb.js
View file @ 1a26ba4f
......@@ -131,7 +131,7 @@ function initGrid(){
{field:'jzwtp1',title:'建筑物图片1',hidden:true,width:120},
{field:'jzwtp2',title:'建筑物图片2',hidden:true,width:120},
{field:'jd',title:'经度',hidden:true,width:120},
{field:'wd',title:'维度',hidden:true,width:120},
{field:'wd',title:'纬度',hidden:true,width:120},
{field:'jj',title:'简介',hidden:true,width:120},
{field:'cjry',title:'创建人员',hidden:true,width:120},
{field:'cjrq',title:'创建日期',hidden:true,width:120},
......
WebRoot/yw/nhyw/nhywjtjzwxxb/nhywjtjzwxxb.jsp
View file @ 1a26ba4f
......@@ -61,7 +61,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl.js
View file @ 1a26ba4f
......@@ -145,7 +145,7 @@ function initGrid(){
{field:'azsj',title:'安装时间',hidden:false,width:120},
{field:'sszbx',title:'所属坐标系',hidden:false,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
{field:'xhdjj',title:'led简介',hidden:false,width:120},
{field:'cjry',title:'创建人员',hidden:true,width:120},
{field:'cjrq',title:'创建日期',hidden:true,width:120},
......
WebRoot/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl.jsp
View file @ 1a26ba4f
......@@ -85,7 +85,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl_show.jsp
View file @ 1a26ba4f
......@@ -102,8 +102,8 @@
<input id="jd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="经度必填项" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
</div>
<div class="form-line clearfix">
......
WebRoot/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl_show_detail.jsp
View file @ 1a26ba4f
......@@ -68,7 +68,7 @@
<tr>
<td>经度</td>
<td><span id="jd"></span></td>
<td>维度</td>
<td>纬度</td>
<td><span id="wd"></span></td>
</tr>
<tr>
......
WebRoot/yw/nhyw/nhywjtxcrzgl/jtssxcd/nhywjtssxcd.js
View file @ 1a26ba4f
......@@ -155,7 +155,7 @@ function initGrid(){
{field:'xcqy',title:'巡查区域',hidden:true,width:120},
{field:'xcdd',title:'巡查地点',hidden:false,width:120},
{field:'xcwzjd',title:'巡查位置经度',hidden:true,width:120},
{field:'xcwzwd',title:'巡查位置维度',hidden:true,width:120},
{field:'xcwzwd',title:'巡查位置纬度',hidden:true,width:120},
{field:'xcsj',title:'巡查时间',hidden:false,width:120},
{field:'xcnr',title:'巡查内容',hidden:false,width:120},
{field:'xcjg',title:'巡查结果',hidden:false,width:120},
......
WebRoot/yw/nhyw/nhywjtxcrzgl/jtssxcsb/jtsschsbgl.js
View file @ 1a26ba4f
......@@ -60,7 +60,7 @@ function initGrid(){
{field:'xcqy',title:'巡查区域',hidden:false,width:120},
{field:'xcdd',title:'巡查地点',hidden:true,width:120},
{field:'xcwzjd',title:'巡查位置经度',hidden:true,width:120},
{field:'xcwzwd',title:'巡查位置维度',hidden:true,width:120},
{field:'xcwzwd',title:'巡查位置纬度',hidden:true,width:120},
{field:'xcsj',title:'巡查时间',hidden:true,width:120},
{field:'xcnr',title:'巡查内容',hidden:true,width:120},
{field:'xcjg',title:'巡查结果',hidden:true,width:120},
......
WebRoot/yw/nhyw/nhywjtxhdgl/nhywjtxhdgl.js
View file @ 1a26ba4f
......@@ -154,7 +154,7 @@ function initGrid(){
{field:'lxdh',title:'管辖联系电话',hidden:true,width:120},
{field:'sszbx',title:'所属坐标系',hidden:true,width:120},
{field:'jd',title:'经度',hidden:true,width:120},
{field:'wd',title:'维度',hidden:true,width:120},
{field:'wd',title:'纬度',hidden:true,width:120},
{field:'xhdjj',title:'信号灯简介',hidden:false,width:120},
{field:'cjry',title:'创建人员',hidden:true,width:120},
{field:'cjrq',title:'创建日期',hidden:true,width:120},
......
WebRoot/yw/nhyw/nhywjtxhdgl/nhywjtxhdgl.jsp
View file @ 1a26ba4f
......@@ -86,7 +86,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
WebRoot/yw/nhyw/nhywjtxhdgl/nhywjtxhdgl_show.jsp
View file @ 1a26ba4f
......@@ -118,8 +118,8 @@
</div>
<div class="form-line clearfix">
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
<div class="fl">
......
WebRoot/yw/nhyw/nhywjtxhdgl/nhywjtxhdgl_show_detail.jsp
View file @ 1a26ba4f
......@@ -80,7 +80,7 @@
<tr>
<td>经度</td>
<td><span id="jd"></span></td>
<td>维度</td>
<td>纬度</td>
<td><span id="wd"></span></td>
</tr>
<tr>
......
WebRoot/yw/nhyw/zxld/zxld.js
View file @ 1a26ba4f
......@@ -63,7 +63,7 @@ function initGrid(){
{field:'gxdwbh',title:'管辖单位编号',hidden:false,width:120},
{field:'gxdwmc',title:'管辖单位名称',hidden:false,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
{field:'fx',title:'方向',hidden:false,width:120},
{field:'qs',title:'期数',hidden:true,width:120},
{field:'bz',title:'备注',hidden:true,width:120}
......
WebRoot/yw/nhyw/zxld/zxld_show.jsp
View file @ 1a26ba4f
......@@ -53,7 +53,7 @@
<input id="jd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'">
</div>
</div>
......
WebRoot/yw/recordalarm/nhywjtxhdglstate/ywxhdcurrentstate.js
View file @ 1a26ba4f
var windowId, proName = window.location.pathname.split("/")[1],
sysUrl = "http://" + window.location.host + "/" + proName, toEdit;
var arrs=[];
var arrs = [];
$(function () {
initDefault();
});
......@@ -11,27 +11,27 @@ function initDefault() {
initGrid();
}
function ywXhd(){
function ywXhd() {
$.ajax({
type: 'post',
async:true,
async: true,
dataType: 'json',
url: 'xtclAction!listXtclByPage.do',//dac 行政树
// url:'ptxzsAction!query_Ptxzs.do' ,//本地 行政树
data:{
data: {
LIKEcsdl: "nhywjtxhdglCurrent",
LIKEcslm:"",
LIKEcsdm:"",
LIKEcsmc:"",
LIKEcslm: "",
LIKEcsdm: "",
LIKEcsmc: "",
order: "order by csdl asc",
page: 1,
rows: 20,
},
}).done(function (data) {
var arr=[];
if(data.rows.length>0){
for(var i in data.rows){
arr.push({name:data.rows[i].csmc,value:data.rows[i].csdm});
var arr = [];
if (data.rows.length > 0) {
for (var i in data.rows) {
arr.push({name: data.rows[i].csmc, value: data.rows[i].csdm});
}
}
arrs = arr;
......@@ -56,12 +56,12 @@ function initCacheStatus() {
}
});
var firstShowPanel = true;
var ht=[];
for(var i=0;i<arrs.length;i++){
var str = "#_easyui_combobox_i1_"+i;
ht.push({id:str});
var ht = [];
for (var i = 0; i < arrs.length; i++) {
var str = "#_easyui_combobox_i1_" + i;
ht.push({id: str});
}
for(var i=0;i<ht.length;i++){
for (var i = 0; i < ht.length; i++) {
$(ht[i].id).after("<div onclick='handleA' class='handleCom1' style='display:none;'>" + $(ht[i].id).html() + "</div>");
}
$('#currentstate').combobox({
......@@ -69,8 +69,8 @@ function initCacheStatus() {
var opts = $(this).combobox('options');
var values = $('#currentstate').combobox('getValues');
if (record.id == 1) {
for(var i=0;i<arrs.length;i++){
$("#_easyui_combobox_i1_"+i).show();
for (var i = 0; i < arrs.length; i++) {
$("#_easyui_combobox_i1_" + i).show();
}
$(".handleCom").hide();
} else {
......@@ -91,8 +91,8 @@ function initCacheStatus() {
onShowPanel: function () {
if (!firstShowPanel) {
if (selectedValues.indexOf("1") != -1) {
for(var i=0;i<arrs.length;i++){
$("#_easyui_combobox_i1_"+i).hide();
for (var i = 0; i < arrs.length; i++) {
$("#_easyui_combobox_i1_" + i).hide();
}
} else {
if (selectedValues.length > 0) {
......@@ -105,8 +105,8 @@ function initCacheStatus() {
var values = $('#currentstate').combobox('getValues');
var opts = $(this).combobox('options');
if (record.id == 1) {
for(var i=0;i<arrs.length;i++){
$("#_easyui_combobox_i1_"+i).hide();
for (var i = 0; i < arrs.length; i++) {
$("#_easyui_combobox_i1_" + i).hide();
}
$(".handleCom").show();
} else {
......@@ -135,9 +135,9 @@ function getQueryParams() {
var chosed = $('#currentstate').combobox('getValues');
var currentstate = "";
for (var i in chosed) {
if(chosed[i]=="0"){
if (chosed[i] == "0") {
currentstate += " or STATE is null or STATE=0";
}else{
} else {
currentstate += " or STATE= " + chosed[i];
}
}
......@@ -174,36 +174,29 @@ function initGrid() {
{field: 'xhdbh', title: '信号灯编号', hidden: false, width: 120},
{field: 'qymc', title: '区域名称', hidden: false, width: 120},
{field: 'lkmc', title: '路口名称', hidden: false, width: 120},
{field: 'time', title: '检测时间', hidden: false, width: 125,
{
field: 'time', title: '检测时间', hidden: false, width: 125,
formatter: function (value, row, index) {
if(value==null || value=='' ||value=='null' || value===undefined) {
if (value == null || value == '' || value == 'null' || value === undefined) {
return "";
}else {
} else {
return new Date(value).format("yyyy-MM-dd hh:mm:ss");
}
}
},
{field: 'repairstatename', title: '维修状态', hidden: false, width: 120},
{
field: 'mode', title: '当前状态', hidden: false, width: 60,
field: 'state', title: '当前状态', hidden: false, width: 60,
formatter: function showClick(value, record, num) {
// if (value == 20) {
// 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>";
// }
if (value == 1) {
if (value == "1") {
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 if (value == 0){
} 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>";
}
else {
return "未知";
}
}
},
{
field: 'bz', title: '备注', width: 300,hidden:false,
field: 'bz', title: '备注', width: 300, hidden: false,
formatter: function showClick(value, record, num) {
if (value == null)
return "<a href='javascript:void(0);' class='ahref' onclick='showupdate(" + num + ")'>无 </a>";
......@@ -222,7 +215,7 @@ function showupdate(index) {
title: '备注',
width: 600,
height: 300,
data: {"currentstateid":rows.xh,"remarks":rows.bz},
data: {"currentstateid": rows.xh, "remarks": rows.bz},
buttons: [{
text: $.fn.textbox.defaults.ok,
handler: saveNodeInfo
......@@ -239,27 +232,26 @@ function doSearch() {
}
//保存
function saveNodeInfo() {
var win = $.getTopWindowById(windowId);
var jq = win.$;
$.ajax({
type: 'post',
dataType: 'json',
url: 'nhywjtxhdglAction!update_NhywjtxhdglRemarks.do',
data: {"bz": jq('#bz').val(), "XGTJxh": jq('#XGTJid').val()},
success: function (value) {
if (value == "success") {
$.showMsg("操作成功！");
top.$("#" + windowId).dialog('close');
doSearch();
} else if (value == "same") {
$.showMsg("已存在！");
} else {
$.showMsg("操作失败！");
}
$.ajax({
type: 'post',
dataType: 'json',
url: 'nhywjtxhdglAction!update_NhywjtxhdglRemarks.do',
data: {"bz": jq('#bz').val(), "XGTJxh": jq('#XGTJid').val()},
success: function (value) {
if (value == "success") {
$.showMsg("操作成功！");
top.$("#" + windowId).dialog('close');
doSearch();
} else if (value == "same") {
$.showMsg("已存在！");
} else {
$.showMsg("操作失败！");
}
});
}
}
});
}
WebRoot/yw/recordalarm/nhywjtydpglstate/nhywjtydpglstate.js
View file @ 1a26ba4f
......@@ -179,20 +179,17 @@ function initGrid() {
{field:'qdfs',title:'取电方式',hidden:true,width:120},
{field:'sszbx',title:'所属坐标系',hidden:true,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
{field: 'xjsj', title: '检测时间', hidden: false, width: 120},
{field: 'repairstatename', title: '维修状态', hidden: false, width: 120},
{
field: 'sbzt', title: '当前状态', hidden: false, width: 60,
field: 'state', title: '当前状态', hidden: false, width: 60,
formatter: function showClick(value, record, num) {
if (value == 1) {
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 if (value == 0){
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 "未知";
}
}
},
{
......
WebRoot/yw/recordalarm/nhywjtydpglstate/ywydpcurrentstate_show.jsp
View file @ 1a26ba4f
......@@ -89,8 +89,8 @@
<input id="jd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="经度必填项" >
</div>
<div class="fl">
<span class="text-content"><em class="must"></em>维度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="维度必填项" >
<span class="text-content"><em class="must"></em>纬度：</span>
<input id="wd" class="easyui-textbox" data-options="required:false,validType:'length[0,40]'" missingMessage="纬度必填项" >
</div>
</div>
<div class="form-line clearfix">
......
WebRoot/yw/recordalarm/ywmachinecurrentstate/ywmachinecurrentstate.js
View file @ 1a26ba4f
......@@ -195,9 +195,10 @@ function initGrid() {
},*/
{field: 'machinename', title: '机器名称', hidden: false, width: 120},
{field: 'machineip', title: '机器ip', hidden: false, width: 120},
{field: 'currentstatetime', title: '当前状态检测时间', hidden: false, width: 125},
{field: 'currentstatetime', title: '检测时间', hidden: false, width: 125},
{field: 'repairstatename', title: '维修状态', hidden: false, width: 60},
{
field: 'currentstate', title: '当前状态', hidden: true, width: 60,
field: 'currentstate', title: '当前状态', hidden: false, width: 60,
formatter: function showClick(value, record, num) {
if (value == 1) {
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>";
......@@ -205,16 +206,12 @@ function initGrid() {
} 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>";
}
// else{
// return value;
// }
}
},
{field: 'repairstatename', title: '维修状态', hidden: false, width: 60},
{
field: 'machinestate', title: '主机状态', hidden: false, width: 60,
field: 'machinestate', title: '主机状态', hidden: true, width: 60,
formatter: function showClick(value, record, num) {
// console.log("主机：",value,record);
if (value == 1) {
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 if (value == 0) {
......
WebRoot/yw/szmap/map/MapToolBar.js
View file @ 1a26ba4f
......@@ -199,9 +199,9 @@ MapToolBar.mapCameraLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -276,9 +276,9 @@ MapToolBar.mapJtjzwLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -309,9 +309,9 @@ MapToolBar.mapNhywjtbzLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -341,9 +341,9 @@ MapToolBar.mapjtbxLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -373,9 +373,9 @@ MapToolBar.mapjthlLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -406,9 +406,9 @@ MapToolBar.mapjtxhdLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -439,9 +439,9 @@ MapToolBar.mapjtydpLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -471,9 +471,9 @@ MapToolBar.mapjtdcLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -504,9 +504,9 @@ MapToolBar.mapjtwbLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......@@ -538,9 +538,9 @@ MapToolBar.mapjtldLabel = function () {
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='jd' value='${x}' placeholder='标注经度'>" +
"</div></div>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注维度：</label>" +
"<div class='form-group'><label for='wd' class='col-sm-left control-label'>标注纬度：</label>" +
"<div class='col-sm-right'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注维度'>" +
" <input type='text' class='form-control' id='wd' value='${y}' placeholder='标注纬度'>" +
"</div></div>" +
"<div class='form-group'><div class='col-sm-2'></div>" +
"<div class='col-sm-10'>" +
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/camera-search.jsp
View file @ 1a26ba4f
......@@ -76,7 +76,7 @@
<th>设备名称</th>
<!-- <th>设备编号</th> -->
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/detector-search.jsp
View file @ 1a26ba4f
......@@ -76,7 +76,7 @@
<th>道路名称</th>
<th>道路编码</th>
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/jtbx-search.jsp
View file @ 1a26ba4f
......@@ -81,7 +81,7 @@
<th>标线品牌</th>
<th>标线材质</th>
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/jthl-search.jsp
View file @ 1a26ba4f
......@@ -82,7 +82,7 @@
<th>방목謹뵀</th>
<th>빱으꼼醴</th>
<th>쒔똑</th>
<th>郭똑</th>
<th>款똑</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/jtjzw-search.jsp
View file @ 1a26ba4f
......@@ -80,7 +80,7 @@
<th>建筑物类型</th>
<th>建筑物区域</th>
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/jtxhd-search.jsp
View file @ 1a26ba4f
......@@ -84,7 +84,7 @@
<th>规格型号</th>
<th>区域名称</th>
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/jtydp-search.jsp
View file @ 1a26ba4f
......@@ -84,7 +84,7 @@
<th>规格型号</th>
<th>区域名称</th>
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/ld-search.jsp
View file @ 1a26ba4f
......@@ -78,7 +78,7 @@
<th>管辖单位编号</th>
<th>管辖单位名称</th>
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/szmap/map/toolbar_operation/itemPage/nhywjtbz-search.jsp
View file @ 1a26ba4f
......@@ -81,7 +81,7 @@
<th>标志品牌</th>
<th>规格型号</th>
<th>经度</th>
<th>维度</th>
<th>纬度</th>
</thead>
<tbody id="tbody">
</tbody>
......
WebRoot/yw/videoalarm/ywvideocurrentstate.js
View file @ 1a26ba4f
......@@ -262,7 +262,7 @@ function saveNodeInfo() {
type: 'post',
dataType: 'json',
url: 'ywvideocurrentstateAction!update_sbtdspsrRemarks.do',
data: {"remarks": jq('#bz').val(), "XGTJid": jq('#XGTJid').val(),"XGTJvideonum":jq("#XGTJsbbh").val(),"XGTJchannenum":jq("#XGTJtdbh").val()},
data: {"remarks": jq('#bz').val(), "XGTJid": jq('#XGTJid').val(),"XGTJvideonum":jq("#XGTJsbbh").val(),"XGTJchannelnum":jq("#XGTJtdbh").val()},
success: function (value) {
if (value == "success") {
$.showMsg("操作成功！");
......
WebRoot/yw/yw/nhyw/nhywjtbxgl/nhywjtbxgl.js
View file @ 1a26ba4f
......@@ -129,7 +129,7 @@ function initGrid(){
{field:'lxr',title:'管辖联系人',hidden:false,width:120},
{field:'lxdh',title:'管辖联系电话',hidden:false,width:120},
{field:'jd',title:'经度',hidden:false,width:120},
{field:'wd',title:'维度',hidden:false,width:120},
{field:'wd',title:'纬度',hidden:false,width:120},
// {field:'sjzp',title:'实景照片',hidden:false,width:120},
{field:'cjry',title:'创建人员',hidden:true,width:120},
{field:'cjrq',title:'创建日期',hidden:true,width:120},
......
WebRoot/yw/yw/nhyw/nhywjtbxgl/nhywjtbxgl.jsp
View file @ 1a26ba4f
......@@ -66,7 +66,7 @@
<input id="LIKEjd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
<span class="text-content">维度：</span>
<span class="text-content">纬度：</span>
<input id="LIKEwd" data-options="validType:'length[0,40]'" >
</div>
<div class='fl'>
......
src/cn/yw/detector/action/DetectorAction.java
View file @ 1a26ba4f
......@@ -198,8 +198,9 @@ public class DetectorAction extends BaseAction {
public void update_DetectorRemarks() {
Map map = Struts2Utils.getRequestParameterMap();
try {
if(RHUtil.isNotEmpty(map.get("remarks")) && map.get("remarks").toString().indexOf("survey")>0){
if(RHUtil.isNotEmpty(map.get("remarks")) && map.get("remarks").toString().indexOf("survey")>=0){
map.put("repairstate",900);
map.put("state",1);
}
int result = service.update_DetectorRemarks(map);
Struts2Utils.renderJson(Constants.SUCCESS);
......
src/cn/yw/machinemanage/action/YwmachineinfoAction.java
View file @ 1a26ba4f
......@@ -188,6 +188,7 @@ public class YwmachineinfoAction extends BaseAction{
try {
if(RHUtil.isNotEmpty(map.get("remarks"))&& map.get("remarks").toString().contains("survey")){
map.put("repairstate",900);
map.put("currentstate",1);
this.service.update_YwmachinecurrentstateRepairstate(map);
}
int result = service.update_YwmachineinfoRemarks(map);
......
src/cn/yw/nhyw/nhywjtledydpgl/action/NhywjtledydpglAction.java
View file @ 1a26ba4f
......@@ -177,6 +177,7 @@ public class NhywjtledydpglAction extends BaseAction {
try {
if(RHUtil.isNotEmpty(map.get("bz"))&& map.get("bz").toString().contains("survey")){
map.put("repairstate",900);
map.put("state",1);
}
int result = service.update_NhywjtledydpglRemarks(map);
Struts2Utils.renderJson(Constants.SUCCESS);
......
src/cn/yw/nhyw/nhywjtxhdgl/action/NhywjtxhdglAction.java
View file @ 1a26ba4f
......@@ -203,8 +203,9 @@ public class NhywjtxhdglAction extends BaseAction {
public void update_NhywjtxhdglRemarks() {
Map map = Struts2Utils.getRequestParameterMap();
try {
if(RHUtil.isNotEmpty(map.get("bz"))&& map.get("bz").toString().indexOf("survey")>0){
if(RHUtil.isNotEmpty(map.get("bz"))&& map.get("bz").toString().indexOf("survey")>=0){
map.put("repairstate",900);
map.put("state",1);
}
this.service.update_NhywjtxhdglRepairstate(map);
Struts2Utils.renderJson(Constants.SUCCESS);
......
src/cn/yw/video/videostate/action/YwvideocurrentstateAction.java
View file @ 1a26ba4f
......@@ -1053,6 +1053,7 @@ public class YwvideocurrentstateAction extends BaseAction{
//有“survey”这个内容就让设备维修状态改变下，可以不让做告警处理
if(RHUtil.isNotEmpty(map.get("remarks"))&& map.get("remarks").toString().contains("survey")){
map.put("repairstate",900);
map.put("isonline",1);
this.service.update_ywvideocurrentstateRepairState(map);
}
this.service.update_sbtdspsrRemarks(map);
......
src/cn/yw/zxld/action/ZxldAction.java
View file @ 1a26ba4f
......@@ -181,8 +181,9 @@ public class ZxldAction extends BaseAction {
public void update_ZxldRemarks() {
Map map = Struts2Utils.getRequestParameterMap();
try {
if(RHUtil.isNotEmpty(map.get("bz"))&& map.get("bz").toString().indexOf("survey")>0){
if(RHUtil.isNotEmpty(map.get("bz"))&& map.get("bz").toString().indexOf("survey")>=0){
map.put("repairstate",900);
map.put("state",1);
}
int result = service.update_ZxldRemarks(map);
Struts2Utils.renderJson(Constants.SUCCESS);
......
src/sqlmap/Detector.xml
View file @ 1a26ba4f
......@@ -521,6 +521,9 @@
update its.ksh_detector set remarks=#remarks#
<isNotEmpty prepend="," property="repairstate">
repairstate = #repairstate#
</isNotEmpty>
<isNotEmpty prepend="," property="state">
state = #state#
</isNotEmpty>
where id=#XGTJid#
</update>
......
src/sqlmap/Nhywjtledydpgl.xml
View file @ 1a26ba4f
......@@ -523,6 +523,7 @@
update nhywjtledydpgl set xgry=#xgry#,xgrq=#xgrq#, bz = #bz#
<dynamic prepend=", ">
<isNotEmpty prepend=',' property='repairstate'>repairstate=#repairstate#</isNotEmpty>
<isNotEmpty prepend=',' property='state'>state=#state#</isNotEmpty>
</dynamic>
where xh = #XGTJxh#
</update>
......
src/sqlmap/Nhywjtxhdgl.xml
View file @ 1a26ba4f
......@@ -426,6 +426,7 @@
<update id="update_NhywjtxhdglRepairstate" parameterClass="java.util.HashMap">
update nhywjtxhdgl set xgry=#xgry#,xgrq=#xgrq#,bz=#bz#
<isNotEmpty prepend="," property="repairstate">repairstate=#repairstate#</isNotEmpty>
<isNotEmpty prepend="," property="state">state=#state#</isNotEmpty>
where xh = #XGTJxh#
</update>
<!-- delete object -->
......
src/sqlmap/Ywmachinecurrentstate.xml
View file @ 1a26ba4f
......@@ -342,8 +342,7 @@
<!-- limit $start$ ,$limit$-->
<!-- </isNotEmpty> &ndash;&gt;-->
SELECT (select csmc from xtcl where csdl = 'ywMachineCurrentState' and csdm = currentstate ) as
currentstatename,
SELECT (select csmc from xtcl where csdl = 'ywMachineCurrentState' and csdm = currentstate ) as currentstatename,
currentstateid, currentstate, b.machineid, b.machinenum , b.machinename, b.machineip, repairstate,
(select alarmname from ywalarmeventcode where alarmcode=repairstate) repairstatename,
currentstatetime, machinestate, cpustatus, cpuusage, memorystate, memorytotal, memoryusage, harddiskstate,
......
src/sqlmap/Ywmachineinfo.xml
View file @ 1a26ba4f
......@@ -452,6 +452,7 @@
<isNotEmpty prepend=',' property='repairstate'>repairstate=#repairstate#</isNotEmpty>
<isNotEmpty prepend=',' property='modifyaccount'>modifyaccount=#modifyaccount#</isNotEmpty>
<isNotEmpty prepend=',' property='modifytime'>modifytime=#modifytime#</isNotEmpty>
<isNotEmpty prepend=',' property='currentstate'>currentstate=#currentstate#</isNotEmpty>
</dynamic>
where machineid =#XGTJmachineid#
</update>
......
src/sqlmap/Ywvideocurrentstate.xml
View file @ 1a26ba4f
......@@ -788,14 +788,6 @@
union
select 'normal' csdm ,'normal'csmc , count(*) cnt
from ywvideocurrentstate a right join sbtdspsr d on (d.sbbh=a.videonum and d.tdbh=a.channelnum ) where a.isonline is not null and isonline!=0
union
select isonline csdm, csmc, count(*) cnt
from ywvideocurrentstate a
left join xtcl b
on a.isonline = b.csdm
and b.csdl = 'ywVideoCurrentState'
right join sbtdspsr d on (d.sbbh=a.videonum and d.tdbh=a.channelnum )
group by isonline,csmc
</select>
<select id="vdqStatisticsRegion" resultClass="java.util.HashMap" parameterClass="java.util.Map">
......@@ -1427,6 +1419,7 @@
<isNotEmpty prepend=',' property='repairstate'>repairstate=#repairstate#</isNotEmpty>
<isNotEmpty prepend=',' property='modifyaccount'>modifyaccount=#modifyaccount#</isNotEmpty>
<isNotEmpty prepend=',' property='modifytime'>modifytime=#modifytime#</isNotEmpty>
<isNotEmpty prepend=',' property='isonline'>isonline=#isonline#</isNotEmpty>
</dynamic>
where videonum = #XGTJvideonum# and channelnum=#XGTJchannelnum#
</update>
......
src/sqlmap/Zxld.xml
View file @ 1a26ba4f
......@@ -140,9 +140,12 @@
</update>
<update id="update_ZxldRemarks" parameterClass="java.util.Map">
update its.ksh_zxld set bz=#bz#
update its.ksh_zxld set bz=#bz#
<isNotEmpty prepend="," property="repairstate">
repairstate = #repairstate#
</isNotEmpty>
<isNotEmpty prepend="," property="state">
state = #state#
</isNotEmpty>
where xh = #XGTJxh#
</update>
......
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