~whyclxw/gx_tieta.git

parent: e9d774c0 | 补丁 | 提交 | show whitespace

whychdw

2021-01-19 a3d3fedaf6812f0ee15af12ae87ff3451886b7f6

提交代码

4个文件已修改

	gx_tieta/WebRoot/Top.jsp	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/control.jsp	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/js/buildNav.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/power.jsp	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gx_tieta/WebRoot/Top.jsp

@@ -51,6 +51,11 @@
    <script type="text/javascript" src="js/base.js"></script>

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

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

    <style type="text/css">
        .batt-state .list.list-hide {
            display: none;
        }
    </style>
  </head>

  

  <body>

@@ -64,7 +69,7 @@
                <div class="list">

                    <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span></a></div>        <!-- 机房停电数 -->

                </div>

                <div class="list">

                <div class="list list-hide" id="battLiftNum">
                    <div class="list-contain">续航不足机房数:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span></a></div>        <!-- 机房续航不足数 -->

                </div>

                <div class="list">

@@ -236,6 +241,35 @@
  <script type="text/javascript" src="js/rightmenu.js"></script>

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

  <script type="text/javascript">

      var permits;
    <%    Object obj=session.getAttribute("permits");
        if(obj!=null){
            String permits =obj.toString();%>
            permits=<%=permits%>;
            //console.info(json);
    <%    }%>
    // 是否显示续航不足
    if(isHasPermit('engine_room_endurance_search_permit', permits)) {
        $("#battLiftNum").removeClass('list-hide');
    }
    //根据权限名判断是否具有某个权限
    function isHasPermit(_permitName,_permitList)
    {
        //console.info(_permitList);
        var _isHasPermit=false;
        //遍历_permitList根据_permitName找到该权限是否具有
        for(var i=0;i<_permitList.length;i++)
        {
            //console.info(_permitList[i].permit_item_name);
            //console.info(_permitList[i].permit_item_value);
            if(_permitList[i].permit_item_name == _permitName && _permitList[i].permit_item_value == 1)
            {
                _isHasPermit = true;
                return _isHasPermit;
            }
        }
        return _isHasPermit;
    }
     //检测页面缓存的版本号是否为最新

     if(typeof(checkAPPVersion) == 'function') {

         checkAPPVersion(function(stats, oVersion, nVersion) {    // 检测版本号


 gx_tieta/WebRoot/control.jsp

@@ -1626,7 +1626,7 @@
                // console.log(b);

                $.post("Battalarm_dataAction!serchByCondition", _param, function(data){

                    data=JSON.parse(data.result);

                    console.info(data);

                    //console.info(data);


                    // layer.close(alarmLoad);                    

                    if(data.code==1 && data.data.length>1) {

@@ -1678,7 +1678,7 @@
       //    });

                $.post("Batt_devalarm_dataAction!serchByInfo", _param, function (data){

                    data=JSON.parse(data.result);

                    console.info(data);

                    //console.info(data);
                    

                    // layer.close(alarmLoad);                    

                    if(data.code==1 && data.data.length>0) {

@@ -2231,8 +2231,6 @@
                        var nowTime = new Date(model.data[0].note).getTime();        //当前时间

                        var record = new Date(model.data[0].record_datetime).getTime();

                        

                        //console.info(Math.abs(nowTime-record)/1000);

						
                        if(Math.abs(nowTime-record)/1000 > outTime){

                            isOutTime = true;

                        }else{

@@ -2249,6 +2247,7 @@
                    //console.info(isOutTime);

                    if(isOutTime || !navigator.onLine){

                        mygraph.graphtype = 4;

                        mygraph.ischange = 1;
                    }

                    //console.info(isOutTime);

                    

@@ -2290,7 +2289,6 @@
        //更新电池组端信息

        function updateGroupinfo(obj){            

            if(obj != undefined){

                //console.info(obj);

                var battstatus = "";

                var online_vol = obj.online_vol.toFixed(2);

                var group_vol = obj.group_vol.toFixed(2);

@@ -2321,7 +2319,7 @@
            $.post("Batt_rtstateAction_serchByCondition", "rtstate.battGroupId="+BattGroupId, function(data){

                data = eval("("+data.result+")");

                data=data.data;

                //console.info(data);

                console.info(data);
                var rtstate=data[0];

                var batt_test_starttime=new Date(rtstate.batt_test_starttime).setHours(new Date(rtstate.batt_test_starttime).getHours()-8);

                var rec_datetime = new Date(rtstate.rec_datetime).setHours(new Date(rtstate.rec_datetime).getHours()-8);


 gx_tieta/WebRoot/js/buildNav.js

@@ -68,7 +68,8 @@
         {permit_item_name:'batt_discharge_model_permit',num:85},        //批量系统参数设置

         

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

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

         {permit_item_name:'batt_alm_param_query_permit',num:66}, // 设备告警参数设置
         {permit_item_name: 'engine_room_endurance_search_permit', num: 70}, // 机房续航能力查询
     ];

//定义有关导航是否显示的权限的名称

var permitName=[

@@ -79,7 +80,8 @@
          'server_param_query_permit','batt_alm_query_permit',

          'dev_alm_query_permit','battfault_query_permit','usrtaskcheck_query_permit',

          'taskchange_query_permit','batt_discharge_model_permit',

          'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit', 'install_look_permit'

          'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit', 'install_look_permit',
          'engine_room_endurance_search_permit'
      ];






 gx_tieta/WebRoot/power.jsp

@@ -262,6 +262,16 @@
                    </table>

                </div>

            </div>

            <div class="list-con">
                <div class="list list1">
                    <span>机房续航能力<s:text name="Permit"/></span>            <!-- 机房续航能力查询 -->
                    <table>
                        <tr>
                            <td><input type="checkbox" id="engine_room_endurance_search_permit"><s:text name="Search"/></td>                    <!-- 查询 -->
                        </tr>
                    </table>
                </div>
            </div>
            <!-- 设置当前容器遮罩层 -->

            <div class="mask"></div>

        </div>

@@ -1344,6 +1354,13 @@
                        $('#install_check_permit').prop('checked',true);

                    }

                }

				
                // 51机房续航能力 查询
                if(list[i].permit_item_name ==  'engine_room_endurance_search_permit'){
                    if(list[i].permit_item_value == 1){
                        $('#engine_room_endurance_search_permit').prop('checked',true);
                    }
                }
            }

        }

    }

@@ -1868,6 +1885,15 @@
                            list[i].permit_item_value = 0;

                        }

                    }

                    //51机房续航能力 查询
                    if (list[i].permit_item_name == 'engine_room_endurance_search_permit') {
                        if($('#engine_room_endurance_search_permit').is(':checked')){
                            list[i].permit_item_value = 1;
                        }else{
                            list[i].permit_item_value = 0;
                        }
                    }
					
                }

            }

        }

			@@ -51,6 +51,11 @@
			<script type="text/javascript" src="js/base.js"></script>
			<script type="text/javascript" src="js/nocontent.js"></script>
			<script type="text/javascript" src="js/loading.js"></script>
			<style type="text/css">
			.batt-state .list.list-hide {
			display: none;
			}
			</style>
			</head>

			<body>
			@@ -64,7 +69,7 @@
			<div class="list">
			<div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span></a></div> <!-- 机房停电数 -->
			</div>
			<div class="list">
			<div class="list list-hide" id="battLiftNum">
			<div class="list-contain">续航不足机房数:<a href="batt-life-manage.jsp?is_stand=1" class="badge default" id="weak_home"><span class="num">0</span></a></div> <!-- 机房续航不足数 -->
			</div>
			<div class="list">
			@@ -236,6 +241,35 @@
			<script type="text/javascript" src="js/rightmenu.js"></script>
			<script type="text/javascript" src="src/layui.all.js"></script>
			<script type="text/javascript">
			var permits;
			<% Object obj=session.getAttribute("permits");
			if(obj!=null){
			String permits =obj.toString();%>
			permits=<%=permits%>;
			//console.info(json);
			<% }%>
			// 是否显示续航不足
			if(isHasPermit('engine_room_endurance_search_permit', permits)) {
			$("#battLiftNum").removeClass('list-hide');
			}
			//根据权限名判断是否具有某个权限
			function isHasPermit(_permitName,_permitList)
			{
			//console.info(_permitList);
			var _isHasPermit=false;
			//遍历_permitList根据_permitName找到该权限是否具有
			for(var i=0;i<_permitList.length;i++)
			{
			//console.info(_permitList[i].permit_item_name);
			//console.info(_permitList[i].permit_item_value);
			if(_permitList[i].permit_item_name == _permitName && _permitList[i].permit_item_value == 1)
			{
			_isHasPermit = true;
			return _isHasPermit;
			}
			}
			return _isHasPermit;
			}
			//检测页面缓存的版本号是否为最新
			if(typeof(checkAPPVersion) == 'function') {
			checkAPPVersion(function(stats, oVersion, nVersion) { // 检测版本号

			@@ -1626,7 +1626,7 @@
			// console.log(b);
			$.post("Battalarm_dataAction!serchByCondition", _param, function(data){
			data=JSON.parse(data.result);
			console.info(data);
			//console.info(data);

			// layer.close(alarmLoad);
			if(data.code==1 && data.data.length>1) {
			@@ -1678,7 +1678,7 @@
			// });
			$.post("Batt_devalarm_dataAction!serchByInfo", _param, function (data){
			data=JSON.parse(data.result);
			console.info(data);
			//console.info(data);

			// layer.close(alarmLoad);
			if(data.code==1 && data.data.length>0) {
			@@ -2231,8 +2231,6 @@
			var nowTime = new Date(model.data[0].note).getTime(); //当前时间
			var record = new Date(model.data[0].record_datetime).getTime();

			//console.info(Math.abs(nowTime-record)/1000);

			if(Math.abs(nowTime-record)/1000 > outTime){
			isOutTime = true;
			}else{
			@@ -2249,6 +2247,7 @@
			//console.info(isOutTime);
			if(isOutTime \|\| !navigator.onLine){
			mygraph.graphtype = 4;
			mygraph.ischange = 1;
			}
			//console.info(isOutTime);

			@@ -2290,7 +2289,6 @@
			//更新电池组端信息
			function updateGroupinfo(obj){
			if(obj != undefined){
			//console.info(obj);
			var battstatus = "";
			var online_vol = obj.online_vol.toFixed(2);
			var group_vol = obj.group_vol.toFixed(2);
			@@ -2321,7 +2319,7 @@
			$.post("Batt_rtstateAction_serchByCondition", "rtstate.battGroupId="+BattGroupId, function(data){
			data = eval("("+data.result+")");
			data=data.data;
			//console.info(data);
			console.info(data);
			var rtstate=data[0];
			var batt_test_starttime=new Date(rtstate.batt_test_starttime).setHours(new Date(rtstate.batt_test_starttime).getHours()-8);
			var rec_datetime = new Date(rtstate.rec_datetime).setHours(new Date(rtstate.rec_datetime).getHours()-8);

			@@ -68,7 +68,8 @@
			{permit_item_name:'batt_discharge_model_permit',num:85}, //批量系统参数设置

			{permit_item_name:'batt_alm_param_query_permit',num:31}, // 电池告警参数设置
			{permit_item_name:'batt_alm_param_query_permit',num:66} // 设备告警参数设置
			{permit_item_name:'batt_alm_param_query_permit',num:66}, // 设备告警参数设置
			{permit_item_name: 'engine_room_endurance_search_permit', num: 70}, // 机房续航能力查询
			];
			//定义有关导航是否显示的权限的名称
			var permitName=[
			@@ -79,7 +80,8 @@
			'server_param_query_permit','batt_alm_query_permit',
			'dev_alm_query_permit','battfault_query_permit','usrtaskcheck_query_permit',
			'taskchange_query_permit','batt_discharge_model_permit',
			'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit', 'install_look_permit'
			'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit', 'install_look_permit',
			'engine_room_endurance_search_permit'
			];

			@@ -262,6 +262,16 @@
			</table>
			</div>
			</div>
			<div class="list-con">
			<div class="list list1">
			<span>机房续航能力<s:text name="Permit"/></span> <!-- 机房续航能力查询 -->
			<table>
			<tr>
			<td><input type="checkbox" id="engine_room_endurance_search_permit"><s:text name="Search"/></td> <!-- 查询 -->
			</tr>
			</table>
			</div>
			</div>
			<!-- 设置当前容器遮罩层 -->
			<div class="mask"></div>
			</div>
			@@ -1344,6 +1354,13 @@
			$('#install_check_permit').prop('checked',true);
			}
			}

			// 51机房续航能力查询
			if(list[i].permit_item_name == 'engine_room_endurance_search_permit'){
			if(list[i].permit_item_value == 1){
			$('#engine_room_endurance_search_permit').prop('checked',true);
			}
			}
			}
			}
			}
			@@ -1868,6 +1885,15 @@
			list[i].permit_item_value = 0;
			}
			}
			//51机房续航能力查询
			if (list[i].permit_item_name == 'engine_room_endurance_search_permit') {
			if($('#engine_room_endurance_search_permit').is(':checked')){
			list[i].permit_item_value = 1;
			}else{
			list[i].permit_item_value = 0;
			}
			}

			}
			}
			}