From ac7e8dab32688a34e3ebe797a502d5a1200de9f1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 27 十二月 2018 13:58:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/map.html | 5 +
gx_tieta/WebRoot/ex-battinfo.jsp | 52 ++++++++++++++--
gx_tieta/WebRoot/mobil/batt-edit2.html | 4
gx_tieta/WebRoot/iframe/homeinfo.html | 4
gx_tieta/WebRoot/pages/js/pages/homeInfo.js | 25 ++++++++
gx_tieta/WebRoot/mobil/batt-approved.html | 1
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 4
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 4
gx_tieta/WebRoot/batch-set-curr.jsp | 48 ++++++++++++---
gx_tieta/WebRoot/pages/js/mylayui.js | 29 ++++++++-
10 files changed, 144 insertions(+), 32 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 4b2c858..830c3f4 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -152,6 +152,15 @@
<table id="pageTbl" lay-filter="pageTbl"></table>
</div>
</div>
+ <script type="text/html" id="setStatus">
+ {{# if(d.setCurr == 1){ }}
+ <button class="layui-btn layui-btn-sm layui-btn-warm">璁剧疆鏀剧數鍙傛暟鎴愬姛</button>
+ {{# }else if(d.setCurr == 2){ }}
+ <button class="layui-btn layui-btn-sm layui-btn-danger">璁剧疆鏀剧數鍙傛暟澶辫触</button>
+ {{# }else { }}
+ <button class="layui-btn layui-btn-sm layui-btn-normal">鏈缃斁鐢靛弬鏁�</button>
+ {{# } }}
+ </script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
@@ -415,6 +424,7 @@
,{field:'station_phone', title:'鍩虹珯鎵嬫満鍙风爜', align:'center', width: 140}
,{field:'BattProducer', title:'鐢垫睜鍝佺墝', align:'center', width: 140}
,{field:'BattModel', title:'鐢垫睜鍨嬪彿', align:'center', width: 260}
+ ,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160}
]]
,data:[]
,limit: 20
@@ -427,9 +437,6 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
-
- // 鏌ヨ鍚庡彴鏁版嵁
-
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#batchAdd').click(function() {
@@ -455,25 +462,24 @@
,data: 'json='+JSON.stringify(temp)
,dataType: 'json'
,success: function(res) {
- console.log(res);
+ // console.log(res);
var rs = JSON.parse(res.result);
+ var data = [];
if(rs.code == 1) {
- var data = rs.data;
- console.log(data);
- tOptions.data = data;
- // 鐢熸垚琛ㄦ牸鏁版嵁
- table.render(tOptions);
+ data = rs.data;
}else {
layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
}
+
+ tOptions.data = data;
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(tOptions);
}
,complete:function() {
layer.close(load);
}
});
}
-
-
// 鐐瑰嚮娣诲姞鏋勯�犳煡璇�
function structAddData() {
@@ -513,6 +519,26 @@
}
return rs;
}
+
+ // 鐐瑰嚮鎵归噺璁剧疆鏀剧數鐢垫祦鍙傛暟
+ $('#batchSetCurr').click(function() {
+ var checkStatus = table.checkStatus('pageTbl');
+ var data = checkStatus.data;
+ if(data.length == 0) {
+ layer.msg('璇烽�夋嫨瑕佽缃殑鏈烘埧');
+ return;
+ }
+ // console.log(data);
+ // 璁剧疆鏀剧數鍙傛暟
+ getDisCurrParam(data);
+ });
+
+
+ // 鑾峰彇鏀剧數鍙傛暟
+ function getDisCurrParam(data) {
+ console.log(data);
+ var data = GetHourRate();
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index c5fec0d..c0b02b5 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -77,15 +77,21 @@
</div>
</div>
</div>
+ <!-- 鏈烘埧闈㈡澘淇℃伅闈㈡澘淇℃伅 -->
+ <div id="homeInfoIframeData"></div>
+ <!-- 瀹℃牳鎿嶄綔鏍� -->
<script type="text/html" id="battGrouptools">
<a class="layui-btn layui-btn-xs" lay-event="adopt">瀹℃牳</a>
</script>
<script type="text/html" id="acceptBattGroupTools">
- {{# if(d.check_en !=2){ }}
- <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">楠屾敹</a>
+ {{# if(d.check_en ==0){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">寰呯敵璇�</a>
+ {{# }else if(d.check_en ==1) { }}
+ <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">宸查獙鏀�</a>
{{# }else { }}
<a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="accept">楠屾敹</a>
{{# } }}
+ <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="look">鏈烘埧鐜</a>
<a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="control">瀹炴椂鏌ヨ</a>
</script>
<script type="text/html" id="applyEn">
@@ -122,6 +128,7 @@
<script type="text/javascript" src="src/layui.js"></script>
<script type="text/javascript" src="pages/js/mylayui.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
+ <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
layui.use(['form', 'table', 'layer', 'element'], function() {
/* 椤甸潰瀵煎叆layui妯″潡 */
@@ -129,6 +136,7 @@
var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
var element = layui.element; // 鑾峰彇鍏冪礌鎿嶄綔妯″潡
+ var laytpl = layui.laytpl; // 鑾峰彇妯℃澘鎿嶄綔妯″潡
/* 鍒嗛〉淇℃伅妯″潡 */
var Page = new TblPage(); // 瀹炰緥鍖朤blPage瀵硅薄--楠屾敹鐨勭殑瀹℃牳淇℃伅
@@ -276,7 +284,7 @@
,{field:'apply_date', title:'鐢宠鏃ユ湡', align:'center', width: 260}
,{field:'confirm_name', title:'瀹℃牳浜�', align:'center', width: 120}
,{field:'check_uname', title:'楠屾敹浜�', align:'center', width: 120}
- ,{field:'doThings', fixed: 'right', title:'楠屾敹鎿嶄綔', align: 'center', toolbar: '#acceptBattGroupTools', width:180}
+ ,{field:'doThings', fixed: 'right', title:'楠屾敹鎿嶄綔', align: 'center', toolbar: '#acceptBattGroupTools', width:240}
]]
,data:[]
,limit: 10000
@@ -287,6 +295,8 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
+ // 鏇存柊琛ㄦ牸鐨勫璞�
+ var layuiTbl = new LayuiTbl(acceptOptions, layui, laytpl, table.cache.acceptTbl);
// 瀹℃壒鎿嶄綔鏍�
table.on('tool(pageTbl)', function(obj) {
@@ -311,6 +321,9 @@
break;
case 'control':
controlPage(obj.data);
+ break;
+ case 'look':
+ lookHomeInfo(obj.data);
break;
}
});
@@ -477,6 +490,26 @@
window.open(url);
}
+ // 鏌ョ湅鏈烘埧淇℃伅
+ function lookHomeInfo(data) {
+ var sid = data.StationId;
+ var tabC = [
+ {
+ type: 'env'
+ ,title: '鍩虹珯鐜鐭棰�'
+ ,tshow: ''
+ ,cshow: ''
+ }
+ ,{
+ type: 'envImg'
+ ,title: '鍩虹珯鐜鍥鹃泦'
+ ,tshow: 'layui-this'
+ ,cshow: 'layui-show'
+ }
+ ];
+ showHomeInfoIframe(sid, tabC);
+ }
+
// 鏌ヨ鍚庡彴鏁版嵁
search();
function search() {
@@ -617,7 +650,7 @@
,complete: function() {
layer.close(load);
// 鍚姩鑷姩鍒锋柊
- //updateAcceptSearch();
+ updateAcceptSearch();
}
});
}
@@ -661,10 +694,13 @@
acceptPage.setAll(0);
}
- $('#acceptNum').text(getAcceptHome(resData)); // 璁剧疆寰界珷
- acceptOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
- // 鐢熸垚琛ㄦ牸鏁版嵁
- table.reload('acceptTbl', acceptOptions);
+ // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
+ for(var i=0; i<resData.length; i++) {
+ var _resData = resData[i];
+ _resData.doThings = '';
+ layuiTbl.updateTr(i, _resData);
+ }
+
// 瀹炴椂鍥炶皟
updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
}
diff --git a/gx_tieta/WebRoot/iframe/homeinfo.html b/gx_tieta/WebRoot/iframe/homeinfo.html
index 4a8eeb3..5b826e8 100644
--- a/gx_tieta/WebRoot/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/iframe/homeinfo.html
@@ -288,7 +288,7 @@
</table>
</div>
{{# }else if(item.type == 'env'){ }}
- <div class="layui-tab-item">
+ <div class="layui-tab-item {{ item.cshow }}">
<div id="video" style="width: 100%;height: 100%;"></div>
<div id="videos" class="video-list">
<div class="video-list-container">
@@ -338,7 +338,7 @@
</div>
</div>
{{# }else if(item.type == 'envImg'){ }}
- <div class="layui-tab-item">
+ <div class="layui-tab-item {{ item.cshow }}">
<div class="layui-carousel" id="imgCarousel" lay-filter="imgCarousel">
<div carousel-item="" class="carousel-item" id="carouselItems"></div>
</div>
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index fdcb112..e4333e5 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -188,6 +188,7 @@
,anim: 4
,content: 'iframe/homeinfo1.html'
});
+ layer.full(iframePopup);
// applyendyanshou(arr);
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index acbad84..6b9a40e 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -356,7 +356,7 @@
$(function(){
creatAllView(temp.length).trigger('create');
//creatMonCapOpt(temp.length);
- setMonVolStd(temp.length);
+ setchangedMonVolStd(temp.length);
creatBa(temp.length).trigger('create');
});
@@ -686,7 +686,7 @@
}
return selected;
}
- function setMonVolStd(suoyin){
+ function setchangedMonVolStd(suoyin){
for(var u=0;u<suoyin;u++){
var id='';
id='#MonCount'+u;
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 527b3d7..a588c3b 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -752,7 +752,7 @@
return $(str).attr('checked','true');
}
- function setMonVolStd(suoyin){
+ function setchangedMonVolStd(suoyin){
for(var u=0;u<suoyin;u++){
var id='';
id='#MonCount'+u;
@@ -766,7 +766,7 @@
}
}
- setMonVolStd(suoyin);
+ setchangedMonVolStd(suoyin);
function setMonVolStd(index){
for(var i=0;i<index;i++){
var s='#MonVolStd'+i;
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index e01afca..29a9b7a 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -321,7 +321,7 @@
var lixiandianyafazhi = [0,0,0,0];
$(function(){
creatAllView(temp.length).trigger('create');
- setMonVolStd(temp.length);
+ setchangedMonVolStd(temp.length);
creatBa(temp.length).trigger('create');
});
@@ -674,7 +674,7 @@
}*/
- function setMonVolStd(suoyin){
+ function setchangedMonVolStd(suoyin){
for(var u=0;u<suoyin;u++){
var id='';
id='#MonCount'+u;
diff --git a/gx_tieta/WebRoot/mobil/map.html b/gx_tieta/WebRoot/mobil/map.html
index 608108d..5b09b61 100644
--- a/gx_tieta/WebRoot/mobil/map.html
+++ b/gx_tieta/WebRoot/mobil/map.html
@@ -280,6 +280,7 @@
,anim: 4
,content: 'iframe/homeinfo.html'
});
+ layer.full(iframePopup);
}
// 鐐瑰嚮绛涢�夊脊鍑哄唴瀹�
@@ -293,6 +294,7 @@
,anim: 4
,content: 'iframe/homeinfo.html'
});
+ layer.full(iframePopup);
});
// 鎼滅储鏈烘埧鑾峰彇鐒︾偣
@@ -307,6 +309,7 @@
,anim: 5
,content: 'iframe/searchHome.html'
});
+ layer.full(iframePopup);
});
// 鏌ヨ鏈烘埧
@@ -530,6 +533,7 @@
,anim: 4
,content: 'iframe/homeinfo.html'
});
+ layer.full(iframePopup);
}
// 鍒犻櫎鍦板浘鍥炬爣
@@ -738,6 +742,7 @@
,anim: 4
,content: 'iframe/seenhomeinfo.html'
});
+ layer.full(iframePopup);
}
// 鏄剧ず鍦板浘鎻愮ず闈㈡澘
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index 141ec8f..785509f 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -405,14 +405,28 @@
var layui = this.layui;
var preData = this.cache[index];
- var _data = $.extend(preData, data||{});
+ var _data = $.extend(preData||{}, data||{});
var tds = this._getBodyTds(index);
- console.log(preData);
+ var tdRs = this._getFixedRTds(index);
+ //console.log(_data);
// 閬嶅巻
var _this = this;
layui.each(_data, function(key, value) {
// 閬嶅巻tds鐨勫��
- tds.each(function() {
+ tds.each(function(k) {
+ var _field = $(this).data('field');
+ if(key == _field) {
+ var cell = $(this).find('.layui-table-cell');
+ var content = _this._getContent(key, value, _data);
+ cell.html(content);
+ }
+ });
+ });
+
+ // 淇敼娴姩
+ layui.each(_data, function(key, value) {
+ // 閬嶅巻tds鐨勫��
+ tdRs.each(function(k) {
var _field = $(this).data('field');
if(key == _field) {
var cell = $(this).find('.layui-table-cell');
@@ -429,6 +443,12 @@
return trList.eq(index).find('td');
}
+ ,_getFixedRTds: function(index) {
+ var layuiTableView = $(this.ele).next('.layui-table-view');
+ var layuiFixedR = layuiTableView.find('.layui-table-fixed.layui-table-fixed-r .layui-table tbody');
+ var trList = layuiFixedR.find('tr');
+ return trList.eq(index).find('td');
+ }
,_getContent: function(key, value, data) {
var col = this.col; // 鎵�鏈夌殑鍒�
var laytpl = this.tpl;
@@ -440,7 +460,8 @@
// 鍒ゆ柇褰撳墠鍐呭鏄惁涓哄搴旂殑闇�瑕佹洿鏂扮殑鏁版嵁
if(key == _col.field) {
// 鍒ゆ柇鏄惁鏈夋ā鏉�
- templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value;
+ templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value.toString();
+ //console.log(templet);
// 鏍规嵁妯℃澘鏋勬垚content
laytpl(templet).render(data, function(html) {
rs = html;
diff --git a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
index d262d4d..0e12e6f 100644
--- a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
+++ b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -207,4 +207,27 @@
// 杩斿洖缁撴灉闆�
return rs;
-}
\ No newline at end of file
+}
+
+// 鏄剧ず鏈烘埧淇℃伅
+function showHomeInfoIframe(sid, data) {
+ var rs = {
+ sid: sid,
+ tabc:data
+ };
+
+ $('#homeInfoIframeData').data('data', rs);
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '<i class="fa fa-home"></i>鍩虹珯淇℃伅',
+ area: ['960px', '524px'],
+ btn:['閲嶇疆闈㈡澘'],
+ fixed: true, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/homeinfo.html',
+ yes:function(index) {
+ layer.iframeSrc(index, 'iframe/homeinfo.html');
+ }
+ });
+}
--
Gitblit v1.9.1