Prechádzať zdrojové kódy

Merge branch 'master' of http://124.70.43.205:3000/sunzehao/cesium_three

Koishi 3 mesiacov pred
rodič
commit
ab1e8305f1

+ 2 - 2
index.html

@@ -8,8 +8,8 @@
     <title>“天镜” 数字孪生可视化引擎</title>
 
     <!-- 完整版 -->
-<script src="https://cdn.jsdelivr.net/npm/cesium@1.132/Build/Cesium/Cesium.js"></script>
-<link href="https://cdn.jsdelivr.net/npm/cesium@1.132/Build/Cesium/Widgets/widgets.css" rel="stylesheet">
+<!-- <script src="https://cdn.jsdelivr.net/npm/cesium@1.132/Build/Cesium/Cesium.js"></script>
+<link href="https://cdn.jsdelivr.net/npm/cesium@1.132/Build/Cesium/Widgets/widgets.css" rel="stylesheet"> -->
   </head>
   <body>
     <div id="app"></div>

+ 1 - 1
src/components/comModelDialog.vue

@@ -13,7 +13,7 @@
     >
       <el-tab-pane label="基础信息" name="jcxx">
         <div class="jcxx">
-            <windHome />
+            <windHome :modelValItem="modelValItem" />
         </div>
       </el-tab-pane>
       <el-tab-pane label="视频监控" name="spjk">

+ 9 - 0
src/components/windHome/index.vue

@@ -256,6 +256,14 @@ export default {
     LineCharts,
     powerReviewHome,
   },
+  props: {
+    modelValItem: {
+        type: Object,
+        default: () => {
+            return {};
+        },
+    },
+},
   data() {
     return {
       screenHeight: window.innerHeight,
@@ -626,6 +634,7 @@ export default {
     },
     dataChange() {
         this.wpInfos = dataJson.wpInfosdata
+        this.wpInfos.czmc = this.modelValItem.name
         this.powerList = dataJson.Powertrend.value;
         this.powerDataHome = [
             {

+ 4 - 4
src/views/cesiumComponents/topographicMap.vue

@@ -29,8 +29,8 @@
 </template>
 
 <script>
-// import * as Cesium from "../../Cesium";
-// import "../../Cesium/Widgets/widgets.css";
+import * as Cesium from "../../Cesium";
+import "../../Cesium/Widgets/widgets.css";
 import fjLonLatJson from "./fjLonLat.json";
 import comModelDialog from "@/components/comModelDialog.vue"
 export default {
@@ -50,8 +50,8 @@ export default {
     },
     methods: {
         async initCesium() {
-            Cesium.Ion.defaultAccessToken =
-                "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwYTQwNDk3MC05YTZkLTQ2ZTEtODc0MS1lZTFkYjFlOTFmNmQiLCJpZCI6MTcyNDQ1LCJpYXQiOjE3NTQ4ODA4MzF9.KnhENYiHxNwTkhTWRA-lHqG59coLVT2FsIyOru2TV3E";
+            // Cesium.Ion.defaultAccessToken =
+            //     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwYTQwNDk3MC05YTZkLTQ2ZTEtODc0MS1lZTFkYjFlOTFmNmQiLCJpZCI6MTcyNDQ1LCJpYXQiOjE3NTQ4ODA4MzF9.KnhENYiHxNwTkhTWRA-lHqG59coLVT2FsIyOru2TV3E";
             const box = document.getElementById('cesiumContainer')
             const viewer = new Cesium.Viewer(box, {
                 animation: false,//是否创建动画小器件,左下角仪表