Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

军

2018-09-29 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6

 gx_tieta/WebRoot/equipWarn1.jsp

@@ -574,6 +574,7 @@
               pageCurr:Page.pageCurr,                  //当前页

            }

           };

           console.log(temp);

           return temp;

        }

        

@@ -721,6 +722,7 @@
               case 618502:return "通讯告警";

               case 618503:return "设备过温告警";

               case 618504:return "二极管D1告警";

               case 119023:return "续航不足告警";

            }

         }

         return "通信故障";

@@ -966,7 +968,7 @@
                  var _attr = {

                     StationId: __data.StationId

                  };

                  var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);

                  var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                  optsList.push(tmp);

               }