|
|
@@ -250,6 +250,7 @@ String.prototype.replaceAll = function(s1, s2) {
|
|
|
picStr += "</div>";
|
|
|
dArr.push(picStr);
|
|
|
} else if (cols[i].type == "monitor") {
|
|
|
+ console.log("monitor");
|
|
|
var monitor = $.zui.store.get("monitor");
|
|
|
var vice_monitor = $.zui.store.get("vice_monitor");
|
|
|
var str = "<div>";
|
|
|
@@ -258,18 +259,18 @@ String.prototype.replaceAll = function(s1, s2) {
|
|
|
'<div class="col-sm-6">'+
|
|
|
'<select class="form-control" style="height:25px;font-size:10px" id="select'+obj.id+'">';
|
|
|
str +='<option value="0" >'+"暂无选择"+'</option>'
|
|
|
- for(var i =0 ; i< monitor.length ; i++){
|
|
|
- var u = monitor[i];
|
|
|
- if(obj.monitor != null && obj.monitor != ''){
|
|
|
- if(u.id == obj.monitor){
|
|
|
- str += '<option value="'+u.id+'" selected="selected">'+u.truename+'</option>'
|
|
|
+ for(var index in monitor){
|
|
|
+ var u = monitor[index];
|
|
|
+ if(obj.monitor != null && obj.monitor != ''){
|
|
|
+ if(u.id == obj.monitor){
|
|
|
+ str += '<option value="'+u.id+'" selected="selected">'+u.truename+'</option>'
|
|
|
+ }else{
|
|
|
+ str += '<option value="'+u.id+'" >'+u.truename+'</option>'
|
|
|
+ }
|
|
|
}else{
|
|
|
str += '<option value="'+u.id+'" >'+u.truename+'</option>'
|
|
|
}
|
|
|
- }else{
|
|
|
- str += '<option value="'+u.id+'" >'+u.truename+'</option>'
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
str += '</select>'+
|
|
|
'</div>'+
|
|
|
'</div>'+
|
|
|
@@ -279,18 +280,18 @@ String.prototype.replaceAll = function(s1, s2) {
|
|
|
'<div class="col-sm-6">'+
|
|
|
'<select class="form-control" style="height:25px;font-size:10px" id="vselect'+obj.id+'">';
|
|
|
str +='<option value="0" >'+"暂无选择"+'</option>'
|
|
|
- for(var i =0 ; i< vice_monitor.length ; i++){
|
|
|
- var u = vice_monitor[i];
|
|
|
- if(obj.vice_monitor != null && obj.vice_monitor != ''){
|
|
|
- if(u.id == obj.vice_monitor){
|
|
|
- str += '<option value="'+u.id+'" selected="selected">'+u.truename+'</option>'
|
|
|
+ for(var j in vice_monitor){
|
|
|
+ var u = vice_monitor[j];
|
|
|
+ if(obj.vice_monitor != null && obj.vice_monitor != ''){
|
|
|
+ if(u.id == obj.vice_monitor){
|
|
|
+ str += '<option value="'+u.id+'" selected="selected">'+u.truename+'</option>'
|
|
|
+ }else{
|
|
|
+ str += '<option value="'+u.id+'" >'+u.truename+'</option>'
|
|
|
+ }
|
|
|
}else{
|
|
|
str += '<option value="'+u.id+'" >'+u.truename+'</option>'
|
|
|
}
|
|
|
- }else{
|
|
|
- str += '<option value="'+u.id+'" >'+u.truename+'</option>'
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
str += '</select>'+
|
|
|
'</div>'+
|
|
|
"</div>"+
|