瀏覽代碼

header修改

bulusiLuo 3 年之前
父節點
當前提交
04cbaecb6a

+ 113 - 186
package-lock.json

@@ -1793,7 +1793,6 @@
         "thread-loader": "^2.1.3",
         "url-loader": "^2.2.0",
         "vue-loader": "^15.9.2",
-        "vue-loader-v16": "npm:vue-loader@^16.1.0",
         "vue-style-loader": "^4.1.2",
         "webpack": "^4.0.0",
         "webpack-bundle-analyzer": "^3.8.0",
@@ -1808,6 +1807,51 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ssri": {
           "version": "8.0.1",
           "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
@@ -1816,6 +1860,24 @@
           "requires": {
             "minipass": "^3.1.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -3418,14 +3480,14 @@
       "dev": true
     },
     "clone-deep": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-2.0.2.tgz",
-      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
         "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       }
     },
     "coa": {
@@ -4685,28 +4747,27 @@
       }
     },
     "echarts": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.3.1.tgz",
-      "integrity": "sha512-nWdlbgX3OVY0hpqncSvp0gDt1FRSKWn7lsWEH+PHmfCuvE0QmSw17pczQvm8AvawnLEkmf1Cts7YwQJZNC0AEQ==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz",
+      "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==",
       "requires": {
-        "tslib": "2.3.0",
-        "zrender": "5.3.1"
+        "zrender": "4.3.2"
       },
       "dependencies": {
-        "tslib": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        "zrender": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz",
+          "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g=="
         }
       }
     },
     "echarts-gl": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz",
-      "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-1.1.0.tgz",
+      "integrity": "sha512-zbGq09XbOfqLsrMKmXhQnUn2Wvmd9eOiA0K/eyQqIqyu3GzKpmdVLZydUgIr+CHi1PEJ0Lwh3cRHA18MSbI7IQ==",
       "requires": {
-        "claygl": "^1.2.1",
-        "zrender": "^5.1.1"
+        "claygl": "^1.1.0",
+        "zrender": "^4.0.2"
       }
     },
     "ee-first": {
@@ -5630,15 +5691,8 @@
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
-    },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
-      "requires": {
-        "for-in": "^1.0.1"
-      }
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true
     },
     "forever-agent": {
       "version": "0.6.1",
@@ -6112,8 +6166,7 @@
     "hash-sum": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
-      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-      "dev": true
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="
     },
     "hash.js": {
       "version": "1.1.7",
@@ -6957,7 +7010,8 @@
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true
     },
     "is-extglob": {
       "version": "2.1.1",
@@ -7076,6 +7130,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -7175,7 +7230,8 @@
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true
     },
     "isstream": {
       "version": "0.1.2",
@@ -7272,7 +7328,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.0.tgz",
       "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
       "requires": {
         "minimist": "^1.2.5"
       }
@@ -7311,7 +7366,8 @@
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
     },
     "launch-editor": {
       "version": "2.3.0",
@@ -7444,6 +7500,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz",
       "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
       "requires": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -7454,6 +7511,7 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
           "requires": {
             "minimist": "^1.2.0"
           }
@@ -7519,11 +7577,6 @@
       "resolved": "https://registry.npmmirror.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
       "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="
     },
-    "lodash.tail": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmmirror.com/lodash.tail/-/lodash.tail-4.1.1.tgz",
-      "integrity": "sha512-+7y6zfkH4TqgS5DYKIqJuxmL5xT3WUUumVMZVRpDUo0UqJREwZqKmGo9wluj12FbPGl1UjRf2TnAImbw/bKtdw=="
-    },
     "lodash.transform": {
       "version": "4.6.0",
       "resolved": "https://registry.npmmirror.com/lodash.transform/-/lodash.transform-4.6.0.tgz",
@@ -7877,22 +7930,6 @@
         }
       }
     },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
-      "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmmirror.com/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g=="
-        }
-      }
-    },
     "mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -7993,7 +8030,8 @@
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
     },
     "nice-try": {
       "version": "1.0.5",
@@ -10346,28 +10384,16 @@
       }
     },
     "sass-loader": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-7.1.0.tgz",
-      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmmirror.com/sass-loader/download/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
-        "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
-        "neo-async": "^2.5.0",
-        "pify": "^3.0.0",
-        "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
       }
     },
     "sax": {
@@ -10607,20 +10633,12 @@
       }
     },
     "shallow-clone": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-1.0.0.tgz",
-      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-        }
+        "kind-of": "^6.0.2"
       }
     },
     "shebang-command": {
@@ -12118,87 +12136,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "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.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-          "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.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.5.3",
       "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.5.3.tgz",
@@ -13135,19 +13072,9 @@
       }
     },
     "zrender": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.3.1.tgz",
-      "integrity": "sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw==",
-      "requires": {
-        "tslib": "2.3.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        }
-      }
+      "version": "4.3.2",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz",
+      "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g=="
     }
   }
 }

+ 3 - 3
package.json

@@ -10,11 +10,10 @@
   "dependencies": {
     "axios": "^0.26.0",
     "core-js": "^3.6.5",
-    "echarts": "^5.3.1",
-    "echarts-gl": "^2.0.9",
+    "echarts": "^4.9.0",
+    "echarts-gl": "^1.1.0",
     "element-ui": "^2.15.6",
     "node-sass": "^4.9.0",
-    "sass-loader": "^7.1.0",
     "superapi-51world": "^5.4.0",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
@@ -29,6 +28,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
+    "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   },
   "eslintConfig": {

二進制
src/assets/logo.png


+ 1 - 1
src/utils/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
   // 系统名称
-  sysTitle: '陵水智慧水务综合管理平台',
+  sysTitle: '马边彝族自治县水务平台',
   sysApiUrl:'http://118.24.21.156:8087',
 }

+ 161 - 132
src/views/Home.vue

@@ -2,16 +2,23 @@
   <div class="home">
     <div class="hander">
       <div class="handertime">
-        <div class="ledfont">10:30:00</div>
-        <div class="date">2022-01-10 星期一</div>
+        <div class="ledfont">{{ getTimer(new Date()) }}</div>
+        <div class="date">{{ getDay(new Date()) }}</div>
         <div class="weather"></div>
       </div>
 
       <div class="system">
-        <template v-for="menu in sysmenu" >
-          <div class="defaultbtn" v-bind:class="{ isActive: activeIndex==menu.index }" :key="menu.index" @click="menuClick(menu)">{{menu.name}}</div>
+        <template v-for="menu in sysmenu">
+          <div
+            class="defaultbtn"
+            v-bind:class="{ isActive: activeIndex == menu.index }"
+            :key="menu.index"
+            @click="menuClick(menu)"
+          >
+            {{ menu.name }}
+          </div>
         </template>
-<!-- 
+        <!-- 
         <div class="defaultbtn" @click="dashboardClick">数据总览</div>
         <div class="defaultbtn" @click="pipedmaClick">管网漏控</div>
         <div class="defaultbtn">客户营销</div>
@@ -20,7 +27,7 @@
       </div>
     </div>
     <div class="content">
-       <router-view ></router-view>
+      <router-view></router-view>
     </div>
   </div>
 </template>
@@ -29,113 +36,140 @@
 // @ is an alias to /src //  lang='scss'
 
 export default {
-  name: 'Home',
-  components: {
-  },
+  name: "Home",
+  components: {},
   data() {
     return {
-      sysmenu:[
-        {index:'0',name:'数据总览',path:'dashboard'},
-        {index:'1',name:'管网漏控',path:'pipedma'},
-        {index:'2',name:'客户营销',path:'mis'},
-        {index:'3',name:'生产工艺',path:'scada'},
-        {index:'4',name:'视频监控',path:'video'},
-      ],
-      activeIndex:'0'
-    }
+      sysmenu: [],
+      activeIndex: "0",
+    };
   },
-  created(){
+  created() {
     let currentPath = this.$route.path;
-    let currentMenu = this.sysmenu.find(menu=>{
-      return currentPath.includes(menu.path)
+    let currentMenu = this.sysmenu.find((menu) => {
+      return currentPath.includes(menu.path);
     });
-    if(typeof(currentMenu) != "undefined"){
+    if (typeof currentMenu != "undefined") {
       console.log(JSON.stringify(currentMenu));
-      this.activeIndex = currentMenu.index
+      this.activeIndex = currentMenu.index;
     }
-
-    
   },
   methods: {
-    menuClick(e){
-      console.log(JSON.stringify(e))
-      this.activeIndex = e.index
-      this.$router.push({name:e.path,query: {}})
+    menuClick(e) {
+      console.log(JSON.stringify(e));
+      this.activeIndex = e.index;
+      this.$router.push({ name: e.path, query: {} });
     },
-    dashboardClick(){
-      this.$router.push({name:'dashboard',query: {}})
+    dashboardClick() {
+      this.$router.push({ name: "dashboard", query: {} });
     },
-    pipedmaClick(){
-      this.$router.push({name:'pipedma',query: {}})
-    }
-  }
-}
+    pipedmaClick() {
+      this.$router.push({ name: "pipedma", query: {} });
+    },
+    getDay(data) {
+      var date = new Date(data);
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      var d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      var week = date.getDay();
+      if (week == 0) {
+        week = "日";
+      } else if (week == 1) {
+        week = "一";
+      } else if (week == 2) {
+        week = "二";
+      } else if (week == 3) {
+        week = "三";
+      } else if (week == 4) {
+        week = "四";
+      } else if (week == 5) {
+        week = "五";
+      } else if (week == 6) {
+        week = "六";
+      }
+      var currentdate = y + "-" + m + "-" + d + " " + "星期" + week;
+      return currentdate;
+    },
+    getTimer(data) {
+      var date = new Date(data);
+      var hh = date.getHours();
+      hh = hh < 10 ? "0" + hh : hh;
+      var mm = date.getMinutes();
+      mm = mm < 10 ? "0" + mm : mm;
+      var ss = date.getSeconds();
+      ss = ss < 10 ? "0" + ss : ss;
+      var time = hh + ":" + mm + ":" + ss;
+      return time;
+    },
+  },
+};
 </script>
 
 <style lang='scss'>
-
-.home{
+.home {
   height: 100%;
-  background: url('../assets/bg.png') no-repeat;
-  background-size:100%100%;
+  background: url("../assets/bg.png") no-repeat;
+  background-size: 100%100%;
   // font-family: Source Han Sans CN;
   overflow: hidden;
 
-  .hander{
+  .hander {
     margin-top: 8px;
     height: 56px;
-    background: url('../assets/logo.png') no-repeat;
-    background-size:100%100%;
+    background: url("../assets/logo.png") no-repeat;
+    background-size: 100%100%;
     // border:1px red solid;
-    display:flex;
-    align-items:flex-end; 
-    
-    .handertime{
+    display: flex;
+    align-items: flex-end;
+
+    .handertime {
       width: 500px;
       height: 24px;
       line-height: 24px;
       // border:1px red solid;
       padding-bottom: 6px;
-      display:flex;
+      display: flex;
       justify-content: flex-start;
 
-      div{
+      div {
         // border: 1px red solid;
         padding-bottom: 2px;
       }
 
-      .ledfont{
+      .ledfont {
         font-size: 24px;
         font-family: "myFont";
-        color: #C7EAFF;
+        color: #c7eaff;
         width: 100px;
       }
 
-      .date{
+      .date {
         font-size: 16px;
-        color: #6BBDEF;
+        color: #6bbdef;
         width: 150px;
       }
     }
 
-    .system{
+    .system {
       // border: 1px red solid;
       padding-bottom: 2px;
       right: 24.3%;
       position: absolute;
-      display:flex;
-      justify-content:  flex-end;//flex-start;
+      display: flex;
+      justify-content: flex-end; //flex-start;
 
-      .defaultbtn{
+      .defaultbtn {
         // border: 1px red solid;
         width: 145px;
         height: 44px;
-        background: url('../assets/defaultbtn.png') no-repeat;
-        background-size:100%100%;
+        background: url("../assets/defaultbtn.png") no-repeat;
+        background-size: 100%100%;
         font-weight: 400;
-       
-        color: #29B1FF;
-        line-height: 44px;  
+
+        color: #29b1ff;
+        line-height: 44px;
         position: relative;
         margin-left: -10px;
       }
@@ -147,92 +181,87 @@ export default {
       //   cursor: pointer;
       // }
 
-      .isActive{
-        background: url('../assets/hoverbtn.png') no-repeat;
-        background-size:100%100%;
-        color: #FFFFFF;
+      .isActive {
+        background: url("../assets/hoverbtn.png") no-repeat;
+        background-size: 100%100%;
+        color: #ffffff;
       }
 
-      .defaultbtn:hover{
-        background: url('../assets/hoverbtn.png') no-repeat;
-        background-size:100%100%;
-        color: #FFFFFF;
+      .defaultbtn:hover {
+        background: url("../assets/hoverbtn.png") no-repeat;
+        background-size: 100%100%;
+        color: #ffffff;
         cursor: pointer;
       }
     }
   }
 
-  .content{
+  .content {
     width: 100%;
     height: calc(100% - 64px);
     // border: 1px red solid;
   }
 }
-  .box{
-    /* border:1px red solid; */
-    /* background: url('../assets/box.png') no-repeat; */
-    background: url('../assets/box.png') left top no-repeat;
-     background-size:100% auto;
-  }
+.box {
+  /* border:1px red solid; */
+  /* background: url('../assets/box.png') no-repeat; */
+  background: url("../assets/box.png") left top no-repeat;
+  background-size: 100% auto;
+}
 
-  .boxm{
-         width: 400px;
-            height: 400px;
-  }
+.boxm {
+  width: 400px;
+  height: 400px;
+}
 
-  .boxm1{
-     width: 200px;
-            height: 200px;
-  }
- .sijiaobiankuang1{
-       
-            border: 1px #2BAEFD solid;
-            background:
-                    linear-gradient(to top, #28ACFF , #28ACFF ) left top no-repeat,/*上左*/
-                    linear-gradient(to right, #28ACFF , #28ACFF ) left top no-repeat,/*左上*/
-                    linear-gradient(to left, #28ACFF , #28ACFF ) right top no-repeat,/*上右*/
-                    linear-gradient(to bottom, #28ACFF , #28ACFF ) right top no-repeat,/*上右*/
-                    linear-gradient(to left, #28ACFF , #28ACFF ) left bottom no-repeat,/*下左*/
-                    linear-gradient(to bottom, #28ACFF , #28ACFF ) left bottom no-repeat,/*左下*/
-                    linear-gradient(to top, #28ACFF , #28ACFF ) right bottom no-repeat,/*下右*/
-                    linear-gradient(to left, #28ACFF , #28ACFF ) right bottom no-repeat;/*右下*/
-
-            background-size: 16px 16px, 16px 16px, 16px 16px, 16px 16px;
-            /* background-color: rgba(36,56,128,0.21); */
-        }
-  .sijiaobiankuang{
-       
-            border: 1px #2BAEFD solid;
-            background:
-                    linear-gradient(to top, #28ACFF , #28ACFF ) left top no-repeat,/*上左*/
-                    linear-gradient(to right, #28ACFF , #28ACFF ) left top no-repeat;/*左上*/
-            background-size: 6px 6px, 6px 6px, 6px 6px, 6px 6px;
-            /* background-color: rgba(36,56,128,0.21); */
-        }
-
-   .box1{
-    /* border:1px red solid; */
-    width: 200px;
-height: 200px;
-padding: 10px;
-border: 1px #2BAEFD solid;
-background-image:
-linear-gradient(top right, #f00 15px, #162e48 0);
-/* linear-gradient(-135deg, #f00 15px, #162e48 0);  */
-/* background-image: linear-gradient(-45deg, #f00 15px, #162e48 0); */
-/* background-image: -webkit-linear-gradient(top,red 20%,blue 40%,green 60%,black 80%); */
-	/* linear-gradient(transparent 10px, #0e294c 10px, #0e294c calc(100% - 10px), transparent calc(100% - 10px), transparent 100%),
+.boxm1 {
+  width: 200px;
+  height: 200px;
+}
+.sijiaobiankuang1 {
+  border: 1px #2baefd solid;
+  background: linear-gradient(to top, #28acff, #28acff) left top no-repeat,
+    /*上左*/ linear-gradient(to right, #28acff, #28acff) left top no-repeat,
+    /*左上*/ linear-gradient(to left, #28acff, #28acff) right top no-repeat,
+    /*上右*/ linear-gradient(to bottom, #28acff, #28acff) right top no-repeat,
+    /*上右*/ linear-gradient(to left, #28acff, #28acff) left bottom no-repeat,
+    /*下左*/ linear-gradient(to bottom, #28acff, #28acff) left bottom no-repeat,
+    /*左下*/ linear-gradient(to top, #28acff, #28acff) right bottom no-repeat,
+    /*下右*/ linear-gradient(to left, #28acff, #28acff) right bottom no-repeat; /*右下*/
+
+  background-size: 16px 16px, 16px 16px, 16px 16px, 16px 16px;
+  /* background-color: rgba(36,56,128,0.21); */
+}
+.sijiaobiankuang {
+  border: 1px #2baefd solid;
+  background: linear-gradient(to top, #28acff, #28acff) left top no-repeat,
+    /*上左*/ linear-gradient(to right, #28acff, #28acff) left top no-repeat; /*左上*/
+  background-size: 6px 6px, 6px 6px, 6px 6px, 6px 6px;
+  /* background-color: rgba(36,56,128,0.21); */
+}
+
+.box1 {
+  /* border:1px red solid; */
+  width: 200px;
+  height: 200px;
+  padding: 10px;
+  border: 1px #2baefd solid;
+  background-image: linear-gradient(top right, #f00 15px, #162e48 0);
+  /* linear-gradient(-135deg, #f00 15px, #162e48 0);  */
+  /* background-image: linear-gradient(-45deg, #f00 15px, #162e48 0); */
+  /* background-image: -webkit-linear-gradient(top,red 20%,blue 40%,green 60%,black 80%); */
+  /* linear-gradient(transparent 10px, #0e294c 10px, #0e294c calc(100% - 10px), transparent calc(100% - 10px), transparent 100%),
 	linear-gradient(90deg, transparent 10px, #0e294c 10px, #0e294c calc(100% - 10px), transparent calc(100% - 10px), transparent 100%),
 	linear-gradient(#4cc7f3 2px, transparent 2px, transparent calc(100% - 2px), #4cc7f3 calc(100% - 2px), #4cc7f3 100%),
 	linear-gradient(90deg, #4cc7f3 2px, transparent 2px, transparent calc(100% - 2px), #4cc7f3 calc(100% - 2px), #4cc7f3 100%); */
-background-repeat: no-repeat;
-background-position: top left, top left, bottom right, bottom right;
-background-size: 100% 100%, 100% 100%;
-  }
+  background-repeat: no-repeat;
+  background-position: top left, top left, bottom right, bottom right;
+  background-size: 100% 100%, 100% 100%;
+}
 
-    .box2{
-    /* border:1px red solid; */
-    width: 100px;
-    height: 100px;
-  }
+.box2 {
+  /* border:1px red solid; */
+  width: 100px;
+  height: 100px;
+}
 </style>

+ 1 - 0
src/views/dashboard/components/scadadata/waterGauge.vue

@@ -45,6 +45,7 @@ export default {
   methods: {
     drwaChart() {
       const chartReady = this.$echarts.init(this.$refs.chart)
+      // console.log('lz',chartReady.setOption(options));
       const options = {
         series: [{
           name: "Indicator",

+ 1 - 0
src/views/dashboard/components/scadadata/waterLine.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 生产数据展示曲线图 -->
   <div class="waterLine" ref="chart"></div>
 </template>