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

src/components/comModelDialog.vue

@@ -27,7 +27,12 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="模型解构" name="third">
-        <!-- <ModelUnpack /> -->
+        <div class="third">
+            <ModelUnpack
+          :modelUnpackType="modelUnpackType"
+          v-if="showFjDialogActiveName === 'third'"
+        />
+        </div>
       </el-tab-pane>
     </el-tabs>
   </el-dialog>
@@ -36,6 +41,7 @@
 <script>
 import windPro from "@/components/windProDetail/windProblem.vue"
 import windHome from "@/components/windHome/index.vue"
+import ModelUnpack from "@/components/modelUnpack.vue";
 export default {
     props: {
         showcomModelDia: {
@@ -51,12 +57,14 @@ export default {
     },
     components: {
         windPro,
-        windHome
+        windHome,
+        ModelUnpack
     },
     data() {
         return {
             showFjDialog: false,
             showFjDialogActiveName: "jcxx",
+            modelUnpackType: "fengji",
             modelValItem: null,
             title: ""
         }
@@ -97,10 +105,10 @@ export default {
 
       .el-tabs__content {
         height: 100%;
-        .jcxx, .gzck{
+        .jcxx, .gzck, .third{
             height: 100%;
         }
-        .spjk{
+        .spjk, .third{
             height: 80vh;
         }
       }

src/views/cesium.vue

@@ -168,11 +168,11 @@ export default {
 
   data() {
     return {
-      showFjDialog: true,
+      showFjDialog: false,
       modelUnpackType: "fengji",
       showFjDialogActiveName: "mxjg",
       checkMode: false, // 调试模式
-      allyShow: false,
+      allyShow: true,
       viewer: null,
       windLayer: null, // 风场图
       windLayerTimmer: null, // 风场图计时器
@@ -947,6 +947,7 @@ export default {
     top: 0;
     width: 100%;
     background: #fff;
+    opacity: 0.8;
     display: flex;
     justify-content: flex-end;
     align-items: center;

src/views/cesiumComponents/rainLayer.vue

@@ -287,6 +287,7 @@ export default {
     top: 0;
     width: 100%;
     background: #fff;
+    opacity: 0.8;
     display: flex;
     justify-content: flex-end;
     align-items: center;

src/views/cesiumComponents/temperatureLayer.vue

@@ -286,6 +286,7 @@ export default {
     top: 0;
     width: 100%;
     background: #fff;
+    opacity: 0.8;
     display: flex;
     justify-content: flex-end;
     align-items: center;

src/views/cesiumComponents/topographicMap.vue

@@ -284,6 +284,7 @@ export default {
     top: 0;
     width: 100%;
     background: #fff;
+    opacity: 0.8;
     display: flex;
     justify-content: flex-end;
     align-items: center;