From d4ebdb224370b399f156d8da142019fb44216c64 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 07 一月 2019 13:53:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param1.jsp | 14 ++++
gx_tieta/WebRoot/iframe/batt-info-edit.html | 4
gx_tieta/WebRoot/iframe/batt-info-add.html | 91 +++++++++++++++++++++++------
gx_tieta/WebRoot/pages/js/mylayui.js | 30 +++++++++-
4 files changed, 112 insertions(+), 27 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index 058dc80..7d22d3c 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -132,6 +132,8 @@
<div id="iframeAddData"></div>
<!-- 鍏抽棴椤甸潰涓璱frame寮瑰嚭灞� -->
<div id="iframeClose"></div>
+ <!-- 鏌ヨ骞舵樉绀虹紪杈戦潰鏉� -->
+ <div id="iframeShowEidt"></div>
<script type="text/html" id="battGrouptools">
<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
@@ -170,7 +172,7 @@
//console.info(json);
<% } %>
- console.log(permits);
+ // console.log(permits);
layui.use(['form', 'table', 'layer', 'element'], function() {
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
@@ -513,6 +515,15 @@
searchHomeInfoByName(obj.data.StationName);
}
+ // 鐐瑰嚮鏄剧ず缂栬緫闈㈡澘
+ $('#iframeShowEidt').click(function() {
+ var sName = $(this).data('sName');
+ if(sName) {
+ searchHomeInfoByName(sName);
+ }
+ });
+
+
// 鏍规嵁鏈烘埧鐨勫悕绉版煡璇㈡満鎴跨殑淇℃伅
function searchHomeInfoByName(homename) {
var temp = {
@@ -536,7 +547,6 @@
async:true,
dataType:'json',
data:"json="+JSON.stringify(temp),
-
success: function(res){
var rs = JSON.parse(res.result)
if(rs.code == 1) {
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index 6d96497..34ebeec 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -404,6 +404,7 @@
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
+ var editPopupShow = parent.$('#iframeShowEidt');
var monCapStds = [50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 1000];
var battProducers = ['鍦ｉ槼', '鐞嗗＋', '閾舵嘲', '鍗楅兘', '鍙岀櫥', 'SENRY', '鑹鹃粯鐢�', '绉戝＋杈�', '涓版棩', '涓叴鑳芥淳', '鍏夊畤', '閮庤揪', '鑹捐鏂崕杈�', '闆勯煬', '椋庡竼', '鏂囬殕', '涓北'];
var monNums = [4, 24]
@@ -542,30 +543,80 @@
// 鎻愪氦鍐呭
form.on('submit(enAdd)', function(data) {
- //console.log(data);
- layer.confirm('鏄惁纭娣诲姞', {icon: 3, title:'鎻愮ず'}, function(index){
- var _data = data.field;
- var province = _data.StationName1; // 鐪�
- var city = _data.StationName2; // 甯�
- var home = _data.StationName3; // 鏈烘埧鍚嶇О
- var bts = _data.StationName4; // 璁惧鍚嶇О
- _data.StationName = province+'-'+city+'-'+home+'-'+bts;
-
- var temp = analysisData(editInfo.addGroupNum, _data);
-
- checkDevId(_data.FBSDeviceId, function(devid){
- // 娣诲姞鐢垫睜淇℃伅
- addBatt(temp);
- }, function(pre, max) {
- layer.msg('璁惧ID:'+pre+'琚崰鐢�,鎺ㄨ崘浣跨敤'+max);
- // 鏇存柊璁惧id鍜岃澶噄p
- $('#devid').val(max);
- $('#fbsip').val(getDevIp(max));
- });
+ // 鏍￠獙鏈烘埧鍚嶇О
+ checkHomeName(data, function() {
+ //console.log(data);
+ layer.confirm('鏄惁纭娣诲姞', {icon: 3, title:'鎻愮ず'}, function(index){
+ var _data = data.field;
+ var province = _data.StationName1; // 鐪�
+ var city = _data.StationName2; // 甯�
+ var home = _data.StationName3; // 鏈烘埧鍚嶇О
+ var bts = _data.StationName4; // 璁惧鍚嶇О
+ _data.StationName = province+'-'+city+'-'+home+'-'+bts;
+
+ var temp = analysisData(editInfo.addGroupNum, _data);
+
+ checkDevId(_data.FBSDeviceId, function(devid){
+ // 娣诲姞鐢垫睜淇℃伅
+ addBatt(temp);
+ }, function(pre, max) {
+ layer.msg('璁惧ID:'+pre+'琚崰鐢�,鎺ㄨ崘浣跨敤'+max);
+ // 鏇存柊璁惧id鍜岃澶噄p
+ $('#devid').val(max);
+ $('#fbsip').val(getDevIp(max));
+ });
+ });
});
+
return false;
});
+ // 妫�娴嬫満鎴垮悕绉版槸鍚︾浉鍚�
+ function checkHomeName(data, callback) {
+ var _data = data.field;
+ var province = _data.StationName1; // 鐪�
+ var city = _data.StationName2; // 甯�
+ var home = _data.StationName3; // 鏈烘埧鍚嶇О
+ var bts = _data.StationName4; // 璁惧鍚嶇О
+ _data.StationName = province+'-'+city+'-'+home+'-'+bts;
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName: _data.StationName
+ };
+ var loading = layer.load(1);
+ // 璇锋眰鍚庡彴楠岃瘉
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!judgeBatt'
+ ,data: 'json='+JSON.stringify(tmp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ //console.log(rs);
+ if(rs.code == 1) {
+ // 鏈烘埧宸插瓨鍦ㄥ垽鏂槸鍚﹁繘鍏ョ紪杈戞満鎴�
+ layer.confirm('璇ユ満鎴垮凡瀛樺湪锛屾槸鍚﹁繘鍏ョ紪杈戯紒',{icon:0, title: '鎻愮ず'}, function(index) {
+ // 鏄剧ず缂栬緫闈㈡澘
+ editPopupShow.data('sName', _data.StationName);
+ editPopupShow.click();
+ // 鍏抽棴娣诲姞闈㈡澘闈㈡澘
+ parent.$('#iframeClose').click();
+ });
+ }else {
+ callback();
+ }
+ }
+ ,error: function() {
+ layer.msg('鏍￠獙鏈烘埧鍚嶇О澶辫触锛岃閲嶆柊鎻愪氦锛�');
+ }
+ ,complete: function() {
+ layer.close(loading);
+ }
+ });
+
+ }
+
// 鐩戞祴褰撳墠鎻愪氦鐨勮澶嘔D鏄惁涓烘渶澶�
function checkDevId(devid, success, error) {
var load = layer.load(1);
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index c054623..d1d7b6b 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -209,7 +209,7 @@
<div class="layui-block">
<label class="layui-form-label">鏈烘埧鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" name="StationName3" lay-verify="required" id="homename" autocomplete="off" class="layui-input" value="{{= d.StationName3 }}">
+ <input type="text" name="StationName3" disabled="" lay-verify="required" id="homename" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.StationName3 }}">
</div>
</div>
</div>
@@ -499,7 +499,7 @@
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
- console.log(editInfo);
+ //console.log(editInfo);
editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);
editInfo.monCapStds = monCapStds; // 鏍囩О瀹归噺鍒楄〃
editInfo.battProducers = battProducers; // 鐢垫睜鍝佺墝鍒楄〃
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index aab196a..4800537 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -403,7 +403,6 @@
LayuiTbl.prototype = {
updateTr: function(index, data) {
var layui = this.layui;
-
var preData = this.cache[index];
var _data = $.extend(preData||{}, data||{});
var tds = this._getBodyTds(index);
@@ -437,6 +436,13 @@
});
}
,updateCol: function(major, field, data) { // 鏇存柊鍒楃殑鍊�
+ // 鍒ゆ柇褰撳墠灞炴�ф槸鍚︽槸data鐨勫睘鎬�
+ if(field in data) {
+ var index = this.getIndex(major, data[major]); // 鑾峰彇闇�瑕佹洿鏂扮殑琛�
+ if(index != undefined) { // 鑾峰彇鍒�
+ this.updateTr(index, data); // 鏇存柊琛ㄦ牸鐨勬暟鎹�
+ }
+ }
}
,_getBodyTds: function(index) {
@@ -463,8 +469,11 @@
// 鍒ゆ柇褰撳墠鍐呭鏄惁涓哄搴旂殑闇�瑕佹洿鏂扮殑鏁版嵁
if(key == _col.field) {
// 鍒ゆ柇鏄惁鏈夋ā鏉�
- templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value.toString();
+ console.log(key+'***'+_col.field);
+ console.log(_col.templet);
+ templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():typeof value == 'number'?value.toString():value;
//console.log(templet);
+ templet = templet?templet:typeof value == 'number'?value.toString():value;
// 鏍规嵁妯℃澘鏋勬垚content
laytpl(templet).render(data, function(html) {
rs = html;
@@ -476,8 +485,23 @@
return false;
}
- ,_getIndex: function(field, value) {
+ ,getIndex: function(field, value) {
+ // 閬嶅巻cache鐨勫��
+ var cache = this.cache;
+ var index = undefined;
+ for(var i=0; i<cache.length; i++) {
+ var _cache = cache[i];
+ console.log(_cache)
+ if(field in _cache && _cache[field] == value) {
+ index = i;
+ break;
+ }
+ }
+ return index;
+ }
+ ,setCache: function(cache) {
+ this.cache = cache;
}
};
--
Gitblit v1.9.1