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

81041

2018-12-12 1c66e0a1353b784bf94f34ea342bd39b052099a9

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

 gx_tieta/WebRoot/equipHistWarn1.jsp

@@ -764,6 +764,7 @@
                case 119025:return "基站发电告警";

                case 119026:return "基站掉站告警";

                case 119027:return "基站开门告警";

                case 119028:return "设备高温告警";

            }

        }

        return "通信故障";


 gx_tieta/WebRoot/equipWarn1.jsp

@@ -123,6 +123,7 @@
                                    <option value="119025">基站发电告警</option>

                                    <option value="119026">基站掉站告警</option>

                                    <option value="119027">基站开门告警</option>

                                    <option value ="119028">设备高温告警</option>

                                    

                                </select>

                            </td>

@@ -738,6 +739,7 @@
                    case 119025:return "基站发电告警";

                    case 119026:return "基站掉站告警";

                    case 119027:return "基站开门告警";

                    case 119028:return "设备高温告警";

                }

            }

            return "通信故障";