Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

index.html

@@ -10,15 +10,13 @@
     />
     <title><%= VITE_GLOB_APP_TITLE %></title>
     <link rel="icon" href="/favicon.ico" />
+
     <link rel="stylesheet" href="/hc/hc.css">
 
-    <link href="/mapboxgl/mapbox-gl.css" rel="stylesheet">
+    <!-- <link href="/mapboxgl/mapbox-gl.css" rel="stylesheet">
-    <script src="/mapboxgl/mapbox-gl.js"></script>
+    <script src="/mapboxgl/mapbox-gl-2.15.0.min.js"></script> -->
 
-    <!-- <link href="https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.css" rel="stylesheet">
+    <script src="/turf/turf-7.0.0.min.js"></script>
-    <script src="https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.js"></script> -->
-
-    <script src="/public/turf/turf-7.0.0.min.js"></script>
 
     <!-- <script src="https://cdn.jsdelivr.net/npm/@turf/turf@7.0.0/turf.min.js"></script> -->
 
@@ -33,7 +31,6 @@
     <script src="/monitor/jsencrypt.min.js"></script>
     <script src="/monitor/jsWebControl-1.0.0.min.js"></script>
 
- 
       <!-- easy plaer -->
 
       <script src="./EasyPlayer-element.min.js"></script>

public/bigScreen/js/middleMap.js

@@ -80,7 +80,7 @@ worldMapContainer1.style.width = "970px";
 worldMapContainer1.style.position = "relative";
 worldMapContainer1.style.left = "30px";
 
-mapboxgl.accessToken = 'pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q';
+mapboxgl.accessToken = 'pk.eyJ1IjoibGllYmFvIiwiYSI6ImNsMXg1OHdtcTE3eDEza3FmODBmeXhldmIifQ.CYYMuikQnGHMtTNq60B_xA';
 let map = new mapboxgl.Map({
     container: 'distribution_map',
     style: {

src/components/Map/src/components/Location.vue

@@ -54,7 +54,7 @@
   let map: Map;
 
   onMounted(() => {
-    mapboxgl.accessToken = "pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q"
+    mapboxgl.accessToken = "pk.eyJ1IjoiaHVhbmdsaWkiLCJhIjoiY2wwM2E4a2drMDVrZjNrcGRucHIxOHo0cyJ9.0ecG5KGQE6R-SmhxvLvhHg"
     map = initMap();
     map.on('load', function () {
       refreshLocation();

src/components/MapboxMaps/MapComponent.vue

@@ -920,6 +920,7 @@
 
   function mapmouseover(e) {}
   onMounted(() => {
+
     // let mapDiv =  window.document.getElementById(mapContainerName.value);
     // mapDiv?.onmouseover = function(e){
     //   alert(e);

src/components/MapboxMaps/src/config.ts

@@ -1,5 +1,5 @@
 export enum MapboxConfig {
-  ACCESS_TOKEN = 'pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q',
+  ACCESS_TOKEN = 'pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw',
   // ACCESS_TOKEN = "1234",
   TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
   // add more config options here

src/views/demo/audit/util.ts

@@ -22,7 +22,7 @@ export const SubjectKeyObj = {
   '耕地非粮化': 'Subject_GDFLH', //耕地非粮化
   '重点问题Ⅰ类': 'Subject_ZDWT1', //重点问题Ⅰ类
   '重点问题Ⅱ类': 'Subject_ZDWT2', //重点问题Ⅱ类
-  '生态保护红线监管': 'Subject_STHX',  //生态保护红线监管
+  '生态保护红线监管': 'Subject_STBHHXJG',  //生态保护红线监管
   '生态修复': 'Subject_STXF',  //生态修复
 }
 export const codeObj = {

src/views/demo/system/geoservermanagement/clound/clound.data.ts

@@ -158,7 +158,7 @@ export const servicesColumns: BasicColumn[] = [
     },
 ];
 
-export const MAPBOX_TOKEN = "pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q";
+export const MAPBOX_TOKEN = "pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw";
 
 export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
 

src/views/sys/exception/Converge/config.ts

@@ -1,4 +1,4 @@
-export const MAPBOX_TOKEN = "pk.eyJ1IjoibGllYmFvIiwiYSI6ImNsMXg1OHdtcTE3eDEza3FmODBmeXhldmIifQ.CYYMuikQnGHMtTNq60B_xA";
+export const MAPBOX_TOKEN = "pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw";
 
 export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
 

src/views/sys/exception/Converge/src/config.ts

@@ -1,5 +1,5 @@
 export enum MapboxConfig {
-  ACCESS_TOKEN = 'pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q',
+  ACCESS_TOKEN = 'pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw',
   // ACCESS_TOKEN = "1234",
   TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
   // add more config options here

src/views/sys/exception/LargeScreenMap/config.ts

@@ -1,4 +1,4 @@
-export const MAPBOX_TOKEN = "pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q";
+export const MAPBOX_TOKEN = "pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw";
 
 export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
 

src/views/sys/exception/VideoSupervision/map/config.ts

@@ -1,4 +1,4 @@
-export const MAPBOX_TOKEN = "pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q";
+export const MAPBOX_TOKEN = "pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw";
 
 export const TINADITU_TOKEN = "b6585bc41ee16251dbe6b1af64f375d9";
 

src/views/sys/exception/VideoSupervision/map/src/config.ts

@@ -1,5 +1,5 @@
 export enum MapboxConfig {
-  ACCESS_TOKEN = 'pk.eyJ1IjoiemhhbmcxMjM4ODk5OSIsImEiOiJja3N5Ync1cXcyMTR2Mm9xempmbGE4MnBtIn0.R-j78CRvbs6JZG-MDSoh8Q',
+  ACCESS_TOKEN = 'pk.eyJ1IjoiY3VybXVkZ2VvbnBoZCIsImEiOiJjbHAxZXU2dmwwajV6MmxwZzRpdXhobjB2In0.uIuuAtk1EtV7HSbjpUfeOw',
   // ACCESS_TOKEN = "1234",
   TDT_TOKEN = 'b6585bc41ee16251dbe6b1af64f375d9',
   // add more config options here