Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git i...

didiyu

2018-12-10 6382c2a4220ff5774dba39848c2faabf0f7002f1

 gx_tieta/WebRoot/iframe/batt-info-edit.html

@@ -134,41 +134,9 @@
        </div>

        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">

            <div class="layui-block">

                <label class="layui-form-label">设备索引<span class="red">*</span></label>

                <div class="layui-input-block">

                    <select name="GroupIndexInFBSDevice" id="devindex">

                        {{# layui.each([0,1,2,3], function(index) { }};

                            {{# if(index == d.GroupIndexInFBSDevice) { }}

                                <option value="{{ index }}" selected>{{ index }}</option>

                            {{# }else{ }}

                                <option value="{{ index }}">{{ index }}</option>

                            {{# } }}

                        {{# });  }}

                    </select>

                </div>

            </div>

        </div>

        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">

            <div class="layui-block">

                <label class="layui-form-label">电池组ID</label>

                <div class="layui-input-block">

                    <input type="text" name="BattGroupId" lay-verify="required|number" id="groupid" disabled="" autocomplete="off" class="layui-input  layui-bg-gray" value="{{= d.BattGroupId }}">

                </div>

            </div>

        </div>

        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">

            <div class="layui-block">

                <label class="layui-form-label">电池组编号</label>

                <div class="layui-input-block">

                    <input type="text" name="BattGroupNum" lay-verify="required|number" id="groupnum" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattGroupNum }}">

                </div>

            </div>

        </div>

        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">

            <div class="layui-block">

                <label class="layui-form-label">电池组名称</label>

                <div class="layui-input-block">

                    <input type="text" name="BattGroupName" lay-verify="required" id="groupname" autocomplete="off" class="layui-input" value="{{= d.BattGroupName }}">

                </div>

            </div>

        </div>

@@ -264,7 +232,7 @@
            <div class="layui-block">

                <label class="layui-form-label">基站手机号码<span class="red">*</span></label>

                <div class="layui-input-block">

                    <input type="text" name="station_phone" lay-verify="required|phone" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">

                    <input type="text" name="station_phone" lay-verify="required|number" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">

                </div>

            </div>

        </div>

@@ -333,6 +301,51 @@
                </div>

             </div>

        </div>

      <div class="layui-row layui-col-space8">

      {{# layui.each(d.btsinfo, function(index, item) { }}

         <div class="layui-col-lg6">

            <div class="layui-card">

               <div class="layui-card-header layui-bg-gray">{{item.BattGroupName}}</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.GroupIndexInFBSDevice}}.index">

                                 {{# layui.each([0,1,2,3], function(k) { }}

                                           {{# if(item.GroupIndexInFBSDevice == 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">电池组ID</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}}">

                               </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.GroupIndexInFBSDevice}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattGroupName}}">

                               </div>

                            </div>

                     </div>

                  </div>

               </div>

            </div>

           </div>

      {{# }); }}

      </div>

    </script>

    <script type="text/javascript" src="../src/layui.js"></script>

    <script  type="text/javascript">

@@ -428,6 +441,23 @@
               $('#fbsip').val(getDevIp(val));

            });

            

            // 根据标称电压修改设置浮充电压阀值/设置离线电压阀值

            $('#battInfo').on('input propertychange', '#monvol', setFloatAndoutLine);

            
            // 根据单体数量修改设置浮充电压阀值/设置离线电压阀值

            $('#battInfo').on('input propertychange', '#moncount', setFloatAndoutLine);

            
            // 设置浮充电压阀值/设置离线电压阀值

            function setFloatAndoutLine() {

               var vol = $('#monvol').val();

               var monnum = $('#moncount').val();

               var chargeVol = (vol*1.117*monnum).toFixed(1);      // 浮充电压阀值

            var outlineVol = (vol*1.073*monnum).toFixed(1);      // 离线电压阀值

				
            $('#floatVolLevel').val(chargeVol);      // 浮充电压阀值

            $('#offlineVolLevel').val(outlineVol);   // 离线电压阀值

            }

            
            // 提交内容

            form.on('submit(enEidt)', function(data) {

               layer.confirm('是否确认修改', {icon: 3, title:'提示'}, function(index){

@@ -437,8 +467,8 @@
                   var home = _data.StationName3;         // 机房名称

                   var bts = _data.StationName4;         // 设备名称

                   _data.StationName = province+'-'+city+'-'+home+'-'+bts;

                   var temp = [_data];

                   //console.log(temp);

                   var temp = analysisData(editInfo.btsinfo, _data);

                   // console.log(temp);

                   // 更新数据

                   updBatt(temp);

               });

@@ -502,6 +532,44 @@
                 }

              });

         }

			
         // 解析添加的数据

         function analysisData(btsinfo, data) {

            //console.log(arr);

            var rs = [];

            for(var i=0; i<btsinfo.length; i++) {

               var temp = {};

               var _btsinfo = btsinfo[i];

               var _num = _btsinfo.GroupIndexInFBSDevice;

               var _index = 'group'+_num+'.index';

               var _name = 'group'+_num+'.name';

               var _id = 'group'+_num+'.id';

               Object.keys(data).forEach(function(key) {

                  if(checkKeyNotVal(key)) {

                     if(key == _index) {

                        temp.GroupIndexInFBSDevice = data[key];

                     }else if(key == _name){

                        temp.BattGroupName = data[key];

                     }else if(key == _id) {

                        temp.BattGroupId = data[key];

                     }

                  }else {

                     temp[key] = data[key];	
                  }

               });

					
               rs.push(temp);

            }

				
            return rs;

         }

			
         // 检测当前属性是否为废属性

         function checkKeyNotVal(key) {

            var patt = /^group[0-9]{1}\./;

				
            return patt.test(key);

         }

        });

    </script>

</body>