From 6dfb3274dcc7c1a5475d5c45a538ec1fed78ac93 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 14 十二月 2018 10:07:10 +0800
Subject: [PATCH] 修改电池面板中添加电池组
---
gx_tieta/WebRoot/mobil/map.html | 3
gx_tieta/WebRoot/iframe/batt-info-edit.html | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
gx_tieta/WebRoot/mobil/iframe/homeinfo.html | 3 -
gx_tieta/WebRoot/Top.jsp | 2
4 files changed, 161 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 9a3de45..51ebf9e 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -930,7 +930,7 @@
}else{
linkNum++;
// 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝ｅ父
- if(linkNum == 1) {
+ if(linkNum == 2) {
console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛佽烦杞埌鐧婚檰");
// 缃戠粶姝ｅ父浣嗘湇鍔″櫒杩炵画澶氭妫�娴嬩笉姝ｅ父璺宠浆鍒扮櫥闄嗛〉闈�
alert('缃戠粶杩炴帴寮傚父锛岃妫�鏌ョ綉缁滆繛鎺ユ槸鍚︽甯革紒');
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index b570de3..a90b2c6 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -27,7 +27,8 @@
<div class="layui-row layui-col-space8" id="battInfo"></div>
<div style="height: 8px;"></div>
<div class="layui-row">
- <div class="layui-col-xs3 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">
+ <div class="layui-col-xs5 layui-col-xs-offset7 layui-col-sm5 layui-col-sm-offset7 layui-col-md3 layui-col-md-offset9 layui-col-lg3 layui-col-lg-offset9">
+ <button class="layui-btn layui-btn-sm layui-btn-normal" id="addGroup">娣诲姞鐢垫睜缁�</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="" lay-filter="enEidt">纭缂栬緫</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="closePage">鍏抽棴闈㈡澘</button>
</div>
@@ -301,9 +302,9 @@
</div>
</div>
</div>
- <div class="layui-row layui-col-space8">
+ <div class="layui-row layui-col-space8" id="battGroupInfo">
{{# layui.each(d.btsinfo, function(index, item) { }}
- <div class="layui-col-lg6">
+ <div class="layui-col-lg6 batt-group-item">
<div class="layui-card">
<div class="layui-card-header layui-bg-gray">{{item.BattGroupName}}</div>
<div class="layui-card-body">
@@ -328,7 +329,7 @@
<div class="layui-block">
<label class="layui-form-label">鐢垫睜缁処D</label>
<div class="layui-input-block">
- <input type="text" name="group{{item.GroupIndexInFBSDevice}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{item.BattGroupId}}">
+ <input type="text" name="group{{item.GroupIndexInFBSDevice}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray battid" value="{{item.BattGroupId}}">
</div>
</div>
</div>
@@ -347,6 +348,66 @@
{{# }); }}
</div>
</script>
+ <script type="text/html" id="addBattGroupTpl">
+ {{# layui.each(d, function(index, item) { }}
+ <div class="layui-col-lg6 batt-group-item">
+ <div class="layui-card">
+ <div class="layui-card-header layui-bg-gray">{{item.name}}</div>
+ <div class="layui-card-body">
+ <div class="layui-row layui-col-space8">
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
+ <div class="layui-input-block">
+ <select name="group{{item.num}}.index">
+ {{# layui.each([0,1,2,3], function(k) { }}
+ {{# if(item.num == k) { }}
+ <option value="{{ k }}" selected>{{ k }}</option>
+ {{# }else{ }}
+ <option value="{{ k }}">{{ k }}</option>
+ {{# } }}
+ {{# }); }}
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鐢垫睜缁処D</label>
+ <div class="layui-input-block">
+ <input type="text" name="group{{item.num}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray battid" value="{{item.id}}">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
+ <div class="layui-input-block">
+ <input type="text" name="group{{item.num}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.name}}">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{# }); }}
+
+ </script>
+ <script type="text/html" id="battGroupNum">
+ <div style="width:300px; height: 40px;">
+ <div style="margin-top: 20px;margin-left: 8px; margin-right: 8px; text-algin: center;">
+ <span>鏂板缓 </span>
+ <select id="addGroupnum" style="width: 190px;height: 26px; border: 1px solid #ccc">
+ {{# layui.each(d.num, function(index, item) { }}
+ <option value="{{ item }}">{{ item }}</option>
+ {{# }); }}
+ </select>涓數姹犵粍
+ <br><br>
+ </div>
+ </div>
+ </script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript">
layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {
@@ -358,7 +419,7 @@
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
- //console.log(editInfo);
+ // console.log(editInfo);
var data = {
StationId: '4011100'
,StationName1: '骞胯タ鐪�'
@@ -411,8 +472,6 @@
elem: '#usedate'
,format: 'yyyy-MM-dd HH:mm:ss'
});
-
-
});
// 楠岃瘉淇℃伅
@@ -460,6 +519,7 @@
// 鎻愪氦鍐呭
form.on('submit(enEidt)', function(data) {
+ // console.log(data);
layer.confirm('鏄惁纭淇敼', {icon: 3, title:'鎻愮ず'}, function(index){
var _data = data.field;
var province = _data.StationName1; // 鐪�
@@ -467,7 +527,8 @@
var home = _data.StationName3; // 鏈烘埧鍚嶇О
var bts = _data.StationName4; // 璁惧鍚嶇О
_data.StationName = province+'-'+city+'-'+home+'-'+bts;
- var temp = analysisData(editInfo.btsinfo, _data);
+ var battNum = getBattGroupNum();
+ var temp = analysisData(battNum, _data);
// console.log(temp);
// 鏇存柊鏁版嵁
updBatt(temp);
@@ -537,10 +598,10 @@
function analysisData(btsinfo, data) {
//console.log(arr);
var rs = [];
- for(var i=0; i<btsinfo.length; i++) {
+ for(var i=0; i<btsinfo; i++) {
var temp = {};
- var _btsinfo = btsinfo[i];
- var _num = _btsinfo.GroupIndexInFBSDevice;
+
+ var _num = i;
var _index = 'group'+_num+'.index';
var _name = 'group'+_num+'.name';
var _id = 'group'+_num+'.id';
@@ -570,6 +631,93 @@
return patt.test(key);
}
+
+ var battGroupNum = $('#battGroupNum').html();
+ // 鐐瑰嚮娣诲姞鐢垫睜缁勬寜閽�
+ $('#addGroup').click(function() {
+ getPreMaxBattGroupId();
+ var num = getBattGroupNum();
+ if(num>=4) {
+ layer.msg('鏈�澶�4缁勭數姹犵粍');
+ return;
+ }
+ var addNum = 4-num;
+ //console.log(typeof addNum);
+ var tmp = {num:[]};
+ // 鏋勯�犵敓鎴愭坊鍔犵數姹犱釜鏁扮殑鏁版嵁
+ for(var i=0; i<addNum; i++) {
+ tmp.num.push(i+1);
+ }
+ //console.log(tmp);
+ // 娓叉煋鍐呭
+ laytpl(battGroupNum).render(tmp, function(html) {
+ //console.log(html);
+ // 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁�
+ layer.open({
+ type: 1
+ ,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�'
+ ,content: html
+ ,area: ['335px', '165px']
+ ,fixed: true
+ ,resize: false
+ ,btn:['纭畾', '鍙栨秷']
+ ,yes: function(index) {
+ layer.close(index);
+ var _num = $('#addGroupnum').val();
+ var _min = getBattGroupNum();
+ getMaxBattGroupId(_min, _num); // 鑾峰彇鏈�澶х殑鐢垫睜缁処D骞剁敓鎴愭寚瀹氱殑鏁版嵁鏍煎紡
+ }
+ });
+ });
+ });
+
+ // 鑾峰彇鏈�澶х殑鐢垫睜缁勬暟
+ function getBattGroupNum() {
+ var num = $('#battGroupInfo .batt-group-item').length;
+ return num;
+ }
+
+ // 鑾峰彇褰撳墠鏈�澶х殑鐢垫睜缁刬d
+ function getPreMaxBattGroupId(battid) {
+ var _maxid = $('#battGroupInfo .battid').eq(-1).val(); // 褰撳墠闈㈡澘涓渶澶х殑鐢垫睜缁刬d
+ var rsMaxId = battid>_maxid?battid:Number(_maxid)+1; // 褰撳墠鏁版嵁搴撴渶澶х殑鐢垫睜缁刬d
+ return rsMaxId; // 杩斿洖鏈�澶х殑鐢垫睜缁刬d
+ }
+
+ // 鑾峰彇鐢垫睜鏈�澶х殑id骞剁敓鎴愭寚瀹氭牸寮忕殑鏁版嵁
+ var addBattGroupTpl = $('#addBattGroupTpl').html();
+ function getMaxBattGroupId(min, num) {
+ var load = layer.load(1); // 娣诲姞绛夊緟妗�
+ // 璇锋眰鍚庡彴鑾峰彇鏈�澶х數姹犵粍鐨刬d
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: "BattInfAction!searchMaxBattgroupId"
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ var battid = getPreMaxBattGroupId(rs.data);
+ var temp = [];
+ for(var i=0; i<num; i++) {
+ var _temp = {};
+ _temp.num = i+min;
+ _temp.id = i+battid;
+ _temp.name = '鐢垫睜缁�'+(_temp.num+1);
+
+ temp.push(_temp);
+ }
+ laytpl(addBattGroupTpl).render(temp, function(html) {
+ var $html = $(html);
+ $('#battGroupInfo').append($html);
+ form.render();
+ });
+ }
+ ,complete: function() {
+ layer.close(load); // 鍏抽棴绛夊緟妗�
+ }
+ });
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo.html
index 9b5001c..e45fe6d 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo.html
@@ -333,9 +333,6 @@
var model = eval('('+data.result+')');
if(model.code == 1){
alert("璁剧疆鎴愬姛");
- map.clearOverlays();
- searchStation();
- searchProvince();
}else{
alert("璁剧疆澶辫触");
}
diff --git a/gx_tieta/WebRoot/mobil/map.html b/gx_tieta/WebRoot/mobil/map.html
index b479468..1c3fb5e 100644
--- a/gx_tieta/WebRoot/mobil/map.html
+++ b/gx_tieta/WebRoot/mobil/map.html
@@ -55,7 +55,7 @@
<div class="page-header bg-gay3">
<div class="layui-row h40">
<div class="layui-col-xs3 layui-col-md1 full-height">
- <button class="layui-btn layui-btn-primary layui-btn-sm mrt5 mrl8"><i class="fa fa-reply mrr4"></i>杩斿洖</button>
+ <a href="index.html" class="layui-btn layui-btn-primary layui-btn-sm mrt5 mrl8"><i class="fa fa-reply mrr4"></i>杩斿洖</a>
</div>
<div class="layui-col-xs6 layui-col-md10 full-height line-height40">鏈烘埧瀹氫綅</div>
<div class="layui-col-xs3 layui-col-md1 full-height line-height40 t-align-right t-align-right">
@@ -300,7 +300,6 @@
});
}
-
//鎷︽埅瀹夊崜鍥為��鎸夐挳
history.pushState(null, null, location.href);
--
Gitblit v1.9.1