内容修改

whychdw

2021-11-08 62c9a71c72468abba6c6d95657868dc0228f3396

内容修改

 gx_tieta/WebRoot/ele-param.jsp

@@ -197,8 +197,14 @@
                

                // 设置检测文件名弹出框的content

                var addGroupContent = '<div style="width:300px; height: 40px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px; text-algin: center;">'+

                                        '<span>新建&nbsp;</span>'+

                                        '<select id="addGroupnum" style="width: 190px;height: 26px; border: 1px solid #ccc">'+

                                        '<span>设备类型:</span>'+

                                        '<select id="devType" style="width: 180px;height: 26px; border: 1px solid #ccc">'+

                                            '<option value="9100">常规BTS</option>'+

                                            '<option value="9110">假负载BTS</option>'+

                                        '</select>'+

                                        '<br><br>'+

                                        '<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;新建:&nbsp;</span>'+

                                        '<select id="addGroupnum" style="width: 180px;height: 26px; border: 1px solid #ccc">'+

                                            '<option value="1">1</option>'+

                                            '<option value="2">2</option>'+

                                            '<option value="3">3</option>'+

@@ -752,50 +758,149 @@
                    ,productDate: '2018-09-18 00:00:00'

                    ,useDate: '2018-09-18 00:00:00'

                    ,install_user: ''



                    ,videoUrl: "",   // 萤石云视频监控序列号

                    chargeType: 1,  // 充电类型

                    buscoupleState: "0", // 母联状态

                    tmp_id: "0",      // 电价模板id



                    Vol_grade: "0", // 电压等级（kV）

                    Manufacturers: '无', // 生产厂家

                    Assetequipment: '', // 是否资产级设备

                    Deviceclasspath: '', // 设备分类全路径

                    Deviceoperationdepartment: '', // 设备运维部门

                    PropertyRightUnit: '', // 产权单位

                    PropertyAttribute: '', // 产权属性

                    FactoryNumber: '', // 出厂编号

                    OperationTeam: '', // 运维(保管)班组

                    DeviceIdentityCode: '', // 设备身份编码

                    ProjectType: '', // 项目类型

                    BatteryApplicationType: '', // 蓄电池应用类型

                    SingleRatedVoltage: "0", // 单电压额定电压

                    RemoteMonitor: '', // 是否实现远程监控

                    BatttIndependentPlaced: '', // 是否独立蓄电池室放置

                    JunChargeVoltageValue: "0", // 均充电压设定值

                };

                

                // 点击新建按钮

                // $('#paging .new-item').click(function() {

                //     var len = tOptions.data.length;

                //     var _rsData = defaultData;

                //     if(len) {

                //         _rsData = tOptions.data[len-1];

                //     }

                //     getMaxDevId(function(id) {

                //         // 打开面板设置新建电池组个数

                //         layer.open({

                //             type: 1

                //             ,title: '选择新建电池组'

                //             ,content: addGroupContent

                //             ,fixed: true

                //             ,resize: false

                //             ,area: ["320px", "200px"]

                //             ,btn:['确定', '取消']

                //             ,yes: function(index) {

                //                 var groupNum = $('#addGroupnum').val();

                //                 layer.close(index);

                //                 // 生成数组

                //                 var _arr = [];

                //                 for(var i=0; i<groupNum; i++) {

                //                     _arr.push(i+1);

                //                 }

                //

                //                 _rsData.addGroupNum = _arr;

                //                 _rsData.FBSDeviceId = id;

                //                 $('#iframeEdit').data('data', _rsData);

                //

                //                 iframePopup = layer.open({

                //                     type: 2

                //                     ,title: '新建电池组'

                //                     ,area:['1200px', '520px']

                //                     ,resize: false

                //                     ,content: 'iframe/batt-info-add.html'

                //                 });

                //             },

                //         });

                //     });

                //

                // });



                // 点击新建按钮

                $('#paging .new-item').click(function() {

                    var len = tOptions.data.length;

                    var _rsData = defaultData;

                    // 打开面板设置新建电池组个数

                    layer.open({

                        type: 1

                        , title: '新建电池组'

                        , content: addGroupContent

                        , fixed: true

                        , resize: false

                        , area: ["320px", "200px"]

                        , btn: ['确定', '取消']

                        , yes: function (index) {

                            let groupNum = $('#addGroupnum').val();

                            let devType =  $("#devType").val();

                            getMaxIdByType(devType, groupNum, index);

                        }

                    });

                });



                /**

                 * 根据设备类型查询最大的设备ID并打开新建面板

                 * @param type 设备类型

                 * @param groupNum    电池组个数

                 * @param index 新建面板的编号

                 */

                function getMaxIdByType(type, groupNum, index) {

                    let load = layer.load(1);

                    let len = tOptions.data.length;

                    let _rsData = defaultData;

                    if(len) {

                        _rsData = tOptions.data[len-1];

                    }

                    getMaxDevId(function(id) {

                        // 打开面板设置新建电池组个数

                        layer.open({

                            type: 1

                            ,title: '选择新建电池组个数'

                            ,content: addGroupContent

                            ,fixed: true

                            ,resize: false

                            ,btn:['确定', '取消']

                            ,yes: function(index) {

                                var groupNum = $('#addGroupnum').val();

                                layer.close(index);

                                // 生成数组

                                var _arr = [];

                                for(var i=0; i<groupNum; i++) {

                                    _arr.push(i+1);

                                }

								
                                _rsData.addGroupNum = _arr;

                                _rsData.FBSDeviceId = id;

                                $('#iframeEdit').data('data', _rsData);

								
                                iframePopup = layer.open({

                                    type: 2

                                    ,title: '新建电池组'

                                    ,area:['1200px', '520px']

                                    ,resize: false

                                    ,content: 'iframe/batt-info-add.html'

                                });

                    // 查询后台

                    $.ajax({

                        type: 'post'

                        ,async: true

                        ,url: 'BattInfAction!searchNewMaxDeviceId'

                        ,data: "json="+JSON.stringify({

                            FBSDeviceId: type,

                        })

                        ,dataType: 'json'

                        ,success:function(res) {

                            // 关闭弹出框

                            layer.close(index);

                            let rs = JSON.parse(res.result);

                            let id = rs.data;



                            // 生成数组

                            let _arr = [];

                            for(let i=0; i<groupNum; i++) {

                                _arr.push(i+1);

                            }

                        });

                    }); 
					
                });

				


                            _rsData.addGroupNum = _arr;

                            _rsData.FBSDeviceId = id;



                            $('#iframeEdit').data('data', _rsData);



                            // 开启新建面板

                            iframePopup = layer.open({

                                type: 2

                                ,title: '新建电池组'

                                ,area:['1200px', '520px']

                                ,resize: false

                                ,content: 'iframe/batt-info-add.html'

                            });

                        }

                        ,error() {

                            layer.msg("获取设备ID失败！请检查网络");

                        }

                        ,complete: function() {

                            layer.close(load);

                        },

                    });

                }



                // 获取最大设备id

                function getMaxDevId(callback) {

                    var load = layer.load(1);


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

@@ -39,7 +39,7 @@
        </div>

    </div>

    <script type="text/html" id="battInfoTpl">

        <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">机房编号</label>

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

@@ -47,7 +47,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-lg4">

            <div class="layui-block">

                <label class="layui-form-label">省<span class="red">*</span></label>

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

@@ -55,7 +55,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-lg4">

            <div class="layui-block">

                <label class="layui-form-label">市<span class="red">*</span></label>

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

@@ -63,7 +63,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-lg4">

            <div class="layui-block">

                <label class="layui-form-label">区/县<span class="red">*</span></label>

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

@@ -83,11 +83,11 @@
            <div class="layui-block">

                <label class="layui-form-label">设备名称</label>

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

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

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

                </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">

@@ -95,7 +95,7 @@
                </div>

            </div>

        </div>

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

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

            <div class="layui-block">

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

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

@@ -103,11 +103,11 @@
                </div>

            </div>

        </div>

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

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

            <div class="layui-block">

                <label class="layui-form-label">设备IP</label>

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

                    <input type="text" name="FbsDeviceIp" disabled="" id="fbsip" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FbsDeviceIp }}">

                    <input type="text" name="FbsDeviceIp" id="fbsip" autocomplete="off" class="layui-input" value="{{= d.FbsDeviceIp }}">

                </div>

            </div>

        </div>

@@ -212,6 +212,54 @@
                <label class="layui-form-label">负载电流<span class="red">*</span></label>

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

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

                </div>

            </div>

        </div>

        <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">

                    <input type="text" name="tmp_id" id="tmp_id" autocomplete="off" class="layui-input" value="{{= d.tmp_id }}">

                </div>

            </div>

        </div>

        <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">母联状态<span class="red">*</span></label>

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

                    <input type="text" name="buscoupleState" id="buscoupleState" autocomplete="off" class="layui-input" value="{{= d.buscoupleState }}">

                </div>

            </div>

        </div>

        <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">充电类型<span class="red">*</span></label>

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

                    <input type="text" name="chargeType" id="chargeType" autocomplete="off" class="layui-input" value="{{= d.chargeType }}">

                </div>

            </div>

        </div>

        <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">电压等级<span class="red">*</span></label>

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

                    <input type="text" name="Vol_grade" id="Vol_grade" autocomplete="off" class="layui-input" value="{{= d.Vol_grade }}">

                </div>

            </div>

        </div>

        <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">单电压额定电压<span class="red">*</span></label>

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

                    <input type="text" name="SingleRatedVoltage" id="SingleRatedVoltage" autocomplete="off" class="layui-input" value="{{= d.SingleRatedVoltage }}">

                </div>

            </div>

        </div>

        <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">均充电压设定值<span class="red">*</span></label>

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

                    <input type="text" name="JunChargeVoltageValue" id="JunChargeVoltageValue" autocomplete="off" class="layui-input" value="{{= d.JunChargeVoltageValue }}">

                </div>

            </div>

        </div>

@@ -454,6 +502,7 @@
            var editPopupShow = parent.$('#iframeShowEidt');

            var monCapStds = [50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 1000];

            var battProducers = getBattProducers();

            console.log(battProducers);

            var monNums = [4, 24];

            // 省-市-区县模板

            var provinceTpl = $('#provinceTpl').html();

@@ -469,7 +518,6 @@
            editInfo.monCapStds = monCapStds;        // 标称容量列表

            editInfo.battProducers = battProducers;    // 电池品牌列表

            editInfo.monNums = monNums;                // 单体数量

            //console.log(editInfo);

            var data = {

                StationId: '4011100'

                ,StationName1: '广西省'

@@ -504,6 +552,28 @@
                ,productDate: '2018-09-18 00:00:00'

                ,useDate: '2018-09-18 00:00:00'

                ,install_user: '呵呵'



                  ,videoUrl: "",   // 萤石云视频监控序列号

                  chargeType: 1,  // 充电类型

                  buscoupleState: "0", // 母联状态

                  tmp_id: "0",      // 电价模板id



                  Vol_grade: "0", // 电压等级（kV）

                  Manufacturers: '', // 生产厂家

                  Assetequipment: '', // 是否资产级设备

                  Deviceclasspath: '', // 设备分类全路径

                  Deviceoperationdepartment: '', // 设备运维部门

                  PropertyRightUnit: '', // 产权单位

                  PropertyAttribute: '', // 产权属性

                  FactoryNumber: '', // 出厂编号

                  OperationTeam: '', // 运维(保管)班组

                  DeviceIdentityCode: '', // 设备身份编码

                  ProjectType: '', // 项目类型

                  BatteryApplicationType: '', // 蓄电池应用类型

                  SingleRatedVoltage: "0", // 单电压额定电压

                  RemoteMonitor: '', // 是否实现远程监控

                  BatttIndependentPlaced: '', // 是否独立蓄电池室放置

                  JunChargeVoltageValue: "0", // 均充电压设定值

            };

           

            // 渲染内容

@@ -577,7 +647,6 @@
            // 修改电池品牌

            form.on('select(battProducer)', function(data) {

                if(data.value==-100 ) {

                    //console.log(provinces);

                    laytpl(battProducerTpl).render({}, function(html) {

                        // 打开面板设置新建电池组个数

                        layer.open({

@@ -638,24 +707,17 @@
                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和设备ip

                             $('#devid').val(max);

                             $('#fbsip').val(getDevIp(max));

                         });

                        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);



                        // 添加电池信息

                        addBatt(temp);

                    });

                });

                

@@ -772,7 +834,6 @@
            

            // 解析添加的数据

            function analysisData(arr, data) {

                //console.log(arr);

                var rs = [];

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

                    var temp = {};

@@ -1014,7 +1075,6 @@
                            ,btn:['确定', '取消']

                            ,yes: function(index) {

                                var val = $('#oCounty').val();

                                console.log(val);

                                setSelVal($('#county'), val);

                                layer.close(index);

                            }


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

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

                <label class="layui-form-label">设备名称</label>

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

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

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

                </div>

            </div>

        </div>


 gx_tieta/WebRoot/pages/js/mylayui.js

@@ -682,6 +682,7 @@
        ,dataType: 'json'

        ,success: function(res) {

            var rs = JSON.parse(res.result);

            console.log(rs);

            // 判断查询结果

            if(rs.code == 1) {

                var data = rs.data;

@@ -692,8 +693,8 @@
                        producers.push(_data.BattProducer);

                    }

                }

                producers.push('其他');

            }

            producers.push('其他');

        }

        ,complete: function() {