Ming 4 lat temu
rodzic
commit
f0070b86d5

+ 129 - 131
package-lock.json

@@ -1223,7 +1223,7 @@
     },
     "@popperjs/core": {
       "version": "2.9.2",
-      "resolved": "https://registry.npm.taobao.org/@popperjs/core/download/@popperjs/core-2.9.2.tgz?cache=0&sync_timestamp=1617290324040&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40popperjs%2Fcore%2Fdownload%2F%40popperjs%2Fcore-2.9.2.tgz",
+      "resolved": "https://registry.nlark.com/@popperjs/core/download/@popperjs/core-2.9.2.tgz",
       "integrity": "sha1-rep7aVPLs0ZRdmsFSEaOdDxqI1M="
     },
     "@simonwep/pickr": {
@@ -1812,6 +1812,63 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995778321&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995355917&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
+          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ssri": {
           "version": "8.0.1",
           "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826725566&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1820,6 +1877,28 @@
           "requires": {
             "minipass": "^3.1.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.3.3",
+          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz",
+          "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -2199,7 +2278,7 @@
     },
     "abbrev": {
       "version": "1.1.1",
-      "resolved": "https://registry.nlark.com/abbrev/download/abbrev-1.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
       "dev": true
     },
@@ -2409,7 +2488,7 @@
     },
     "array-find-index": {
       "version": "1.0.2",
-      "resolved": "https://registry.nlark.com/array-find-index/download/array-find-index-1.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
@@ -2536,7 +2615,7 @@
     },
     "async-foreach": {
       "version": "0.1.3",
-      "resolved": "https://registry.nlark.com/async-foreach/download/async-foreach-0.1.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
       "dev": true
     },
@@ -3196,7 +3275,7 @@
     },
     "camelcase-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.nlark.com/camelcase-keys/download/camelcase-keys-2.1.0.tgz?cache=0&sync_timestamp=1624609060222&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcamelcase-keys%2Fdownload%2Fcamelcase-keys-2.1.0.tgz",
+      "resolved": "https://registry.nlark.com/camelcase-keys/download/camelcase-keys-2.1.0.tgz?cache=0&sync_timestamp=1624608993530&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcamelcase-keys%2Fdownload%2Fcamelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
@@ -3556,7 +3635,7 @@
     },
     "code-point-at": {
       "version": "1.1.0",
-      "resolved": "https://registry.nlark.com/code-point-at/download/code-point-at-1.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/code-point-at/download/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
@@ -3722,7 +3801,7 @@
     },
     "console-control-strings": {
       "version": "1.1.0",
-      "resolved": "https://registry.nlark.com/console-control-strings/download/console-control-strings-1.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
@@ -4322,7 +4401,7 @@
     },
     "dayjs": {
       "version": "1.10.6",
-      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz?cache=0&sync_timestamp=1625557310646&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.6.tgz",
+      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz?cache=0&sync_timestamp=1625557417200&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.6.tgz",
       "integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM="
     },
     "debug": {
@@ -5949,13 +6028,13 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz?cache=0&sync_timestamp=1618553044693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
@@ -5964,7 +6043,7 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.nlark.com/string-width/download/string-width-1.0.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&sync_timestamp=1618558751438&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
@@ -5975,7 +6054,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.nlark.com/strip-ansi/download/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -6027,7 +6106,7 @@
     },
     "get-stdin": {
       "version": "4.0.1",
-      "resolved": "https://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz?cache=0&sync_timestamp=1618557719783&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fget-stdin%2Fdownload%2Fget-stdin-4.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
       "dev": true
     },
@@ -6108,7 +6187,7 @@
     },
     "globule": {
       "version": "1.3.2",
-      "resolved": "https://registry.nlark.com/globule/download/globule-1.3.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/globule/download/globule-1.3.2.tgz",
       "integrity": "sha1-2L3Z6eTu+PluJFmZpd7n612FKcQ=",
       "dev": true,
       "requires": {
@@ -6166,7 +6245,7 @@
     },
     "has-ansi": {
       "version": "2.0.0",
-      "resolved": "https://registry.nlark.com/has-ansi/download/has-ansi-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
@@ -6175,7 +6254,7 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz?cache=0&sync_timestamp=1618553044693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         }
@@ -6738,7 +6817,7 @@
     },
     "indent-string": {
       "version": "2.1.0",
-      "resolved": "https://registry.nlark.com/indent-string/download/indent-string-2.1.0.tgz?cache=0&sync_timestamp=1618847271946&other_urls=https%3A%2F%2Fregistry.nlark.com%2Findent-string%2Fdownload%2Findent-string-2.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz?cache=0&sync_timestamp=1618679442183&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
@@ -7100,7 +7179,7 @@
     },
     "is-finite": {
       "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/is-finite/download/is-finite-1.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/is-finite/download/is-finite-1.1.0.tgz?cache=0&sync_timestamp=1617779324274&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-finite%2Fdownload%2Fis-finite-1.1.0.tgz",
       "integrity": "sha1-kEE1x3+0LAZB1qobzbxNqo2ggvM=",
       "dev": true
     },
@@ -7291,7 +7370,7 @@
     },
     "js-base64": {
       "version": "2.6.4",
-      "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz",
+      "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1621703447855&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
       "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
       "dev": true
     },
@@ -7797,7 +7876,7 @@
     },
     "map-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz?cache=0&sync_timestamp=1617771341569&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmap-obj%2Fdownload%2Fmap-obj-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz?cache=0&sync_timestamp=1617771232226&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmap-obj%2Fdownload%2Fmap-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": true
     },
@@ -7845,7 +7924,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "https://registry.nlark.com/meow/download/meow-3.7.0.tgz?cache=0&sync_timestamp=1626388195360&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmeow%2Fdownload%2Fmeow-3.7.0.tgz",
+      "resolved": "https://registry.nlark.com/meow/download/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
@@ -8566,7 +8645,7 @@
     },
     "npmlog": {
       "version": "4.1.2",
-      "resolved": "https://registry.nlark.com/npmlog/download/npmlog-4.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz",
       "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "dev": true,
       "requires": {
@@ -8593,7 +8672,7 @@
     },
     "number-is-nan": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz?cache=0&sync_timestamp=1617776101309&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnumber-is-nan%2Fdownload%2Fnumber-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
@@ -10051,7 +10130,7 @@
     },
     "read-pkg-up": {
       "version": "1.0.1",
-      "resolved": "https://registry.nlark.com/read-pkg-up/download/read-pkg-up-1.0.1.tgz?cache=0&sync_timestamp=1618846971516&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fread-pkg-up%2Fdownload%2Fread-pkg-up-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
@@ -10061,7 +10140,7 @@
       "dependencies": {
         "find-up": {
           "version": "1.1.2",
-          "resolved": "https://registry.nlark.com/find-up/download/find-up-1.1.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
@@ -10071,7 +10150,7 @@
         },
         "path-exists": {
           "version": "2.1.0",
-          "resolved": "https://registry.nlark.com/path-exists/download/path-exists-2.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
@@ -10080,7 +10159,7 @@
         },
         "path-type": {
           "version": "1.1.0",
-          "resolved": "https://registry.nlark.com/path-type/download/path-type-1.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz?cache=0&sync_timestamp=1611752015315&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-type%2Fdownload%2Fpath-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "requires": {
@@ -10135,7 +10214,7 @@
     },
     "redent": {
       "version": "1.0.0",
-      "resolved": "https://registry.nlark.com/redent/download/redent-1.0.0.tgz?cache=0&sync_timestamp=1620069702182&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fredent%2Fdownload%2Fredent-1.0.0.tgz",
+      "resolved": "https://registry.nlark.com/redent/download/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
@@ -10145,7 +10224,7 @@
       "dependencies": {
         "strip-indent": {
           "version": "1.0.1",
-          "resolved": "https://registry.nlark.com/strip-indent/download/strip-indent-1.0.1.tgz",
+          "resolved": "https://registry.nlark.com/strip-indent/download/strip-indent-1.0.1.tgz?cache=0&sync_timestamp=1620053310624&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-indent%2Fdownload%2Fstrip-indent-1.0.1.tgz",
           "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
           "dev": true,
           "requires": {
@@ -10509,7 +10588,7 @@
         },
         "cliui": {
           "version": "5.0.0",
-          "resolved": "https://registry.nlark.com/cliui/download/cliui-5.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz",
           "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
           "dev": true,
           "requires": {
@@ -10520,13 +10599,13 @@
         },
         "emoji-regex": {
           "version": "7.0.3",
-          "resolved": "https://registry.nlark.com/emoji-regex/download/emoji-regex-7.0.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-7.0.3.tgz?cache=0&sync_timestamp=1614682707048&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Femoji-regex%2Fdownload%2Femoji-regex-7.0.3.tgz",
           "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY=",
           "dev": true
         },
         "find-up": {
           "version": "3.0.0",
-          "resolved": "https://registry.nlark.com/find-up/download/find-up-3.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
           "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
           "dev": true,
           "requires": {
@@ -10535,13 +10614,13 @@
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "resolved": "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "locate-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
           "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
           "dev": true,
           "requires": {
@@ -10551,7 +10630,7 @@
         },
         "p-locate": {
           "version": "3.0.0",
-          "resolved": "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
           "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
           "dev": true,
           "requires": {
@@ -10560,13 +10639,13 @@
         },
         "path-exists": {
           "version": "3.0.0",
-          "resolved": "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz",
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },
         "string-width": {
           "version": "3.1.0",
-          "resolved": "https://registry.nlark.com/string-width/download/string-width-3.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&sync_timestamp=1618558751438&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-3.1.0.tgz",
           "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
           "dev": true,
           "requires": {
@@ -10577,7 +10656,7 @@
         },
         "strip-ansi": {
           "version": "5.2.0",
-          "resolved": "https://registry.nlark.com/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-5.2.0.tgz",
           "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
           "dev": true,
           "requires": {
@@ -10586,7 +10665,7 @@
         },
         "wrap-ansi": {
           "version": "5.1.0",
-          "resolved": "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-5.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz",
           "integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
           "dev": true,
           "requires": {
@@ -10597,7 +10676,7 @@
         },
         "yargs": {
           "version": "13.3.2",
-          "resolved": "https://registry.nlark.com/yargs/download/yargs-13.3.2.tgz",
+          "resolved": "https://registry.nlark.com/yargs/download/yargs-13.3.2.tgz?cache=0&sync_timestamp=1620086465147&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs%2Fdownload%2Fyargs-13.3.2.tgz",
           "integrity": "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0=",
           "dev": true,
           "requires": {
@@ -10706,7 +10785,7 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995778321&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
           "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
           "dev": true,
           "requires": {
@@ -10715,7 +10794,7 @@
         },
         "async": {
           "version": "3.2.0",
-          "resolved": "https://registry.npm.taobao.org/async/download/async-3.2.0.tgz",
+          "resolved": "https://registry.nlark.com/async/download/async-3.2.0.tgz",
           "integrity": "sha1-s6JoXF67ZB094C0WEALGD8n4VyA=",
           "dev": true
         },
@@ -10731,7 +10810,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
           "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
           "dev": true,
           "requires": {
@@ -10809,7 +10888,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.nlark.com/source-map/download/source-map-0.4.4.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
@@ -11600,7 +11679,7 @@
     },
     "strip-bom": {
       "version": "2.0.0",
-      "resolved": "https://registry.nlark.com/strip-bom/download/strip-bom-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz?cache=0&sync_timestamp=1618599587805&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-bom%2Fdownload%2Fstrip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
@@ -12525,87 +12604,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.3.3",
-      "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz?cache=0&sync_timestamp=1626830451373&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.3.3.tgz",
-      "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
-          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "4.0.8",
       "resolved": "https://registry.nlark.com/vue-router/download/vue-router-4.0.8.tgz",
@@ -13339,7 +13337,7 @@
     },
     "wide-align": {
       "version": "1.1.3",
-      "resolved": "https://registry.nlark.com/wide-align/download/wide-align-1.1.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz",
       "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
       "dev": true,
       "requires": {
@@ -13348,19 +13346,19 @@
       "dependencies": {
         "ansi-regex": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz?cache=0&sync_timestamp=1618553044693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-3.0.0.tgz",
+          "resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-3.0.0.tgz",
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "resolved": "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "string-width": {
           "version": "2.1.1",
-          "resolved": "https://registry.nlark.com/string-width/download/string-width-2.1.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&sync_timestamp=1618558751438&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-2.1.1.tgz",
           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
           "dev": true,
           "requires": {
@@ -13370,7 +13368,7 @@
         },
         "strip-ansi": {
           "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/strip-ansi/download/strip-ansi-4.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-4.0.0.tgz",
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {

+ 8 - 3
src/assets/css/index.css

@@ -482,15 +482,15 @@ p {
     background-image: url(../images/statisTop-bg.png);
 }
 
-.statisTop>ul:first-child {
+.statisTop>ul.one {
     background-image: url(../images/statisTop1.png)
 }
 
-.statisTop>ul:nth-child(2) {
+.statisTop>ul.two {
     background-image: url(../images/statisTop2.png)
 }
 
-.statisTop>ul:nth-child(3) {
+.statisTop>ul.three {
     background-image: url(../images/statisTop3.png)
 }
 
@@ -787,6 +787,11 @@ p {
     left: -0.3rem !important;
 }
 
+.filterSec .el-date-editor .el-range-separator {
+    color: #fff;
+    line-height: 19px
+}
+
 
 /* 历史趋势 */
 

+ 221 - 221
src/store/index.js

@@ -7,137 +7,137 @@ export default createStore({
         Time_Data: [], //公共api请求参数->Time_Data
         timearr: [], //公共处理开始时间和结束时间中的时间段天数 值存储
         itemStyle: [{
-            normal: {
-                borderColor: "rgba(0,244,253,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(0,244,253,1)",
+                normal: {
+                    borderColor: "rgba(0,244,253,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(0,244,253,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(253,143,0,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(253,143,0,1)",
+            {
+                normal: {
+                    borderColor: "rgba(253,143,0,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(253,143,0,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(0,255,18,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(0,255,18,1)",
+            {
+                normal: {
+                    borderColor: "rgba(0,255,18,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(0,255,18,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(0,255,230,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(0,255,230,1)",
+            {
+                normal: {
+                    borderColor: "rgba(0,255,230,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(0,255,230,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(142,51,255,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(142,51,255,1)",
+            {
+                normal: {
+                    borderColor: "rgba(142,51,255,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(142,51,255,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(77,200,120,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(77,200,120,1)",
+            {
+                normal: {
+                    borderColor: "rgba(77,200,120,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(77,200,120,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(255,47,47,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(255,47,47,1)",
+            {
+                normal: {
+                    borderColor: "rgba(255,47,47,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(255,47,47,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(70,100,255,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(70,100,255,1)",
+            {
+                normal: {
+                    borderColor: "rgba(70,100,255,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(70,100,255,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(255,143,53,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(255,143,53,1)",
+            {
+                normal: {
+                    borderColor: "rgba(255,143,53,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(255,143,53,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(150,150,50,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(150,150,50,1)",
+            {
+                normal: {
+                    borderColor: "rgba(150,150,50,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(150,150,50,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(70,192,255,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(70,192,255,1)",
+            {
+                normal: {
+                    borderColor: "rgba(70,192,255,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(70,192,255,1)",
+                    },
                 },
             },
-        },
-        {
-            normal: {
-                borderColor: "rgba(20,99,100,1)",
-                borderWidth: 2,
-                color: "rgba(6, 68, 83, 1)",
-                lineStyle: {
-                    width: 2, //折线宽度
-                    color: "rgba(20,99,100,1)",
+            {
+                normal: {
+                    borderColor: "rgba(20,99,100,1)",
+                    borderWidth: 2,
+                    color: "rgba(6, 68, 83, 1)",
+                    lineStyle: {
+                        width: 2, //折线宽度
+                        color: "rgba(20,99,100,1)",
+                    },
                 },
             },
-        },
         ], //公共echarts图表样式
         Time_All: [], //公共时间 返回数组 -> 年月日时分秒 时间戳
 
@@ -149,91 +149,91 @@ export default createStore({
         th_defaultTime: [], //设备监控--->数据报表时间选择器v-model
         fh_defaultTime: [], //设备监控--->运行状态统计时间选择器v-model
         table_list: [{
-            name: "电流",
-            list: [
-                { name: "A相电流", value: "Ia" },
-                { name: "B相电流", value: "Ib" },
-                { name: "C相电流", value: "Ic" },
-            ],
-        },
-        {
-            name: "功率",
-            list: [
-                { name: "A相有功功率 kW", value: "Pa" },
-                { name: "A相无功功率 kVar", value: "Qa" },
-                { name: "B相有功功率 kW", value: "Pb" },
-                { name: "B相无功功率 kVar", value: "Qb" },
-                { name: "C相有功功率 kW", value: "Pc" },
-                { name: "C相无功功率 kVar", value: "Qc" },
-                { name: "总有功功率 kW", value: "P" },
-                { name: "总无功功率 kW", value: "Q" },
-                { name: "实时需量 kW", value: "Demand" },
-            ],
-        },
-        {
-            name: "电度",
-            list: [
-                { name: "正有功电度 kWh", value: "Epp" },
-                { name: "负有功电度 kWh", value: "Epn" },
-                { name: "正无功电度 kvarh", value: "Eqp" },
-                { name: "负无功电度 kvarh", value: "Eqn" },
-            ],
-        },
-        {
-            name: "电压",
-            list: [
-                { name: "A相电压 kV", value: "Ua" },
-                { name: "B相电压 kV", value: "Ub" },
-                { name: "C相电压 kV", value: "Uc" },
-                { name: "回路电压 V", value: "Ul" },
-                { name: "AB线电压 V", value: "Uab" },
-                { name: "BC线电压 V", value: "Ubc" },
-                { name: "CA线电压 V", value: "Uca" },
-            ],
-        },
-        {
-            name: "温度 ℃",
-            list: [
-                { name: "外接温度1", value: "T1" },
-                { name: "外接温度2", value: "T2" },
-                { name: "外接温度3", value: "T3" },
-                { name: "外接温度4", value: "T4" },
-                { name: "环境温度", value: "DeviceTemp" },
-            ],
-        },
-        {
-            name: "频率 Hz",
-            list: [{ name: "频率", value: "F" }],
-        },
-        {
-            name: "功率因数",
-            list: [
-                { name: "A相功率因数", value: "COSa" },
-                { name: "B相功率因数", value: "COSb" },
-                { name: "C相功率因数", value: "COSc" },
-                { name: "功率因数", value: "COS" },
-            ],
-        },
-        {
-            name: "谐波电流有效值 A",
-            list: [
-                { name: "Ia总谐波电流", value: "IHa" },
-                { name: "Ib总谐波电流", value: "IHa" },
-                { name: "Ic总谐波电流", value: "IHc" },
-            ],
-        },
-        {
-            name: "通讯参数",
-            list: [{ name: "设备信号强度", value: "SignalIntensity" }],
-        },
-        {
-            name: "电压突变 次",
-            list: [
-                { name: "电压暂升次数", value: "Upt" },
-                { name: "电压暂降次数", value: "Udt" },
-                { name: "电压中断次数", value: "Ust" },
-            ],
-        },
+                name: "电流",
+                list: [
+                    { name: "A相电流", value: "Ia" },
+                    { name: "B相电流", value: "Ib" },
+                    { name: "C相电流", value: "Ic" },
+                ],
+            },
+            {
+                name: "功率",
+                list: [
+                    { name: "A相有功功率 kW", value: "Pa" },
+                    { name: "A相无功功率 kVar", value: "Qa" },
+                    { name: "B相有功功率 kW", value: "Pb" },
+                    { name: "B相无功功率 kVar", value: "Qb" },
+                    { name: "C相有功功率 kW", value: "Pc" },
+                    { name: "C相无功功率 kVar", value: "Qc" },
+                    { name: "总有功功率 kW", value: "P" },
+                    { name: "总无功功率 kW", value: "Q" },
+                    { name: "实时需量 kW", value: "Demand" },
+                ],
+            },
+            {
+                name: "电度",
+                list: [
+                    { name: "正有功电度 kWh", value: "Epp" },
+                    { name: "负有功电度 kWh", value: "Epn" },
+                    { name: "正无功电度 kvarh", value: "Eqp" },
+                    { name: "负无功电度 kvarh", value: "Eqn" },
+                ],
+            },
+            {
+                name: "电压",
+                list: [
+                    { name: "A相电压 kV", value: "Ua" },
+                    { name: "B相电压 kV", value: "Ub" },
+                    { name: "C相电压 kV", value: "Uc" },
+                    { name: "回路电压 V", value: "Ul" },
+                    { name: "AB线电压 V", value: "Uab" },
+                    { name: "BC线电压 V", value: "Ubc" },
+                    { name: "CA线电压 V", value: "Uca" },
+                ],
+            },
+            {
+                name: "温度 ℃",
+                list: [
+                    { name: "外接温度1", value: "T1" },
+                    { name: "外接温度2", value: "T2" },
+                    { name: "外接温度3", value: "T3" },
+                    { name: "外接温度4", value: "T4" },
+                    { name: "环境温度", value: "DeviceTemp" },
+                ],
+            },
+            {
+                name: "频率 Hz",
+                list: [{ name: "频率", value: "F" }],
+            },
+            {
+                name: "功率因数",
+                list: [
+                    { name: "A相功率因数", value: "COSa" },
+                    { name: "B相功率因数", value: "COSb" },
+                    { name: "C相功率因数", value: "COSc" },
+                    { name: "功率因数", value: "COS" },
+                ],
+            },
+            {
+                name: "谐波电流有效值 A",
+                list: [
+                    { name: "Ia总谐波电流", value: "IHa" },
+                    { name: "Ib总谐波电流", value: "IHa" },
+                    { name: "Ic总谐波电流", value: "IHc" },
+                ],
+            },
+            {
+                name: "通讯参数",
+                list: [{ name: "设备信号强度", value: "SignalIntensity" }],
+            },
+            {
+                name: "电压突变 次",
+                list: [
+                    { name: "电压暂升次数", value: "Upt" },
+                    { name: "电压暂降次数", value: "Udt" },
+                    { name: "电压中断次数", value: "Ust" },
+                ],
+            },
         ], //设备监控--->数据报表->默认tabs数据
         se_tabs: [
             { label: '电流', name: "I" },
@@ -284,24 +284,24 @@ export default createStore({
                 checked_list[i] === "电流" ?
                     checked = "I" :
                     checked_list[i] === "功率" ?
-                        checked = "P" :
-                        checked_list[i] === "电度" ?
-                            checked = "KWh" :
-                            checked_list[i] === "电压" ?
-                                checked = "V" :
-                                checked_list[i] === "温度" ?
-                                    checked = "C" :
-                                    checked_list[i] === "频率" ?
-                                        checked = "HZ" :
-                                        checked_list[i] === "功率因数" ?
-                                            checked = "PS" :
-                                            checked_list[i] === "谐波电流有效值" ?
-                                                checked = "RMS" :
-                                                checked_list[i] === "通讯参数" ?
-                                                    checked = "DDB" :
-                                                    checked_list[i] === "电压突变" ?
-                                                        checked = "VT" :
-                                                        ""
+                    checked = "P" :
+                    checked_list[i] === "电度" ?
+                    checked = "KWh" :
+                    checked_list[i] === "电压" ?
+                    checked = "V" :
+                    checked_list[i] === "温度" ?
+                    checked = "C" :
+                    checked_list[i] === "频率" ?
+                    checked = "HZ" :
+                    checked_list[i] === "功率因数" ?
+                    checked = "PS" :
+                    checked_list[i] === "谐波电流有效值" ?
+                    checked = "RMS" :
+                    checked_list[i] === "通讯参数" ?
+                    checked = "DDB" :
+                    checked_list[i] === "电压突变" ?
+                    checked = "VT" :
+                    ""
                 state.queryType += checked_list.length > 1 ? checked + "," : checked;
             }
             state.queryType = checked_list.length > 1 ? state.queryType.slice(0, state.queryType.length - 1) : state.queryType
@@ -324,7 +324,7 @@ export default createStore({
                 var HH = time[i].getHours() < 10 ? '0' + time[i].getHours() : time[i].getHours()
                 var MM = time[i].getMinutes() < 10 ? '0' + time[i].getMinutes() : time[i].getMinutes()
                 var SS = time[i].getSeconds() < 10 ? '0' + time[i].getSeconds() : time[i].getSeconds()
-                // console.log(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
+                    // console.log(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
                 state.Time_Data.push(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
             }
         },
@@ -348,8 +348,8 @@ export default createStore({
                 k = k + 24 * 60 * 60 * 1000;
             }
             state.timearr = arrTime
-            // return arrTime;
-            // 时间格式处理
+                // return arrTime;
+                // 时间格式处理
             function datetimeparse(timestamp, format, prefix) {
                 if (typeof timestamp == "string") {
                     timestamp = Number(timestamp);
@@ -381,20 +381,20 @@ export default createStore({
                 let YYYY = dateobj.getFullYear();
                 let MM =
                     dateobj.getMonth() > 8 ?
-                        dateobj.getMonth() + 1 :
-                        "0" + (dateobj.getMonth() + 1);
+                    dateobj.getMonth() + 1 :
+                    "0" + (dateobj.getMonth() + 1);
                 let DD =
                     dateobj.getDate() > 9 ? dateobj.getDate() : "0" + dateobj.getDate();
                 let HH =
                     dateobj.getHours() > 9 ? dateobj.getHours() : "0" + dateobj.getHours();
                 let mm =
                     dateobj.getMinutes() > 9 ?
-                        dateobj.getMinutes() :
-                        "0" + dateobj.getMinutes();
+                    dateobj.getMinutes() :
+                    "0" + dateobj.getMinutes();
                 let ss =
                     dateobj.getSeconds() > 9 ?
-                        dateobj.getSeconds() :
-                        "0" + dateobj.getSeconds();
+                    dateobj.getSeconds() :
+                    "0" + dateobj.getSeconds();
                 let output = "";
                 let separator = "/";
                 if (format) {
@@ -455,8 +455,8 @@ export default createStore({
             const SS = time.getSeconds(); //秒
             const timestamp = new Date().getTime(); //时间戳
             state.Time_All = [Y, M, D, HH, MM, SS, timestamp]
-            state.se_defaultTime = [new Date(Y, M, D, 0, 0, 0), new Date()] //设备监控--->历史趋势时间选择器v-model
-            state.th_defaultTime = [new Date(Y, M, D, 0, 0, 0), new Date()] //设备监控--->数据报表时间选择器v-model
+            state.se_defaultTime = [new Date(Y, M, D, 0, 0, 0), new Date()] //设备监控--->历史趋势时间选择器v-model  //home设备总数
+            state.th_defaultTime = [new Date(Y, M, D, 0, 0, 0), new Date()] //设备监控--->数据报表时间选择器v-model  //home运维管理
             state.fh_defaultTime = [new Date(Y, M, 1, 0, 0, 0), new Date()] //设备监控--->运行状态统计时间选择器v-model  //概览 -> 告警统计折线图
         },
     }

+ 16 - 3
src/views/home/components/lineChart.vue

@@ -36,11 +36,24 @@ export default {
       var chart = echarts.init(this.$refs.lineChart);
       var option;
 
+      var timeLine = new Array();
+       timeLine = this.ftrendIcoCount[0].listDate;
+
+
       // var arr = new Array();
       // for (var i = 0; i < 32; i++) {
-      //   arr.push(i);
+      //   timeLine.push(i);
+      // }
+
+      // if (this.ftrendIcoCount[0].listDate.length) {
+      //   console.log("有数据");
+      //   timeLine = this.ftrendIcoCount[0].listDate;
+      // } else {
+      //   console.log("无数据");
+      //   for (var i = 0; i < 32; i++) {
+      //     timeLine.push(i);
+      //   }
       // }
-      var arr = this.ftrendIcoCount[0].listDate;
 
       option = {
         color: ["#00F4FD", "#FD8F00"],
@@ -69,7 +82,7 @@ export default {
         xAxis: {
           type: "category",
           boundaryGap: true,
-          data: arr,
+          data: timeLine,
           axisTick: {
             show: false, //去除刻度线
           },

+ 1 - 0
src/views/home/components/statisBottom.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="panel statisBottom">
+    <h2>站点用电量</h2>
     <ul>
       <li style="">
         <div>

+ 4 - 3
src/views/home/components/statisTop.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="panel statisTop">
-    <ul>
+    <h2>数据统计</h2>
+    <ul class="one">
       <li>
         <div>
           <p><span class="num text-orange">{{falarmCount.count}}</span> 条</p>
@@ -15,7 +16,7 @@
       </li>
     </ul>
 
-    <ul>
+    <ul class="two">
       <li>
         <div>
           <p><span class="num text-blue">{{fsiteCount.normalCount}}</span> 个</p>
@@ -30,7 +31,7 @@
       </li>
     </ul>
 
-    <ul>
+    <ul class="three">
       <li>
         <div>
           <p><span class="num text-yellow">{{fpersonalCount.maintain}}</span> 名</p>

+ 10 - 12
src/views/home/components/triangleChart.vue

@@ -32,18 +32,17 @@ export default {
       var chart = echarts.init(this.$refs.triangleChart);
       var option;
 
-      var arr=[
-    {name:'重载运行',reaVal:this.frtAnalogData.heavyLoad},
-    {name:'轻载运行',reaVal:this.frtAnalogData.easyLoad},
-    {name:'正常运行',reaVal:this.frtAnalogData.norMalLoad},
-  ]
+      var arr = [
+        { name: "重载运行", reaVal: this.frtAnalogData.heavyLoad*100+'%' },
+        { name: "轻载运行", reaVal: this.frtAnalogData.easyLoad*100+'%' },
+        { name: "正常运行", reaVal: this.frtAnalogData.norMalLoad*100+'%' },
+      ];
 
-arr.sort((a,b)=>a.reaVal-b.reaVal);
+      arr.sort((a, b) => a.reaVal - b.reaVal);
 
-
-arr[0].value=10;
-arr[1].value=20;
-arr[2].value=30
+      arr[0].value = 10;
+      arr[1].value = 20;
+      arr[2].value = 30;
 
       option = {
         calculable: true,
@@ -65,7 +64,6 @@ arr[2].value=30
               show: true,
               // formatter: " {b|{b}}    {a|{c}} ",
               formatter: function (params) {
-
                 let a = params.data.name + "   ";
                 let b = params.data.reaVal;
                 return "{a|" + a + "}" + "{b|" + b + "}";
@@ -95,7 +93,7 @@ arr[2].value=30
               borderWidth: 0,
               borderColor: "#fff",
             },
-            data: arr
+            data: arr,
           },
         ],
       };

+ 11 - 8
src/views/home/index.vue

@@ -36,6 +36,7 @@
         </div>
         <div class="column">
           <div class="panel deviceSum">
+            <h2>设备运行状态</h2>
             <div class="filterSec" style="top: 0.7rem">
               <el-date-picker
                 v-model="dDefaultTime"
@@ -54,6 +55,7 @@
             <div class="panel-footer"></div>
           </div>
           <div class="panel line1 operStatus">
+            <h2>负载率</h2>
             <triangle-chart
               :frtAnalogData="rtAnalogData"
               v-if="this.rtAnalogData.heavyLoad"
@@ -68,6 +70,7 @@
       <div class="bottomBox">
         <div class="column">
           <div class="panel currentUsage" style="height: 100%">
+            <h2>总能耗</h2>
             <div class="filterSec">
               <select name="" id="" v-model="dayType">
                 <option value="0">当日用量趋势</option>
@@ -84,6 +87,7 @@
         </div>
         <div class="column">
           <div class="panel currentUsage" style="height: 100%">
+            <h2>运维管理</h2>
             <div class="filterSec">
               <el-date-picker
                 v-model="fDefaultTime"
@@ -137,14 +141,13 @@ export default {
   },
   data() {
     return {
-      fDefaultTime: [
-        new Date("2021-6-12 00:00:00"),
-        new Date("2021-7-12 00:00:00"),
-      ],
-      dDefaultTime: [
-        new Date("2021-6-12 00:00:00"),
-        new Date("2021-6-13 00:00:00"),
-      ],
+      dDefaultTime: this.$store.state.se_defaultTime,
+      // fDefaultTime: [
+      //   new Date("2021-6-23 00:00:00"),
+      //   new Date("2021-7-12 00:00:00"),
+      // ],
+      fDefaultTime:this.$store.state.th_defaultTime,
+      
       map: null,
       alarmCount: {},
       personalCount: {},

+ 1 - 1
src/views/site/Overview.vue

@@ -157,7 +157,7 @@ export default {
       select_value: 1,
       filterSec_value: 1,
 
-      hisDefaultTime: new Date('2021-07-01'),
+      hisDefaultTime: this.$store.state.se_defaultTime[1],
     };
   },
   created() {},

+ 1 - 0
src/views/site/components/Overview/alarmingChart.vue

@@ -96,6 +96,7 @@ export default {
         },
 
         yAxis: {
+          minInterval:1,//将刻度的最小间距设置为1
           name: "(条)",
           nameTextStyle: {
             color: "#fff",

+ 2 - 2
src/views/site/components/Overview/pieChart.vue

@@ -118,13 +118,13 @@ export default {
                 textStyle: {
                   color: "#fff",
                 },
-                formatter: " {b}:\n{c} ",
+                formatter: " {b} ",
               },
               emphasis: {
                 show: true,
               },
             },
-            radius: ["43%", "65%"],
+            radius: ["43%", "60%"],
             type: "pie",
             data: pie,
             labelLine: {

+ 1 - 1
src/views/site/components/Overview/pieChart2.vue

@@ -123,7 +123,7 @@ export default {
                 textStyle: {
                   color: "#fff",
                 },
-                formatter: " {b}:\n{c} ",
+                formatter: " {b} ",
               },
               emphasis: {
                 show: true,