elementUI 图标修复

.gitignore

@@ -26,3 +26,4 @@ yarn-error.log
 /.gitignore
 /public/icon/img404-thumbnail.jpg
 /public/phpMyAdmin4.8.5/
+/public/fonts

package-lock.json

@@ -1616,6 +1616,14 @@
             "resolved": "https://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.1.tgz?cache=0&sync_timestamp=1574272018408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-limiter%2Fdownload%2Fasync-limiter-1.0.1.tgz",
             "integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0="
         },
+        "async-validator": {
+            "version": "1.8.5",
+            "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&sync_timestamp=1605751734916&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz",
+            "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
+            "requires": {
+                "babel-runtime": "6.x"
+            }
+        },
         "asynckit": {
             "version": "0.4.0",
             "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
@@ -1705,6 +1713,11 @@
                 }
             }
         },
+        "babel-helper-vue-jsx-merge-props": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+            "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
+        },
         "babel-loader": {
             "version": "8.1.0",
             "resolved": "https://registry.npm.taobao.org/babel-loader/download/babel-loader-8.1.0.tgz?cache=0&sync_timestamp=1584717315701&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.1.0.tgz",
@@ -1766,6 +1779,22 @@
                 "object.assign": "^4.1.0"
             }
         },
+        "babel-runtime": {
+            "version": "6.26.0",
+            "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
+            "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+            "requires": {
+                "core-js": "^2.4.0",
+                "regenerator-runtime": "^0.11.0"
+            },
+            "dependencies": {
+                "regenerator-runtime": {
+                    "version": "0.11.1",
+                    "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
+                    "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
+                }
+            }
+        },
         "backo2": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
@@ -2713,6 +2742,11 @@
             "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
             "dev": true
         },
+        "core-js": {
+            "version": "2.6.11",
+            "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.11.tgz",
+            "integrity": "sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw="
+        },
         "core-js-compat": {
             "version": "3.6.5",
             "resolved": "https://registry.npm.taobao.org/core-js-compat/download/core-js-compat-3.6.5.tgz",
@@ -3444,6 +3478,26 @@
             "integrity": "sha1-dYqFZaZLeImycTKlHSq7ixNcnQE=",
             "dev": true
         },
+        "element-ui": {
+            "version": "2.14.1",
+            "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.14.1.tgz",
+            "integrity": "sha1-i1dFxzZsHBpgO7bAIShupxh+KqI=",
+            "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": {
+                "deepmerge": {
+                    "version": "1.5.2",
+                    "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
+                    "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
+                }
+            }
+        },
         "elliptic": {
             "version": "6.5.3",
             "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
@@ -6428,6 +6482,11 @@
             "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=",
             "dev": true
         },
+        "normalize-wheel": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
+            "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+        },
         "npm-run-path": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -8121,6 +8180,11 @@
             "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
             "dev": true
         },
+        "resize-observer-polyfill": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
+            "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
+        },
         "resolve": {
             "version": "1.17.0",
             "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.17.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.17.0.tgz",
@@ -9394,6 +9458,11 @@
                 }
             }
         },
+        "throttle-debounce": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
+            "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
+        },
         "through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",

package.json

@@ -27,6 +27,7 @@
   "dependencies": {
     "bootstrap-select": "^1.13.18",
     "echarts": "^4.9.0",
+    "element-ui": "^2.14.1",
     "jquery.cookie": "^1.4.1",
     "js-cookie": "^2.2.1",
     "laravel-echo": "^1.8.0",

resources/js/elementUi.js

@@ -0,0 +1,3 @@
+import ElementUI from 'element-ui';
+
+Vue.use(ElementUI);

resources/sass/app.scss

@@ -5,7 +5,6 @@
 @import "color";
 @import 'layout';
 @import 'effect';
-@import 'elements';
 
 // Bootstrap
 @import '~bootstrap/scss/bootstrap';

resources/sass/elementUi.scss

@@ -0,0 +1 @@
+@import '~element-ui/lib/theme-chalk/index.css';

resources/sass/elements.scss

@@ -1,6 +0,0 @@
-input[type=checkbox]
-{
-    width:17px;
-    height:17px;
-    opacity:0.85;
-}

webpack.mix.js

@@ -25,10 +25,7 @@ mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');
 mix.js('resources/js/queryForm/header.js','public/js/queryForm/header.js');
 
 mix.copy('resources/sound/','public/sound');
+mix.js('resources/js/elementUi.js','public/js/element-ui.js')
+    .sass('resources/sass/elementUi.scss', 'public/css/element-ui.css');
 
-mix.js('resources/js/element-ui.js','public/js/element-ui.js');
-mix.copy('resources/sass/element-ui.css','public/css/element-ui.css');
-
-if (mix.inProduction()) {
-    mix.version();
-}
+mix.version();