Merge branch 'jzl'

danger-manage-web/src/utils/cesium/cesiumClass.js

 /*
  * @Author: your name
  * @Date: 2021-12-07 14:19:18
- * @LastEditTime: 2022-10-11 11:46:52
+ * @LastEditTime: 2022-10-12 09:15:48
  * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /cesium-vue/src/utils/seieumClass.js
@@ -1100,6 +1100,7 @@ export default class CreateCesium {
         // material: Cesium.Color.RED.withAlpha(0.5),
         material: dangerColor[item.colorNum],
         classificationType: Cesium.ClassificationType.BOTH,
+        // classificationType: Cesium.ClassificationType.CESIUM_3D_TILE,
       },
     });
     polygon.danger = true;

danger-manage-web/src/views/dangerScale/profile/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-06-16 15:03:40
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-10-10 10:17:30
+ * @LastEditTime: 2022-10-12 09:20:17
  * @FilePath: /danger-manage-web/src/views/bigwindow/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -25,12 +25,16 @@
 
 <script>
 import CreateCesium, { DEVICE_PIC_TYPE } from "@/utils/cesium/cesiumClass.js";
+import { dangerArr } from "@/utils/cesium/dangerArr.js";
+
 import Video from "@/components/bigWindow/video";
 import Null from "@/components/bigWindow/Null";
 import Danger from "@/components/bigWindow/Danger";
 import weixiandian from "@/components/bigWindow/weixiandian";
 import ydqt from "@/components/bigWindow/ydqt";
 import danger from "@/assets/images/danger.png";
+import Danger2 from "@/components/bigWindow/Danger2";
+
 import Editor from "@/components/Editor";
 
 //  危险风险分布图
@@ -204,9 +208,19 @@ export default {
       ["../3dtiles/jsondata/tileset.json"],
       this
     );
-    this.danger.forEach((item) => {
-      this.Cesium.addDanger(item, Danger);
-    });
+    // this.danger.forEach((item) => {
+    //   this.Cesium.addDanger(item, Danger);
+    // });
+    dangerArr
+      .map((item) => {
+        return {
+          lnglatArr: item.path,
+          ...item,
+        };
+      })
+      .forEach((item) => {
+        this.Cesium.addDanger(item, Danger2);
+      });
     // this.data1.forEach((item) => {
     //   this.Cesium.addDevice(item, "pic", Video);
     // });

danger-manage-web/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-03 10:51:24
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-10-11 17:40:35
+ * @LastEditTime: 2022-10-12 09:22:21
  * @FilePath: /danger-manage-web/src/views/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -415,10 +415,10 @@ export default {
         .forEach((item) => {
           this.Cesium.addDanger(item, Danger2);
         });
-      this.data11.forEach((item) => {
-        item.config = { scale: 1, textHeight: -32 };
-        this.Cesium.addDevice(item, "pic", Video);
-      });
+      // this.data11.forEach((item) => {
+      //   item.config = { scale: 1, textHeight: -32 };
+      //   this.Cesium.addDevice(item, "pic", Video);
+      // });
       // this.data12.forEach((item) => {
       //   item.config = { scale: 1, textHeight: -94 };
       //   this.Cesium.addDevice(item, "pic", tcq);