From 19725c3f47412a6003bc98f4c7168a737a55319b Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期四, 18 四月 2024 15:57:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/wxdDemo

---
 src/components/viewer.vue |  120 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/src/components/viewer.vue b/src/components/viewer.vue
index ea09e92..0fe964f 100644
--- a/src/components/viewer.vue
+++ b/src/components/viewer.vue
@@ -18,21 +18,21 @@
   light,
 } from "@/utils/work";
 import bus from "@/utils/bus";
-import { getVectorList,getRadio } from "@/api/http";
+import { getVectorList, getRadio } from "@/api/http";
 export default {
   name: "App",
-  data () {
+  data() {
     return {};
   },
   methods: {
-    init () {
-      const that=this;
-      window.currentsubindex=1;
-      let _core=new SmartEarth.Core();
-      window.tedp=new this.$trame({
+    init() {
+      const that = this;
+      window.currentsubindex = 1;
+      let _core = new SmartEarth.Core();
+      window.tedp = new this.$trame({
         elem: "app1",
         width: 4992,
-        prop: [0,0],
+        prop: [0, 0],
         height: 2560,
         navtop: 300,
         gisType: "hf",
@@ -56,13 +56,13 @@
         },
         gisInit: (webgis) => {
           //杩斿洖鍦板浘瀵硅薄
-          window.Sgworld=webgis;
-          window.sgworld=webgis;
-          window.Viewer=webgis.Viewer;
-          window.viewer=webgis.Viewer;
-          window.Cesium=Cesium;
+          window.Sgworld = webgis;
+          window.sgworld = webgis;
+          window.Viewer = webgis.Viewer;
+          window.viewer = webgis.Viewer;
+          window.Cesium = Cesium;
 
-          window.layers=window.sgworld.Viewer.scene.imageryLayers;
+          window.layers = window.sgworld.Viewer.scene.imageryLayers;
           // const blackMarble = layers.addImageryProvider(
           //   new Cesium.IonImageryProvider({ assetId: 3812 })
           // );
@@ -70,7 +70,7 @@
           // blackMarble.alpha = 0.0;
           // blackMarble.brightness = 2.0;
           // 鍦扮悆棰滆壊
-          Viewer.scene.globe.baseColor=
+          Viewer.scene.globe.baseColor =
             Cesium.Color.fromCssColorString("#272d39");
           // //椋炲悜骞垮窞
           // window.Viewer.camera.flyTo({
@@ -97,44 +97,44 @@
               roll: 0,
             },
           });
-          let urldian1=
+          let urldian1 =
             "http://183.162.245.49:8099/geoserver/SHwuxiandian/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=SHwuxiandian:1GZ_POI&maxFeatures=50&outputFormat=application%2Fjson";
-          let urldian=
+          let urldian =
             "http://183.162.245.49:8099/geoserver/SHP/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=SHP:SH_POI1&maxFeatures=50&outputFormat=application%2Fjson";
           try {
-            loaddian(urldian1,"[TE_DESC]","[height]");
-            loaddian(urldian,"[name]","[Height]");
+            loaddian(urldian1, "[TE_DESC]", "[height]");
+            loaddian(urldian, "[name]", "[Height]");
             loadBaimo(1);
             loadLW();
             addRightMouseEvent();
             SPPM();
             loadYH();
-            juhe(true,"鐩戞祴绔�");
+            juhe(true, "鐩戞祴绔�");
             addMpt(true);
-          } catch(error) { }
+          } catch (error) {}
           //寮�鍚棩鐓�
-          viewer.scene.globe.enableLighting=false;
-          viewer.shadows=false;
+          viewer.scene.globe.enableLighting = false;
+          viewer.shadows = false;
           addMouseEvent();
           light();
           getVectorList().then((res) => {
-            if(res.message==="Success") {
-              let region=res.rows;
+            if (res.message === "Success") {
+              let region = res.rows;
               region.forEach((item) => {
-                let arr=[];
+                let arr = [];
                 JSON.parse(item.vlatlngs).forEach((item2) => {
-                  arr.push([item2[1],item2[0]]);
+                  arr.push([item2[1], item2[0]]);
                 });
-                item.vlatlngs=JSON.stringify(arr);
+                item.vlatlngs = JSON.stringify(arr);
               });
-              bus.$emit("areaData",region);
+              bus.$emit("areaData", region);
             }
           });
           //鑾峰彇鏃犵嚎鐢垫暟鎹�
           getRadio().then((res) => {
-            if(res.message==="Success") {
-              let radio=res.rows;
-              bus.$emit("radioData",radio);
+            if (res.message === "Success") {
+              let radio = res.rows;
+              bus.$emit("radioData", radio);
               console.log(radio);
             }
           });
@@ -147,30 +147,30 @@
           // window.Viewer.scene.primitives.add(baimo);
           //鍘垮煙杈圭晫,缃戞牸
         },
-        subClick (index) {
+        subClick(index) {
           let showindex;
-          switch(index) {
+          switch (index) {
             case 0:
-              showindex=1;
+              showindex = 1;
               break;
             case 1:
-              showindex=2;
+              showindex = 2;
               break;
             case 2:
-              showindex=3;
+              showindex = 3;
               break;
             case 3:
-              showindex=4;
+              showindex = 4;
               break;
             case 4:
-              showindex=5;
+              showindex = 5;
               break;
             default:
               break;
           }
-          bus.$emit("showindex",showindex);
+          bus.$emit("showindex", showindex);
         },
-        prop: [970,970],
+        prop: [970, 970],
         nav: {
           navTop: () => import("@/components/top/navTop"),
         },
@@ -239,16 +239,46 @@
           freeAnalyse: () => import("@/components/props/freeAnalyse"), //绌洪棽璧勬簮灞曠ず
           moreTZ: () => import("@/components/props/moreTZ"), //绌洪棽璧勬簮灞曠ず
           // SurprisePlus
-          showMilitaryPlot: () => import("@/components/props/militaryPlot"),//鍐涗簨鏍囩粯
-          situationComparison: () => import("@/components/props/situationComparison"),//鎬佸娍瀵规瘮
-          occupancyAnalysis: () => import("@/components/props/occupancyAnalysis"), //棰戣氨鍗犵敤搴﹀垎鏋�
+          showMilitaryPlot: () => import("@/components/props/militaryPlot"), //鍐涗簨鏍囩粯
+          situationComparison: () =>
+            import("@/components/props/situationComparison"), //鎬佸娍瀵规瘮
+          occupancyAnalysis: () =>
+            import("@/components/props/occupancyAnalysis"), //棰戣氨鍗犵敤搴﹀垎鏋�
 
           densityAnalysis: () => import("@/components/props/densityAnalysis"), //鐢ㄩ瀵嗗害鍒嗘瀽
+
+          SC1: () => import("@/components/props/situationComparison6-1"),
+          SC2: () => import("@/components/props/situationComparison6-2"),
+          SC3: () => import("@/components/props/situationComparison6-3"),
+          SC4: () => import("@/components/props/situationComparison6-4"),
+          SC5: () => import("@/components/props/situationComparison6-5"),
+          SC6: () => import("@/components/props/situationComparison6-6"),
+          SC7: () => import("@/components/props/situationComparison6-7"),
+          SC8: () => import("@/components/props/situationComparison7-1"),
+          SC9: () => import("@/components/props/situationComparison7-2-1"),
+          SC10: () => import("@/components/props/situationComparison7-3-1"),
+          SC11: () => import("@/components/props/situationComparison7-4"),
+          SC12: () => import("@/components/props/situationComparison7-5"),
+          SC13: () => import("@/components/props/situationComparison7-6"),
+          SC14: () => import("@/components/props/situationComparison7-7"),
+          SC15: () => import("@/components/props/situationComparison7-8"),
+          SC16: () => import("@/components/props/situationComparison7-9"),
+          SC17: () => import("@/components/props/situationComparison8-1"),
+          SC18: () => import("@/components/props/situationComparison8-2"),
+          SC19: () => import("@/components/props/situationComparison8-3"),
+          SC20: () => import("@/components/props/situationComparison8-4"),
+          SC21: () => import("@/components/props/situationComparison9-1"),
+          SC22: () => import("@/components/props/situationComparison9-2"),
+          SC23: () => import("@/components/props/situationComparison9-3"),
+          SC24: () => import("@/components/props/situationComparison10-1"),
+          SC25: () => import("@/components/props/situationComparison10-2"),
+          SC26: () => import("@/components/props/situationComparison10-3"),
+          SC27: () => import("@/components/props/situationComparison10-4"),
         },
       });
     },
   },
-  mounted () {
+  mounted() {
     this.init();
   },
 };

--
Gitblit v1.9.3