From 47afb8a442b89e73d81628b78cc4d45f76fed4b9 Mon Sep 17 00:00:00 2001 From: wangyilin <1454641981@qq.com> Date: Thu, 31 Oct 2024 09:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect_information/.env.development | 2 +- collect_information/.env.production | 3 +- .../src/pages/police/mine/index.scss | 71 +++++++++++++++++++ .../src/pages/police/mine/index.vue | 51 ++++++++++++- securityManagement/.env.development | 3 +- securityManagement/.env.production | 7 ++ securityManagement/package.json | 3 +- securityManagement/src/router/index.ts | 2 +- securityManagement/vite.config.ts | 4 +- 9 files changed, 136 insertions(+), 10 deletions(-) diff --git a/collect_information/.env.development b/collect_information/.env.development index edad538..24cdd4f 100644 --- a/collect_information/.env.development +++ b/collect_information/.env.development @@ -1,3 +1,3 @@ # 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config TARO_APP_ID="wx0acd1c4fcf94bdd3" -TARO_APP_BASE_API="http://172.10.10.93:8765" +TARO_APP_BASE_API="https://www.hnjinglian.cn:5678" diff --git a/collect_information/.env.production b/collect_information/.env.production index be6f45e..b582c8e 100644 --- a/collect_information/.env.production +++ b/collect_information/.env.production @@ -1 +1,2 @@ -# TARO_APP_ID="生产环境下的小程序appid" \ No newline at end of file +# TARO_APP_ID="wx0acd1c4fcf94bdd3" +TARO_APP_BASE_API="https://www.hnjinglian.cn:5678" diff --git a/collect_information/src/pages/police/mine/index.scss b/collect_information/src/pages/police/mine/index.scss index e69de29..22a7712 100644 --- a/collect_information/src/pages/police/mine/index.scss +++ b/collect_information/src/pages/police/mine/index.scss @@ -0,0 +1,71 @@ +.public { + height: 100vh; + background-color: #fff; +} +.public-container { + height: 320rpx; + display: flex; + align-items: center; + background-image: url('../../../assets/images/banner.png'); + background-repeat: no-repeat; + background-position: right; + overflow: hidden; + padding: 45rpx; + box-sizing: border-box; + .contacts { + height: 75rpx; + width: 75rpx; + border-radius: 50%; + border: solid 1px gray; + .image { + width: 100%; + height: 100%; + } + } + .tips-text { + display: flex; + font-size: 28rpx; + color: #fff; + line-height: 50rpx; + margin-left: 20rpx; + flex-direction: column; + justify-content: space-evenly; + } +} +.exit { + height: 100rpx; + line-height: 40px; + border-bottom: solid 0.5px #ebebf7; + box-sizing: border-box; + display: flex; + justify-content: space-between; + align-items: center; + color: #7d7d7d; + .exitItem { + display: flex; + align-items: center; + margin-left: 30rpx; + } + .exitItemIndex { + height: 40rpx; + width: 40rpx; + border-radius: 50%; + display: block; + line-height: 48rpx; + image { + width: 100%; + height: 100%; + } + } + .microscope { + width: 8px; + height: 8px; + display: inline-block; + border: solid 2px #ccc; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + border-bottom: white; + border-left: white; + } +} + diff --git a/collect_information/src/pages/police/mine/index.vue b/collect_information/src/pages/police/mine/index.vue index ce60812..c3cf9de 100644 --- a/collect_information/src/pages/police/mine/index.vue +++ b/collect_information/src/pages/police/mine/index.vue @@ -1,9 +1,56 @@ diff --git a/securityManagement/.env.development b/securityManagement/.env.development index 6ed8ec6..39570f5 100644 --- a/securityManagement/.env.development +++ b/securityManagement/.env.development @@ -8,8 +8,7 @@ VITE_APP_BASE_API=/api VITE_APP_PROXY_URL=http://172.10.10.93:8765 # rsa 公钥 -VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R0NWIOBciHCr7P7coDT8tNKfelgR7txcJOqHCO/MIWe7T04aHQTcpQxqx9hMca7dbqz8TZpz9jvLzE/6ZonVKxHsoFnNlHMp1/CPAJ9f6D9wYicum2KltJkmQ0g//D9W2zPCYoGOmSRFcZx/KEBa4EM53jQIDAQAB - +VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpu1C3JHZ+Ng/eVVCZtwKsOZv9RktpAL13pKy4FoRHyNv2t8TPV2AMzLzfEzlWx001nBxyVxEMR2N9jAcqFLHv7r16ciOzbtzB9dky2G+bc9jIs4/EdVK5bAZcPRh5Jrb78sC9PHyR4AeceDyCIKHLUbWBJB4NTZE0s1Wh5kMynQIDAQAB # minio VITE_APP_MINIO_URL=https://www.hnjinglian.cn:9000 VITE_APP_MINIO_BUCKET=police-security-dev diff --git a/securityManagement/.env.production b/securityManagement/.env.production index 99d9241..b9c3697 100644 --- a/securityManagement/.env.production +++ b/securityManagement/.env.production @@ -6,3 +6,10 @@ VITE_DROP_CONSOLE=true # axios VITE_APP_BASE_API=/api VITE_APP_PROXY_URL=https://172.10.10.238:8765 + + +# rsa 公钥 +VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpu1C3JHZ+Ng/eVVCZtwKsOZv9RktpAL13pKy4FoRHyNv2t8TPV2AMzLzfEzlWx001nBxyVxEMR2N9jAcqFLHv7r16ciOzbtzB9dky2G+bc9jIs4/EdVK5bAZcPRh5Jrb78sC9PHyR4AeceDyCIKHLUbWBJB4NTZE0s1Wh5kMynQIDAQAB +# minio +VITE_APP_MINIO_URL=https://www.hnjinglian.cn:9000 +VITE_APP_MINIO_BUCKET=police-security \ No newline at end of file diff --git a/securityManagement/package.json b/securityManagement/package.json index d2da1d0..c9a6753 100644 --- a/securityManagement/package.json +++ b/securityManagement/package.json @@ -16,9 +16,10 @@ "lodash-es": "^4.17.21", "pinia": "^2.2.2", "pinia-plugin-persistedstate": "^3.2.0", - "vue-component-type-helpers": "^2.1.2", "sass": "^1.77.8", + "terser": "^5.36.0", "vue": "^3.4.37", + "vue-component-type-helpers": "^2.1.2", "vue-router": "4", "vue-uuid": "^3.0.0" }, diff --git a/securityManagement/src/router/index.ts b/securityManagement/src/router/index.ts index 106f0ed..85aacfc 100644 --- a/securityManagement/src/router/index.ts +++ b/securityManagement/src/router/index.ts @@ -10,7 +10,7 @@ import {ROUTER_WHITE_LIST} from "@/config"; * createWebHashHistory: 路径带#号 这部分 URL 从未被发送到服务器,所以它不需要在服务器层面上进行任何特殊处理,影响SEO */ const router = createRouter({ - history: createWebHistory(), + history: createWebHistory('/securityManagement/'), routes: [...staticRouter], strict: false, scrollBehavior: () => ({left: 0, top: 0}) diff --git a/securityManagement/vite.config.ts b/securityManagement/vite.config.ts index 495f184..c23ff1e 100644 --- a/securityManagement/vite.config.ts +++ b/securityManagement/vite.config.ts @@ -14,7 +14,7 @@ export default defineConfig(({mode}) => { define: { __APP_ENV: JSON.stringify(env) }, - base: '/', + base: '/securityManagement/', plugins: [ vue(), vueJsx(), @@ -43,7 +43,7 @@ export default defineConfig(({mode}) => { } }, build: { - outDir: 'dist', + outDir: 'securityManagement', target: 'modules', chunkSizeWarningLimit: 1500, minify: 'terser',