~whychwj/haha.git

parent: 09e1bbbe | 补丁 | 提交 | ignore whitespace

Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

81041

2019-01-09 eed5715ed72cda38a07d792b3750fdb077ff0492

Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

9个文件已修改

	gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter$1.class	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/bat-set-test.jsp	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/batch-set-curr.jsp	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/iframe/setcurr.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/js/buildNav.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/global_zh_CN.properties	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties

@@ -1118,4 +1118,7 @@
Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5



##################  batt-station-update1.jsp   #########################

BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7



##################  bat-set-test.jsp     ##############################

Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e

 gx_tieta/WebRoot/bat-set-test.jsp

@@ -15,7 +15,7 @@
        <meta http-equiv="expires" content="0">    

        <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">

        <meta http-equiv="description" content="This is my page">

        <title>电池参数设置</title>

        <title><s:text name="Batch_batt_param_set"/></title>                        <!-- 批量电池参数设置 -->

        <link rel="stylesheet" type="text/css" href="pages/css/base.css">

        <link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">

        <link rel="stylesheet" type="text/css" href="src/css/layui.css">

@@ -59,7 +59,7 @@
        <div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">

            <!-- 条件筛选 -->

            <div class="layui-page-filter">

                <div class="page-filter-header layui-page-filter-fweight">电池参数设置</div>

                <div class="page-filter-header layui-page-filter-fweight"><s:text name="Batch_batt_param_set"/></div>

                <div class="page-filter-content">

                    <table>

                        <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">

@@ -120,8 +120,8 @@
                                       <div class="layui-form-item">

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

                                               <select name="sysType" id="sysType" lay-filter="sysType" lay-search="">

                                                   <option value="12">1U设备</option>

                                                <option value="2">2U设备</option>

                                                   <option value="12">12V设备</option>

                                                <option value="2">2V设备</option>

                                            </select>

                                           </div>

                                       </div>

@@ -818,6 +818,8 @@
                    batchSetBattParams(rsData, keyIds);

                });

                

                // 设置添加操作的字符串

                var addBattStr = '';

                // 批量设置放电参数

                function batchSetBattParams(params, keys) {

                    // 判断data的值是否为空

@@ -833,7 +835,7 @@
                            type: 'post'

                            ,async: true

                            ,url: 'Fbs9100_battparamAction_action_updatePro'

                            ,data: 'json='+JSON.stringify(params)

                            ,data: 'json='+JSON.stringify(params)+'&json_msg='+addBattStr

                            ,dataType: 'json'

                            ,success: function(res) {

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

@@ -906,12 +908,22 @@
                            var rs = JSON.parse(res.result);

                            //console.log(rs);

                            var data = [];

                            addBattStr = '';        // 初始化字符串 
                            if(rs.code == 1) {

                                data = rs.data;

                                data = formatSearchData(data);

                            }else {

                                layer.msg('没有可设置的电池组!');

                            }

                            // 如果有添加的数据

                            if(data.length !=0) {

                                if(addBattStr.length == 0) {    // 字符串长度为0

                                    addBattStr += getFilterStr(temp);

                                }else {

                                    addBattStr += ','+getFilterStr(temp);	
                                }

                            }

        					
                            tOptions.data = data;

                            //console.log(data);

                               // 生成表格数据

@@ -1072,6 +1084,15 @@
                    }

                    return rs;

                }

				
                // 获取筛选条件的字符串

                function getFilterStr(data) {

                    var rsString = '';

                    rsString += data.StationName;

                    rsString += '-'+data.MonVolStd+'V设备';

                    rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'电池组1': '电池组2');

                    return rsString;

                }

            });

        </script>

    </body>


 gx_tieta/WebRoot/batch-set-curr.jsp

@@ -117,8 +117,8 @@
                                       <div class="layui-form-item">

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

                                               <select name="sysType" id="sysType" lay-filter="sysType" lay-search="">

                                                   <option value="12">1U设备</option>

                                                <option value="2">2U设备</option>

                                                   <option value="12">12V设备</option>

                                                <option value="2">2V设备</option>

                                            </select>

                                           </div>

                                       </div>

@@ -565,6 +565,7 @@
                

                // 点击添加电池组

                $('#setCurrIframe').data('setCurr', []);

        		
                $('#batchAdd').click(function() {

                    var structData = structAddData();

                    // 判断是否选择要添加的内容

@@ -578,7 +579,8 @@
                });

                

                

        		
                // 设置添加操作的字符串

                var addBattStr = '';

                // 查询正在放电的设备

                function searchChargeDev(callback, cParam, isCallback) {

                    var rq = structAddData();        // 获取查询条件

@@ -589,6 +591,8 @@
                        devType = preDevType;

                        // 设备类型的条件改变清空表格

                        tOptions.data = [];

                        // 清空字符串

                        addBattStr = '';

                        // 查询正在放电的内容

                        $.ajax({

                            type: 'post'

@@ -667,6 +671,15 @@
                            var data = [];

                            if(rs.code == 1) {

                                data = getFilterData(rs.data, tOptions.data);

                            }

        					
                            // 如果有添加的数据

                            if(data.length !=0) {

                                if(addBattStr.length == 0) {    // 字符串长度为0

                                    addBattStr += getFilterStr(temp);

                                }else {

                                    addBattStr += ','+getFilterStr(temp);	
                                }

                            }

                            // 将数据添加到表格中

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

@@ -790,14 +803,14 @@
                

                // 请求设置参数

                function ajaxSetParam(param) {

                    console.log(param);

                    //console.log(param);

                    var load = layer.load(1);

                    // 请求后台

                    $.ajax({

                        type: 'post'

                        ,async: true

                        ,url: 'Fbs9100_setparamAction_action_updatePro'

                        ,data: 'json='+JSON.stringify(param)

                        ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr    // 添加操作记录

                        ,dataType: 'json'

                        ,success: function(res) {

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

@@ -984,7 +997,7 @@
                        layer.msg('暂无无法启动,请先设置放电参数!');

                        return;

                    }

					
                    $('#setCurrIframe').data('addBattStr', addBattStr);

                    // 显示面板

                    layer.open({

                        type: 2

@@ -1217,7 +1230,16 @@
                    }

                    

                    return rs;

                }				
                }

				
                // 获取筛选条件的字符串

                function getFilterStr(data) {

                    var rsString = '';

                    rsString += data.StationName;

                    rsString += '-'+data.MonVolStd+'V设备';

                    rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'电池组1': '电池组2');

                    return rsString;

                }		
                

            });

        </script>


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


 gx_tieta/WebRoot/js/buildNav.js

@@ -63,6 +63,7 @@
         {permit_item_name:'batt_discharge_model_permit',num:71},        //电池组配组管理

         {permit_item_name:'install_look_permit',num:82},        //基站安装审批

         {permit_item_name:'batt_discharge_model_permit',num:83},        //BTS设备升级

         {permit_item_name:'batt_discharge_model_permit',num:84},        //批量电池组参数设置

         

         {permit_item_name:'batt_alm_param_query_permit',num:31}, // 电池告警参数设置

         {permit_item_name:'batt_alm_param_query_permit',num:66} // 设备告警参数设置


 gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java

@@ -88,6 +88,7 @@
             {"batt_discharge_model_permit","71"},    //电池组配组管理

             {"install_look_permit","82"},    //基站安装审批

             {"batt_discharge_model_permit","83"},    //BTS设备升级

             {"batt_discharge_model_permit","84"},    //批量电池组参数设置

             

             {"batt_alm_param_query_permit","31"},        //告警参数设置

             {"batt_alm_param_query_permit","66"},        //设备告警参数设置


 gx_tieta/src/global_zh_CN.properties

@@ -1118,4 +1118,7 @@
Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5



##################  batt-station-update1.jsp   #########################

BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7



##################  bat-set-test.jsp     ##############################

Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e

			@@ -1118,4 +1118,7 @@
			Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5

			################## batt-station-update1.jsp #########################
			BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
			BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7

			################## bat-set-test.jsp ##############################
			Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e

			@@ -15,7 +15,7 @@
			<meta http-equiv="expires" content="0">
			<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
			<meta http-equiv="description" content="This is my page">
			<title>电池参数设置</title>
			<title><s:text name="Batch_batt_param_set"/></title> <!-- 批量电池参数设置 -->
			<link rel="stylesheet" type="text/css" href="pages/css/base.css">
			<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
			<link rel="stylesheet" type="text/css" href="src/css/layui.css">
			@@ -59,7 +59,7 @@
			<div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
			<!-- 条件筛选 -->
			<div class="layui-page-filter">
			<div class="page-filter-header layui-page-filter-fweight">电池参数设置</div>
			<div class="page-filter-header layui-page-filter-fweight"><s:text name="Batch_batt_param_set"/></div>
			<div class="page-filter-content">
			<table>
			<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
			@@ -120,8 +120,8 @@
			<div class="layui-form-item">
			<div class="layui-input-block">
			<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
			<option value="12">1U设备</option>
			<option value="2">2U设备</option>
			<option value="12">12V设备</option>
			<option value="2">2V设备</option>
			</select>
			</div>
			</div>
			@@ -818,6 +818,8 @@
			batchSetBattParams(rsData, keyIds);
			});

			// 设置添加操作的字符串
			var addBattStr = '';
			// 批量设置放电参数
			function batchSetBattParams(params, keys) {
			// 判断data的值是否为空
			@@ -833,7 +835,7 @@
			type: 'post'
			,async: true
			,url: 'Fbs9100_battparamAction_action_updatePro'
			,data: 'json='+JSON.stringify(params)
			,data: 'json='+JSON.stringify(params)+'&json_msg='+addBattStr
			,dataType: 'json'
			,success: function(res) {
			var rs = JSON.parse(res.result);
			@@ -906,12 +908,22 @@
			var rs = JSON.parse(res.result);
			//console.log(rs);
			var data = [];
			addBattStr = ''; // 初始化字符串
			if(rs.code == 1) {
			data = rs.data;
			data = formatSearchData(data);
			}else {
			layer.msg('没有可设置的电池组!');
			}
			// 如果有添加的数据
			if(data.length !=0) {
			if(addBattStr.length == 0) { // 字符串长度为0
			addBattStr += getFilterStr(temp);
			}else {
			addBattStr += ','+getFilterStr(temp);
			}
			}

			tOptions.data = data;
			//console.log(data);
			// 生成表格数据
			@@ -1072,6 +1084,15 @@
			}
			return rs;
			}

			// 获取筛选条件的字符串
			function getFilterStr(data) {
			var rsString = '';
			rsString += data.StationName;
			rsString += '-'+data.MonVolStd+'V设备';
			rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'电池组1': '电池组2');
			return rsString;
			}
			});
			</script>
			</body>

			@@ -117,8 +117,8 @@
			<div class="layui-form-item">
			<div class="layui-input-block">
			<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
			<option value="12">1U设备</option>
			<option value="2">2U设备</option>
			<option value="12">12V设备</option>
			<option value="2">2V设备</option>
			</select>
			</div>
			</div>
			@@ -565,6 +565,7 @@

			// 点击添加电池组
			$('#setCurrIframe').data('setCurr', []);

			$('#batchAdd').click(function() {
			var structData = structAddData();
			// 判断是否选择要添加的内容
			@@ -578,7 +579,8 @@
			});



			// 设置添加操作的字符串
			var addBattStr = '';
			// 查询正在放电的设备
			function searchChargeDev(callback, cParam, isCallback) {
			var rq = structAddData(); // 获取查询条件
			@@ -589,6 +591,8 @@
			devType = preDevType;
			// 设备类型的条件改变清空表格
			tOptions.data = [];
			// 清空字符串
			addBattStr = '';
			// 查询正在放电的内容
			$.ajax({
			type: 'post'
			@@ -667,6 +671,15 @@
			var data = [];
			if(rs.code == 1) {
			data = getFilterData(rs.data, tOptions.data);
			}

			// 如果有添加的数据
			if(data.length !=0) {
			if(addBattStr.length == 0) { // 字符串长度为0
			addBattStr += getFilterStr(temp);
			}else {
			addBattStr += ','+getFilterStr(temp);
			}
			}
			// 将数据添加到表格中
			for(var i=0; i<data.length; i++) {
			@@ -790,14 +803,14 @@

			// 请求设置参数
			function ajaxSetParam(param) {
			console.log(param);
			//console.log(param);
			var load = layer.load(1);
			// 请求后台
			$.ajax({
			type: 'post'
			,async: true
			,url: 'Fbs9100_setparamAction_action_updatePro'
			,data: 'json='+JSON.stringify(param)
			,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr // 添加操作记录
			,dataType: 'json'
			,success: function(res) {
			var rs = JSON.parse(res.result);
			@@ -984,7 +997,7 @@
			layer.msg('暂无无法启动,请先设置放电参数!');
			return;
			}

			$('#setCurrIframe').data('addBattStr', addBattStr);
			// 显示面板
			layer.open({
			type: 2
			@@ -1217,7 +1230,16 @@
			}

			return rs;
			}
			}

			// 获取筛选条件的字符串
			function getFilterStr(data) {
			var rsString = '';
			rsString += data.StationName;
			rsString += '-'+data.MonVolStd+'V设备';
			rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'电池组1': '电池组2');
			return rsString;
			}

			});
			</script>

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

			@@ -63,6 +63,7 @@
			{permit_item_name:'batt_discharge_model_permit',num:71}, //电池组配组管理
			{permit_item_name:'install_look_permit',num:82}, //基站安装审批
			{permit_item_name:'batt_discharge_model_permit',num:83}, //BTS设备升级
			{permit_item_name:'batt_discharge_model_permit',num:84}, //批量电池组参数设置

			{permit_item_name:'batt_alm_param_query_permit',num:31}, // 电池告警参数设置
			{permit_item_name:'batt_alm_param_query_permit',num:66} // 设备告警参数设置

			@@ -88,6 +88,7 @@
			{"batt_discharge_model_permit","71"}, //电池组配组管理
			{"install_look_permit","82"}, //基站安装审批
			{"batt_discharge_model_permit","83"}, //BTS设备升级
			{"batt_discharge_model_permit","84"}, //批量电池组参数设置

			{"batt_alm_param_query_permit","31"}, //告警参数设置
			{"batt_alm_param_query_permit","66"}, //设备告警参数设置