From 0ac46331c1829fbca7cc1873f8d143de2e5feee9 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 09:59:39 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/js/base.js | 6 +-
gx_tieta/WebRoot/control.jsp | 4 ++
gx_tieta/WebRoot/iframe/homeinfo.html | 81 ++++++++++++++++++++++++++++++++--------
gx_tieta/WebRoot/charge-test.jsp | 4 ++
gx_tieta/WebRoot/pages/js/pages/homeInfo.js | 11 +++++
gx_tieta/WebRoot/pages/css/mylayui.css | 3 +
gx_tieta/WebRoot/ele-param.jsp | 8 ++-
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html | 1
8 files changed, 95 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 0c280ba..b6a0c0a 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -484,6 +484,10 @@
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
</tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
+ </tr>
</table>
</div>
<div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 67e1692..5d1d84f 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -376,6 +376,10 @@
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
</tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
+ </tr>
</table>
</div>
<div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index 97c5a42..cb01b6b 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -234,13 +234,13 @@
'<s:text name="Computer_room"/><s:text name="Number"/>', '鐪�','<s:text name="City"/>', '<s:text name="County"/>', '<s:text name="Computer_name"/>', '<s:text name="Equipment"/><s:text name="Name"/>', '<s:text name="Computer_room"/>IP', 'FBS<s:text name="Equipment"/>ID(<s:text name="Important"/>)',
'FBS<s:text name="Equipment"/>IP(<s:text name="Important"/>)','瀛愮綉鎺╃爜','缃戝叧', 'FBS<s:text name="Equipment"/><s:text name="Name"/>', 'FBS<s:text name="Batt"/><s:text name="Indexes"/>(0-3)', '<s:text name="Batt_group"/>ID', '<s:text name="Computer_room"/><s:text name="Within"/><s:text name="Batt_group"/><s:text name="Number"/>', '<s:text name="Battery_name"/>', '<s:text name="Floate_charge"/><s:text name="Voltage"/><s:text name="Threshold"/>(V)',
'<s:text name="Offline"/><s:text name="Voltage"/><s:text name="Threshold"/>(V)', '<s:text name="Floate_charge"/><s:text name="Current"/><s:text name="Threshold"/>(A)', '<s:text name="Monomer_All"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Nomina_voltage_monomer"/>(V)', '<s:text name="Nominal"/><s:text name="Monomer_resistance"/>(m惟)', '<s:text name="Nominal"/><s:text name="Monomer_conductance"/>',
- '<s:text name="Monomer_voltage"/><s:text name="Lower_order"/><s:text name="Offset"/>(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜', '<s:text name="Battery_brand"/>', '<s:text name="Battery_model"/>', '<s:text name="Battery_produt_date"/>', '<s:text name="Put_into_use_time"/>'
+ '<s:text name="Monomer_voltage"/><s:text name="Lower_order"/><s:text name="Offset"/>(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜', '<s:text name="Battery_brand"/>', '<s:text name="Battery_model"/>', '<s:text name="Battery_produt_date"/>', '<s:text name="Put_into_use_time"/>', '瀹夎浜哄憳'
];
defaultArr = [
'35000001','鐪�','鍩庡競', '鍖哄幙', '鏈烘埧鍚嶇О', '璁惧鍚嶇О', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9600',
'0', '1000001', '1', '鏂板缓鐢垫睜缁�1', '2.230', '2.150', '30', '24', '3000',
- '2', '0.2', '5000', '0.05',15,0,'', '鍙岀櫥', 'GMF-3000', '2012-05-04', '2012-06-13'
+ '2', '0.2', '5000', '0.05',15,0,'', '鍙岀櫥', 'GMF-3000', '2012-05-04', '2012-06-13', ''
];
// 鐢熸垚琛ㄦ牸
$(function() {
@@ -822,6 +822,7 @@
arrTd.push(model.data[i].BattModel); //鐢垫睜鍨嬪彿
arrTd.push(model.data[i].BattProductDate.substr(0,10)); //鐢垫睜鐢熶骇鏃ユ湡
arrTd.push(model.data[i].BattInUseDate.substr(0,10)); //鎶曞叆浣跨敤鏃ユ湡
+ arrTd.push(model.data[i].install_user); // 璁惧瀹夎浜哄憳
/* arrTd.push("");
arrTd.push("");
arrTd.push(model.data[i].StationId_ex); //鎶曞叆浣跨敤鏃ユ湡 */
@@ -1011,9 +1012,10 @@
obj.BattModel = $(this).find('td').eq(29).text(); //鐢垫睜鍨嬪彿
obj.BattProductDate = $(this).find('td').eq(30).text(); //鐢垫睜鐢熶骇鏃ユ湡
obj.BattInUseDate = $(this).find('td').eq(31).text(); //鐢垫睜浣跨敤鏃ユ湡
+ obj.install_user = $(this).find('td').eq(32).text(); //瀹夎浜哄憳
_arr.push(obj);
});
- //console.info(_arr);
+ console.info(_arr);
return _arr;
}
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
index 153ec70..18bdbc6 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
@@ -154,6 +154,7 @@
,choose: function(obj){
addImgsOpts.files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
var files = this.files = obj.pushFile();
+ imgsInfo.text('');
//璇诲彇鏈湴鏂囦欢
obj.preview(function(index, file, result){
var tr = $(['<tr id="upload-'+ index +'">'
diff --git a/gx_tieta/WebRoot/iframe/homeinfo.html b/gx_tieta/WebRoot/iframe/homeinfo.html
index abe495d..4872a8b 100644
--- a/gx_tieta/WebRoot/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/iframe/homeinfo.html
@@ -44,7 +44,7 @@
{{# layui.each(d.tabc, function(index, item){ }}
{{# if(item.type == 'group'){ }}
<div class="layui-tab-item {{ item.cshow }}">
- <table class="hdw-tbl">
+ <table class="hdw-tbl mrb8">
<thead>
<tr>
<th style="width:30%">鍙傛暟鍚嶇О</th>
@@ -108,12 +108,16 @@
<td>璐熻矗浜�</td>
<td>{{ item.content.person }}</td>
</tr>
+ <tr>
+ <td>瀹夎浜哄憳</td>
+ <td>{{ item.content.install_user }}</td>
+ </tr>
</tbody>
</table>
</div>
{{# }else if(item.type == 'home'){ }}
<div class="layui-tab-item {{ item.cshow }}">
- <table class="hdw-tbl">
+ <table class="hdw-tbl mrb8">
<thead>
<tr>
<th style="width:30%">鍙傛暟鍚嶇О</th>
@@ -297,17 +301,32 @@
<br>
<div class="layui-form mrl8">
<div class="layui-form-item">
- <button type="button" class="layui-btn" id="test5"><i class="layui-icon"> </i>閫夋嫨涓婁紶瑙嗛</button>
- <div class="layui-input-inline">
- <input type="text" name="title" autocomplete="off" placeholder="璇疯緭鍏ヨ棰戝悕绉�" class="layui-input">
- </div>
+ <button type="button" class="layui-btn" id="test5"><i class="layui-icon"> </i>閫夋嫨涓婁紶瑙嗛</button>
+ <div class="layui-input-inline">
+ <input type="text" name="title" autocomplete="off" placeholder="璇疯緭鍏ヨ棰戝悕绉�" class="layui-input">
+ </div>
+ </div>
</div>
- </div>
- <div class="layui-progress layui-progress-big mrl8 mrr8" lay-showPercent="yes" lay-filter="uploadProgress">
- <div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>
- </div>
- <div class="bottom-btn">
- <button type="button" class="layui-btn layui-btn-normal" id="upload">纭涓婁紶</button>
+ <div class="layui-upload">
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="videoInfoTbl"></tbody>
+ </table>
+ </div>
+ </div>
+ <div class="layui-progress layui-progress-big mrl8 mrr8" lay-showPercent="yes" lay-filter="uploadProgress">
+ <div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>
+ </div>
+ <div class="bottom-btn">
+ <button type="button" class="layui-btn layui-btn-normal" id="upload">纭涓婁紶</button>
+ </div>
</div>
</div>
{{# } }}
@@ -345,7 +364,9 @@
var player;
element.on('tab(homeInfoTab)', function(data){
- if(!player) {
+ var playerName = '鍩虹珯鐜鐭棰�';
+ var tabTxt = $(this).text();
+ if(!player && tabTxt == playerName) {
player = new ckplayer(videoObject);
}
});
@@ -389,6 +410,33 @@
})
}
,accept: 'video' //瑙嗛
+ ,choose: function(obj) {
+
+ var files = this.files = obj.pushFile();
+ console.log(files);
+ videoInfoTbl.text('');
+ // 閬嶅巻
+ Object.keys(files).forEach(function(key) {
+ var file = files[key];
+ console.log(file);
+ var tr = $(['<tr id="upload-'+ key +'">'
+ ,'<td>'+ file.name +'</td>'
+ ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
+ ,'<td>'
+ ,'<button class="layui-btn layui-btn-xs layui-btn-danger imgs-delete">鍒犻櫎</button>'
+ ,'</td>'
+ ,'</tr>'].join(''));
+
+ //鍒犻櫎
+ tr.find('.imgs-delete').on('click', function(){
+ delete files[key]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadVideo.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ videoInfoTbl.append(tr);
+ });
+ }
,progress: function(e , percent) {
element.progress('uploadProgress',percent + '%');
}
@@ -396,6 +444,7 @@
var rs = JSON.parse(res.result);
if(rs.code == 1) {
element.progress('uploadProgress', '涓婁紶鎴愬姛锛�');
+ getVideoList(sid, gFileName, true);
}
}
});
@@ -441,9 +490,9 @@
var videoUrl = createVideosList(videoContainer, rsList, fileName);
// 鏄惁鏇存柊瑙嗛鍒楄〃
if(update) {
-
+
}else{
- videoObject.video = [[videoUrl, 'video/mp4']];
+ //videoObject.video = [[videoUrl, 'video/mp4']];
}
}else {
createVideosList(videoContainer, [], fileName);
@@ -478,7 +527,7 @@
}
// 婵�娲昏閫変腑鐨勮棰�
- container.find('.video-item').eq(acIndex).addClass('video-item-active');
+ // container.find('.video-item').eq(acIndex).addClass('video-item-active');
// 璁剧疆鍏ㄥ眬鐨勬鍦ㄦ挱鏀剧殑瑙嗛鐨勫悕绉�
gFileName = list[acIndex].fileName;
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 3a8d23d..7ff1c73 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -412,7 +412,7 @@
//console.info(data);
document.getElementById("FBSDeviceIp").innerHTML=data.FbsDeviceIp; //璁惧Ip
document.getElementById("GroupIndexInFBSDevice").innerHTML=data.GroupIndexInFBSDevice; //Bindex
-
+ document.getElementById("installUser").innerHTML= data.install_user; // 瀹夎浜哄憳
//鏄剧ず鐢垫睜缁勬満鍘嗗崱
$('#card_infor').show();
@@ -424,7 +424,7 @@
//鏍规嵁stationid鏌ヨ鍩虹珯鐨勪俊鎭�
function findStationInfoByStation(temp){
- console.info(JSON.stringify(temp));
+ //console.info(JSON.stringify(temp));
$.ajax({
type:"post",
url: "Battinf_exAction!serchByCondition",
@@ -433,7 +433,7 @@
data:"json="+JSON.stringify(temp),
success: function(data){
var model = eval('('+data.result+')');
- console.log(model);
+ //console.log(model);
if(model.code == 1 && model.data.length>0){
var station = model.data[0];
//console.info(station);
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index 0ff5647..2b78aea 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -188,6 +188,9 @@
.mrr8 {
margin-right: 8px;
}
+.mrb8 {
+ margin-bottom: 8px;
+}
/* bg-color */
.bg-red {
background-color: #FF0000;
diff --git a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
index d6ab551..da07a63 100644
--- a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
+++ b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -37,6 +37,7 @@
// 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
function formatHomeInfo(data) {
+ //console.log(data);
var groupDefaults = {
homeid: '',
homename: '',
@@ -51,7 +52,8 @@
chargecurr: '',
chargevol: '',
equipeinfo: '',
- person: ''
+ person: '',
+ install_user: ''
};
var homeDefaults = {
@@ -96,10 +98,12 @@
+'锛汭P锛�'+_data.FbsDeviceIp+'锛汢Index锛�'+_data.GroupIndexInFBSDevice;
content.equipeinfo = equipeinfo;
content.person = '';
+ content.install_user = _data.install_user;
tabc.push(tmp);
}
var StationId_ex = data[0].StationId_ex;
+ var install_user = data[0].install_user;
var homeData = data[0].binf_ex;
var tmp = {};
tmp.title = '鍩虹珯淇℃伅';
@@ -158,6 +162,7 @@
content.distance = homeData.upperStationRoute;
content.degree = homeData.upperStationDifficult;
content.repair = homeData.clienteleErrorService;
+ content.install_user = install_user;
// 鏄惁娣诲姞鍩虹珯淇℃伅
if(content.stationid != '0') {
@@ -168,12 +173,16 @@
var tmp = {};
tmp.type = 'env';
tmp.title = '鍩虹珯鐜鐭棰�';
+ tmp.tshow = '';
+ tmp.cshow = '';
tabc.push(tmp);
// 涓婁紶瑙嗛
var tmp = {};
tmp.type = 'upload';
tmp.title = '涓婁紶鐭棰�';
+ tmp.tshow = '';
+ tmp.cshow = '';
tabc.push(tmp);
--
Gitblit v1.9.1