Przeglądaj źródła

Merge branch 'master' of http://43.143.235.246:9080/fireLHB/firemap

xyh 2 lat temu
rodzic
commit
ad7f3e1ec6
1 zmienionych plików z 14 dodań i 14 usunięć
  1. 14 14
      src/views/situation/index.vue

+ 14 - 14
src/views/situation/index.vue

@@ -13,25 +13,25 @@
       </el-col>
       <el-tabs type="border-card" v-model="activeName" tab-position="left" class="menu" :stretch="true"
         @tab-click="legendClick">
-        <el-tab-pane name="first">
+        <!-- <el-tab-pane name="first">
           <el-tooltip placement="right" effect="light" slot="label">
             <span slot="content" class="item">标绘</span>
             <span><i class="el-icon-wind-power"></i></span>
           </el-tooltip>
-        </el-tab-pane>
-        <el-tab-pane name="second">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane name="second">
           <el-tooltip placement="right" effect="light" slot="label">
             <span slot="content" class="item">模型</span>
             <span><i class="el-icon-receiving"></i></span>
           </el-tooltip>
           <Model @selectModel="selectModel" :isShow="isShow"></Model>
-        </el-tab-pane>
-        <el-tab-pane name="third">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane name="third">
           <el-tooltip placement="right" effect="light" slot="label">
             <span slot="content" class="item">测量</span>
             <span><i class="el-icon-discount"></i></span>
           </el-tooltip>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane name="fouth">
           <el-tooltip placement="right" effect="light" slot="label">
             <span slot="content" class="item">测想定</span>
@@ -783,15 +783,15 @@ export default {
       this.viewer2D.entities.add({
         id: this.id,
         position: position,
-        // point: {
-        //   pixelSize: 12, // 调整点的大小,可以增大点的像素大小
-        //   color: this.Cesium.Color.fromCssColorString(color)
-        // },
-        model: {
-          uri: modelUrl, // 替换为你的3D模型文件路径
-          scale: 1.0, // 调整3D模型的缩放大小
-          minimumPixelSize: 64 // 设置3D模型的最小像素大小,确保在视图中可见
+        point: {
+          pixelSize: 12, // 调整点的大小,可以增大点的像素大小
+          color: this.Cesium.Color.fromCssColorString(color)
         },
+        // model: {
+        //   uri: modelUrl, // 替换为你的3D模型文件路径
+        //   scale: 1.0, // 调整3D模型的缩放大小
+        //   minimumPixelSize: 64 // 设置3D模型的最小像素大小,确保在视图中可见
+        // },
         label: {
           text: type+' '+name,
           show: true,