Merge branch 'master' of https://gitee.com/dmc_qq/etc-project

package-lock.json

@@ -1,13 +1,8 @@
 {
-<<<<<<< HEAD
-=======
   "name": "etc-project",
->>>>>>> 1773229aa281664dd3e6faab09b9569c166b3dc3
   "version": "0.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
-<<<<<<< HEAD
-=======
   "packages": {
     "": {
       "version": "0.0.0",
@@ -24,6 +19,7 @@
         "screenfull": "^6.0.1",
         "vue": "^3.2.2",
         "vue-fragment": "^1.5.2",
+        "vue-json-excel": "^0.3.0",
         "vue-router": "4",
         "vuex": "^4.0.2"
       },
@@ -1147,6 +1143,11 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/downloadjs": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmmirror.com/downloadjs/-/downloadjs-1.4.7.tgz",
+      "integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q=="
+    },
     "node_modules/duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npm.taobao.org/duplexer2/download/duplexer2-0.1.4.tgz",
@@ -1253,201 +1254,6 @@
         "esbuild-windows-arm64": "0.13.15"
       }
     },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-android-arm64/download/esbuild-android-arm64-0.13.15.tgz",
-      "integrity": "sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-darwin-64/download/esbuild-darwin-64-0.13.15.tgz?cache=0&sync_timestamp=1637498120004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-darwin-64%2Fdownload%2Fesbuild-darwin-64-0.13.15.tgz",
-      "integrity": "sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-darwin-arm64/download/esbuild-darwin-arm64-0.13.15.tgz",
-      "integrity": "sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-freebsd-64/download/esbuild-freebsd-64-0.13.15.tgz?cache=0&sync_timestamp=1637498589376&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-freebsd-64%2Fdownload%2Fesbuild-freebsd-64-0.13.15.tgz",
-      "integrity": "sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-freebsd-arm64/download/esbuild-freebsd-arm64-0.13.15.tgz",
-      "integrity": "sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-32/download/esbuild-linux-32-0.13.15.tgz",
-      "integrity": "sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-64/download/esbuild-linux-64-0.13.15.tgz",
-      "integrity": "sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-arm/download/esbuild-linux-arm-0.13.15.tgz",
-      "integrity": "sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-arm64/download/esbuild-linux-arm64-0.13.15.tgz",
-      "integrity": "sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-mips64le/download/esbuild-linux-mips64le-0.13.15.tgz?cache=0&sync_timestamp=1637498771624&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-linux-mips64le%2Fdownload%2Fesbuild-linux-mips64le-0.13.15.tgz",
-      "integrity": "sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-ppc64le/download/esbuild-linux-ppc64le-0.13.15.tgz?cache=0&sync_timestamp=1637462734786&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-linux-ppc64le%2Fdownload%2Fesbuild-linux-ppc64le-0.13.15.tgz",
-      "integrity": "sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-netbsd-64/download/esbuild-netbsd-64-0.13.15.tgz",
-      "integrity": "sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ]
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-openbsd-64/download/esbuild-openbsd-64-0.13.15.tgz?cache=0&sync_timestamp=1637462735411&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-openbsd-64%2Fdownload%2Fesbuild-openbsd-64-0.13.15.tgz",
-      "integrity": "sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-sunos-64/download/esbuild-sunos-64-0.13.15.tgz?cache=0&sync_timestamp=1637498772126&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-sunos-64%2Fdownload%2Fesbuild-sunos-64-0.13.15.tgz",
-      "integrity": "sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ]
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-windows-32/download/esbuild-windows-32-0.13.15.tgz",
-      "integrity": "sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/esbuild-windows-64": {
       "version": "0.13.15",
       "resolved": "https://registry.npmmirror.com/esbuild-windows-64/download/esbuild-windows-64-0.13.15.tgz?cache=0&sync_timestamp=1637462733698&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-windows-64%2Fdownload%2Fesbuild-windows-64-0.13.15.tgz",
@@ -1461,19 +1267,6 @@
         "win32"
       ]
     },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-windows-arm64/download/esbuild-windows-arm64-0.13.15.tgz",
-      "integrity": "sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
@@ -1917,20 +1710,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmmirror.com/fsevents/download/fsevents-2.3.2.tgz",
-      "integrity": "sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/fstream": {
       "version": "1.0.12",
       "resolved": "https://registry.npm.taobao.org/fstream/download/fstream-1.0.12.tgz",
@@ -3598,6 +3377,14 @@
         "vue": "^2.5.16"
       }
     },
+    "node_modules/vue-json-excel": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/vue-json-excel/-/vue-json-excel-0.3.0.tgz",
+      "integrity": "sha512-FrSh0tVUpw4K+ilLO8g0Qp52eFJw/hkk3rZPTEKo9qVkJgVfQtZwzj3UWc5ACYxA3jLk9HtjK+f9xKHCN4Kgag==",
+      "dependencies": {
+        "downloadjs": "^1.4.7"
+      }
+    },
     "node_modules/vue-loader": {
       "version": "16.8.3",
       "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
@@ -3683,7 +3470,6 @@
       "dev": true
     }
   },
->>>>>>> 1773229aa281664dd3e6faab09b9569c166b3dc3
   "dependencies": {
     "@babel/helper-validator-identifier": {
       "version": "7.15.7",
@@ -3783,7 +3569,8 @@
     "@element-plus/icons-vue": {
       "version": "1.1.4",
       "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-1.1.4.tgz",
-      "integrity": "sha512-Iz/nHqdp1sFPmdzRwHkEQQA3lKvoObk8azgABZ81QUOpW9s/lUyQVUSh0tNtEPZXQlKwlSh7SPgoVxzrE0uuVQ=="
+      "integrity": "sha512-Iz/nHqdp1sFPmdzRwHkEQQA3lKvoObk8azgABZ81QUOpW9s/lUyQVUSh0tNtEPZXQlKwlSh7SPgoVxzrE0uuVQ==",
+      "requires": {}
     },
     "@eslint/eslintrc": {
       "version": "1.0.4",
@@ -4003,7 +3790,8 @@
       "version": "1.10.2",
       "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz",
       "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/compiler-core": {
       "version": "3.2.22",
@@ -4130,7 +3918,8 @@
         "vue-demi": {
           "version": "0.12.4",
           "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.4.tgz",
-          "integrity": "sha512-ztPDkFt0TSUdoq1ZI6oD730vgztBkiByhUW7L1cOTebiSBqSYfSQgnhYakYigBkyAybqCTH7h44yZuDJf2xILQ=="
+          "integrity": "sha512-ztPDkFt0TSUdoq1ZI6oD730vgztBkiByhUW7L1cOTebiSBqSYfSQgnhYakYigBkyAybqCTH7h44yZuDJf2xILQ==",
+          "requires": {}
         }
       }
     },
@@ -4149,7 +3938,8 @@
       "version": "5.3.2",
       "resolved": "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.2.tgz",
       "integrity": "sha1-ftW7VZCLOy8bxVxq8WU7rafweTc=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv": {
       "version": "6.12.6",
@@ -4521,6 +4311,11 @@
         "esutils": "^2.0.2"
       }
     },
+    "downloadjs": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmmirror.com/downloadjs/-/downloadjs-1.4.7.tgz",
+      "integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q=="
+    },
     "duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npm.taobao.org/duplexer2/download/duplexer2-0.1.4.tgz",
@@ -4611,111 +4406,6 @@
         "esbuild-windows-arm64": "0.13.15"
       }
     },
-    "esbuild-android-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-android-arm64/download/esbuild-android-arm64-0.13.15.tgz",
-      "integrity": "sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-darwin-64/download/esbuild-darwin-64-0.13.15.tgz?cache=0&sync_timestamp=1637498120004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-darwin-64%2Fdownload%2Fesbuild-darwin-64-0.13.15.tgz",
-      "integrity": "sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-darwin-arm64/download/esbuild-darwin-arm64-0.13.15.tgz",
-      "integrity": "sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-freebsd-64/download/esbuild-freebsd-64-0.13.15.tgz?cache=0&sync_timestamp=1637498589376&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-freebsd-64%2Fdownload%2Fesbuild-freebsd-64-0.13.15.tgz",
-      "integrity": "sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-freebsd-arm64/download/esbuild-freebsd-arm64-0.13.15.tgz",
-      "integrity": "sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-32/download/esbuild-linux-32-0.13.15.tgz",
-      "integrity": "sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-64/download/esbuild-linux-64-0.13.15.tgz",
-      "integrity": "sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-arm/download/esbuild-linux-arm-0.13.15.tgz",
-      "integrity": "sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-arm64/download/esbuild-linux-arm64-0.13.15.tgz",
-      "integrity": "sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-mips64le/download/esbuild-linux-mips64le-0.13.15.tgz?cache=0&sync_timestamp=1637498771624&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-linux-mips64le%2Fdownload%2Fesbuild-linux-mips64le-0.13.15.tgz",
-      "integrity": "sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-ppc64le": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-ppc64le/download/esbuild-linux-ppc64le-0.13.15.tgz?cache=0&sync_timestamp=1637462734786&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-linux-ppc64le%2Fdownload%2Fesbuild-linux-ppc64le-0.13.15.tgz",
-      "integrity": "sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-netbsd-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-netbsd-64/download/esbuild-netbsd-64-0.13.15.tgz",
-      "integrity": "sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-openbsd-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-openbsd-64/download/esbuild-openbsd-64-0.13.15.tgz?cache=0&sync_timestamp=1637462735411&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-openbsd-64%2Fdownload%2Fesbuild-openbsd-64-0.13.15.tgz",
-      "integrity": "sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-sunos-64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-sunos-64/download/esbuild-sunos-64-0.13.15.tgz?cache=0&sync_timestamp=1637498772126&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-sunos-64%2Fdownload%2Fesbuild-sunos-64-0.13.15.tgz",
-      "integrity": "sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-32": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-windows-32/download/esbuild-windows-32-0.13.15.tgz",
-      "integrity": "sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==",
-      "dev": true,
-      "optional": true
-    },
     "esbuild-windows-64": {
       "version": "0.13.15",
       "resolved": "https://registry.npmmirror.com/esbuild-windows-64/download/esbuild-windows-64-0.13.15.tgz?cache=0&sync_timestamp=1637462733698&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fesbuild-windows-64%2Fdownload%2Fesbuild-windows-64-0.13.15.tgz",
@@ -4723,13 +4413,6 @@
       "dev": true,
       "optional": true
     },
-    "esbuild-windows-arm64": {
-      "version": "0.13.15",
-      "resolved": "https://registry.npmmirror.com/esbuild-windows-arm64/download/esbuild-windows-arm64-0.13.15.tgz",
-      "integrity": "sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==",
-      "dev": true,
-      "optional": true
-    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
@@ -4833,7 +4516,8 @@
       "version": "8.3.0",
       "resolved": "https://registry.nlark.com/eslint-config-prettier/download/eslint-config-prettier-8.3.0.tgz?cache=0&sync_timestamp=1619270475218&other_urls=https%3A%2F%2Fregistry.nlark.com%2Feslint-config-prettier%2Fdownload%2Feslint-config-prettier-8.3.0.tgz",
       "integrity": "sha1-90cbILb+ipqSVMxoRFQgKIai3Xo=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-prettier": {
       "version": "4.0.0",
@@ -5067,13 +4751,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmmirror.com/fsevents/download/fsevents-2.3.2.tgz",
-      "integrity": "sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=",
-      "dev": true,
-      "optional": true
-    },
     "fstream": {
       "version": "1.0.12",
       "resolved": "https://registry.npm.taobao.org/fstream/download/fstream-1.0.12.tgz",
@@ -5160,7 +4837,8 @@
     "graceful-fs": {
       "version": "4.2.9",
       "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "devOptional": true
     },
     "has": {
       "version": "1.0.3",
@@ -5402,7 +5080,8 @@
     "lodash-unified": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.2.tgz",
-      "integrity": "sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g=="
+      "integrity": "sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==",
+      "requires": {}
     },
     "lodash.merge": {
       "version": "4.6.2",
@@ -5518,7 +5197,8 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/ms/download/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+      "devOptional": true
     },
     "nanoid": {
       "version": "3.3.2",
@@ -5928,14 +5608,6 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-<<<<<<< HEAD
-    "ssf": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
-      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
-      "requires": {
-        "frac": "~1.1.2"
-=======
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz",
@@ -5943,7 +5615,6 @@
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
->>>>>>> 1773229aa281664dd3e6faab09b9569c166b3dc3
       }
     },
     "string-width": {
@@ -5957,15 +5628,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz",
-      "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz",
@@ -6400,7 +6062,16 @@
     "vue-fragment": {
       "version": "1.5.2",
       "resolved": "https://registry.npmmirror.com/vue-fragment/-/vue-fragment-1.5.2.tgz",
-      "integrity": "sha512-KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA=="
+      "integrity": "sha512-KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA==",
+      "requires": {}
+    },
+    "vue-json-excel": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/vue-json-excel/-/vue-json-excel-0.3.0.tgz",
+      "integrity": "sha512-FrSh0tVUpw4K+ilLO8g0Qp52eFJw/hkk3rZPTEKo9qVkJgVfQtZwzj3UWc5ACYxA3jLk9HtjK+f9xKHCN4Kgag==",
+      "requires": {
+        "downloadjs": "^1.4.7"
+      }
     },
     "vue-loader": {
       "version": "16.8.3",

package.json

@@ -20,6 +20,7 @@
     "screenfull": "^6.0.1",
     "vue": "^3.2.2",
     "vue-fragment": "^1.5.2",
+    "vue-json-excel": "^0.3.0",
     "vue-router": "4",
     "vuex": "^4.0.2"
   },

src/main.ts

@@ -15,9 +15,10 @@ import './style/main.css'
 import { isValidKey } from '@/utils/utils'
 //请求
 import * as request from '@/api/index'
-
+//导出表格
+//import JsonExcel from 'vue-json-excel'
 const app = createApp(App)
-
+//app.component('downloadExcel', JsonExcel)
 //全局注册请求
 app.config.globalProperties.$request = request;
 app.use(router)

src/views/dengmingcong/cardFillDo/cardFillDo.vue

@@ -51,9 +51,7 @@
         ref,
         reactive
     } from 'vue'
-    import {
-        useRequest
-    } from 'vue-request';
+    //import {useRequest} from 'vue-request';
     import axios from 'axios';
     
     import {

src/views/shengbo/blacklistQuery/blacklistQuery.vue

@@ -13,9 +13,9 @@
     <div class="topstyle">
       <el-date-picker
         v-model="formdata.startDate"
+        value-format="YYYY-MM-DD hh:mm:ss"
         type="datetime"
         placeholder="开始日期"
-        format="YYYY/MM/DD hh:mm:ss"
       />
       <!-- <span>-</span> -->
       <!-- <el-button>至</el-button> -->
@@ -23,7 +23,7 @@
         v-model="formdata.endDate"
         type="datetime"
         placeholder="结束日期"
-        format="YYYY/MM/DD hh:mm:ss"
+        value-format="YYYY-MM-DD hh:mm:ss"
         style="margin-left: 5px"
       />
     </div>
@@ -44,7 +44,7 @@
   </div>
   <!-- 弹窗 -->
   <div>
-    <el-dialog v-model="dialogFormVisible" class="as-gravity-center">
+    <el-dialog v-model="dialogFormVisible">
       <span class="as-gravity-center" style="font-size: 25px">卡黑名单-操作(下黑反白)</span>
       
       <el-form :model="addtodata" style="padding-top: 22px" :rules="rules">
@@ -82,7 +82,7 @@
   </div>
   <div style="padding-top: 12px">
     <el-table :data="tableData" border style="width: 100%">
-      <el-table-column prop="serialNumber" label="序号" width="60" />
+      <el-table-column type="index" label="序号" width="60" />
       <el-table-column prop="ardNumber" label="卡号" width="120" />
       <el-table-column prop="blacklistType" label="黑名单类型" width="100" />
       <el-table-column prop="effectiveTimeOfBlacklist" label="黑名单生效时间" width="170" />
@@ -96,7 +96,7 @@
         <el-button @click="dialogFormVisible1 = true" style="border-style: none">详情</el-button>
       </el-table-column>
     </el-table>
-    <el-dialog v-model="dialogFormVisible1" class="as-gravity-center">
+    <el-dialog v-model="dialogFormVisible1">
       <span class="as-gravity-center" style="font-size: 22px">基本信息</span>
       <el-form :model="detailsPopup" style="padding-top: 12px">
         <el-form-item label="卡号：" :label-width="100">
@@ -134,9 +134,9 @@
       </template>
     </el-dialog>
   </div>
-  <div style="padding-top: 12px" class="as-gravity-center-end">
+  <!-- <div style="padding-top: 12px" class="as-gravity-center-end">
     <el-pagination :page-sizes="[10, 20, 30, 40]" layout="sizes, prev, pager, next" :total="1000" />
-  </div>
+  </div> -->
 </template>
 
 <script lang="ts" setup>
@@ -166,7 +166,10 @@ function search() {
 }
 //重置
 function reset() {
-  console.log('重置')
+  formdata.ardNumber = ''
+  formdata.startDate = ''
+  formdata.endDate = ''
+  formdata.queryType = ''
 }
 //添加
 function addTo() {
@@ -210,7 +213,6 @@ const detailsPopup = reactive({
 })
 
 interface User {
-  serialNumber: string //序号
   ardNumber: string //卡号  
   blacklistType: string //黑名单类型
   effectiveTimeOfBlacklist: string //黑名单生效时间
@@ -232,7 +234,6 @@ const handleCurrentChange = (val: User | undefined) => {
 }
 const tableData: User[] = [
   {
-    serialNumber: '1',
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
     effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
@@ -244,7 +245,6 @@ const tableData: User[] = [
     negativeeasons: '',
   },
  {
-    serialNumber: '2',
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
     effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
@@ -256,7 +256,6 @@ const tableData: User[] = [
     negativeeasons: '',
   },
   {
-    serialNumber: '3',
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
     effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
@@ -268,7 +267,28 @@ const tableData: User[] = [
     negativeeasons: '',
   },
   {
-    serialNumber: '4',
+    ardNumber: '52011640230217310678',
+    blacklistType: '账户透支',
+    effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
+    state: '在黑',
+    blacklistAntiWhiteTime: '',
+    xiaheiOperatorNo: 'ETCGsyh002',
+    causeOfBlack: '车牌尾号L76欠费:229.78元;于20201219进入黑名单',
+    antiWhiteOperatorNo: '',
+    negativeeasons: '',
+  },
+  {
+    ardNumber: '52011640230217310678',
+    blacklistType: '账户透支',
+    effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
+    state: '在黑',
+    blacklistAntiWhiteTime: '',
+    xiaheiOperatorNo: 'ETCGsyh002',
+    causeOfBlack: '车牌尾号L76欠费:229.78元;于20201219进入黑名单',
+    antiWhiteOperatorNo: '',
+    negativeeasons: '',
+  },
+  {
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
     effectiveTimeOfBlacklist: '2020-12-19T03:41:04',

src/views/shengbo/trafficFlow/trafficFlow.vue

@@ -19,7 +19,7 @@
         v-model="formData.startDate"
         type="datetime"
         placeholder="开始日期"
-        format="YYYY/MM/DD hh:mm:ss"
+        value-format="YYYY-MM-DD hh:mm:ss"
       />
       <!-- <span>-</span> -->
       <!-- <el-button>至</el-button> -->
@@ -27,21 +27,28 @@
         v-model="formData.endDate"
         type="datetime"
         placeholder="结束日期"
-        format="YYYY/MM/DD hh:mm:ss"
+        value-format="YYYY-MM-DD hh:mm:ss"
         style="margin-left: 5px"
       />
     </div>
     <!-- 按钮 -->
     <div class="topstyle">
-      <el-button type="success" :icon="Search" @click="submitForm">搜索</el-button>
-      <el-button type="warning" :icon="Refresh" @click="submitReset">重置</el-button>
-      <el-button type="primary" plain @click="exportAll">导出当前页</el-button>
+      <el-button type="success" :icon="Search" @click="search">搜索</el-button>
+      <el-button type="warning" :icon="Refresh" @click="reset">重置</el-button>
+      <!-- <download-excel
+        :data="tableData1"
+        :header="tableData.title"
+        name="需要导出的表格名字.xls"
+      >
+        
+      </download-excel> -->
+      <el-button type="primary" plain @click="exportCurrentPage">导出当前页</el-button>
       <el-button type="primary" plain @click="exportAll">导出所有</el-button>
     </div>
   </div>
   <div style="padding-top: 12px">
     <el-table :data="tableData1" style="width: 100%" border>
-      <el-table-column prop="serialNumber" label="序号" width="60" />
+      <el-table-column type="index" label="序号" width="60" />
       <el-table-column prop="etcCardNumber" label="ETC卡号" width="190" />
       <el-table-column prop="licensePlateNumber" label="车牌号" width="100" />
       <el-table-column prop="consumptionType" label="消费类型" width="90" />
@@ -60,35 +67,22 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref, toRaw } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { Calendar, Search, Refresh } from '@element-plus/icons-vue'
 import type { ElTable } from 'element-plus'
 import { getCurrentInstance, onMounted } from 'vue'
 
-const { proxy } = getCurrentInstance()
-onMounted(() => {
-  proxy.$request
-    .get('api/user',{},{
-        baseURL: 'http://192.168.1.101:8080',
-      }
-    )
-    .then((res) => {
-      console.log(res,'12345')
-    })
-    .catch((err) => {
-      console.log(err)
-    })
-})
+
 
 const formData = reactive({
   etcCardNumber: '', //ETC卡号
   licensePlateNumber: '', //车牌号
   startDate: '', //开始日期
   endDate: '', //结束日期
-  
 })
 const tableData = reactive({
+  title: "xx公司表格",
   serialNumber: '', //序号
   etcCardNumber: '', //ETC卡号
   licensePlateNumber: '', //车牌号
@@ -101,17 +95,42 @@ const tableData = reactive({
   transactionAmount: '', //交易金额
   postransactionalance: '', //交易后余额
 })
-// 搜索
-const submitForm = () => {}
-// 重置
-const submitReset = () => {
-  //myform.value?.resetFields()
-}
 
-function exportAll() {}
+//  json_fields: {
+//         "排查日期":'date',
+//         "整改隐患内容":'details',
+//         "整改措施":'measure',
+//         "整改时限":'timeLimit',
+//         "应急措施和预案":'plan',
+//         "整改责任人":'personInCharge',
+//         "填表人":'preparer',
+//         "整改资金":'fund',
+//         "整改完成情况":'complete',
+//         "备注":'remark',
+//       },
+
+//搜索
+function search() {
+  console.log(toRaw(formData))
+  console.log('发送搜索请求')
+}
+//重置
+function reset() {
+  formData.etcCardNumber = ''
+  formData.licensePlateNumber = ''
+  formData.startDate = ''
+  formData.endDate = ''
+}
+//导出当前页
+function exportCurrentPage() {
+  console.log('导出当前页的表格数据')
+}
+//导出所有
+function exportAll() {
+  console.log('导出所有数据')
+}
 
 interface User {
-  serialNumber: string //序号
   etcCardNumber: string //ETC卡号
   licensePlateNumber: string //车牌号
   consumptionType: string //消费类型
@@ -136,7 +155,6 @@ const handleCurrentChange = (val: User | undefined) => {
 
 const tableData1: User[] = [
   {
-    serialNumber: '1',
     etcCardNumber: '52011328220200481698',
     licensePlateNumber: '贵A710AE',
     consumptionType: '省内流水',
@@ -149,7 +167,6 @@ const tableData1: User[] = [
     postransactionalance: '38.25',
   },
   {
-    serialNumber: '2',
     etcCardNumber: '52011328220200481698',
     licensePlateNumber: '贵A710AE',
     consumptionType: '省内流水',
@@ -162,7 +179,6 @@ const tableData1: User[] = [
     postransactionalance: '38.25',
   },
   {
-    serialNumber: '3',
     etcCardNumber: '52011328220200481698',
     licensePlateNumber: '贵A710AE',
     consumptionType: '省内流水',
@@ -175,7 +191,6 @@ const tableData1: User[] = [
     postransactionalance: '38.25',
   },
   {
-    serialNumber: '4',
     etcCardNumber: '52011328220200481698',
     licensePlateNumber: '贵A710AE',
     consumptionType: '省内流水',
@@ -188,7 +203,6 @@ const tableData1: User[] = [
     postransactionalance: '38.25',
   },
   {
-    serialNumber: '5',
     etcCardNumber: '52011328220200481698',
     licensePlateNumber: '贵A710AE',
     consumptionType: '省内流水',
@@ -201,7 +215,6 @@ const tableData1: User[] = [
     postransactionalance: '38.25',
   },
   {
-    serialNumber: '6',
     etcCardNumber: '52011328220200481698',
     licensePlateNumber: '贵A710AE',
     consumptionType: '省内流水',

yarn.lock

@@ -722,6 +722,11 @@
   dependencies:
     "esutils" "^2.0.2"
 
+"downloadjs@^1.4.7":
+  "integrity" "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q=="
+  "resolved" "https://registry.npmmirror.com/downloadjs/-/downloadjs-1.4.7.tgz"
+  "version" "1.4.7"
+
 "duplexer2@~0.1.4":
   "integrity" "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME="
   "resolved" "https://registry.npm.taobao.org/duplexer2/download/duplexer2-0.1.4.tgz"
@@ -2119,6 +2124,13 @@
   "resolved" "https://registry.npmmirror.com/vue-fragment/-/vue-fragment-1.5.2.tgz"
   "version" "1.5.2"
 
+"vue-json-excel@^0.3.0":
+  "integrity" "sha512-FrSh0tVUpw4K+ilLO8g0Qp52eFJw/hkk3rZPTEKo9qVkJgVfQtZwzj3UWc5ACYxA3jLk9HtjK+f9xKHCN4Kgag=="
+  "resolved" "https://registry.npmmirror.com/vue-json-excel/-/vue-json-excel-0.3.0.tgz"
+  "version" "0.3.0"
+  dependencies:
+    "downloadjs" "^1.4.7"
+
 "vue-loader@^16.0.0-alpha.3":
   "integrity" "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="
   "resolved" "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz"