静态排版ecahrts图表配置

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": {
@@ -2199,7 +2199,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 +2409,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 +2536,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
     },
@@ -3205,7 +3205,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": {
@@ -3215,7 +3215,7 @@
       "dependencies": {
         "camelcase": {
           "version": "2.1.1",
-          "resolved": "https://registry.nlark.com/camelcase/download/camelcase-2.1.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz",
           "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
           "dev": true
         }
@@ -3554,7 +3554,7 @@
     },
     "clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz",
+      "resolved": "https://registry.nlark.com/clone-deep/download/clone-deep-4.0.1.tgz",
       "integrity": "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=",
       "dev": true,
       "requires": {
@@ -3587,7 +3587,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
     },
@@ -3753,7 +3753,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
     },
@@ -4329,7 +4329,7 @@
     },
     "currently-unhandled": {
       "version": "0.4.1",
-      "resolved": "https://registry.nlark.com/currently-unhandled/download/currently-unhandled-0.4.1.tgz?cache=0&sync_timestamp=1618847033604&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcurrently-unhandled%2Fdownload%2Fcurrently-unhandled-0.4.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
@@ -4353,7 +4353,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": {
@@ -5977,13 +5977,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=1618552978881&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": {
@@ -5992,7 +5992,7 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&sync_timestamp=1618558823901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-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": {
@@ -6003,7 +6003,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553351145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-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": {
@@ -6055,7 +6055,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
     },
@@ -6136,7 +6136,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": {
@@ -6194,7 +6194,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": {
@@ -6203,7 +6203,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=1618552978881&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
         }
@@ -6772,7 +6772,7 @@
     },
     "indent-string": {
       "version": "2.1.0",
-      "resolved": "https://registry.nlark.com/indent-string/download/indent-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": {
@@ -7134,7 +7134,7 @@
     },
     "is-finite": {
       "version": "1.1.0",
-      "resolved": "https://registry.nlark.com/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
     },
@@ -7271,7 +7271,7 @@
     },
     "is-utf8": {
       "version": "0.2.1",
-      "resolved": "https://registry.nlark.com/is-utf8/download/is-utf8-0.2.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
@@ -7302,7 +7302,8 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
     },
     "isobject": {
       "version": "3.0.1",
@@ -7324,7 +7325,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
     },
@@ -7582,7 +7583,7 @@
     },
     "load-json-file": {
       "version": "1.1.0",
-      "resolved": "https://registry.nlark.com/load-json-file/download/load-json-file-1.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
@@ -7595,7 +7596,7 @@
       "dependencies": {
         "parse-json": {
           "version": "2.2.0",
-          "resolved": "https://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz?cache=0&sync_timestamp=1610966667117&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-json%2Fdownload%2Fparse-json-2.2.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz?cache=0&sync_timestamp=1610966646988&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-json%2Fdownload%2Fparse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
@@ -7830,7 +7831,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
     },
@@ -7878,7 +7879,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "https://registry.nlark.com/meow/download/meow-3.7.0.tgz?cache=0&sync_timestamp=1620227920685&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": {
@@ -8293,34 +8294,6 @@
       "integrity": "sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M=",
       "dev": true
     },
-    "node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.nlark.com/node-gyp/download/node-gyp-3.8.0.tgz?cache=0&sync_timestamp=1622168102506&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-gyp%2Fdownload%2Fnode-gyp-3.8.0.tgz",
-      "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
-      "dev": true,
-      "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1616463603361&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true
-        }
-      }
-    },
     "node-ipc": {
       "version": "9.1.4",
       "resolved": "https://registry.npm.taobao.org/node-ipc/download/node-ipc-9.1.4.tgz?cache=0&sync_timestamp=1614360837674&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-ipc%2Fdownload%2Fnode-ipc-9.1.4.tgz",
@@ -8404,19 +8377,19 @@
       "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=1618552978881&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
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1618995778321&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1618995384030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1618995355917&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -8450,7 +8423,7 @@
         },
         "lru-cache": {
           "version": "4.1.5",
-          "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz",
+          "resolved": "https://registry.nlark.com/lru-cache/download/lru-cache-4.1.5.tgz",
           "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
           "dev": true,
           "requires": {
@@ -8498,19 +8471,15 @@
             "abbrev": "1"
           }
         },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.nlark.com/lru-cache/download/lru-cache-4.1.5.tgz",
-          "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1616463603361&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553351145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-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": {
@@ -8519,7 +8488,7 @@
         },
         "supports-color": {
           "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1618560959124&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1622293579301&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         },
@@ -8531,15 +8500,6 @@
         }
       }
     },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649892953&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1"
-      }
-    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz",
@@ -8594,7 +8554,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": {
@@ -8621,7 +8581,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
     },
@@ -10072,7 +10032,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": {
@@ -10082,7 +10042,7 @@
       "dependencies": {
         "find-up": {
           "version": "1.1.2",
-          "resolved": "https://registry.nlark.com/find-up/download/find-up-1.1.2.tgz?cache=0&sync_timestamp=1618847130383&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-up%2Fdownload%2Ffind-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": {
@@ -10092,7 +10052,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": {
@@ -10101,7 +10061,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": {
@@ -10118,7 +10078,7 @@
         },
         "read-pkg": {
           "version": "1.1.0",
-          "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz?cache=0&sync_timestamp=1616914810926&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fread-pkg%2Fdownload%2Fread-pkg-1.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz",
           "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
           "dev": true,
           "requires": {
@@ -10156,7 +10116,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": {
@@ -10166,7 +10126,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": {
@@ -10323,7 +10283,7 @@
     },
     "repeating": {
       "version": "2.0.1",
-      "resolved": "https://registry.nlark.com/repeating/download/repeating-2.0.1.tgz?cache=0&sync_timestamp=1620068853953&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frepeating%2Fdownload%2Frepeating-2.0.1.tgz",
+      "resolved": "https://registry.nlark.com/repeating/download/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
@@ -10524,7 +10484,7 @@
       "dependencies": {
         "camelcase": {
           "version": "5.3.1",
-          "resolved": "https://registry.nlark.com/camelcase/download/camelcase-5.3.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
           "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
           "dev": true
         },
@@ -10541,13 +10501,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?cache=0&sync_timestamp=1618847130383&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-up%2Fdownload%2Ffind-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": {
@@ -10556,13 +10516,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.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz?cache=0&sync_timestamp=1597082033698&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flocate-path%2Fdownload%2Flocate-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": {
@@ -10572,7 +10532,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": {
@@ -10581,13 +10541,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.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&sync_timestamp=1618558823901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-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": {
@@ -10598,7 +10558,7 @@
         },
         "strip-ansi": {
           "version": "5.2.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz?cache=0&sync_timestamp=1618553351145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-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": {
@@ -10607,7 +10567,7 @@
         },
         "wrap-ansi": {
           "version": "5.1.0",
-          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz?cache=0&sync_timestamp=1618558887146&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwrap-ansi%2Fdownload%2Fwrap-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": {
@@ -10618,7 +10578,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": {
@@ -10636,7 +10596,7 @@
         },
         "yargs-parser": {
           "version": "13.1.2",
-          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.2.tgz",
+          "resolved": "https://registry.nlark.com/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&sync_timestamp=1624233514145&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz",
           "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
           "dev": true,
           "requires": {
@@ -10648,7 +10608,7 @@
     },
     "sass-loader": {
       "version": "8.0.2",
-      "resolved": "https://registry.nlark.com/sass-loader/download/sass-loader-8.0.2.tgz",
+      "resolved": "https://registry.nlark.com/sass-loader/download/sass-loader-8.0.2.tgz?cache=0&sync_timestamp=1623350053592&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsass-loader%2Fdownload%2Fsass-loader-8.0.2.tgz",
       "integrity": "sha1-3r7NjDziQ8dkVPLoKQSCFQOACQ0=",
       "dev": true,
       "requires": {
@@ -10673,7 +10633,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": {
@@ -10682,7 +10642,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
         },
@@ -10698,7 +10658,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": {
@@ -11576,7 +11536,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": {
@@ -13292,7 +13252,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": {
@@ -13301,19 +13261,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=1618552978881&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.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&sync_timestamp=1618558823901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-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": {
@@ -13323,7 +13283,7 @@
         },
         "strip-ansi": {
           "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz?cache=0&sync_timestamp=1618553351145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-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": {

src/assets/css/index.css

@@ -394,7 +394,8 @@ p {
     color: #F6E418
 }
 
-.alarm {
+.alarm,
+.text-red {
     color: #FF0000
 }
 
@@ -528,6 +529,30 @@ p {
     background-image: url(../images/powerView-bg.png);
 }
 
+.overview .topBox {
+    height: 65%;
+}
+
+.overview .topBox .deviceSum ul {
+    height: 100%;
+}
+
+.overview .topBox .deviceSum li {
+    display: inline-block;
+    width: 50%;
+    /* border: 1px solid red; */
+    height: 100%
+}
+
+.overview .topBox .deviceSum p {
+    font-size: .2rem;
+    text-align: center
+}
+
+.overview .bottomBox {
+    height: calc(35% - 0.45rem);
+}
+
 .overview .bottomBox .panel {
     background-image: url(../images/powerBottom-bg.png);
     padding-bottom: 0

src/views/site/Overview.vue

@@ -1,20 +1,26 @@
 <template>
   <div class="overview">
     <section class="mainbox">
-
-       <!-- topBox start -->
+      <!-- topBox start -->
       <div class="topBox">
+        <div class="column">
+          <div class="panel powerView">
+            <h2>用电量概览</h2>
 
+            <div class="powerBox">
+                <power-top></power-top>
+           
+                <power-bottom></power-bottom>
+            </div>
 
-        <div class="column " >
-          <div class="panel powerView">
-             <h2>用电量概览</h2>
-             <div class="panel-footer"></div>
+            <div class="panel-footer"></div>
           </div>
-          
         </div>
         <div class="column mapBox">
-          <div class="map panel" style="height:100%;z-index:999999999999;width:100%">
+          <div
+            class="map panel"
+            style="height: 100%; z-index: 999999999999; width: 100%"
+          >
             <map-static-top></map-static-top>
             <div class="panel-footer"></div>
           </div>
@@ -22,19 +28,27 @@
 
         <div class="column">
           <div class="panel deviceSum">
-           <h2>设备统计</h2>
-            <pie-chart></pie-chart>
+            <h2>设备统计</h2>
+            <ul>
+              <li>
+                <p>监测对象</p>
+                <pie-chart></pie-chart>
+              </li>
+              <li>
+                <p>监测设备</p>
+                <pie-chart2></pie-chart2>
+              </li>
+            </ul>
             <div class="panel-footer"></div>
           </div>
-          <div class="panel deviceSum" style="margin-bottom:0">
+          <div class="panel operStatus">
             <h2>告警统计</h2>
-            <pie-chart></pie-chart>
+            <alarming-chart></alarming-chart>
             <div class="panel-footer"></div>
           </div>
         </div>
       </div>
-       <!-- topBox end -->
-
+      <!-- topBox end -->
 
       <!-- bottomBox start -->
       <div class="bottomBox">
@@ -47,60 +61,72 @@
         </div>
         <div class="column">
           <div class="panel currentUsage" style="height: 100%">
-             <h2>需量趋势</h2>
+            <h2>需量趋势</h2>
             <bar-chart></bar-chart>
             <div class="panel-footer"></div>
           </div>
         </div>
-         <div class="column">
+        <div class="column">
           <div class="panel currentUsage" style="height: 100%">
-             <div class="filterSec">
+            <div class="filterSec">
               <select name="" id="">
                 <option value="11">日</option>
                 <option value="22">月</option>
               </select>
             </div>
             <h2>历史趋势</h2>
-           <hist-trend-chart></hist-trend-chart>
+            <hist-trend-chart></hist-trend-chart>
             <div class="panel-footer"></div>
           </div>
         </div>
       </div>
-       <!-- bottomBox end -->
+      <!-- bottomBox end -->
     </section>
   </div>
 </template>
 <script>
-// import statisTop from "./components/Overview/statisTop";
-// import statisBottom from "./components/Overview/statisBottom";
-import pieChart from "./components/Overview/pieChart";
+import powerTop from "./components/Overview/powerTop";
+import powerBottom from "./components/Overview/powerBottom";
 import barChart from "./components/Overview/barChart";
 // import lineChart from "./components/Overview/lineChart";
 import mapStaticTop from "./components/Overview/mapStaticTop";
 
 import realTimeChart from "./components/Overview/realTimeChart";
 import histTrendChart from "./components/Overview/histTrendChart";
+import alarmingChart from "./components/Overview/alarmingChart";
+import pieChart from "./components/Overview/pieChart";
+import pieChart2 from "./components/Overview/pieChart2";
 
 export default {
   name: "index",
-  // components: { statisTop, statisBottom, pieChart, barChart, lineChart,mapStaticTop },
-   components: { pieChart,barChart, mapStaticTop,realTimeChart,histTrendChart },
+  // components: { powerTop, powerBottom, pieChart, barChart, lineChart,mapStaticTop },
+  components: {
+     powerTop, powerBottom,
+    barChart,
+    mapStaticTop,
+    realTimeChart,
+    histTrendChart,
+    alarmingChart,
+    pieChart,
+    pieChart2,
+  },
   data() {
-    return {
-     
-    };
+    return {};
   },
   created() {},
-  mounted() {
-   
-  },
-  methods: {
-
-    
-  },
+  mounted() {},
+  methods: {},
 };
 </script>
 
 <style lang="scss">
-
+.powerBox {
+  height: 100%;
+  border: 1px solid pink;
+ 
+  .poerrViewBottom {
+    height: 70%;
+    border: 1px solid red;
+  }
+}
 </style>

src/views/site/components/Overview/alarmingChart.vue

@@ -0,0 +1,126 @@
+<template>
+  <div ref="distion" style="width: 100%; height: 100%"></div>
+</template>
+<script>
+import * as echarts from "echarts";
+
+export default {
+  props: {},
+  data() {
+    return {};
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+
+  beforeUnmount() {
+    window.removeEventListener("resize", this.chart);
+  },
+
+  methods: {
+    //次数分布折线图
+    initChart() {
+      var chart = echarts.init(this.$refs.distion);
+      var option;
+
+      option = {
+        //    backgroundColor:'#323a5e',
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          },
+        },
+        grid: {
+          left: "0%",
+          right: "0%",
+          bottom: "0%",
+          top: "16%",
+          containLabel: true,
+        },
+    
+        xAxis: {
+          type: "category",
+          data: ["07-01",
+            "07-02",
+            "07-03",
+            "07-04",
+            "07-05",
+            "07-06",
+            "07-07",
+          ],
+          axisLine: {
+            lineStyle: {
+              color:"rgba(0,0,0,0.1)",
+            },
+          },
+          axisTick: {
+                show: false
+            },
+          axisLabel: {
+            textStyle: {
+                 color: '#fff',
+              fontFamily: "Microsoft YaHei",
+            },
+          },
+        },
+
+        yAxis: {
+             name: '（条）',
+              nameTextStyle: {
+            color: "#fff",
+            },
+          type: "value",
+        //   max: "800",
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: "white",
+            },
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: "rgba(255,255,255,0.1)",
+            },
+          },
+          axisLabel: {},
+        },
+        series: [
+          {
+            name: "昨日",
+            type: "bar",
+            barWidth: "20%",
+            barGap: '0%',
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: "#00A7FD",
+                  },
+                  {
+                    offset: 1,
+                    color: "#00A7FD",
+                  },
+                ]),
+              },
+            },
+            data: [4, 1, 3, 3, 3, 10, 20, 12, 3,15,25,18],
+          },
+          
+        ],
+      };
+
+      chart.setOption(option);
+      window.addEventListener("resize", () => {
+        chart.resize();
+      });
+    },
+  },
+};
+</script>

src/views/site/components/Overview/barChart.vue

@@ -26,150 +26,183 @@ export default {
       var chart = echarts.init(this.$refs.distion);
       var option;
 
+      var arr = new Array();
+      for (var i = 0; i < 31; i++) {
+        arr.push(i);
+      }
+
       option = {
-        //    backgroundColor:'#323a5e',
         tooltip: {
           trigger: "axis",
           axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+            type: "shadow",
+            label: {
+              show: true,
+            },
           },
         },
         grid: {
-          left: "0%",
-          right: "0%",
-          bottom: "0%",
-          top: "22%",
-          containLabel: true,
+          left: "4%",
+          top: "18%",
+          right: "5%",
+          bottom: "27%",
         },
         legend: {
-          itemGap: 30,
-          left: '30%',
-          top: 0,
+          // data: ["昨日总人数", "今日实时人数", "昨日使用率"],
+          data: ["最小值", "最大值", "平均值"],
+          bottom: "0%",
           textStyle: {
             color: "#fff",
+            fontSize: 12,
           },
           itemWidth: 12,
           itemHeight: 10,
         },
         xAxis: {
-          type: "category",
-          data: ["0:00",
-            "2:00",
-            "4:00",
-            "6:00",
-            "8:00",
-            "10:00",
-            "12:00",
-            "13:00",
-            "16:00",
-            "18:00",
-            "20:00",
-            "22:00",
-          ],
+          data: arr,
           axisLine: {
+            show: true, //隐藏X轴轴线
             lineStyle: {
-              color:"rgba(0,0,0,0.1)",
+              color: "#3d5269",
+              width: 1,
             },
           },
           axisTick: {
-                show: false
-            },
+            show: false, //隐藏X轴刻度
+            alignWithLabel: true,
+          },
           axisLabel: {
-            // interval: 0,
-            // rotate: 40,
+            show: true,
             textStyle: {
-                 color: '#fff',
-              fontFamily: "Microsoft YaHei",
+              color: "#fff", //X轴文字颜色
+              fontSize: 10,
             },
+            interval: 0,
+            // rotate: 30
           },
         },
-
-        yAxis: {
-          type: "value",
-        //   max: "800",
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: "white",
+        yAxis: [
+          {
+            type: "value",
+            name: "KW",
+            nameTextStyle: {
+              color: "#fff",
+              fontSize: 10,
             },
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: "rgba(255,255,255,0.1)",
+            splitLine: {
+              show: true,
+              lineStyle: {
+                width: 1,
+                 color: "rgba(255,255,255,0.1)",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+            axisLine: {
+              show: false,
+            },
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: "#fff",
+                fontSize: 10,
+              },
             },
           },
-          axisLabel: {},
+          {
+            type: "value",
+            name: "平均值",
+            nameTextStyle: {
+                color: "#fff",
+                fontSize: 10
+            },
+            position: "right",
+            splitLine: {
+                show: false
+            },
+            axisTick: {
+                show: false
+            },
+            axisLine: {
+                show: false,
+                lineStyle: {
+                    color: "#396A87",
+                    width: 2
+                }
+            },
+            axisLabel: {
+                show: true,
+                formatter: "{value} %", //右侧Y轴文字显示
+                textStyle: {
+                    color: "#fff",
+                    fontSize: 10
+                }
+            }
         },
-        // dataZoom: [
-        //   {
-        //     show: true,
-        //     height: 12,
-        //     xAxisIndex: [0],
-        //     bottom: "8%",
-        //     start: 10,
-        //     end: 90,
-        //     handleIcon:
-        //       "path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z",
-        //     handleSize: "110%",
-        //     handleStyle: {
-        //       color: "#d3dee5",
-        //     },
-        //     textStyle: {
-        //       color: "#fff",
-        //     },
-        //     borderColor: "#90979c",
-        //   },
-        //   {
-        //     type: "inside",
-        //     show: true,
-        //     height: 15,
-        //     start: 1,
-        //     end: 35,
-        //   },
-        // ],
+        ],
         series: [
           {
-            name: "昨日",
+            name: "最小值",
             type: "bar",
-            barWidth: "20%",
-            barGap: '0%',
+            barWidth: "4",
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: "#00A7FD",
+                    color: "#00FBE0",
                   },
                   {
                     offset: 1,
-                    color: "#00A7FD",
+                    color: "#00FBE0",
                   },
                 ]),
               },
             },
-            data: [40, 40, 30, 30, 30, 40, 40, 40, 30,40,50,60],
+            data: [0.24, 0.45, 0.43,  0.35,  0.76,  0.154,  0.86,  0.42,  0.68,  0.97,  0.24,  0.34,0.45, 0.45, 0.43,  0.75,  0.85, 0.35,  0.76,  0.154,  0.86,  0.42,  0.68,  0.97,0.43,  0.35,  0.76,  0.154,  0.86,  0.42,  0.68,  0.97,],
           },
           {
-            name: "当日",
+            name: "最大值",
             type: "bar",
-            barWidth: "20%",
+            barWidth: "4",
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: "#FD8F00",
+                    color: "#FF8A0D",
                   },
                   {
                     offset: 1,
-                    color: "#FD8F00",
+                    color: "#FF8A0D",
                   },
                 ]),
               },
             },
-            data: [40, 50, 50, 50, 50, 40, 40, 50, 50,20,40,30],
+            data: [ 0.133,  0.23,  0.114,  0.67,  0.89,  0.35,  0.67,  0.96,  0.90,  0.46,  0.75,  0.85, 0.75,  0.85,0.45, 0.43,  0.35,  0.76,  0.154,  0.86,  0.42,  0.68,  0.97,0.45, 0.43,  0.35,  0.76,  0.154,  0.86,  0.42,  0.68,  0.97,],
+          },
+          {
+            name: "平均值",
+            type: "line",
+            yAxisIndex: 1, //使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用
+            showAllSymbol: true, //显示所有图形。
+            symbol: "circle", //标记的图形为实心圆
+            symbolSize: 6, //标记的大小
+            itemStyle: {
+              //折线拐点标志的样式
+              color: "#fff",
+              borderColor: "#44A9FF",
+              width: 2,
+              shadowColor: "#44A9FF",
+              shadowBlur: 2,
+            },
+            lineStyle: {
+              color: "#44A9FF",
+              width: 2,
+              shadowBlur: 2,
+            },
+            data: [4.2, 3.5, 2.9, 7.8, 2, 3, 4.2, 3.5, 2.9, 7.8, 2, 3, 7.8, 2, 3, 4.2, 3.5, 2.9, 7.8, 2, 3, 7.8, 2, 3, 4.2, 3.5, 2.9, 7.8, 2, 3,2],
           },
         ],
       };

src/views/site/components/Overview/mapStaticTop.vue

@@ -3,26 +3,17 @@
     <ul>
       <li>
         <div>
-          <p><span class="num static">36</span></p>
-          <p>站点总数</p>
+          <p>今日用电量</p>
+          <p><span class="num static">115.328</span>kWh</p>
+          <p>昨日同期 198.4 <span class="text-red">79.78% ↑</span></p>
         </div>
       </li>
       <li>
         <div>
-          <p><span class="num offLine">36</span></p>
-          <p>离线站点</p>
-        </div>
-      </li>
-      <li>
-        <div>
-          <p><span class="num error">36</span></p>
-          <p>故障站点</p>
-        </div>
-      </li>
-      <li>
-        <div>
-          <p><span class="num alarm">36</span></p>
-          <p>告警站点</p>
+          <p>实时负载</p>
+          <p>
+            <span class="num text-yellow" style="margin-bottom: 0">36</span>
+          </p>
         </div>
       </li>
     </ul>
@@ -35,24 +26,25 @@
   left: 2px;
   z-index: 1;
   ul {
-    display: flex;
+    // display: flex;
     text-align: center;
 
     li {
-      flex: 1;
-      width: 1.5rem;
-      height: 0.8rem;
+      // flex: 1;
+
+      padding: 0.125rem 0.25rem;
       display: flex;
       align-items: center;
       justify-content: center;
-      border: 1px solid #00f4fd;
-      p{
-          font-size:.2rem
+      background: #081f2f;
+      border: 1px solid rgba(0,244,253,.5);
+      p {
+        font-size: 0.2rem;
       }
-      .num{
-          margin-bottom:.0625rem;
-          display:inline-block;
-          font-size:.3rem
+      .num {
+        margin: 0.0625rem;
+        display: inline-block;
+        font-size: 0.3rem;
       }
     }
   }

src/views/site/components/Overview/pieChart.vue

@@ -52,25 +52,17 @@ export default {
       var option;
 
       var pie = [
-        {
-          value: 50,
-          name: "正常",
-        },
-        {
-          value: 150,
-          name: "故障",
+         {
+          value: 12,
+          name: "配电",
         },
         {
-          value: 100,
-          name: "离线",
+          value: 5,
+          name: "箱变",
         },
         {
-          value: 100,
-          name: "预警",
-        },
-        {
-          value: 100,
-          name: "其他",
+          value: 3,
+          name: "杆变",
         },
       ];
       var totalNum = 0;
@@ -80,11 +72,12 @@ export default {
 
       option = {
         grid: {
+         
         },
 
         title: [
           {
-            text: "{name|" + totalNum + "}\n{val|设备总数}",
+            text: "{name|" + totalNum + "}\n{val|总数}",
             top: "center",
             left: "center",
             textStyle: {
@@ -108,7 +101,9 @@ export default {
           },
         ],
         tooltip: {
-          trigger: "item",
+          // trigger: "item",
+         trigger: 'item',
+         confine:true,//将此限制打开后tooltip将不再溢出
           formatter: function (params) {
             return (
               params.name +
@@ -120,34 +115,39 @@ export default {
             );
           },
         },
-        // itemStyle:{
-        //     normal: {
-        //          label: {
-        //              show: true,
-        //         position: 'outside',
-        //              color: 'green',
-        //          }
-        //     }
-        // },
+  
 
         series: [
           {
             label: {
+              position: "inside",//此处将展示的文字在内部展示
               normal: {
                 show: true,
-                formatter: " {b}：{c} ",
+                formatter: " {b}:{c} ",
               },
               emphasis: {
                 show: true,
               },
             },
             name: "访问来源",
-            radius: ["45%", "67%"],
+            radius: ["43%", "65%"],
             type: "pie", 
             data: pie,
+            labelLine: {
+							normal: {
+								length: 3, //aa折线长度
+								// length2: 1, //aa折线长度
+
+							}
+						},
+            // labelLine:{  
+            //     normal:{  
+            //         length:5  
+            //     }  
+            // }, 
           },
         ],
-        color: ["#0DFE95", "#F7B61C", "#2BCCFF", "#FE5C0D", "#4388F9"],
+        color: ["#39BBFE", "#FCCB35", "#FC7735"],
       };
 
       chart.setOption(option);

src/views/site/components/Overview/pieChart2.vue

@@ -0,0 +1,134 @@
+<template>
+
+  <div ref="distion" style="width: 100%; height: 100%"></div>
+</template>
+<script>
+import * as echarts from "echarts";
+
+export default {
+  props: {
+  },
+  data() {
+    return {};
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+
+  beforeUnmount() {
+    window.removeEventListener("resize", this.chart);
+  },
+
+  methods: {
+    //次数分布折线图
+    initChart() {
+      var chart = echarts.init(this.$refs.distion);
+      var option;
+
+      var pie = [
+         {
+          value: 15,
+          name: "电力",
+        },
+        {
+          value: 5,
+          name: "视频",
+        },
+      ];
+      var totalNum = 0;
+      pie.forEach(function (value) {
+        totalNum += value.value;
+      });
+
+      option = {
+        grid: {
+         
+        },
+
+        title: [
+          {
+            text: "{name|" + totalNum + "}\n{val|总数}",
+            top: "center",
+            left: "center",
+            textStyle: {
+              rich: {
+                name: {
+                  fontSize: 30,
+                  fontWeight: "normal",
+                  color: "#FFFFFF",
+                  fontFamily:"impact",
+                   padding: [0, 0,3,0]
+
+                },
+                val: {
+                  fontSize: 14,
+                  fontWeight: "normal",
+                  color: "#FFFFFF",
+                  padding: [3,0,0, 0]
+                },
+              },
+            },
+          },
+        ],
+        tooltip: {
+          // trigger: "item",
+         trigger: 'item',
+         confine:true,//将此限制打开后tooltip将不再溢出
+          formatter: function (params) {
+            return (
+              params.name +
+              "：" +
+              params.value +
+              "<br>占比：" +
+              params.percent.toFixed(2) +
+              "%"
+            );
+          },
+        },
+  
+
+        series: [
+          {
+            label: {
+              position: "inside",//此处将展示的文字在内部展示
+              normal: {
+                show: true,
+                formatter: " {b}:{c} ",
+              },
+              emphasis: {
+                show: true,
+              },
+            },
+            name: "访问来源",
+            radius: ["43%", "65%"],
+            type: "pie", 
+            data: pie,
+            labelLine: {
+							normal: {
+								length: 3, //aa折线长度
+								// length2: 1, //aa折线长度
+
+							}
+						},
+            // labelLine:{  
+            //     normal:{  
+            //         length:5  
+            //     }  
+            // }, 
+          },
+        ],
+        color: ["#39FEFC", "#FC3535"],
+      };
+
+      chart.setOption(option);
+      window.addEventListener("resize", () => {
+        chart.resize();
+      });
+      this.chart = chart;
+    },
+  },
+};
+</script>

src/views/site/components/Overview/powerBottom.vue

@@ -0,0 +1,17 @@
+<template>
+  <div></div>
+</template>
+<script>
+export default {
+  name: "statisTop",
+  components: {},
+  methods: {
+    // Site_details(){
+    //   this.$router.push({ path: '/Site_details'});//, query: { title: title }
+    // }
+  },
+};
+</script>
+
+<style>
+</style>

src/views/site/components/Overview/powerTop.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="poerrViewTop">
+    <ul>
+      <li>
+        <div>
+          <p>今日用电量</p>
+          <p><span class="num static">115.328</span>kWh</p>
+          <p>昨日同期 198.4 <span class="text-red">79.78% ↑</span></p>
+        </div>
+      </li>
+     <li>
+        <div>
+          <p>今日用电量</p>
+          <p><span class="num static">115.328</span>kWh</p>
+          <p>昨日同期 198.4 <span class="text-red">79.78% ↑</span></p>
+        </div>
+      </li>
+    </ul>
+  </div>
+</template>
+<script>
+export default {
+  name: "statisTop",
+  components: {},
+  methods: {
+  
+  },
+};
+</script>
+
+<style lang="scss">
+ .poerrViewTop {
+    height: 30%;
+    border: 1px solid red;
+  }
+ .poerrViewTop ul {
+    display: flex;
+    text-align: center;
+    height:100%;
+
+    li {
+      height:100%;
+      flex: 1;
+
+      // padding: 0.125rem 0.25rem;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: #081f2f;
+      border: 1px solid rgba(0,244,253,.5);
+      p {
+        font-size: 0.2rem;
+      }
+      .num {
+        margin: 0.0625rem;
+        display: inline-block;
+        font-size: 0.3rem;
+      }
+    }
+  }
+
+
+</style>

src/views/site/components/Overview/statisBottom.vue

@@ -1,43 +0,0 @@
-<template>
-  <div class="panel statisBottom">
-    <ul>
-      <li style="">
-        <div>
-          <p><span class="num text-blue">1564.26</span></p>
-          <p class="mb-10">(kW)</p>
-        </div>
-        <p  class="timeEle">日用电量</p>
-      </li>
-      <li>
-        <div>
-          <p><span class="num text-yellow">156445.89</span></p>
-          <p class="mb-10">(kW)</p>
-          
-        </div>
-        <p class="timeEle">月用电量</p>
-      </li>
-      <li>
-        <div>
-          <p><span class="num text-orange">4521564.63</span></p>
-           <p class="mb-10">(kW)</p>
-        </div>
-        <p class="timeEle">年用电量</p>
-      </li>
-    </ul>
-    <div class="panel-footer"></div>
-  </div>
-</template>
-<script>
-export default {
-  name: "statisTop",
-  components: {},
-  methods: {
-    // Site_details(){
-    //   this.$router.push({ path: '/Site_details'});//, query: { title: title }
-    // }
-  },
-};
-</script>
-
-<style>
-</style>

src/views/site/components/Overview/statisTop.vue

@@ -1,68 +0,0 @@
-<template>
-  <div class="panel statisTop">
-    <ul>
-      <li>
-        <div>
-          <p><span class="num text-orange">135</span> 条</p>
-          <p>告警总数</p>
-        </div>
-      </li>
-      <li>
-        <div>
-          <p><span class="num text-orange">50</span> 条</p>
-          <p>未处理告警数</p>
-        </div>
-      </li>
-    </ul>
-
-    <ul>
-      <li>
-        <div>
-          <p><span class="num text-blue">100</span> 个</p>
-          <p>总站点数</p>
-        </div>
-      </li>
-      <li>
-        <div>
-          <p><span class="num text-blue">1000</span> kW</p>
-          <p>总实时负荷</p>
-        </div>
-      </li>
-    </ul>
-
-    <ul>
-      <li>
-        <div>
-          <p><span class="num text-yellow">36</span> 名</p>
-          <p>运维人员</p>
-        </div>
-      </li>
-      <li>
-        <div>
-          <p><span class="num text-yellow">8</span> 名</p>
-          <p>电力人员</p>
-        </div>
-      </li>
-    </ul>
-
-    <div class="panel-footer">
-      
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: "statisTop",
-  components: {},
-  methods: {
-    // Site_details(){
-    //   this.$router.push({ path: '/Site_details'});//, query: { title: title }
-    // }
-  },
-};
-</script>
-
-<style>
-
-
-</style>