From 19b73a554f3babcd7bd4fbbc0c3e7cf2e21c5a9f Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Wed, 31 Jul 2024 10:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=B1=87=E8=81=9A=E3=80=81?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes/index.ts | 9 + .../MapList/ShowInfoModal/index.vue | 3 +- .../demo/tiankongdi/mapaggregation/index.vue | 4 +- src/views/sys/exception/Converge.vue | 217 +++++++++ src/views/sys/exception/Converge/config.ts | 63 +++ src/views/sys/exception/Converge/index.vue | 450 ++++++++++++++++++ src/views/sys/exception/Exception.vue | 4 +- .../sys/exception/LargeScreenMap/index.vue | 17 +- ....timestamp-1722387150017-c3991c9d1cc1f.mjs | 66 +++ 9 files changed, 815 insertions(+), 18 deletions(-) create mode 100644 src/views/sys/exception/Converge.vue create mode 100644 src/views/sys/exception/Converge/config.ts create mode 100644 src/views/sys/exception/Converge/index.vue create mode 100644 vite.config.ts.timestamp-1722387150017-c3991c9d1cc1f.mjs diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index cfca4418..cc088241 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -90,6 +90,14 @@ export const SubjectRoute: AppRouteRecordRaw = { title: '主题', }, }; +export const LargeScreenRoute: AppRouteRecordRaw = { + path: '/largeScreen', + name: 'largeScreen', + component: () => import('@/views/sys/exception/Exception.vue'), + meta: { + title: '大屏', + }, +}; export const FORMCALLPAGE_ROUTE: AppRouteRecordRaw = { path: '/formCallPageParent', component: LAYOUT, @@ -126,4 +134,5 @@ export const basicRoutes = [ SchemeRoute, SubjectRoute, FORMCALLPAGE_ROUTE, + LargeScreenRoute, ]; diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue index 3af16178..103046e7 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue @@ -54,7 +54,7 @@ {{ jieshou_people }} - {{ jieshou_time.split('.')[0] }} + {{ jieshou_time?.split('.')[0] }} @@ -261,7 +261,6 @@ const mapConfig = ref({}); getConfig({ code: 'mapsetting' }).then((res) => { mapConfig.value = JSON.parse(res.codeValue); - console.log('resresres', mapConfig.value); }); const props = defineProps(['showInfoData']); diff --git a/src/views/demo/tiankongdi/mapaggregation/index.vue b/src/views/demo/tiankongdi/mapaggregation/index.vue index 5ea45646..0270fbab 100644 --- a/src/views/demo/tiankongdi/mapaggregation/index.vue +++ b/src/views/demo/tiankongdi/mapaggregation/index.vue @@ -1,6 +1,6 @@ diff --git a/src/views/sys/exception/Converge.vue b/src/views/sys/exception/Converge.vue new file mode 100644 index 00000000..46723c04 --- /dev/null +++ b/src/views/sys/exception/Converge.vue @@ -0,0 +1,217 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/sys/exception/Converge/config.ts b/src/views/sys/exception/Converge/config.ts new file mode 100644 index 00000000..7d006c87 --- /dev/null +++ b/src/views/sys/exception/Converge/config.ts @@ -0,0 +1,63 @@ +export const MAPBOX_TOKEN = "pk.eyJ1Ijoic2hpY2hhbzEyMyIsImEiOiJja3FobnI1aDEwNGF6Mm9vOXVhNnBzZmFhIn0.2fZKiMqCQHxVY74QShMEGQ"; + +export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9"; + +export const MAP_VIEWER = { + "兰山区":{ + center:{lng: 118.35182370979693, lat: 35.183090621691385}, + zoom:10.048587811931847 + }, + "河东区":{ + center:{lng: 118.59697279346507, lat: 35.18490235060048}, + zoom:10, + }, + "罗庄区":{ + center:{lng: 118.32214269732968, lat: 34.88793861991461}, + zoom:10.348587811931848, + }, + "高新区":{ + center:{lng: 118.22321338283429, lat: 35.02848900013085}, + zoom:11.197175623863698, + }, + "沂河新区":{ + center:{lng: 118.56406202558459, lat: 35.02402208121399}, + zoom:9.848587811931848, + }, + "费县":{ + center:{lng: 118.07423584053117, lat: 35.25200708547465}, + zoom:9.700000000000005, + }, + "平邑县":{ + center:{lng: 117.7943998613617, lat: 35.397797381650626}, + zoom:9.5, + }, + "蒙阴县":{ + center:{lng: 118.16071230795704, lat: 35.706258658571166}, + zoom:9.500000000000002, + }, + "沂水县":{ + center:{lng: 118.7262955596875, lat: 35.875369642007094}, + zoom:9.500000000000002, + }, + "沂南县":{ + center:{lng: 118.45908849919756, lat: 35.49273684421736}, + zoom:9.748587811931854, + }, + "兰陵县":{ + center:{lng: 118.10841982910361, lat: 34.81986176408728}, + zoom:9.597175623863698, + }, + "郯城县":{ + center:{lng: 118.32120708234048, lat: 34.635986538650336}, + zoom:9.7, + }, + "临沭县":{ + center:{lng: 118.74187031029359, lat: 34.850952753798644}, + zoom:9.848587811931848, + }, + "莒南县":{ + center:{lng: 118.96807389575793, lat: 35.186365164136504}, + zoom:9.848587811931848, + } +} + diff --git a/src/views/sys/exception/Converge/index.vue b/src/views/sys/exception/Converge/index.vue new file mode 100644 index 00000000..6a93f97d --- /dev/null +++ b/src/views/sys/exception/Converge/index.vue @@ -0,0 +1,450 @@ + + + diff --git a/src/views/sys/exception/Exception.vue b/src/views/sys/exception/Exception.vue index b1ebcd70..d9f9dbc2 100644 --- a/src/views/sys/exception/Exception.vue +++ b/src/views/sys/exception/Exception.vue @@ -1,6 +1,6 @@