diff --git a/.env.production b/.env.production index 6c7bdb0..b6bf52a 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,6 @@ VUE_APP_TITLE = 人口数据管理系统 ENV = 'production' # 人口数据管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API_HTML = "http://122.193.93.182:19002" +VUE_APP_BASE_API = 'http://122.193.93.182:19002' + diff --git a/src/components/mars-map/index.vue b/src/components/mars-map/index.vue index c762b6f..5028075 100644 --- a/src/components/mars-map/index.vue +++ b/src/components/mars-map/index.vue @@ -9,12 +9,14 @@ import MarsMap from "@/components/mars-work/mars-map.vue"; export default { + // http://39.101.188.84:9999/demo/tc-community/lib/geoJson/xiaoqu.json data() { const basePathUrl = window.basePathUrl || ""; return { configUrl: basePathUrl + "lib/config/config.json", tiles3dLayer: null, map: null, + baseUrl: basePathUrl + "lib/geoJson", }; }, props: { @@ -32,6 +34,14 @@ export default { methods: { onMapload(map) { this.map = map; + // const OfflineCache = CesiumNetworkPlug.OfflineCacheController; + // console.log(this.baseUrl, "sssss"); + + // // ① 全局缓存 + // // OfflineCache.ruleList.add("*") + // // ② 对指定地址的 瓦片图层 缓存 + // OfflineCache.ruleList.add("https://services.arcgisonline.com/"); + this.$emit("mapLoad", map); }, }, diff --git a/src/router/index.js b/src/router/index.js index 512ead1..9bc7ce8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -183,7 +183,7 @@ Router.prototype.replace = function push(location) { }; export default new Router({ - mode: "history", // 去掉url中的# + // mode: "history", // 去掉url中的# scrollBehavior: () => ({ y: 0 }), routes: constantRoutes, }); diff --git a/src/store/getters.js b/src/store/getters.js index 17776a7..8a60c71 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -26,5 +26,6 @@ const getters = { pie: (state) => state.taicang.pie, queryParamsIndex: (state) => state.taicang.queryParams, queryParamsXiaoqu: (state) => state.xiaoqu.queryParmas, + mapParmas: (state) => state.xiaoqu.mapParmas, }; export default getters; diff --git a/src/store/modules/xiaoqu.js b/src/store/modules/xiaoqu.js index f2bc3a8..212b732 100644 --- a/src/store/modules/xiaoqu.js +++ b/src/store/modules/xiaoqu.js @@ -2,6 +2,10 @@ const xiaoqu = { state: { //页面接口参数 queryParmas: {}, + mapParmas: { + sd: false, + networkName: undefined, + }, }, mutations: { //参数变化 @@ -10,6 +14,11 @@ const xiaoqu = { state.queryParmas[key] = query[key]; } }, + CHANGE_QUERY_MAP: (state, query) => { + for (let key in query) { + state.mapParmas[key] = query[key]; + } + }, //重置参数 RESET_QUERY: (state, query) => { state.queryParmas = { diff --git a/src/views/components/index.js b/src/views/components/index.js index a834ef6..f7f0e64 100644 --- a/src/views/components/index.js +++ b/src/views/components/index.js @@ -8,3 +8,5 @@ export { default as IndexModelRight } from "./IndexModel/right.vue"; export { default as xiaoquInfo } from "./xiaoqu/leftData/xiaoquInfo"; export { default as networkInfo } from "./xiaoqu/leftData/networkInfo"; export { default as buildingStatistics } from "./xiaoqu/leftData/buildingStatistics"; + +export { default as mapSearchBox } from "./xiaoqu/mapSearchBox.vue"; diff --git a/src/views/components/xiaoqu/map/index.vue b/src/views/components/xiaoqu/map/index.vue index a2e42b5..2f51ba7 100644 --- a/src/views/components/xiaoqu/map/index.vue +++ b/src/views/components/xiaoqu/map/index.vue @@ -6,6 +6,7 @@ + + diff --git a/src/views/xiaoqu.vue b/src/views/xiaoqu.vue index 4a5d2d4..6430991 100644 --- a/src/views/xiaoqu.vue +++ b/src/views/xiaoqu.vue @@ -4,7 +4,11 @@ :mainTitle="xiaoquIntroduce.deptName + '人口数据管理系统'" :showStreet="false" > + + + +