Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-ui

3 years ago · c5eabcfcb7
7 changed files with 183 additions and 75 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -12,6 +12,7 @@
        "compression-webpack-plugin": "^6.1.1",
        "core-js": "^3.6.5",
        "echarts": "^4.9.0",
+        "element-ui": "^2.15.6",
        "moment": "^2.29.1",
        "quill": "^1.3.7",
        "register-service-worker": "^1.7.1",
@ -3128,7 +3129,7 @@
      "version": "3.1.1",
      "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-3.1.1.tgz",
      "integrity": "sha1-xV7PAhheJGklk5kxDBc84xIzsUI=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "normalize-path": "^3.0.0",
        "picomatch": "^2.0.4"
@ -3327,7 +3328,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz",
      "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=",
-      "dev": true
+      "devOptional": true
    },
    "node_modules/async-limiter": {
      "version": "1.0.1",
@ -3702,7 +3703,7 @@
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.1.0.tgz?cache=0&sync_timestamp=1593261363626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-2.1.0.tgz",
      "integrity": "sha1-MPpAyef+B9vIlWeM0ocCTeokHdk=",
-      "dev": true,
+      "devOptional": true,
      "engines": {
        "node": ">=8"
      }
@ -3711,7 +3712,6 @@
      "version": "1.5.0",
      "resolved": "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz",
      "integrity": "sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "file-uri-to-path": "1.0.0"
@ -4349,7 +4349,7 @@
      "version": "3.4.3",
      "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-3.4.3.tgz?cache=0&sync_timestamp=1602585306469&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-3.4.3.tgz",
      "integrity": "sha1-wd84IxRI5FykrFiObHlXO6alfVs=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "anymatch": "~3.1.1",
        "braces": "~3.0.2",
@ -4370,7 +4370,7 @@
      "version": "3.0.2",
      "resolved": "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz",
      "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "fill-range": "^7.0.1"
      },
@ -4382,7 +4382,7 @@
      "version": "7.0.1",
      "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz",
      "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@ -4394,7 +4394,7 @@
      "version": "7.0.0",
      "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz",
      "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=",
-      "dev": true,
+      "devOptional": true,
      "engines": {
        "node": ">=0.12.0"
      }
@ -4403,7 +4403,7 @@
      "version": "5.0.1",
      "resolved": "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz",
      "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "is-number": "^7.0.0"
      },
@ -5917,7 +5917,6 @@
      "version": "1.5.2",
      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1593463429320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz",
      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=",
-      "dev": true,
      "engines": {
        "node": ">=0.10.0"
      }
@ -6506,6 +6505,30 @@
      "integrity": "sha1-x+2YUSx/823cv+2eVOY1UzXDUlc=",
      "dev": true
    },
+    "node_modules/element-ui": {
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
+      "dependencies": {
+        "async-validator": "~1.8.1",
+        "babel-helper-vue-jsx-merge-props": "^2.0.0",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1"
+      },
+      "peerDependencies": {
+        "vue": "^2.5.17"
+      }
+    },
+    "node_modules/element-ui/node_modules/async-validator": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+      "dependencies": {
+        "babel-runtime": "6.x"
+      }
+    },
    "node_modules/elliptic": {
      "version": "6.5.3",
      "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.3.tgz?cache=0&sync_timestamp=1592492775532&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.3.tgz",
@ -7456,7 +7479,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz",
      "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=",
-      "dev": true,
      "optional": true
    },
    "node_modules/filesize": {
@ -7718,7 +7740,6 @@
      "resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-2.1.3.tgz?cache=0&sync_timestamp=1604593376153&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-2.1.3.tgz",
      "integrity": "sha1-+3OHA66NL5/pAMM4Nt3r7ouX8j4=",
      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
-      "dev": true,
      "hasInstallScript": true,
      "optional": true,
      "os": [
@ -7837,7 +7858,7 @@
      "version": "5.1.1",
      "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz",
      "integrity": "sha1-tsHvQXxOVmPqSY8cRa+saRa7wik=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "is-glob": "^4.0.1"
      },
@ -8824,7 +8845,7 @@
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz",
      "integrity": "sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "binary-extensions": "^2.0.0"
      },
@ -8976,7 +8997,7 @@
      "version": "2.1.1",
      "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
+      "devOptional": true,
      "engines": {
        "node": ">=0.10.0"
      }
@ -8994,7 +9015,7 @@
      "version": "4.0.1",
      "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
      "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "is-extglob": "^2.1.1"
      },
@ -10480,7 +10501,6 @@
      "version": "2.14.2",
      "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591646310&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz",
      "integrity": "sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk=",
-      "dev": true,
      "optional": true
    },
    "node_modules/nanoid": {
@ -10644,7 +10664,7 @@
      "version": "3.0.0",
      "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz",
      "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=",
-      "dev": true,
+      "devOptional": true,
      "engines": {
        "node": ">=0.10.0"
      }
@ -10667,6 +10687,11 @@
        "node": ">=6"
      }
    },
+    "node_modules/normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+    },
    "node_modules/npm-run-path": {
      "version": "2.0.2",
      "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz?cache=0&sync_timestamp=1577052941951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-2.0.2.tgz",
@ -11228,7 +11253,7 @@
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz",
      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
+      "devOptional": true
    },
    "node_modules/path-exists": {
      "version": "3.0.0",
@ -11318,7 +11343,7 @@
      "version": "2.2.2",
      "resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz",
      "integrity": "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=",
-      "dev": true,
+      "devOptional": true,
      "engines": {
        "node": ">=8.6"
      },
@ -12524,7 +12549,7 @@
      "version": "3.5.0",
      "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-3.5.0.tgz?cache=0&sync_timestamp=1602584331621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-3.5.0.tgz",
      "integrity": "sha1-m6dMAZsV02UnjS6Ru4xI17TULJ4=",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "picomatch": "^2.2.1"
      },
@ -12662,7 +12687,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz",
      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
+      "devOptional": true
    },
    "node_modules/renderkid": {
      "version": "2.0.4",
@ -14682,6 +14707,14 @@
        "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
      }
    },
+    "node_modules/throttle-debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/through": {
      "version": "2.3.8",
      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
@ -15122,7 +15155,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz?cache=0&sync_timestamp=1604768693775&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fupath%2Fdownload%2Fupath-1.2.0.tgz",
      "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=",
-      "dev": true,
+      "devOptional": true,
      "engines": {
        "node": ">=4",
        "yarn": "*"
@ -15527,7 +15560,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npm.taobao.org/watchpack-chokidar2/download/watchpack-chokidar2-2.0.1.tgz",
      "integrity": "sha1-OFAAcu5uzmbzdpk2lQ6hdxvhyVc=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "chokidar": "^2.1.8"
@ -15537,7 +15569,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz",
      "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "micromatch": "^3.1.4",
@ -15548,7 +15579,6 @@
      "version": "2.1.1",
      "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz",
      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "remove-trailing-separator": "^1.0.1"
@ -15561,7 +15591,6 @@
      "version": "1.13.1",
      "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz?cache=0&sync_timestamp=1593261363626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-1.13.1.tgz",
      "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">=0.10.0"
@ -15572,7 +15601,6 @@
      "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.8.tgz?cache=0&sync_timestamp=1602585306469&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-2.1.8.tgz",
      "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=",
      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "anymatch": "^2.0.0",
@ -15596,7 +15624,6 @@
      "resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-1.2.13.tgz?cache=0&sync_timestamp=1604593376153&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-1.2.13.tgz",
      "integrity": "sha1-8yXLBFVZJCi88Rs4M3DvcOO/zDg=",
      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
      "hasInstallScript": true,
      "optional": true,
      "os": [
@ -15614,7 +15641,6 @@
      "version": "3.1.0",
      "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz",
      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "is-glob": "^3.1.0",
@ -15625,7 +15651,6 @@
      "version": "3.1.0",
      "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz",
      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "is-extglob": "^2.1.0"
@ -15638,7 +15663,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz",
      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "binary-extensions": "^1.0.0"
@ -15651,7 +15675,6 @@
      "version": "2.2.1",
      "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz?cache=0&sync_timestamp=1602584331621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-2.2.1.tgz",
      "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "graceful-fs": "^4.1.11",
@ -19288,7 +19311,7 @@
      "version": "3.1.1",
      "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-3.1.1.tgz",
      "integrity": "sha1-xV7PAhheJGklk5kxDBc84xIzsUI=",
-      "dev": true,
+      "devOptional": true,
      "requires": {
        "normalize-path": "^3.0.0",
        "picomatch": "^2.0.4"
@ -19447,7 +19470,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz",
      "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=",
-      "dev": true
+      "devOptional": true
    },
    "async-limiter": {
      "version": "1.0.1",
@ -19734,13 +19757,12 @@
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.1.0.tgz?cache=0&sync_timestamp=1593261363626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-2.1.0.tgz",
      "integrity": "sha1-MPpAyef+B9vIlWeM0ocCTeokHdk=",
-      "dev": true
+      "devOptional": true
    },
    "bindings": {
      "version": "1.5.0",
      "resolved": "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz",
      "integrity": "sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=",
-      "dev": true,
      "optional": true,
      "requires": {
        "file-uri-to-path": "1.0.0"
@ -20279,7 +20301,7 @@
      "version": "3.4.3",
      "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-3.4.3.tgz?cache=0&sync_timestamp=1602585306469&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-3.4.3.tgz",
      "integrity": "sha1-wd84IxRI5FykrFiObHlXO6alfVs=",
-      "dev": true,
+      "devOptional": true,
      "requires": {
        "anymatch": "~3.1.1",
        "braces": "~3.0.2",
@ -20295,7 +20317,7 @@
          "version": "3.0.2",
          "resolved": "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz",
          "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
-          "dev": true,
+          "devOptional": true,
          "requires": {
            "fill-range": "^7.0.1"
          }
@ -20304,7 +20326,7 @@
          "version": "7.0.1",
          "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz",
          "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=",
-          "dev": true,
+          "devOptional": true,
          "requires": {
            "to-regex-range": "^5.0.1"
          }
@ -20313,13 +20335,13 @@
          "version": "7.0.0",
          "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz",
          "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=",
-          "dev": true
+          "devOptional": true
        },
        "to-regex-range": {
          "version": "5.0.1",
          "resolved": "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz",
          "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=",
-          "dev": true,
+          "devOptional": true,
          "requires": {
            "is-number": "^7.0.0"
          }
@ -21507,8 +21529,7 @@
    "deepmerge": {
      "version": "1.5.2",
      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1593463429320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz",
-      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=",
-      "dev": true
+      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
    },
    "default-gateway": {
      "version": "5.0.5",
@ -21995,6 +22016,29 @@
      "integrity": "sha1-x+2YUSx/823cv+2eVOY1UzXDUlc=",
      "dev": true
    },
+    "element-ui": {
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
+      "requires": {
+        "async-validator": "~1.8.1",
+        "babel-helper-vue-jsx-merge-props": "^2.0.0",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1"
+      },
+      "dependencies": {
+        "async-validator": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+          "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+          "requires": {
+            "babel-runtime": "6.x"
+          }
+        }
+      }
+    },
    "elliptic": {
      "version": "6.5.3",
      "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.3.tgz?cache=0&sync_timestamp=1592492775532&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.3.tgz",
@ -22749,7 +22793,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz",
      "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=",
-      "dev": true,
      "optional": true
    },
    "filesize": {
@ -22962,7 +23005,6 @@
      "version": "2.1.3",
      "resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-2.1.3.tgz?cache=0&sync_timestamp=1604593376153&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-2.1.3.tgz",
      "integrity": "sha1-+3OHA66NL5/pAMM4Nt3r7ouX8j4=",
-      "dev": true,
      "optional": true
    },
    "function-bind": {
@ -23050,7 +23092,7 @@
      "version": "5.1.1",
      "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz",
      "integrity": "sha1-tsHvQXxOVmPqSY8cRa+saRa7wik=",
-      "dev": true,
+      "devOptional": true,
      "requires": {
        "is-glob": "^4.0.1"
      }
@ -23814,7 +23856,7 @@
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz",
      "integrity": "sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk=",
-      "dev": true,
+      "devOptional": true,
      "requires": {
        "binary-extensions": "^2.0.0"
      }
@ -23922,7 +23964,7 @@
      "version": "2.1.1",
      "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
+      "devOptional": true
    },
    "is-fullwidth-code-point": {
      "version": "3.0.0",
@ -23934,7 +23976,7 @@
      "version": "4.0.1",
      "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
      "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=",
-      "dev": true,
+      "devOptional": true,
      "requires": {
        "is-extglob": "^2.1.1"
      }
@ -25152,7 +25194,6 @@
      "version": "2.14.2",
      "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591646310&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz",
      "integrity": "sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk=",
-      "dev": true,
      "optional": true
    },
    "nanoid": {
@ -25300,7 +25341,7 @@
      "version": "3.0.0",
      "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz",
      "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=",
-      "dev": true
+      "devOptional": true
    },
    "normalize-range": {
      "version": "0.1.2",
@ -25314,6 +25355,11 @@
      "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=",
      "dev": true
    },
+    "normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+    },
    "npm-run-path": {
      "version": "2.0.2",
      "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz?cache=0&sync_timestamp=1577052941951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-2.0.2.tgz",
@ -25751,7 +25797,7 @@
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz",
      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
+      "devOptional": true
    },
    "path-exists": {
      "version": "3.0.0",
@ -25825,7 +25871,7 @@
      "version": "2.2.2",
      "resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz",
      "integrity": "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=",
-      "dev": true
+      "devOptional": true
    },
    "pify": {
      "version": "4.0.1",
@ -26847,7 +26893,7 @@
      "version": "3.5.0",
      "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-3.5.0.tgz?cache=0&sync_timestamp=1602584331621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-3.5.0.tgz",
      "integrity": "sha1-m6dMAZsV02UnjS6Ru4xI17TULJ4=",
-      "dev": true,
+      "devOptional": true,
      "requires": {
        "picomatch": "^2.2.1"
      }
@ -26957,7 +27003,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz",
      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
+      "devOptional": true
    },
    "renderkid": {
      "version": "2.0.4",
@ -28615,6 +28661,11 @@
        "neo-async": "^2.6.0"
      }
    },
+    "throttle-debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
+    },
    "through": {
      "version": "2.3.8",
      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
@ -28968,7 +29019,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz?cache=0&sync_timestamp=1604768693775&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fupath%2Fdownload%2Fupath-1.2.0.tgz",
      "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=",
-      "dev": true
+      "devOptional": true
    },
    "upper-case": {
      "version": "1.1.3",
@ -29305,7 +29356,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npm.taobao.org/watchpack-chokidar2/download/watchpack-chokidar2-2.0.1.tgz",
      "integrity": "sha1-OFAAcu5uzmbzdpk2lQ6hdxvhyVc=",
-      "dev": true,
      "optional": true,
      "requires": {
        "chokidar": "^2.1.8"
@ -29315,7 +29365,6 @@
          "version": "2.0.0",
          "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz",
          "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=",
-          "dev": true,
          "optional": true,
          "requires": {
            "micromatch": "^3.1.4",
@ -29326,7 +29375,6 @@
              "version": "2.1.1",
              "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz",
              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
              "optional": true,
              "requires": {
                "remove-trailing-separator": "^1.0.1"
@ -29338,14 +29386,12 @@
          "version": "1.13.1",
          "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz?cache=0&sync_timestamp=1593261363626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-1.13.1.tgz",
          "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=",
-          "dev": true,
          "optional": true
        },
        "chokidar": {
          "version": "2.1.8",
          "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.8.tgz?cache=0&sync_timestamp=1602585306469&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-2.1.8.tgz",
          "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=",
-          "dev": true,
          "optional": true,
          "requires": {
            "anymatch": "^2.0.0",
@ -29366,7 +29412,6 @@
          "version": "1.2.13",
          "resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-1.2.13.tgz?cache=0&sync_timestamp=1604593376153&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-1.2.13.tgz",
          "integrity": "sha1-8yXLBFVZJCi88Rs4M3DvcOO/zDg=",
-          "dev": true,
          "optional": true,
          "requires": {
            "bindings": "^1.5.0",
@ -29377,7 +29422,6 @@
          "version": "3.1.0",
          "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz",
          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
          "optional": true,
          "requires": {
            "is-glob": "^3.1.0",
@ -29388,7 +29432,6 @@
              "version": "3.1.0",
              "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz",
              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
              "optional": true,
              "requires": {
                "is-extglob": "^2.1.0"
@ -29400,7 +29443,6 @@
          "version": "1.0.1",
          "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz",
          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
          "optional": true,
          "requires": {
            "binary-extensions": "^1.0.0"
@ -29410,7 +29452,6 @@
          "version": "2.2.1",
          "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz?cache=0&sync_timestamp=1602584331621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-2.2.1.tgz",
          "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=",
-          "dev": true,
          "optional": true,
          "requires": {
            "graceful-fs": "^4.1.11",
--- a/package.json
+++ b/package.json
@ -13,6 +13,7 @@
    "compression-webpack-plugin": "^6.1.1",
    "core-js": "^3.6.5",
    "echarts": "^4.9.0",
+    "element-ui": "^2.15.6",
    "moment": "^2.29.1",
    "quill": "^1.3.7",
    "register-service-worker": "^1.7.1",
--- a/public/index.html
+++ b/public/index.html
@ -12,6 +12,8 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="./favicon.png" type="image/x-icon" >
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
    <title>大唐</title>
    <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=KPWvSuCuXmgphVhYM6tVHmlkav3TGpu5"></script>
  </head>
--- a/src/main.js
+++ b/src/main.js
@ -6,6 +6,7 @@ import './registerServiceWorker';
 import router from './router';
 import store from './store';
 import './plugins/ant-design-vue.js';
+import './plugins/element.js';
 import 'common/portrait.styl';
 import 'common/platform.styl';
 import moment from 'moment'; //导入文件
--- a/src/plugins/element.js
+++ b/src/plugins/element.js
@ -0,0 +1,5 @@
+import Vue from 'vue';
+import { Carousel, CarouselItem } from 'element-ui';
+
+Vue.use(Carousel);
+Vue.use(CarouselItem);
--- a/src/views/FirstPages/FirstPage.vue
+++ b/src/views/FirstPages/FirstPage.vue
@ -81,7 +81,18 @@
          </div>
          <div class="d-flex align-center" style="height: 100%;cursor: pointer;" @click="openPage('news', '0204', '')">更多></div>
        </div>
-        <div class="flex-1 flex-column justify-space-between mt-4">
+        <!-- 轮播图 -->
+        <el-carousel :interval="4000" type="card" class="banner" indicator-position="none">
+          <el-carousel-item v-for="newContent in ImgNews1" :key="newContent.introId">
+            <div class="rotation-box">
+              <img :src="newContent.titleUrl" style="height: 340px;width: 100%" alt="" />
+              <div class="rotation-div one-text">
+                {{ newContent.title }}
+              </div>
+            </div>
+          </el-carousel-item>
+        </el-carousel>
+        <!-- <div class="flex-1 flex-column justify-space-between mt-4">
          <div class="flex-1">
            <div class="flex-1 mr-4">
              <a-carousel style="width: 650px" autoplay>
@ -145,7 +156,7 @@
              </div>
            </div>
          </div>
-        </div>
+        </div> -->
      </div>
      <!-- 专题报道 光荣榜 今天我出镜 -->
      <div class="honor-box mt-4 d-flex justify-space-between">
@ -269,7 +280,7 @@ export default {
    this.getData('0201', 'groupNews', '0');
    this.getData('0202', 'provincialNews', '0');
    this.getData('0203', 'companyNews', '0');
-    this.getData('0201', 'ImgNews1', '1');
+    this.getData('0204', 'ImgNews1', '1');
    this.getData('0202', 'ImgNews2', '1');
    this.getData('0203', 'ImgNews3', '1');
    this.getData('0210', 'sceneStyle', '1');
@ -340,6 +351,16 @@ export default {
 };
 </script>
 <style scoped>
+.banner{
+  padding: 20px 0 15px;
+}
+.banner >>> .el-carousel__container{
+  height: 340px;
+}
+.banner >>> .el-carousel__item--card{
+      height: 340px;
+    /* width: 520px; */
+}
 .content-honor {
  /* box-shadow: 0 0 10px 1px rgba(33, 79, 159, 0.15); */
  flex: 1;
@ -415,6 +436,8 @@ export default {
 }
 .rotation-box {
  position: relative;
+  /* width: 520px; */
+  height: 340px;
 }
 .rotation-div {
  position: absolute;
@ -428,6 +451,12 @@ export default {
  padding: 0 16px;
  z-index: 10;
 }
+.banner .rotation-div {
+  height: 36px;
+  line-height: 36px;
+  font-size: 1.1em;
+  text-align: center;
+}
 .demeanor-content {
  display: inline-block;
  width: 372px;
@ -497,7 +526,7 @@ export default {
  background-color: #fff;
 }
 .news-img {
-  height: 1240px;
+  /* height: 1240px; */
  background-color: #fff;
 }
 .news-demeanor {
--- a/yarn.lock
+++ b/yarn.lock
@ -1909,6 +1909,13 @@
  "resolved" "https://registry.npm.taobao.org/async-validator/download/async-validator-3.5.0.tgz?cache=0&sync_timestamp=1605173652984&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-3.5.0.tgz"
  "version" "3.5.0"

+"async-validator@~1.8.1":
+  "integrity" "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA=="
+  "resolved" "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz"
+  "version" "1.8.5"
+  dependencies:
+    "babel-runtime" "6.x"
+
 "async@^2.6.2":
  "integrity" "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8="
  "resolved" "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz"
@ -1981,7 +1988,7 @@
  dependencies:
    "babylon" "^6.18.0"

-"babel-helper-vue-jsx-merge-props@^2.0.3":
+"babel-helper-vue-jsx-merge-props@^2.0.0", "babel-helper-vue-jsx-merge-props@^2.0.3":
  "integrity" "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
  "resolved" "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz"
  "version" "2.0.3"
@ -3409,7 +3416,7 @@
  "resolved" "https://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz"
  "version" "0.1.3"

-"deepmerge@^1.5.2":
+"deepmerge@^1.2.0", "deepmerge@^1.5.2":
  "integrity" "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
  "resolved" "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1593463429320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz"
  "version" "1.5.2"
@ -3706,6 +3713,18 @@
  "resolved" "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.596.tgz?cache=0&sync_timestamp=1605337472853&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.596.tgz"
  "version" "1.3.596"

+"element-ui@^2.15.6":
+  "integrity" "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw=="
+  "resolved" "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz"
+  "version" "2.15.6"
+  dependencies:
+    "async-validator" "~1.8.1"
+    "babel-helper-vue-jsx-merge-props" "^2.0.0"
+    "deepmerge" "^1.2.0"
+    "normalize-wheel" "^1.0.1"
+    "resize-observer-polyfill" "^1.5.0"
+    "throttle-debounce" "^1.0.1"
+
 "elliptic@^6.5.3":
  "integrity" "sha1-y1nrLv2vc6C9eMzXAVpirW4Pk9Y="
  "resolved" "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.3.tgz?cache=0&sync_timestamp=1592492775532&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.3.tgz"
@ -6495,6 +6514,11 @@
    "query-string" "^4.1.0"
    "sort-keys" "^1.0.0"

+"normalize-wheel@^1.0.1":
+  "integrity" "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+  "resolved" "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz"
+  "version" "1.0.1"
+
 "npm-run-path@^2.0.0":
  "integrity" "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8="
  "resolved" "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz?cache=0&sync_timestamp=1577052941951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-2.0.2.tgz"
@ -7937,7 +7961,7 @@
  "resolved" "https://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz"
  "version" "1.0.0"

-"resize-observer-polyfill@^1.5.1":
+"resize-observer-polyfill@^1.5.0", "resize-observer-polyfill@^1.5.1":
  "integrity" "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
  "resolved" "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz"
  "version" "1.5.1"
@ -9001,6 +9025,11 @@
    "loader-utils" "^1.1.0"
    "neo-async" "^2.6.0"

+"throttle-debounce@^1.0.1":
+  "integrity" "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
+  "resolved" "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz"
+  "version" "1.1.0"
+
 "through@^2.3.6":
  "integrity" "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
  "resolved" "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz"
@ -9532,7 +9561,7 @@
  "resolved" "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz"
  "version" "1.9.1"

-"vue@^2 || ^3.0.0-0", "vue@^2.0.0", "vue@^2.1.8", "vue@^2.6.11", "vue@>=2.5.0", "vue@>=2.6.0":
+"vue@^2 || ^3.0.0-0", "vue@^2.0.0", "vue@^2.1.8", "vue@^2.5.17", "vue@^2.6.11", "vue@>=2.5.0", "vue@>=2.6.0":
  "integrity" "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
  "resolved" "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz"
  "version" "2.6.12"