Merge remote-tracking branch 'origin/js_dev' into js_dev

src/views/pro/traceability/components/collectionCom.vue

@@ -209,8 +209,12 @@ const showLable = (key) => {
       return "持续时间";
     case "DataTimes":
       return "采集时间";
-    case "result":
+    case "tighteningresult":
       return "拧紧结果";
+    case "ng":
+      return "NG";
+    case "alarm":
+      return "警报";
     case "error":
       return "警报";
     case "length":