diff --git a/src/components/GeoComponent/index.vue b/src/components/GeoComponent/index.vue index 5edeb926..f2395ca3 100644 --- a/src/components/GeoComponent/index.vue +++ b/src/components/GeoComponent/index.vue @@ -37,11 +37,17 @@ import { initAMapApiLoader } from '@vuemap/vue-amap'; import '@vuemap/vue-amap/dist/style.css'; import { EnvironmentOutlined } from '@ant-design/icons-vue'; +import { useSystem } from '@/store/system'; +import { storeToRefs } from 'pinia' + +const system = useSystem(); +const {configInfo} = storeToRefs(system); +console.log("configInfo",configInfo) initAMapApiLoader({ // key: '95fa72137f4263f8e64ae01f766ad09c', - key: 'a0415acfc35af15f10221bfa5a6850b4', - securityJsCode: 'cae6108ec3dd222f946d1a7237c78be0', + key: configInfo.value.amap.apiKey || '3bef1ec2347fff12a6b7da11af70d194', + securityJsCode: configInfo.value.amap.secretKey || '259f338768822197a09e3e4959e82cce', }); interface EmitProps { diff --git a/src/style.less b/src/style.less index bfd73195..45ea5ca7 100644 --- a/src/style.less +++ b/src/style.less @@ -38,7 +38,7 @@ body { } .dark { - background-color: #3F4960 !important; + background-color: #001529 !important; h1,& .right-content, & .anticon-bell { color: #fff !important; @@ -49,7 +49,7 @@ body { } .ant-menu { - background-color: #3F4960 !important; + background-color: #001529 !important; .ant-menu-item-selected,& .ant-menu-item-active { transition: background 0.3s cubic-bezier(0.645, 0.045, 0.355, 1) !important; @@ -85,10 +85,10 @@ body { } .ant-layout-sider-dark { - background: #fff !important; + background: #001529 !important; .ant-menu-dark { - background: #fff !important; + background:#001529 !important; span { color: @DarkMenuItemColor; diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue index c3183fe9..5c99dac3 100644 --- a/src/views/system/Basis/index.vue +++ b/src/views/system/Basis/index.vue @@ -392,7 +392,7 @@ const system = useSystem(); const form = reactive({ formValue: { title: '', - headerTheme: 'light', + headerTheme: 'dark', showRecordNumber: true, recordNumber: '', apiKey: '', diff --git a/vite.config.ts b/vite.config.ts index dbfacb33..ce26acd6 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -91,21 +91,21 @@ export default defineConfig(({ mode}) => { ], server: { host:'0.0.0.0', - + port: 8990, proxy: { [env.VITE_APP_BASE_API]: { // target: 'http://192.168.32.226:8844', // target: 'http://192.168.32.244:8881', // target: 'http://192.168.32.217:8844', //张本地 // target: 'http://120.77.179.54:8844', // 120测试 - target: 'http://192.168.33.46:8844', // 本地开发环境 + // target: 'http://192.168.33.46:8844', // 本地开发环境 // target: 'http://192.168.33.99:8844', // 本地开发环境1 - // target: 'http://192.168.33.6:38848', // 社区版开发环境 - // target: 'http://192.168.32.207:8844', // 刘本地 - // target: 'http://192.168.32.187:8844', // 谭本地 + // target: 'http://192.168.33.6:31320', // 社区版开发环境 + // target: 'https://demo.jetlinks.cn', // 刘本地 + target: 'http://192.168.1.17:8848', // 谭本地 // target: 'http://192.168.33.66:8844', // 苟本地 - // target: 'http://192.168.32.137:8844', // 王本地 - ws: 'ws://192.168.33.46:8844', + // target: 'http://192.168.32.189:8844', // 王本地 + ws: 'ws://192.168.1.17:8844', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }