diff --git a/package.json b/package.json index 4f6cd81..40a3bfb 100644 --- a/package.json +++ b/package.json @@ -79,14 +79,19 @@ "eslint": "6.7.2", "eslint-plugin-vue": "6.2.2", "html-webpack-plugin": "3.2.0", + "js-base64": "^3.7.8", "lint-staged": "8.1.5", + "loadsh": "^0.0.4", + "lodash": "^4.17.21", "mockjs": "1.0.1-beta3", + "moment": "^2.30.1", "plop": "2.3.0", "runjs": "4.3.2", "sass": "1.26.2", "sass-loader": "8.0.2", "script-ext-html-webpack-plugin": "2.1.3", "serve-static": "1.13.2", + "svg-baker-runtime": "^1.4.7", "svg-sprite-loader": "4.1.3", "svgo": "1.2.0", "vue-template-compiler": "2.6.10" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5193d37..ac02430 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,6 +44,9 @@ importers: core-js: specifier: ^3.6.5 version: 3.46.0 + crypto-js: + specifier: ^4.2.0 + version: 4.2.0 default-passive-events: specifier: ^2.0.0 version: 2.0.0 @@ -189,12 +192,24 @@ importers: html-webpack-plugin: specifier: 3.2.0 version: 3.2.0(webpack@4.47.0) + js-base64: + specifier: ^3.7.8 + version: 3.7.8 lint-staged: specifier: 8.1.5 version: 8.1.5 + loadsh: + specifier: ^0.0.4 + version: 0.0.4 + lodash: + specifier: ^4.17.21 + version: 4.17.21 mockjs: specifier: 1.0.1-beta3 version: 1.0.1-beta3 + moment: + specifier: ^2.30.1 + version: 2.30.1 plop: specifier: 2.3.0 version: 2.3.0 @@ -213,6 +228,9 @@ importers: serve-static: specifier: 1.13.2 version: 1.13.2 + svg-baker-runtime: + specifier: ^1.4.7 + version: 1.4.7 svg-sprite-loader: specifier: 4.1.3 version: 4.1.3(webpack@4.47.0) @@ -2433,6 +2451,9 @@ packages: resolution: {integrity: sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==} engines: {node: '>= 0.10'} + crypto-js@4.2.0: + resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==} + css-color-names@0.0.4: resolution: {integrity: sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==} @@ -4370,6 +4391,9 @@ packages: js-base64@2.6.4: resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==} + js-base64@3.7.8: + resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==} + js-beautify@1.15.4: resolution: {integrity: sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==} engines: {node: '>=14'} @@ -4574,6 +4598,10 @@ packages: resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} engines: {node: '>=8.9.0'} + loadsh@0.0.4: + resolution: {integrity: sha512-U+wLL8InpfRalWrr+0SuhWgGt10M4OyAk6G8xCYo2rwpiHtxZkWiFpjei0vO463ghW8LPCdhqQxXlMy2qicAEw==} + deprecated: This is a typosquat on the popular Lodash package. This is not maintained nor is the original Lodash package. + locate-path@2.0.0: resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==} engines: {node: '>=4'} @@ -10368,6 +10396,8 @@ snapshots: randombytes: 2.1.0 randomfill: 1.0.4 + crypto-js@4.2.0: {} + css-color-names@0.0.4: {} css-declaration-sorter@4.0.1: @@ -12807,6 +12837,8 @@ snapshots: js-base64@2.6.4: {} + js-base64@3.7.8: {} + js-beautify@1.15.4: dependencies: config-chain: 1.1.13 @@ -13113,6 +13145,8 @@ snapshots: emojis-list: 3.0.0 json5: 2.2.3 + loadsh@0.0.4: {} + locate-path@2.0.0: dependencies: p-locate: 2.0.0 diff --git a/src/views/jurisdiction/deptClass/index.vue b/src/views/jurisdiction/deptClass/index.vue index 354a222..f0367fb 100644 --- a/src/views/jurisdiction/deptClass/index.vue +++ b/src/views/jurisdiction/deptClass/index.vue @@ -196,7 +196,8 @@ import {getClassTreeByClassNameTwo} from "@/api/fondclass.js"; initGetTree(){ this.btnloading = true; let data = { - className: "档案" + className: "档案", + onlyMapped: true }; getClassTreeByClassNameTwo(data).then(res => { this.btnloading = false; diff --git a/src/views/jurisdiction/fondclass/index.vue b/src/views/jurisdiction/fondclass/index.vue index 0dbb69e..fa91de2 100644 --- a/src/views/jurisdiction/fondclass/index.vue +++ b/src/views/jurisdiction/fondclass/index.vue @@ -201,7 +201,8 @@ import {getClassTreeByFondId,saveFondClass,getClassTreeByClassNameTwo} from "@/a initGetTree(){ this.btnloading = true; let data = { - className: "档案" + className: "档案", + onlyMapped: true }; getClassTreeByClassNameTwo(data).then(res => { this.btnloading = false; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 9a27dd0..214d9ff 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -272,7 +272,7 @@ "roles", res.body.userRole.roles[0].roleName ); - //localStronge.setToken(res.body.token); + localStronge.setToken(res.body.token); this.$router.push({ path: "/" });