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

81041

2019-01-02 f5b5ae692cd35224622566039d5e499bbbf9a807

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

 gx_tieta/WebRoot/control.jsp

@@ -1933,11 +1933,13 @@
        //查询电池组的实时状态信息

        function showtable(){

            //searbattrealInfomation();

            searchDevStatusByDev_id();

            findrtstate();

            findrtdata();

            //查询设备的dcdc状态

            searchDevDcDcState();

			
            // 更新拓扑图状态

            searchDevStatusByDev_id();

        }

        

        //根据设备id查询设备当前的开关状态


 gx_tieta/WebRoot/js/buildNav.js

@@ -53,7 +53,7 @@
         

         //电池放电测试

         {permit_item_name:'batt_test_op_permit',num:58},    //电池放电测试

         {permit_item_name:'batt_test_op_permit',num:81},    //批量电池放电测试

         {permit_item_name:'batt_discharge_model_permit',num:81},    //批量电池放电测试

         

         {permit_item_name:'batt_discharge_model_permit',num:59},        //设备充放电模块参数

         {permit_item_name:'battcfg_query_permit', num:63},        //电池信息配置

@@ -76,7 +76,7 @@
          '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'

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

      ];






 gx_tieta/WebRoot/js/elecircle.content.js

@@ -1082,7 +1082,9 @@
            var data = model.data[0];

            var alarmstatus = data.dev_alarmstate;    //[0:'无',1:'暂停',2:'放电测试',3:'放电等待',4:'限流充电',5:'直流充电',6:'充电等待',7:'测试时间到',8:'测试容量到',9:'单体下限到',10:'组端下限到',11:'市电异常',12:'存储卡不足',13:'负载温度高',14:'电流异常',15:'远程通信坏',16:'负载通信坏',17:'选择通信坏',18:'负载电流坏',19:'内存申请坏',20:'未知'];

            var workstatus =parseInt(data.dev_workstate) ;    //[0:'在线监测',1:'放电测试',2:'充电测试',3:'内阻测试',4:'未知'];

            // 判断workstatus

            // console.log(workstatus);

            // console.log(data.dev_testgroupnum+'***'+(batt.GroupIndexInFBSDevice+1)+'***'+mygraph.battstate);

            // 判断workstatus

            switch(workstatus) {

                case 0:    {    // 浮充状态

                    mygraph.graphtype = 0;

@@ -1150,6 +1152,7 @@
                callback.apply({}, [batt, data, mygraph]);

            }

        }else {

            // console.log(123);

            mygraph.graphtype = 4 ;

            _str = '(未连接)';

            // 回调函数

@@ -1157,6 +1160,7 @@
                callback();

            }

        }

        // console.log(lasttype+"**"+mygraph.graphtype);

        // 判断是否更新拓扑图

        if(lasttype != mygraph.graphtype){

            mygraph.ischange = 1;