Merge remote-tracking branch 'origin/master'

18516761980

2021-11-05 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3

 src/main/webapp/views/pda/index.html

@@ -154,8 +154,8 @@
                    } else if (res.data.code === 'b') {
                        $("#locNormalIn1").parent().hide();
                        $("#locNormalOut1").parent().hide();
                        $("#locNormalIn").parent().hide();
                        $("#locNormalOut").parent().hide();
                        // $("#locNormalIn").parent().hide();
                        // $("#locNormalOut").parent().hide();
                    } else if (res.data.code === 'c') {
                        $("#combAgv").parent().hide();
                        $("#combProAgv").parent().hide();