Ver código fonte

Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

maxiaoxiao 8 meses atrás
pai
commit
1d5421dca6

+ 155 - 0
src/components/3DAnalysis/TiltedModel‌/index.vue

@@ -0,0 +1,155 @@
+<template>
+  <div
+    class="sm-panel sm-function-module-content tiltedModel"
+    v-if="tiltedModelShow"
+    v-drag
+  >
+    <div class="sm-panel-header">
+      <span>倾斜模型</span>
+      <span class="closeBtn" @click="toggleVisibility">&times;</span>
+    </div>
+    <div id="tiltedmodelBar" class="modelBarCon">
+      <div class="block">
+        <span class="demonstration">亮度:</span>
+        <el-slider
+          :min="0"
+          :max="2"
+          :step="0.02"
+          v-model="viewModel.brightness"
+        ></el-slider>
+      </div>
+      <div class="block">
+        <span class="demonstration">对比度:</span>
+        <el-slider
+          :min="0"
+          :max="2"
+          :step="0.02"
+          v-model="viewModel.contrast"
+        ></el-slider>
+      </div>
+      <div class="block">
+        <span class="demonstration">色调:</span>
+        <el-slider
+          :min="-1"
+          :max="1"
+          :step="0.02"
+          v-model="viewModel.hue"
+        ></el-slider>
+      </div>
+      <div class="block">
+        <span class="demonstration">饱和度:</span>
+        <el-slider
+          :min="0"
+          :max="2"
+          :step="0.02"
+          v-model="viewModel.saturation"
+        ></el-slider>
+      </div>
+      <div class="block">
+        <span class="demonstration">伽马</span>
+        <el-slider
+          :min="0"
+          :max="2"
+          :step="0.02"
+          v-model="viewModel.gamma"
+        ></el-slider>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "tiltedmodel",
+  data() {
+    return {
+      viewModel: {
+        brightness: 1.2,
+        contrast: 1.2,
+        hue: 0,
+        saturation: 1.2,
+        gamma: 1.1,
+      },
+    };
+  },
+  computed: {
+    tiltedModelShow() {
+      return store.state.toolBar[14];
+    },
+  },
+  methods: {
+    toggleVisibility() {
+      store.setToolBarAction(14);
+    },
+
+    getParameter(newVal) {
+      function subscribeLayerParameter(name) {
+        var layer = store.state.tempLatData;
+        layer[0].forEach((item) => {
+          item[name] = newVal[name];
+        });
+      }
+      subscribeLayerParameter("brightness");
+      subscribeLayerParameter("contrast");
+      subscribeLayerParameter("hue");
+      subscribeLayerParameter("saturation");
+      subscribeLayerParameter("gamma");
+    },
+  },
+  mounted() {},
+  watch: {
+    viewModel: {
+      handler(newVal, oldVal) {
+        console.log("newVal", newVal, "oldVal");
+        if (this.tiltedModelShow) {
+          console.log(document.getElementById("tiltedmodelBar"));
+          this.getParameter(newVal);
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.sm-panel {
+  max-width: 500px;
+}
+
+.tiltedModel {
+  width: 300px;
+  height: 280px;
+
+  .modelBarCon {
+    display: inline-block;
+
+    .block {
+      width: 270px;
+      display: flex;
+      justify-content: space-between;
+      .demonstration{
+        line-height: 38px;
+        font-weight: bold;
+      }
+    }
+
+    /deep/ .el-slider__runway {
+      width: 200px;
+      height: 12px;
+      border-radius: 10px;
+    //   background-color: #E4E7ED;
+      background-color: #3768ca59;
+    }
+    /deep/ .el-slider__bar{
+        background: linear-gradient(to right, rgb(5, 156, 250), white 76%, white);
+        height: 12px;
+        border-radius: 10px;
+    }
+    /deep/ .el-slider__button-wrapper{
+        top: -13px;
+    }
+  }
+}
+</style>

+ 1 - 1
src/components/Bookmark/Bookmark.vue

@@ -141,7 +141,7 @@ export default {
           this.total = res.data.count;
           this.tableData = res.data.data;
         } else {
-          this.$message.error(e);
+          this.$message.error(res.message);
         }
       });
     },

+ 147 - 54
src/components/Combinations/toolBar/toolBar.vue

@@ -2,48 +2,95 @@
   <!-- 暂时隐藏工具栏 -->
   <!-- <div v-show="ToolBarShow"> -->
   <div v-if="true">
-
     <!-- <div class="resourceTree" @click="choose(0)"></div> -->
     <div class="toolBar">
-      <el-cascader size="mini" :show-all-levels="false" :options="xzqTreeData" placeholder="行政区"
-        :props="{ checkStrictly: true, expandTrigger: 'hover' }" clearable v-model="xzqTreeValue"></el-cascader>
+      <el-cascader
+        size="mini"
+        :show-all-levels="false"
+        :options="xzqTreeData"
+        placeholder="行政区"
+        :props="{ checkStrictly: true, expandTrigger: 'hover' }"
+        clearable
+        v-model="xzqTreeValue"
+      ></el-cascader>
       <el-select size="mini" v-model="Skybox" placeholder="天空盒">
-        <el-option v-for="item in SkyboxList" :key="item.value" :label="item.label" :value="item.value">
+        <el-option
+          v-for="item in SkyboxList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
         </el-option>
       </el-select>
-      <li class="sm-btn sm-tool-btn" :title="Resource.Resource" @click="choose(0)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.Resource"
+        @click="choose(0)"
+      >
         <span class="iconfont icontuceng"></span>
       </li>
 
       <!-- <ul v-if="show"> -->
-      <li class="sm-btn sm-tool-btn" :title="Resource.PoinyQuery" @click="choose(9)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.PoinyQuery"
+        @click="choose(9)"
+      >
         <i class="el-icon-thumb"></i>
       </li>
-      <li class="sm-btn sm-tool-btn" :title="Resource.PlacenameLocation" @click="choose(10)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.PlacenameLocation"
+        @click="choose(10)"
+      >
         <i class="el-icon-place"></i>
       </li>
-      <li class="sm-btn sm-tool-btn" :title="Resource.BookMark" @click="choose(11)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.BookMark"
+        @click="choose(11)"
+      >
         <i class="el-icon-notebook-2"></i>
       </li>
-      <li class="sm-btn sm-tool-btn" :title="Resource.measure" @click="choose(7)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.measure"
+        @click="choose(7)"
+      >
         <span class="iconfont iconliangsuan"></span>
       </li>
       <!-- <li class="sm-btn sm-tool-btn" :title="Resource.clip" @click="choose(4)">
         <span class="iconfont iconiEarth-R8-xiugai_caijian"></span>
       </li> -->
-      <li class="sm-btn sm-tool-btn" :title="Resource.terrain" @click="choose(5)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.terrain"
+        @click="choose(5)"
+      >
         <span class="iconfont icondixing"></span>
       </li>
-      <li class="sm-btn sm-tool-btn" :title="Resource.onlineEditing" @click="choose(8)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.onlineEditing"
+        @click="choose(8)"
+      >
         <span class="iconfont iconzaixianbianji"></span>
       </li>
-      <li class="sm-btn sm-tool-btn" :title="Resource.analysis" @click="choose(6)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.analysis"
+        @click="choose(6)"
+      >
         <span class="iconfont iconsanweifenxi"></span>
       </li>
       <!-- <li class="sm-btn sm-tool-btn" :title="Resource.fly" @click="choose(12)">
         <i class="el-icon-guide"></i>
       </li> -->
-      <li class="sm-btn sm-tool-btn" :title="Resource.sceneOptions" @click="choose(3)">
+      <li
+        class="sm-btn sm-tool-btn"
+        :title="Resource.sceneOptions"
+        @click="choose(3)"
+      >
         <i class="el-icon-setting"></i>
       </li>
       <!-- <li class="sm-btn sm-tool-btn" title="行政区划开关" @click="choose(12)">
@@ -53,11 +100,23 @@
       <li class="sm-btn sm-tool-btn" title="模型拉伸" @click="choose(13)">
         <i class="el-icon-receiving"></i>
       </li>
-      <div style="display: none" class="sm-tool-btn" @click="toggleVisibility" :class="{ 'sm-tool-btn-only': !show }">
-        <span class="iconfont" :class="!show
-          ? 'iconiEarth-R8-xiugai_shouqi'
-          : 'iconiEarth-R8-xiugai_zhankai'
-          "></span>
+      <li class="sm-btn sm-tool-btn" title="倾斜模型" @click="choose(14)">
+        <i class="el-icon-office-building"></i>
+      </li>
+      <div
+        style="display: none"
+        class="sm-tool-btn"
+        @click="toggleVisibility"
+        :class="{ 'sm-tool-btn-only': !show }"
+      >
+        <span
+          class="iconfont"
+          :class="
+            !show
+              ? 'iconiEarth-R8-xiugai_shouqi'
+              : 'iconiEarth-R8-xiugai_zhankai'
+          "
+        ></span>
       </div>
     </div>
     <!-- 调用子组件-->
@@ -79,9 +138,14 @@
     <air-lines-trail-lines></air-lines-trail-lines>
     <scan-effect></scan-effect>
     <wind-particle></wind-particle>
-    <placename-location style="width: 400px; height: 400px; z-index: 999999"></placename-location>
-    <click-query style="width: 400px; height: 700px; z-index: 999999"></click-query>
+    <placename-location
+      style="width: 400px; height: 400px; z-index: 999999"
+    ></placename-location>
+    <click-query
+      style="width: 400px; height: 700px; z-index: 999999"
+    ></click-query>
     <modelStretch></modelStretch>
+    <tiltedModel></tiltedModel>
   </div>
 </template>
 
@@ -91,8 +155,9 @@ import { GetXzqhTree, GetXzqhGeom } from "@/api/map";
 import Bookmark from "../../Bookmark/Bookmark.vue";
 import * as cockpit from "@/common/js/cockpit.js";
 import modelStretch from "@/views/modelStretch/index.vue";
+import tiltedModel from "../../3DAnalysis/TiltedModel‌/index.vue";
 export default {
-  components: { clickQuery, Bookmark, modelStretch },
+  components: { clickQuery, Bookmark, modelStretch, tiltedModel },
   name: "ToolBar",
   props: {},
   data() {
@@ -109,25 +174,32 @@ export default {
       skyListener: null,
       defaultSkyBox: null,
       ViewerSkyBox: {},
-      SkyboxList: [{
-        value: 'lantian',
-        label: '蓝天'
-      }, {
-        value: 'qingtian',
-        label: '晴天'
-      }, {
-        value: 'wanxia',
-        label: '晚霞'
-      }, {
-        value: 'cloudy',
-        label: '多云'
-      }, {
-        value: 'partly_cloudy_puresky',
-        label: '晴间多云'
-      }, {
-        value: 'yewan',
-        label: '夜晚'
-      }]
+      SkyboxList: [
+        {
+          value: "lantian",
+          label: "蓝天",
+        },
+        {
+          value: "qingtian",
+          label: "晴天",
+        },
+        {
+          value: "wanxia",
+          label: "晚霞",
+        },
+        {
+          value: "cloudy",
+          label: "多云",
+        },
+        {
+          value: "partly_cloudy_puresky",
+          label: "晴间多云",
+        },
+        {
+          value: "yewan",
+          label: "夜晚",
+        },
+      ],
     };
   },
   created() {
@@ -144,14 +216,32 @@ export default {
       for (let i = 0; i < this.SkyboxList.length; i++) {
         let c = new Cesium.SkyBox({
           sources: {
-            positiveX: "/static/Cesium/Assets/Textures/SkyBox/" + this.SkyboxList[i].value + "/Right.jpg",
-            negativeX: "/static/Cesium/Assets/Textures/SkyBox/" + this.SkyboxList[i].value + "/Left.jpg",
-            positiveY: "/static/Cesium/Assets/Textures/SkyBox/" + this.SkyboxList[i].value + "/Front.jpg",
-            negativeY: "/static/Cesium/Assets/Textures/SkyBox/" + this.SkyboxList[i].value + "/Back.jpg",
-            positiveZ: "/static/Cesium/Assets/Textures/SkyBox/" + this.SkyboxList[i].value + "/Up.jpg",
-            negativeZ: "/static/Cesium/Assets/Textures/SkyBox/" + this.SkyboxList[i].value + "/Down.jpg",
+            positiveX:
+              "/static/Cesium/Assets/Textures/SkyBox/" +
+              this.SkyboxList[i].value +
+              "/Right.jpg",
+            negativeX:
+              "/static/Cesium/Assets/Textures/SkyBox/" +
+              this.SkyboxList[i].value +
+              "/Left.jpg",
+            positiveY:
+              "/static/Cesium/Assets/Textures/SkyBox/" +
+              this.SkyboxList[i].value +
+              "/Front.jpg",
+            negativeY:
+              "/static/Cesium/Assets/Textures/SkyBox/" +
+              this.SkyboxList[i].value +
+              "/Back.jpg",
+            positiveZ:
+              "/static/Cesium/Assets/Textures/SkyBox/" +
+              this.SkyboxList[i].value +
+              "/Up.jpg",
+            negativeZ:
+              "/static/Cesium/Assets/Textures/SkyBox/" +
+              this.SkyboxList[i].value +
+              "/Down.jpg",
           },
-        })
+        });
         c.WSpeed = 0.5;
         this.ViewerSkyBox[this.SkyboxList[i].value] = c;
       }
@@ -173,8 +263,12 @@ export default {
           let skyBoxH1 = 15e4; // 天空开始渐变的最大高度
           let skyBoxH2 = 12e4; // 天空开始渐变的最小高度
           let bufferHeight = 1e4;
-          if (cameraHeight < skyAtmosphereH1 && Cesium.defined(that.currentSkyBox)) {
-            let skyAtmosphereT = (cameraHeight - skyBoxH2) / (skyAtmosphereH1 - skyBoxH2);
+          if (
+            cameraHeight < skyAtmosphereH1 &&
+            Cesium.defined(that.currentSkyBox)
+          ) {
+            let skyAtmosphereT =
+              (cameraHeight - skyBoxH2) / (skyAtmosphereH1 - skyBoxH2);
             if (skyAtmosphereT > 1.0) {
               skyAtmosphereT = 1.0;
             } else if (skyAtmosphereT < 0.0) {
@@ -251,11 +345,10 @@ export default {
             return item.label == "三亚市";
           });
           if (list.length > 0) {
-            list[0].value = '4602'
+            list[0].value = "4602";
             this.xzqTreeData = list[0];
-          }
-          else this.xzqTreeData = res.data;
-          store.setRegionTree(this.xzqTreeData)
+          } else this.xzqTreeData = res.data;
+          store.setRegionTree(this.xzqTreeData);
         }
       });
     },
@@ -291,7 +384,7 @@ export default {
     },
     Skybox() {
       this.setSkyBox();
-    }
+    },
   },
 };
 </script>

+ 1 - 1
src/components/Query/PlacenameLocation/PlacenameLocation.vue

@@ -109,7 +109,7 @@ export default {
           this.total = res.data.count;
           this.tableData = res.data.data;
         } else {
-          this.$message.error(e);
+          this.$message.error(res.message);
         }
       });
     },

+ 74 - 14
src/views/farmlandProtection/components/fxjg.vue

@@ -1,5 +1,5 @@
 <template>
-  <div >
+  <div>
     <div class="fxjg">
       <div class="downloadDiv">
         <div>
@@ -19,7 +19,7 @@
             <span style="color: #fff">图斑数(个)</span>
             <!-- <span color="#2d8cf0" v-if="xmxx">{{ xmxx.sumNumber }}</span> -->
             <span color="#2d8cf0" v-if="resultData && resultData.xmxx"
-              >{{ resultData.xmxx.sumNumber }}个</span
+              >{{ resultData.xmxx.sumNumber || 0 }}个</span
             >
           </div>
         </div>
@@ -30,7 +30,7 @@
           <div class="divText">
             <span style="color: #fff">图斑面积(㎡)</span>
             <span color="#2d8cf0" v-if="resultData && resultData.xmxx"
-              >{{ resultData.xmxx.sumMj }}平方米</span
+              >{{ resultData.xmxx.sumMj || 0 }}平方米</span
             >
           </div>
         </div>
@@ -69,7 +69,7 @@
                 <span style="color: #fff">{{ item2.bsmmc }}图斑数</span>
                 <span
                   style="color: #2d8cf0; font-weight: bold; cursor: pointer"
-                  @click="resultDeatils(item2,item.mx_bsm)"
+                  @click="resultDeatils(item2, item.mx_bsm)"
                   >{{ item2.sumcount }}个</span
                 >
               </div>
@@ -90,6 +90,8 @@
 <script>
 import pie from "@/components/echartsTemplate/pieNew.vue";
 import { QueryGdbhJg } from "../../../api/ghss/gdbh.js";
+// 使用wkt转json
+import parse from "wellknown";
 export default {
   components: { pie },
   props: {
@@ -110,20 +112,20 @@ export default {
 
   methods: {
     download() {},
-    resultDeatils(val,mxbsm) {
+    resultDeatils(val, mxbsm) {
       let obj = {
-        bsm:this.fxjgObj.bsm,
-        mxbsm:mxbsm,
-        yzbsm:val.bsm
-      }
+        bsm: this.fxjgObj.bsm,
+        mxbsm: mxbsm,
+        yzbsm: val.bsm,
+      };
       this.$emit("updateParent", "interObj", obj);
       this.$emit("updateParent", "showInter", true);
-
     },
     initData() {
       QueryGdbhJg({ bsm: this.fxjgObj.bsm }).then((res) => {
         let data = [];
         if (res.statuscode == 200) {
+          console.log(res,':resresres')
           if (res.data.sandiao.mx_data.length) {
             res.data.sandiao.mx_data.forEach((el) => {
               data.push({
@@ -135,6 +137,8 @@ export default {
           }
           this.$refs.echartRef.setOptions({ data, type: "horizontal" }, 1);
           this.resultData = res.data;
+          // this.drawWktPloygon(res.data.xmxx.geom, "#ff0000", "all"); //res.data.bsm
+          this.loadGeoJSON(parse(res.data.xmxx.geom), "#ff0000", "all");
         } else {
           this.$message.error(res.message);
         }
@@ -155,6 +159,62 @@ export default {
 
       // })
     },
+    drawWktPloygon(item, itemColor, id) {
+      // console.log(geometry, "geometry");
+      // let geom = {
+      //   type: "FeatureCollection",
+      //   features: [
+      //     {
+      //       type: "Feature",
+      //       geometry: parse(item),
+      //     },
+      //   ],
+      // };
+      this.loadGeoJSON(parse(item), itemColor, id);
+    },
+    // 加载GeoJSON数据
+    loadGeoJSON(geojson, yanse, id, height, name) {
+      let _this = this;
+      let fcolor =
+        id && id != "all"
+          ? Cesium.Color.fromCssColorString(yanse)
+          : Cesium.Color.WHITE;
+      const dataSource = new Cesium.GeoJsonDataSource();
+      dataSource
+        .load(geojson, {
+          clampToGround: true,
+          stroke: Cesium.Color.fromCssColorString(yanse),
+          fill: fcolor.withAlpha(0.4), //注意:颜色必须大写,即不能为blue
+          strokeWidth: 5,
+          // markerSymbol: "", //点图钉的默认符号
+        })
+        .then((data) => {
+          viewer.dataSources.add(data);
+          let entities = data.entities.values;
+          // let addlabel = false;
+          if (!geojson.type.includes("Polygon") || height) {
+            entities.forEach((entity, ei) => {
+              if (entity.billboard) {
+                entity.billboard = undefined;
+                entity.point = {
+                  pixelsize: 20,
+                  color: Cesium.Color.fromCssColorString(yanse),
+                };
+              }
+            });
+          }
+          var pitch = height ? -0.8 : -45; // Cesium.Math.toRadians(-45.0);-0.7853981633974483
+          let range = height ? 3000 : 5000;
+          viewer.flyTo(data, {
+            offset: new Cesium.HeadingPitchRange(0, pitch, range),
+          });
+          // viewer.zoomTo(data);
+          if (id) {
+            dataSources[id] = data;
+          }
+          if (id == "all") _this.isshowAll = true;
+        });
+    },
   },
   mounted() {},
 };
@@ -297,8 +357,8 @@ export default {
 }
 
 .sm-panel {
-    width: 400px;
-    height: 700px;
-    z-index: 999999;
-  }
+  width: 400px;
+  height: 700px;
+  z-index: 999999;
+}
 </style>

+ 1 - 1
src/views/farmlandProtection/components/fzjcyp.vue

@@ -7,7 +7,7 @@
       :rules="rules"
       label-position="left"
     >
-      <el-form-item label="选址范围:" prop="xzmj">
+      <el-form-item label="分析范围:" prop="xzmj">
         <range type="fzjcyp" :keys="['hx', 'sc']" class="range" ref="range" />
       </el-form-item>
       <el-form-item label="项目名称:" prop="xmmc">

+ 38 - 30
src/views/farmlandProtection/components/interDetails.vue

@@ -17,6 +17,7 @@
             }"
             :data="tableData"
             style="width: 100%"
+            height="731"
           >
             <el-table-column
               show-overflow-tooltip="true"
@@ -109,7 +110,7 @@
                   fontWeight: '400',
                 }"
                 :data="jbxxData"
-                height="350"
+                height="455"
                 style="width: 100%"
               >
                 <el-table-column
@@ -220,38 +221,38 @@ export default {
 }
 
 .tableCon {
-  height: 40rem;
+  height: 48rem;
 
-  /deep/ .el-table tr {
-    background: rgba(10, 25, 38, 0.5) !important;
-  }
+  // /deep/ .el-table tr {
+  //   background: rgba(10, 25, 38, 0.5) !important;
+  // }
 
-  /deep/ .el-table td.el-table__cell,
-  .el-table th.el-table__cell.is-leaf {
-    background: rgba(10, 25, 38, 0.5) !important;
+  // /deep/ .el-table td.el-table__cell,
+  // .el-table th.el-table__cell.is-leaf {
+  //   background: rgba(10, 25, 38, 0.5) !important;
 
-    border-bottom: 0px solid #ebeef5;
-  }
+  //   border-bottom: 0px solid #ebeef5;
+  // }
 
-  .el-table {
-    color: #fff;
-    background: rgba(10, 25, 38, 0.5) !important;
-  }
+  // .el-table {
+  //   color: #fff;
+  //   background: rgba(10, 25, 38, 0.5) !important;
+  // }
 
-  /deep/ .el-table__fixed-right::before,
-  .el-table__fixed::before {
-    background: rgba(10, 25, 38, 0.9) !important;
-  }
+  // /deep/ .el-table__fixed-right::before,
+  // .el-table__fixed::before {
+  //   background: rgba(10, 25, 38, 0.9) !important;
+  // }
 
-  /deep/ .el-table__fixed-right-patch {
-    background: rgba(10, 25, 38, 0.9) !important;
-  }
+  // /deep/ .el-table__fixed-right-patch {
+  //   background: rgba(10, 25, 38, 0.9) !important;
+  // }
 
-  /deep/ .el-table--border::after,
-  .el-table--group::after,
-  .el-table::before {
-    background: rgba(10, 25, 38, 0) !important;
-  }
+  // /deep/ .el-table--border::after,
+  // .el-table--group::after,
+  // .el-table::before {
+  //   background: rgba(10, 25, 38, 0) !important;
+  // }
 }
 
 /deep/ .el-icon-close:before {
@@ -265,7 +266,9 @@ export default {
     color: aqua;
   }
 }
-
+/deep/ .el-carousel--horizontal{
+  margin-top: 15px;
+}
 /deep/ .el-carousel__item h3 {
   color: #475669;
   font-size: 18px;
@@ -288,11 +291,13 @@ export default {
 }
 
 .inter_result {
-  height: 580px;
+  // height: 580px;
+  height: 695px;
 }
 
 .Integration {
-  max-height: 580px;
+  // max-height: 580px;
+  height: 695px;
   overflow: hidden;
   overflow-y: auto;
 
@@ -345,5 +350,8 @@ export default {
     }
   }
 }
-</style>
+.sm-function-module-query{
+  max-height: 800px !important;
+  top: 28px !important;
+}
 </style>

+ 2 - 4
src/views/viewer.vue

@@ -464,10 +464,8 @@ export default {
     beforeCreate() { }, //生命周期 - 创建之前
     created() { }, //生命周期 - 创建完成(可以访问当前this实例)
     beforeMount() { }, //生命周期 - 挂载之前
-    async mounted() {
-
-
-        this.$nextTick((res) => {
+    mounted() {
+        this.$nextTick(() => {
             cockpit.init(viewer);
 
             this.pick_xzqh();

+ 1 - 1
static/Config/config.js

@@ -3,7 +3,7 @@ window.axiosURI = "http://192.168.60.2:8080";
 window.ZTaxiosURI = "http://localhost:9300";
 window.aiURI = "http://192.168.60.6:4000";
 //倾斜模型高度配置
-window.modelBottomAltitude = 10;
+window.modelBottomAltitude = 0;
 // 服务器ip
 window.hostconfig = "localhost";
 //地图初始化中心点