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

hdw

2019-01-09 b4828d7800516141d6bdb419111a5f4e0e7ac554

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

 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

@@ -1119,3 +1119,6 @@


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

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


 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

@@ -1119,3 +1119,6 @@


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

BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7


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

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