From 582ab1900e62416b477e428a71d95c075ca43b8b Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 11:24:13 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-info-add.html | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index a541c9e..2f06466 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -17,6 +17,9 @@
font-size: 20px;
color: #FF5722;
}
+ .layui-not-show {
+ display: none;
+ }
</style>
</head>
<body>
@@ -92,7 +95,7 @@
</div>
</div>
</div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+ <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3 layui-not-show">
<div class="layui-block">
<label class="layui-form-label">璁惧ID<span class="red">*</span></label>
<div class="layui-input-block">
@@ -100,7 +103,7 @@
</div>
</div>
</div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+ <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3 layui-not-show">
<div class="layui-block">
<label class="layui-form-label">璁惧IP</label>
<div class="layui-input-block">
@@ -371,6 +374,22 @@
{{# }); }}
</div>
</script>
+ <script type="text/html" id="msgTpl">
+ <div style="width: 380px;" class="layui-form layui-form-pane">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁惧ID</label>
+ <div class="layui-input-block">
+ <input type="text" name="FBSDeviceId" disabled="" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ爣棰�" class="layui-input layui-bg-gray" value="{{d.FBSDeviceId}}">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁惧IP</label>
+ <div class="layui-input-block">
+ <input type="text" name="FBSDeviceIP" disabled="" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ爣棰�" class="layui-input layui-bg-gray" value="{{d.FbsDeviceIp}}">
+ </div>
+ </div>
+ </div>
+ </script>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
@@ -388,6 +407,9 @@
var monCapStds = [50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 1000];
var battProducers = ['鍦ｉ槼', '鐞嗗＋', '閾舵嘲', '鍗楅兘', '鍙岀櫥', 'SENRY', '鑹鹃粯鐢�', '绉戝＋杈�', '涓版棩', '涓叴鑳芥淳', '鍏夊畤', '閮庤揪', '鑹捐鏂崕杈�', '闆勯煬', '椋庡竼', '鏂囬殕', '涓北'];
var monNums = [4, 24]
+
+ // 娣诲姞瀹屾垚鍚庢彁绀轰俊鎭殑妯℃澘
+ var msgTpl = $('#msgTpl').html();
editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId); // 璁剧疆璁惧IP
editInfo.monCapStds = monCapStds; // 鏍囩О瀹归噺鍒楄〃
@@ -429,7 +451,7 @@
,useDate: '2018-09-18 00:00:00'
,install_user: '鍛靛懙'
};
-
+
// 娓叉煋鍐呭
laytpl(battInfoTpl).render(editInfo, function(html) {
$('#battInfo').html(html);
@@ -668,11 +690,18 @@
var model = eval('('+data.result+')');
//console.info(model);
if(model.code ==1){
- layer.msg('娣诲姞鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
- setTimeout(function() {
- parent.$('#iframeClose').click();
- parent.$('#paging .search').click();
- }, 3000);
+ parent.layer.msg('娣诲姞鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
+ // 鎻愮ず淇℃伅
+ laytpl(msgTpl).render(temp[0], function(html) {
+ parent.layer.open({
+ title: '閲嶈淇℃伅'
+ ,area: ['420px', 'auto']
+ ,content: html
+ });
+ });
+
+ parent.$('#iframeClose').click();
+ parent.$('#paging .search').click();
}else{
layer.msg('娣诲姞澶辫触锛�');
}
--
Gitblit v1.9.1