From 0cd906c45db3badb02753a1988904ca7876b6d1a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 16:03:56 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/setcurr.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/setcurr.html b/gx_tieta/WebRoot/iframe/setcurr.html
index 29513e9..951acf5 100644
--- a/gx_tieta/WebRoot/iframe/setcurr.html
+++ b/gx_tieta/WebRoot/iframe/setcurr.html
@@ -51,8 +51,8 @@
var table = layui.table;
var setCurr = parent.$('#setCurrIframe').data('setCurr');
-
- console.log(setCurr);
+ var addBattStr = parent.$('#setCurrIframe').data('addBattStr');
+ console.log(addBattStr);
// 琛ㄦ牸妯″潡
var tOptions = {
elem: '#pageTbl'
@@ -133,7 +133,7 @@
type: 'post'
,async: true
,url: 'Fbs9100_setparamAction_action_updatePro_dis'
- ,data: 'json='+JSON.stringify(param)
+ ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
--
Gitblit v1.9.1