Merge branch 'dev' of https://git.yfzx.zjtys.com.cn/privateNetwork/inspection-pad-web into dev

pages/inspectionContent/components/customPopup.vue

@@ -68,6 +68,8 @@ const wordMap = {
   实际电池温度: ["已检查", "正常", "异常", "需处理", "已处理"],
   实际电池内阻: ["已检查", "正常", "异常", "需处理", "已处理"],
   故障设备机柜: ["已检查", "无告警", "有告警", "需处理", "已处理"],
+  
+  是否有告警: ["已检查", "无告警", "有告警", "需处理", "已处理"],
 };
 export default {
   props: {
@@ -115,6 +117,7 @@ export default {
         "正常",
         "异常",
         "需处理",
+		"已处理"
       ];
     },
   },