diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 475f4ad..ab3cc5a 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -86,19 +86,22 @@ 高级检索 + 重置 -
+ +
查询 高级检索 + 重置 @@ -132,7 +135,7 @@ width: auto; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } } diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 475f4ad..ab3cc5a 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -86,19 +86,22 @@ 高级检索 + 重置
-
+ +
查询 高级检索 + 重置 @@ -132,7 +135,7 @@ width: auto; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } } diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 9cb7096..2b5ec6e 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -6,7 +6,7 @@ import type { Menu, Route } from '@/global' import { getUserMenus } from '@/api/system/login' import indexDB from '@/utils/indexDB' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' function hasPermission(permissions: Menu.menu[], route: Route.recordMainRaw | Route.recordRaw) { let isAuth = false if (route.meta?.auth) { @@ -228,6 +228,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 475f4ad..ab3cc5a 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -86,19 +86,22 @@ 高级检索 + 重置
-
+ +
查询 高级检索 + 重置 @@ -132,7 +135,7 @@ width: auto; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } } diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 9cb7096..2b5ec6e 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -6,7 +6,7 @@ import type { Menu, Route } from '@/global' import { getUserMenus } from '@/api/system/login' import indexDB from '@/utils/indexDB' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' function hasPermission(permissions: Menu.menu[], route: Route.recordMainRaw | Route.recordRaw) { let isAuth = false if (route.meta?.auth) { @@ -228,6 +228,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 6792245..f5b0ac9 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -7,7 +7,7 @@ import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth' import indexDB from '@/utils/indexDB' import { decrypt, isEncrypt } from '@/utils/security1' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' const useUserStore = defineStore( // 唯一ID 'user', @@ -222,6 +222,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 475f4ad..ab3cc5a 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -86,19 +86,22 @@ 高级检索 + 重置
-
+ +
查询 高级检索 + 重置 @@ -132,7 +135,7 @@ width: auto; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } } diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 9cb7096..2b5ec6e 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -6,7 +6,7 @@ import type { Menu, Route } from '@/global' import { getUserMenus } from '@/api/system/login' import indexDB from '@/utils/indexDB' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' function hasPermission(permissions: Menu.menu[], route: Route.recordMainRaw | Route.recordRaw) { let isAuth = false if (route.meta?.auth) { @@ -228,6 +228,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 6792245..f5b0ac9 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -7,7 +7,7 @@ import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth' import indexDB from '@/utils/indexDB' import { decrypt, isEncrypt } from '@/utils/security1' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' const useUserStore = defineStore( // 唯一ID 'user', @@ -222,6 +222,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/utils/String.ts b/src/utils/String.ts index 6b28042..d6c0bb4 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -1,3 +1,5 @@ + +import dayjs from "dayjs" // 字符串操作方法 // 将 ALARM_CODE -> alarmCode @@ -51,8 +53,17 @@ for (let i = 0; i < str.length; i += interval) { result += str.slice(i, i + interval) + (i + interval < str.length ? '
' : ''); } - if(str.length < interval) { + if (str.length < interval) { return str } return result; } + +// 验证时间是否正确 验证“YYYY-MM-DD”格式的日期 +export function isValidDate(dateStr) { + const regex = /^d{4}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])$/; + if (!regex.test(dayjs(dateStr).format('YYYY-MM-DD'))) return false; + const [year, month, day] = dayjs(dateStr).format('YYYY-MM-DD').split('-').map(Number); + const date = new Date(year, month - 1, day); + return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day; +} diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 475f4ad..ab3cc5a 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -86,19 +86,22 @@ 高级检索 + 重置
-
+ +
查询 高级检索 + 重置 @@ -132,7 +135,7 @@ width: auto; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } } diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 9cb7096..2b5ec6e 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -6,7 +6,7 @@ import type { Menu, Route } from '@/global' import { getUserMenus } from '@/api/system/login' import indexDB from '@/utils/indexDB' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' function hasPermission(permissions: Menu.menu[], route: Route.recordMainRaw | Route.recordRaw) { let isAuth = false if (route.meta?.auth) { @@ -228,6 +228,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 6792245..f5b0ac9 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -7,7 +7,7 @@ import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth' import indexDB from '@/utils/indexDB' import { decrypt, isEncrypt } from '@/utils/security1' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' const useUserStore = defineStore( // 唯一ID 'user', @@ -222,6 +222,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/utils/String.ts b/src/utils/String.ts index 6b28042..d6c0bb4 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -1,3 +1,5 @@ + +import dayjs from "dayjs" // 字符串操作方法 // 将 ALARM_CODE -> alarmCode @@ -51,8 +53,17 @@ for (let i = 0; i < str.length; i += interval) { result += str.slice(i, i + interval) + (i + interval < str.length ? '
' : ''); } - if(str.length < interval) { + if (str.length < interval) { return str } return result; } + +// 验证时间是否正确 验证“YYYY-MM-DD”格式的日期 +export function isValidDate(dateStr) { + const regex = /^d{4}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])$/; + if (!regex.test(dayjs(dateStr).format('YYYY-MM-DD'))) return false; + const [year, month, day] = dayjs(dateStr).format('YYYY-MM-DD').split('-').map(Number); + const date = new Date(year, month - 1, day); + return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day; +} diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index 8500c1f..36bad18 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -6,6 +6,7 @@ import { getStationList } from '@/api/home/station/station' import { getDeptTreeList } from '@/api/system/dept' import { getDeptStation } from '@/api/home/station/station' +import { getLeakageList } from '@/api/home/leakage/index' import indexDB from '@/utils/indexDB' export const indexDBHandler = (name: string, data: string) => { if (indexDB) { @@ -75,3 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } +// 泄露 +export const fetchCacheLeak= () => { + getLeakageList({}).then(res => { + console.log(res.data, '泄露') + indexDBHandler('all-leakage-list', JSON.stringify(res.data)) + }) +} diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 475f4ad..ab3cc5a 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -86,19 +86,22 @@ 高级检索 + 重置
-
+ +
查询 高级检索 + 重置 @@ -132,7 +135,7 @@ width: auto; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } } diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 9cb7096..2b5ec6e 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -6,7 +6,7 @@ import type { Menu, Route } from '@/global' import { getUserMenus } from '@/api/system/login' import indexDB from '@/utils/indexDB' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' function hasPermission(permissions: Menu.menu[], route: Route.recordMainRaw | Route.recordRaw) { let isAuth = false if (route.meta?.auth) { @@ -228,6 +228,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 6792245..f5b0ac9 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -7,7 +7,7 @@ import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth' import indexDB from '@/utils/indexDB' import { decrypt, isEncrypt } from '@/utils/security1' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' const useUserStore = defineStore( // 唯一ID 'user', @@ -222,6 +222,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/utils/String.ts b/src/utils/String.ts index 6b28042..d6c0bb4 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -1,3 +1,5 @@ + +import dayjs from "dayjs" // 字符串操作方法 // 将 ALARM_CODE -> alarmCode @@ -51,8 +53,17 @@ for (let i = 0; i < str.length; i += interval) { result += str.slice(i, i + interval) + (i + interval < str.length ? '
' : ''); } - if(str.length < interval) { + if (str.length < interval) { return str } return result; } + +// 验证时间是否正确 验证“YYYY-MM-DD”格式的日期 +export function isValidDate(dateStr) { + const regex = /^d{4}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])$/; + if (!regex.test(dayjs(dateStr).format('YYYY-MM-DD'))) return false; + const [year, month, day] = dayjs(dateStr).format('YYYY-MM-DD').split('-').map(Number); + const date = new Date(year, month - 1, day); + return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day; +} diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index 8500c1f..36bad18 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -6,6 +6,7 @@ import { getStationList } from '@/api/home/station/station' import { getDeptTreeList } from '@/api/system/dept' import { getDeptStation } from '@/api/home/station/station' +import { getLeakageList } from '@/api/home/leakage/index' import indexDB from '@/utils/indexDB' export const indexDBHandler = (name: string, data: string) => { if (indexDB) { @@ -75,3 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } +// 泄露 +export const fetchCacheLeak= () => { + getLeakageList({}).then(res => { + console.log(res.data, '泄露') + indexDBHandler('all-leakage-list', JSON.stringify(res.data)) + }) +} diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 3f170fd..908deb5 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -251,7 +251,6 @@ const dataRef = ref() const gasRef = ref() const viewData = () => { - // console.log(detailInfo.value, '123') const timerange = [detailInfo.value.alarmTime || '', detailInfo.value.cancelTime || dayjs().format('YYYY-MM-DD HH:mm:ss')] if (detailInfo.value.devTypeName.includes('燃气智能监测终端')) { dataRef.value.initDialog(detailInfo.value, timerange) diff --git a/public/image/emergency/emergency-error.png b/public/image/emergency/emergency-error.png index c9ffc1a..44f1cee 100644 --- a/public/image/emergency/emergency-error.png +++ b/public/image/emergency/emergency-error.png Binary files differ diff --git a/public/image/emergency/emergency-no.png b/public/image/emergency/emergency-no.png deleted file mode 100644 index 44f1cee..0000000 --- a/public/image/emergency/emergency-no.png +++ /dev/null Binary files differ diff --git a/public/image/emergency/emergency-stop.png b/public/image/emergency/emergency-stop.png new file mode 100644 index 0000000..c9ffc1a --- /dev/null +++ b/public/image/emergency/emergency-stop.png Binary files differ diff --git a/public/image/force/force-error.png b/public/image/force/force-error.png index b236e89..bc7d81c 100644 --- a/public/image/force/force-error.png +++ b/public/image/force/force-error.png Binary files differ diff --git a/public/image/force/force-no.png b/public/image/force/force-no.png deleted file mode 100644 index bc7d81c..0000000 --- a/public/image/force/force-no.png +++ /dev/null Binary files differ diff --git a/public/image/force/force-stop.png b/public/image/force/force-stop.png new file mode 100644 index 0000000..b236e89 --- /dev/null +++ b/public/image/force/force-stop.png Binary files differ diff --git a/public/image/occupy/occupy-error.png b/public/image/occupy/occupy-error.png index eac599b..a2cdad5 100644 --- a/public/image/occupy/occupy-error.png +++ b/public/image/occupy/occupy-error.png Binary files differ diff --git a/public/image/occupy/occupy-stop.png b/public/image/occupy/occupy-stop.png index a2cdad5..eac599b 100644 --- a/public/image/occupy/occupy-stop.png +++ b/public/image/occupy/occupy-stop.png Binary files differ diff --git a/public/image/pass/pass-error.png b/public/image/pass/pass-error.png index 4edcb61..533f288 100644 --- a/public/image/pass/pass-error.png +++ b/public/image/pass/pass-error.png Binary files differ diff --git a/public/image/pass/pass-no.png b/public/image/pass/pass-no.png deleted file mode 100644 index 533f288..0000000 --- a/public/image/pass/pass-no.png +++ /dev/null Binary files differ diff --git a/public/image/pass/pass-stop.png b/public/image/pass/pass-stop.png new file mode 100644 index 0000000..4edcb61 --- /dev/null +++ b/public/image/pass/pass-stop.png Binary files differ diff --git a/public/image/pipeline/pieple-error.png b/public/image/pipeline/pieple-error.png index 20fb67d..d73bc7f 100644 --- a/public/image/pipeline/pieple-error.png +++ b/public/image/pipeline/pieple-error.png Binary files differ diff --git a/public/image/pipeline/pieple-no.png b/public/image/pipeline/pieple-no.png deleted file mode 100644 index d73bc7f..0000000 --- a/public/image/pipeline/pieple-no.png +++ /dev/null Binary files differ diff --git a/public/image/pipeline/pieple-stop.png b/public/image/pipeline/pieple-stop.png new file mode 100644 index 0000000..20fb67d --- /dev/null +++ b/public/image/pipeline/pieple-stop.png Binary files differ diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts new file mode 100644 index 0000000..170897c --- /dev/null +++ b/src/api/home/leakage/index.ts @@ -0,0 +1,29 @@ +/** + * 泄露监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getLeakageListPage(data: any) { + return request({ + url: `/monitor/leak/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getLeakageList(data: any) { + return request({ + url: `/monitor/leak/list`, + method: 'post', + data, + }) +} +// 闸井最新监测值显示 +export function getLeakageLatestValue(data: any) { + return request({ + url: `/monitor/leak/latestValue`, + method: 'post', + data, + }) +} diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 475f4ad..ab3cc5a 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -86,19 +86,22 @@ 高级检索 + 重置
-
+ +
查询 高级检索 + 重置 @@ -132,7 +135,7 @@ width: auto; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } } diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 9cb7096..2b5ec6e 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -6,7 +6,7 @@ import type { Menu, Route } from '@/global' import { getUserMenus } from '@/api/system/login' import indexDB from '@/utils/indexDB' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' function hasPermission(permissions: Menu.menu[], route: Route.recordMainRaw | Route.recordRaw) { let isAuth = false if (route.meta?.auth) { @@ -228,6 +228,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 6792245..f5b0ac9 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -7,7 +7,7 @@ import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth' import indexDB from '@/utils/indexDB' import { decrypt, isEncrypt } from '@/utils/security1' -import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo } from '@/utils/sessionData' +import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData' const useUserStore = defineStore( // 唯一ID 'user', @@ -222,6 +222,7 @@ fetchCacheVideo() fetchCacheWell95() fetchCacheDevice() + fetchCacheLeak() setTimeout(() => { fetchCacheWell() fetchCacheStation() diff --git a/src/utils/String.ts b/src/utils/String.ts index 6b28042..d6c0bb4 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -1,3 +1,5 @@ + +import dayjs from "dayjs" // 字符串操作方法 // 将 ALARM_CODE -> alarmCode @@ -51,8 +53,17 @@ for (let i = 0; i < str.length; i += interval) { result += str.slice(i, i + interval) + (i + interval < str.length ? '
' : ''); } - if(str.length < interval) { + if (str.length < interval) { return str } return result; } + +// 验证时间是否正确 验证“YYYY-MM-DD”格式的日期 +export function isValidDate(dateStr) { + const regex = /^d{4}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])$/; + if (!regex.test(dayjs(dateStr).format('YYYY-MM-DD'))) return false; + const [year, month, day] = dayjs(dateStr).format('YYYY-MM-DD').split('-').map(Number); + const date = new Date(year, month - 1, day); + return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day; +} diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index 8500c1f..36bad18 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -6,6 +6,7 @@ import { getStationList } from '@/api/home/station/station' import { getDeptTreeList } from '@/api/system/dept' import { getDeptStation } from '@/api/home/station/station' +import { getLeakageList } from '@/api/home/leakage/index' import indexDB from '@/utils/indexDB' export const indexDBHandler = (name: string, data: string) => { if (indexDB) { @@ -75,3 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } +// 泄露 +export const fetchCacheLeak= () => { + getLeakageList({}).then(res => { + console.log(res.data, '泄露') + indexDBHandler('all-leakage-list', JSON.stringify(res.data)) + }) +} diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 3f170fd..908deb5 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -251,7 +251,6 @@ const dataRef = ref() const gasRef = ref() const viewData = () => { - // console.log(detailInfo.value, '123') const timerange = [detailInfo.value.alarmTime || '', detailInfo.value.cancelTime || dayjs().format('YYYY-MM-DD HH:mm:ss')] if (detailInfo.value.devTypeName.includes('燃气智能监测终端')) { dataRef.value.initDialog(detailInfo.value, timerange) diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue index 423d4f6..6ff350b 100644 --- a/src/views/home/alarm/current/index.vue +++ b/src/views/home/alarm/current/index.vue @@ -213,7 +213,7 @@ }) // 报警状态 getDictByCode('alarmStatus').then((res) => { - alarmStatusList.value = res.data.filter((item: { name: string}) => item.name !== '无需处置') + alarmStatusList.value = res.data.filter((item: { name: string }) => item.name !== '无需处置') }) } @@ -685,13 +685,22 @@ } return style } +const isShowMore = ref(false) +const toggleSearchMore = () => { + isShowMore.value = !isShowMore.value +}