Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-ui/src/App.vue

@@ -44,13 +44,13 @@ export default {
     },
     updated() {
         // 判断是否需要获取通知信息
-        // if (
-        //     localStorage.getItem('notice') &&
-        //     getToken() &&
-        //     !this.noticeDialog.outerVisible
-        // ) {
-        //     this.getHomeNoticeFun()
-        // }
+        if (
+            localStorage.getItem('notice') &&
+            getToken() &&
+            !this.noticeDialog.outerVisible
+        ) {
+            this.getHomeNoticeFun()
+        }
     },
     methods: {
         // 获取通知公告的信息

sgzb-ui/src/views/repairTest/repair/index.vue

@@ -166,7 +166,7 @@
                 align="center"
                 :selectable="
                     (row) => {
-                        return row.repairStatusCode == 44 && row.commit == 0
+                        return row.commit == 0
                     }
                 "
             />

sgzb-ui/src/views/repairTest/repairScrap/index.vue

@@ -167,7 +167,7 @@
                 align="center"
                 :selectable="
                     (row) => {
-                        return row.repairStatusCode == 44 && row.commit == 0
+                        return row.commit == 0
                     }
                 "
             />