diff --git a/package-lock.json b/package-lock.json index ad6869a..6e2aa6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "pinia-plugin-persistedstate": "^3.2.1", "sass": "^1.71.1", "vant": "^4.8.5", + "vconsole": "^3.15.1", "vue": "^3.4.21", "vue-dompurify-html": "^5.0.1", "vue-i18n": "^9.9.1", @@ -27,6 +28,7 @@ "vue-router": "^4.3.0" }, "devDependencies": { + "@vitejs/plugin-basic-ssl": "^1.1.0", "@vitejs/plugin-legacy": "^5.3.1", "@vitejs/plugin-vue": "^5.0.4", "amfe-flexible": "^2.2.1", @@ -1848,7 +1850,6 @@ "version": "7.24.0", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -2887,6 +2888,18 @@ "vue": "^3.0.0" } }, + "node_modules/@vitejs/plugin-basic-ssl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz", + "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==", + "dev": true, + "engines": { + "node": ">=14.6.0" + }, + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" + } + }, "node_modules/@vitejs/plugin-legacy": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-5.3.1.tgz", @@ -3731,6 +3744,17 @@ "url": "https://github.com/sponsors/mesqueeb" } }, + "node_modules/copy-text-to-clipboard": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz", + "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/core-js": { "version": "3.36.0", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz", @@ -5138,6 +5162,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/mutation-observer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz", + "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==" + }, "node_modules/nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", @@ -5654,8 +5683,7 @@ "node_modules/regenerator-runtime": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "dev": true + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "node_modules/regenerator-transform": { "version": "0.15.2", @@ -6494,6 +6522,17 @@ "vue": "^3.0.0" } }, + "node_modules/vconsole": { + "version": "3.15.1", + "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.15.1.tgz", + "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==", + "dependencies": { + "@babel/runtime": "^7.17.2", + "copy-text-to-clipboard": "^3.0.1", + "core-js": "^3.11.0", + "mutation-observer": "^1.0.3" + } + }, "node_modules/vite": { "version": "5.1.6", "resolved": "https://registry.npmmirror.com/vite/-/vite-5.1.6.tgz", @@ -8668,7 +8707,6 @@ "version": "7.24.0", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", - "dev": true, "requires": { "regenerator-runtime": "^0.14.0" } @@ -9309,6 +9347,13 @@ "integrity": "sha512-PHHxeAASgiOpSmMjceweIrv2AxDZIkWXyaczksMoWvKV2YAYEhoizRuk/xFnKF+emUIi46TsQ+rvlm/t2BBCfA==", "requires": {} }, + "@vitejs/plugin-basic-ssl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz", + "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==", + "dev": true, + "requires": {} + }, "@vitejs/plugin-legacy": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-5.3.1.tgz", @@ -9894,6 +9939,11 @@ "is-what": "^3.14.1" } }, + "copy-text-to-clipboard": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz", + "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==" + }, "core-js": { "version": "3.36.0", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz", @@ -10974,6 +11024,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "mutation-observer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz", + "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==" + }, "nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", @@ -11342,8 +11397,7 @@ "regenerator-runtime": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "dev": true + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "regenerator-transform": { "version": "0.15.2", @@ -11970,6 +12024,17 @@ "@vue/shared": "^3.0.0" } }, + "vconsole": { + "version": "3.15.1", + "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.15.1.tgz", + "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==", + "requires": { + "@babel/runtime": "^7.17.2", + "copy-text-to-clipboard": "^3.0.1", + "core-js": "^3.11.0", + "mutation-observer": "^1.0.3" + } + }, "vite": { "version": "5.1.6", "resolved": "https://registry.npmmirror.com/vite/-/vite-5.1.6.tgz", diff --git a/package.json b/package.json index 3286d22..ec89b65 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "pinia-plugin-persistedstate": "^3.2.1", "sass": "^1.71.1", "vant": "^4.8.5", + "vconsole": "^3.15.1", "vue": "^3.4.21", "vue-dompurify-html": "^5.0.1", "vue-i18n": "^9.9.1", @@ -34,6 +35,7 @@ "vue-router": "^4.3.0" }, "devDependencies": { + "@vitejs/plugin-basic-ssl": "^1.1.0", "@vitejs/plugin-legacy": "^5.3.1", "@vitejs/plugin-vue": "^5.0.4", "amfe-flexible": "^2.2.1", diff --git a/src/router/enforceHome.js b/src/router/enforceHome.js index 720ad2c..1fe4ca5 100644 --- a/src/router/enforceHome.js +++ b/src/router/enforceHome.js @@ -29,6 +29,15 @@ const routes = [ isKeepAlive: false, }, }, + //执法端扫码页面 + { + path: "/enforce/scanPageTest", + name: "scanPageTest", + component: () => import("@/views/enforce/scanPageTest.vue"), + meta: { + isKeepAlive: false, + }, + }, //公布执法计划页面 { path: "/enforce/enforcementPlan", diff --git a/src/views/enforce/scanPage.vue b/src/views/enforce/scanPage.vue index 3eb5054..350fba1 100644 --- a/src/views/enforce/scanPage.vue +++ b/src/views/enforce/scanPage.vue @@ -1,10 +1,5 @@ - + + + + - \ No newline at end of file + diff --git a/src/views/login.vue b/src/views/login.vue index a76aed2..61e0b94 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -39,7 +39,7 @@ const onSubmit = async (values) => { // await getLang(); userLogin(values,success=>{ // router.push({ name: "enforceHome" }); - router.push({ name: "Home" }); + router.push({ name: "enforceHome" }); // 定义全局变量 console.log(success.data) debugger diff --git a/vite.config.js b/vite.config.js index ce1c49f..f9342ec 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,10 +1,11 @@ import { defineConfig, loadEnv } from "vite"; import vue from "@vitejs/plugin-vue"; import { baseCfg, pluginCfg } from "./vite-config"; +import basicSsl from '@vitejs/plugin-basic-ssl' export default async ({ mode }) => { const { VITE_BASE_URL } = loadEnv(mode, `${process.cwd()}/vite-env`); return defineConfig({ ...baseCfg({ VITE_BASE_URL }), - plugins: [vue(), ...await pluginCfg({ VITE_BASE_URL })], + plugins: [vue(), ...await pluginCfg({ VITE_BASE_URL }),basicSsl()], }); };