diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/components/map/index.vue b/src/components/map/index.vue index a8eed12..76074fc 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -67,7 +67,6 @@ const flag = ref(true) // 切换图层 const changeLayerGrop = () => { - console.log(flag.value, '1222222222222') if (flag.value) { map.value?.addLayer(layer.value) } @@ -87,16 +86,16 @@ map.value = new offline.Map('map', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' @@ -116,8 +115,8 @@ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/components/map/index.vue b/src/components/map/index.vue index a8eed12..76074fc 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -67,7 +67,6 @@ const flag = ref(true) // 切换图层 const changeLayerGrop = () => { - console.log(flag.value, '1222222222222') if (flag.value) { map.value?.addLayer(layer.value) } @@ -87,16 +86,16 @@ map.value = new offline.Map('map', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' @@ -116,8 +115,8 @@ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/router/modules/carbonDecision.ts b/src/router/modules/carbonDecision.ts index d7341c9..905b3d8 100644 --- a/src/router/modules/carbonDecision.ts +++ b/src/router/modules/carbonDecision.ts @@ -1,11 +1,11 @@ // 碳足迹决策 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonDecision', - component: Layout, + // component: Layout, redirect: '/carbonDecision/decision', name: 'Ddecision', meta: { diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/components/map/index.vue b/src/components/map/index.vue index a8eed12..76074fc 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -67,7 +67,6 @@ const flag = ref(true) // 切换图层 const changeLayerGrop = () => { - console.log(flag.value, '1222222222222') if (flag.value) { map.value?.addLayer(layer.value) } @@ -87,16 +86,16 @@ map.value = new offline.Map('map', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' @@ -116,8 +115,8 @@ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/router/modules/carbonDecision.ts b/src/router/modules/carbonDecision.ts index d7341c9..905b3d8 100644 --- a/src/router/modules/carbonDecision.ts +++ b/src/router/modules/carbonDecision.ts @@ -1,11 +1,11 @@ // 碳足迹决策 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonDecision', - component: Layout, + // component: Layout, redirect: '/carbonDecision/decision', name: 'Ddecision', meta: { diff --git a/src/router/modules/carbonEvaluate.ts b/src/router/modules/carbonEvaluate.ts index 1838bfd..ad045cb 100644 --- a/src/router/modules/carbonEvaluate.ts +++ b/src/router/modules/carbonEvaluate.ts @@ -1,11 +1,11 @@ // 碳足迹评价 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonEvaluate', - component: Layout, + // component: Layout, redirect: '/carbonEvaluate/evaluate', name: 'Devaluate', meta: { diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/components/map/index.vue b/src/components/map/index.vue index a8eed12..76074fc 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -67,7 +67,6 @@ const flag = ref(true) // 切换图层 const changeLayerGrop = () => { - console.log(flag.value, '1222222222222') if (flag.value) { map.value?.addLayer(layer.value) } @@ -87,16 +86,16 @@ map.value = new offline.Map('map', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' @@ -116,8 +115,8 @@ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/router/modules/carbonDecision.ts b/src/router/modules/carbonDecision.ts index d7341c9..905b3d8 100644 --- a/src/router/modules/carbonDecision.ts +++ b/src/router/modules/carbonDecision.ts @@ -1,11 +1,11 @@ // 碳足迹决策 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonDecision', - component: Layout, + // component: Layout, redirect: '/carbonDecision/decision', name: 'Ddecision', meta: { diff --git a/src/router/modules/carbonEvaluate.ts b/src/router/modules/carbonEvaluate.ts index 1838bfd..ad045cb 100644 --- a/src/router/modules/carbonEvaluate.ts +++ b/src/router/modules/carbonEvaluate.ts @@ -1,11 +1,11 @@ // 碳足迹评价 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonEvaluate', - component: Layout, + // component: Layout, redirect: '/carbonEvaluate/evaluate', name: 'Devaluate', meta: { diff --git a/src/router/modules/carbonFootprint.ts b/src/router/modules/carbonFootprint.ts index d399ac7..19d0e06 100644 --- a/src/router/modules/carbonFootprint.ts +++ b/src/router/modules/carbonFootprint.ts @@ -1,11 +1,11 @@ // 碳足迹监测 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonFootprint', - component: Layout, + // component: Layout, redirect: '/carbonFootprint/footprint', name: 'Dfootprint', meta: { diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/components/map/index.vue b/src/components/map/index.vue index a8eed12..76074fc 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -67,7 +67,6 @@ const flag = ref(true) // 切换图层 const changeLayerGrop = () => { - console.log(flag.value, '1222222222222') if (flag.value) { map.value?.addLayer(layer.value) } @@ -87,16 +86,16 @@ map.value = new offline.Map('map', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' @@ -116,8 +115,8 @@ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/router/modules/carbonDecision.ts b/src/router/modules/carbonDecision.ts index d7341c9..905b3d8 100644 --- a/src/router/modules/carbonDecision.ts +++ b/src/router/modules/carbonDecision.ts @@ -1,11 +1,11 @@ // 碳足迹决策 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonDecision', - component: Layout, + // component: Layout, redirect: '/carbonDecision/decision', name: 'Ddecision', meta: { diff --git a/src/router/modules/carbonEvaluate.ts b/src/router/modules/carbonEvaluate.ts index 1838bfd..ad045cb 100644 --- a/src/router/modules/carbonEvaluate.ts +++ b/src/router/modules/carbonEvaluate.ts @@ -1,11 +1,11 @@ // 碳足迹评价 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonEvaluate', - component: Layout, + // component: Layout, redirect: '/carbonEvaluate/evaluate', name: 'Devaluate', meta: { diff --git a/src/router/modules/carbonFootprint.ts b/src/router/modules/carbonFootprint.ts index d399ac7..19d0e06 100644 --- a/src/router/modules/carbonFootprint.ts +++ b/src/router/modules/carbonFootprint.ts @@ -1,11 +1,11 @@ // 碳足迹监测 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonFootprint', - component: Layout, + // component: Layout, redirect: '/carbonFootprint/footprint', name: 'Dfootprint', meta: { diff --git a/src/router/modules/carbonWarning.ts b/src/router/modules/carbonWarning.ts index f89bea8..0cb9fae 100644 --- a/src/router/modules/carbonWarning.ts +++ b/src/router/modules/carbonWarning.ts @@ -1,11 +1,11 @@ // 碳足迹预警 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonWarning', - component: Layout, + // component: Layout, redirect: '/carbonWarning/warning', name: 'Dwarning', meta: { diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/components/map/index.vue b/src/components/map/index.vue index a8eed12..76074fc 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -67,7 +67,6 @@ const flag = ref(true) // 切换图层 const changeLayerGrop = () => { - console.log(flag.value, '1222222222222') if (flag.value) { map.value?.addLayer(layer.value) } @@ -87,16 +86,16 @@ map.value = new offline.Map('map', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' @@ -116,8 +115,8 @@ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/router/modules/carbonDecision.ts b/src/router/modules/carbonDecision.ts index d7341c9..905b3d8 100644 --- a/src/router/modules/carbonDecision.ts +++ b/src/router/modules/carbonDecision.ts @@ -1,11 +1,11 @@ // 碳足迹决策 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonDecision', - component: Layout, + // component: Layout, redirect: '/carbonDecision/decision', name: 'Ddecision', meta: { diff --git a/src/router/modules/carbonEvaluate.ts b/src/router/modules/carbonEvaluate.ts index 1838bfd..ad045cb 100644 --- a/src/router/modules/carbonEvaluate.ts +++ b/src/router/modules/carbonEvaluate.ts @@ -1,11 +1,11 @@ // 碳足迹评价 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonEvaluate', - component: Layout, + // component: Layout, redirect: '/carbonEvaluate/evaluate', name: 'Devaluate', meta: { diff --git a/src/router/modules/carbonFootprint.ts b/src/router/modules/carbonFootprint.ts index d399ac7..19d0e06 100644 --- a/src/router/modules/carbonFootprint.ts +++ b/src/router/modules/carbonFootprint.ts @@ -1,11 +1,11 @@ // 碳足迹监测 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonFootprint', - component: Layout, + // component: Layout, redirect: '/carbonFootprint/footprint', name: 'Dfootprint', meta: { diff --git a/src/router/modules/carbonWarning.ts b/src/router/modules/carbonWarning.ts index f89bea8..0cb9fae 100644 --- a/src/router/modules/carbonWarning.ts +++ b/src/router/modules/carbonWarning.ts @@ -1,11 +1,11 @@ // 碳足迹预警 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonWarning', - component: Layout, + // component: Layout, redirect: '/carbonWarning/warning', name: 'Dwarning', meta: { diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 418b411..9f395ae 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -12,7 +12,6 @@ }) const mapRef = ref() const change = () => { - console.log(mapRef.value.flag, '1111111') mapRef.value.changeLayerGrop() } // 当前展示 diff --git a/public/config/config.json b/public/config/config.json index e0b7d93..fdd3bd1 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,15 +9,15 @@ "DataVUrl":[ { "name": "碳足迹监测", - "url": "http://111.198.10.15:11418/jc/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹评价", - "url": "http://111.198.10.15:11418/pj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" }, { "name": "碳足迹预警", - "url": "http://111.198.10.15:11418/yj/" + "url": "https://share.shanhaibi.com/6705f423dc67f/" } ] } diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue index 88c880e..b27ede2 100644 --- a/src/components/SelectLocationMap/map/index.vue +++ b/src/components/SelectLocationMap/map/index.vue @@ -47,16 +47,16 @@ map.value = new offline.Map('map-location', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [10, 17], - dataZooms: [10, 17], + zooms: [10, 18], + dataZooms: [10, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/components/map/index.vue b/src/components/map/index.vue index a8eed12..76074fc 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -67,7 +67,6 @@ const flag = ref(true) // 切换图层 const changeLayerGrop = () => { - console.log(flag.value, '1222222222222') if (flag.value) { map.value?.addLayer(layer.value) } @@ -87,16 +86,16 @@ map.value = new offline.Map('map', { // 设置地图容器id resizeEnable: true, viewMode: '3D', // 是否为3D地图模式 - zoom: 17, // 初始化地图级别 + zoom: 18, // 初始化地图级别 center: [111.73142, 40.830627], // 初始化地图中心点位置 - zooms: [10, 17], + zooms: [10, 18], layers: [ new offline.TileLayer({ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' @@ -116,8 +115,8 @@ visible: true, zIndex: 0, opacity: 1, - zooms: [6, 17], - dataZooms: [6, 17], + zooms: [6, 18], + dataZooms: [6, 18], getTileUrl: (a: any, b: any, c: any) => { // 经纬度转换成本地瓦片所在路径 const flag = '00000000' diff --git a/src/router/modules/carbonDecision.ts b/src/router/modules/carbonDecision.ts index d7341c9..905b3d8 100644 --- a/src/router/modules/carbonDecision.ts +++ b/src/router/modules/carbonDecision.ts @@ -1,11 +1,11 @@ // 碳足迹决策 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonDecision', - component: Layout, + // component: Layout, redirect: '/carbonDecision/decision', name: 'Ddecision', meta: { diff --git a/src/router/modules/carbonEvaluate.ts b/src/router/modules/carbonEvaluate.ts index 1838bfd..ad045cb 100644 --- a/src/router/modules/carbonEvaluate.ts +++ b/src/router/modules/carbonEvaluate.ts @@ -1,11 +1,11 @@ // 碳足迹评价 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonEvaluate', - component: Layout, + // component: Layout, redirect: '/carbonEvaluate/evaluate', name: 'Devaluate', meta: { diff --git a/src/router/modules/carbonFootprint.ts b/src/router/modules/carbonFootprint.ts index d399ac7..19d0e06 100644 --- a/src/router/modules/carbonFootprint.ts +++ b/src/router/modules/carbonFootprint.ts @@ -1,11 +1,11 @@ // 碳足迹监测 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonFootprint', - component: Layout, + // component: Layout, redirect: '/carbonFootprint/footprint', name: 'Dfootprint', meta: { diff --git a/src/router/modules/carbonWarning.ts b/src/router/modules/carbonWarning.ts index f89bea8..0cb9fae 100644 --- a/src/router/modules/carbonWarning.ts +++ b/src/router/modules/carbonWarning.ts @@ -1,11 +1,11 @@ // 碳足迹预警 import type { Route } from '@/global' -const Layout = () => import('@/layouts/index.vue') +// const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { path: '/carbonWarning', - component: Layout, + // component: Layout, redirect: '/carbonWarning/warning', name: 'Dwarning', meta: { diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 418b411..9f395ae 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -12,7 +12,6 @@ }) const mapRef = ref() const change = () => { - console.log(mapRef.value.flag, '1111111') mapRef.value.changeLayerGrop() } // 当前展示 diff --git a/src/views/evaluate/page.vue b/src/views/evaluate/page.vue index 6b78d43..10434a4 100644 --- a/src/views/evaluate/page.vue +++ b/src/views/evaluate/page.vue @@ -7,6 +7,11 @@ }, }) const { proxy } = getCurrentInstance() as any +const width = document.body.clientWidth +const height = ref(document.body.clientHeight) +window.addEventListener('resize', () => { + height.value = document.body.clientHeight +}) const user = useUserStore() const $router = useRouter() const newPage = ref(proxy.config.DataVUrl) @@ -14,10 +19,110 @@ return newPage.value.filter(item => item.name === props.name)[0] } current() +const src = ref('') +const timer = ref() +const count = ref(0) onMounted(() => { - window.open(`${current().url}?token=${user.token}`, '_blank') - $router.go(-1) - console.log(current().url) + src.value = `${current().url}?token=${user.token}` + const shanhaiFrame = document.getElementById('shanhai-frame') as HTMLIFrameElement + shanhaiFrame.addEventListener('load', (e) => { + console.log('页面挂载完毕') + const json = { + trigger: 'click', + conditions: {}, + boardId: '', + widgetId: '', + } + // 页面 进度条加载完成 + timer.value = setInterval(() => { + count.value += 1 + if (count.value >= 10) { + clearInterval(timer.value) + } + if (props.name.includes('评价')) { + console.log(props.name) + } + else if (props.name.includes('预警')) { + json.boardId = 'd76dd9e6-e001-4caf-89fa-191038f3ca68' + json.widgetId = 'd4a2b18d-de8b-4fab-8118-787ff9342be1' + setTimeout(() => { + shanhaiFrame.contentWindow.postMessage(Object.assign(json, { type: 'triggerInteract' }), '*') + }) + } + else if (props.name.includes('监测')) { + json.boardId = 'd76dd9e6-e001-4caf-89fa-191038f3ca68' + json.widgetId = 'e352ab64-d595-45b0-868d-ce0b42754469' + setTimeout(() => { + shanhaiFrame.contentWindow.postMessage(Object.assign(json, { type: 'triggerInteract' }), '*') + }) + } + }, 1500) + + // 预警 {"optionKey":"text","value":"跳转预警","boardId":"d76dd9e6-e001-4caf-89fa-191038f3ca68","widgetId":"d4a2b18d-de8b-4fab-8118-787ff9342be1"} + // 监测 {"optionKey":"linkage-out","value":false,"boardId":"d76dd9e6-e001-4caf-89fa-191038f3ca68","widgetId":"e352ab64-d595-45b0-868d-ce0b42754469"} + // let json = { trigger: 'click', conditions: {}, boardId: 'd76dd9e6-e001-4caf-89fa-191038f3ca68', widgetId: 'd4a2b18d-de8b-4fab-8118-787ff9342be1' } + // json = Object.assign(json, { type: 'triggerInteract' }) + // shanhaiFrame.contentWindow.postMessage(json, '*') + }) }) +onUnmounted(() => { + clearInterval(timer.value) + timer.value = null +}) +const close = () => { + clearInterval(timer.value) + timer.value = null + $router.go(-1) +} +