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

src/components/3DAnalysis/Smashing/Smashing.vue

@@ -148,7 +148,7 @@ export default {
         //遍历所有s3m图层，删除压平
         for (var i = 0; i < layersData.length; i++) {
           layersData[i].removeFlattenRegion(this.flattenNames[i]);
-          this.flattenNames.push(nameStr);
+          // this.flattenNames.push(nameStr);
         }
         this.flattenNames = [];
       }

src/views/ConstructionApplication3D/BenchmarkLandPriceAnalysis/jzdjfxsmjg.vue

@@ -492,7 +492,7 @@ export default {
             offset: {
               heading: Cesium.Math.toRadians(0),
               pitch: Cesium.Math.toRadians(-90),
-              range: 20,
+              range: 220,
             },
           });
         }

src/views/ConstructionApplication3D/Demolition/CQSetInfo.vue

@@ -82,9 +82,9 @@
       </el-table-column>
     </el-table>
     <el-row justify="center" type="flex">
-      <!-- <el-button type="primary" @click="save()">保存</el-button> -->
+      <el-button type="primary" @click="save()">保存</el-button>
       <el-button type="primary" @click="saveAs('ruleForm')">另存为</el-button>
-      <!-- <el-button type="primary" @click="reset()">重置</el-button> -->
+      <el-button type="primary" @click="reset()">重置</el-button>
       <el-button type="primary" @click="delBZ()">删除</el-button>
     </el-row>
     <el-dialog
@@ -168,6 +168,7 @@ import {
   delCqBcbzItem,
   delCqBcbz,
 } from "@/api/zt/ztApi.js";
+import { v4 as uuidv4 } from "uuid";
 export default {
   props: {
     cqValue: { type: Object },
@@ -429,13 +430,14 @@ export default {
     /**
      * 选择标准下拉框
      */
-    selectZDBZ() {
+    selectZDBZ(key) {
+      debugger;
       var that = this;
       if (that.bcbz && that.bcbz != "") {
         if (window.isUseDB) {
           that.curBCBZ = {
-            id: "",
-            name: "",
+            id: key,
+            name: that.bcbzList.find((c) => c.id == key).name,
             bcbz: [],
           };
           var queryParams = {
@@ -471,11 +473,31 @@ export default {
      */
     reset() {
       debugger;
-      // var val = this.bcbz
-      this.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.CQBCList));
-      var item = this.bcbzList.find((t) => t.id == this.bcbz);
-      debugger;
-      this.curBCBZ = item;
+      let that = this;
+      if (window.isUseDB) {
+        var queryParams = {
+          bz: null,
+          des: null,
+          grade: null,
+          id: null,
+          jg: null,
+          pid: that.bcbz,
+        };
+        getCqBcbzItemList(queryParams)
+          .then((response) => {
+            if (response) {
+              that.curBCBZ.bcbz = response.rows;
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else {
+        this.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.CQBCList));
+        var item = this.bcbzList.find((t) => t.id == this.bcbz);
+        debugger;
+        this.curBCBZ = item;
+      }
     },
 
     /**
@@ -488,6 +510,7 @@ export default {
         return;
       }
       if (window.isUseDB) {
+        debugger;
         var item = {
           id: that.curBCBZ.id,
           name: that.curBCBZ.name,
@@ -495,8 +518,11 @@ export default {
         };
         updateCqBcbz(item)
           .then((res) => {
-            if (res) that.getInitData();
-            that.$layer.alert("保存完成");
+            if (res) {
+              that.cqValue = item.id;
+              that.getInitData();
+              that.$layer.alert("保存完成");
+            }
           })
           .catch((err) => {
             console.log(err);
@@ -540,8 +566,9 @@ export default {
      */
     saveData() {
       debugger;
-      var date = new Date();
-      var val = date.getTime().toString();
+      // var date = new Date();
+      // var val = date.getTime().toString();
+      var val = uuidv4();
       var that = this;
       var newBCBZ = {
         id: val,
@@ -551,7 +578,11 @@ export default {
       if (window.isUseDB) {
         addCqBcbz(newBCBZ)
           .then((res) => {
-            if (res) that.getInitData();
+            if (res) {
+              debugger;
+              that.cqValue = newBCBZ.id;
+              that.getInitData();
+            }
             that.lyoption.content.parent.initSetting();
             that.$layer.alert("保存完成");
           })
@@ -666,21 +697,26 @@ export default {
         jg: that.oldRow.jg,
         pid: that.oldRow.pid,
       };
-      updateCqBcbzItem(model)
-        .then((res) => {
-          if (res) {
-            that.$layer.alert("保存完成");
-            debugger;
-            let bcbz = that.curBCBZ.bcbz.find((c) => c.id == model.id);
-            bcbz.bz = model.bz;
-            bcbz.des = model.des;
-            bcbz.grade = model.grade;
-            bcbz.jg = model.jg;
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+      let bcbz = that.curBCBZ.bcbz.find((c) => c.id == model.id);
+      bcbz.bz = model.bz;
+      bcbz.des = model.des;
+      bcbz.grade = model.grade;
+      bcbz.jg = model.jg;
+      // updateCqBcbzItem(model)
+      //   .then((res) => {
+      //     if (res) {
+      //       that.$layer.alert("保存完成");
+      //       debugger;
+      //       let bcbz = that.curBCBZ.bcbz.find((c) => c.id == model.id);
+      //       bcbz.bz = model.bz;
+      //       bcbz.des = model.des;
+      //       bcbz.grade = model.grade;
+      //       bcbz.jg = model.jg;
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log(err);
+      //   });
     },
     /**
      * 保存当前行

src/views/ConstructionApplication3D/Demolition/DemolitionList.vue

@@ -578,7 +578,7 @@ import {
   getZdProjectList, getZdProjectById, addZdProject, delZdProject,
   addQmResult, addCqResult, addZdResult, expotZDBCWord
 } from "@/api/zt/ztApi.js";
-import zdAnalyse from './zdAnalyse.js'
+import zdAnalyse from './zdAnalyse.js';
 import Popup from "../Popup.js";
 var handlerPolygon;
 var handleInput;
@@ -1138,23 +1138,22 @@ export default {
     };
   },
   created() {
-    if (viewer.shadows == false) {
-      viewer.shadows = true; //开启场景阴影
-      viewer.terrainShadows = true; //地形阴影
-    }
-    let scene = viewer.scene;
-    let layers = scene.layers.layerQueue;
-    //图层模型设置阴影
-    for (let i = 0; i < layers.length; i++) {
-      if (layers[i].shadowType !== 2) {
-        layers[i].shadowType = 2;
-        // layers[i].refresh();
-      }
-    }
+    // if (viewer.shadows == false) {
+    //   viewer.shadows = true; //开启场景阴影
+    //   viewer.terrainShadows = true; //地形阴影
+    // }
+    // let scene = viewer.scene;
+    // let layers = scene.layers.layerQueue;
+    // //图层模型设置阴影
+    // for (let i = 0; i < layers.length; i++) {
+    //   if (layers[i].shadowType !== 2) {
+    //     layers[i].shadowType = 2;
+    //     // layers[i].refresh();
+    //   }
+    // }
     this.initSetting();
   },
   mounted() {
-   
   },
   methods: {
  
@@ -1206,10 +1205,17 @@ export default {
         // this.pageClick();
         this.activePage1='GY';
         this.activePage2='GYQS';
+        
       }else{
+        if(handleInput){
+          handleInput.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+          handleInput.destroy();
+          handleInput=null;
+        }
+        
         this.clear();
-      this.removePolygonEntity();
-      this.curProjectInfo=null;
+        this.removePolygonEntity();
+        this.curProjectInfo=null;
       }
     },
     /**
@@ -1560,6 +1566,9 @@ export default {
      */
     showResult(projectInfo) {
       var that = this
+      if(!handleInput){
+        that.pickEntity();
+      }
       that.activeName = "third";
       this.activePage1='GY';
         this.activePage2='GYQS';
@@ -1921,9 +1930,9 @@ export default {
           if (pick != null) {
             that.tableData = [];
             var fieldNames = [];
-            var fieldValues = []
-            id = pick.id._id
-            if (id&&id.indexOf && id.indexOf(prefix) > -1) {
+            var fieldValues = [];
+            id = pick.id._id;
+            if (id&&pick.id.attributes ) {
               fieldNames = pick.id.attributes.fieldNames;
               fieldValues = pick.id.attributes.fieldValues;
               for (var i = 0; i < fieldNames.length; i++) {
@@ -2071,7 +2080,7 @@ export default {
       that.JTDLLoad(null, showOrHide);
       myChart.on("legendselectchanged", function (parmas) {
         if(that.$refs['JTDL_button'].classList.contains("el-icon-openeyes")){
-          that.pickEntity('ZDJTYD');
+          // that.pickEntity('ZDJTYD');
         var name = parmas.name
         showOrHide = parmas.selected[name]
         that.JTDLLoad(name, showOrHide);
@@ -2263,7 +2272,7 @@ export default {
       debugger
       myChart.on("legendselectchanged", function (parmas) {
         if(that.$refs['GYDL_button'].classList.contains("el-icon-openeyes")){
-          that.pickEntity('ZDGYDL');
+          // that.pickEntity('ZDGYDL');
         var name = parmas.name
         shaowOrHide = parmas.selected[name]
         that.GYDLLoad(name, shaowOrHide);
@@ -2460,7 +2469,7 @@ export default {
       that.QMBCLoad(null, showOrHide)
       myChart1.on("legendselectchanged", function (parmas) {
         if(that.$refs['QMBC_button'].classList.contains("el-icon-openeyes")){
-          that.pickEntity('ZDQMBC');
+          // that.pickEntity('ZDQMBC');
         var name = parmas.name
         showOrHide = parmas.selected[name]
         that.QMBCLoad(name, showOrHide)
@@ -2792,7 +2801,7 @@ export default {
 
       myChart.on("legendselectchanged", function (parmas) {
         if(that.$refs['GYQS_button'].classList.contains("el-icon-openeyes")){
-          that.pickEntity('ZDGYQS');
+          // that.pickEntity('ZDGYQS');
         var name = parmas.name;
         var showOrHide = parmas.selected[name];
         // var index = Object.keys(parmas.selected).findIndex(t => t == name)
@@ -3031,7 +3040,7 @@ export default {
       that.JTUseLoad(datas, null, shaowOrHide)
       myChart.on("legendselectchanged", function (parmas) {
         if(that.$refs['JTUSE_button'].classList.contains("el-icon-openeyes")){
-          that.pickEntity('ZDJTUSE');
+          // that.pickEntity('ZDJTUSE');
           var name = parmas.name
           shaowOrHide = parmas.selected[name]
           that.JTUseLoad(datas, name, shaowOrHide)
@@ -3275,7 +3284,7 @@ export default {
       myChart.setOption(option);
       myChart.on("legendselectchanged", function (parmas) {
         if(that.$refs['JTOwner_button'].classList.contains("el-icon-openeyes")){
-          that.pickEntity('ZDJTOWNER');
+          // that.pickEntity('ZDJTOWNER');
         var name = parmas.name
         showOrHide = parmas.selected[name]
         that.JTOwnerLoad(datas, name, showOrHide);
@@ -3415,7 +3424,9 @@ export default {
       var that = this;
       debugger
       if (handleInput) {
+        handleInput.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
         handleInput.destroy();
+        handleInput=null;
       }
       handlerPolygon = new Cesium.DrawHandler(
         viewer,
@@ -3780,7 +3791,13 @@ export default {
         }
       })
       viewer.entities.add(point);
-      viewer.flyTo(point);
+      viewer.flyTo(point,{
+            offset: {
+              heading: Cesium.Math.toRadians(0),
+              pitch: Cesium.Math.toRadians(-90),
+              range: 220,
+            },
+          });
       setTimeout(function () {
         viewer.entities.removeById('aad');
       }, 3000)
@@ -3958,10 +3975,11 @@ export default {
             var list = JSON.stringify(that.projectList.reverse())
             window.ZSBC.projectList = JSON.parse(list)
           }
+          that.removePolygonEntity();
           var date = new Date()
           debugger
           that.ruleForm.projectName = "拆迁补偿项目_" + that.formatDateTimeToLong(date);
-          that.activeName = "second"
+          
         } else {
           console.log("error submit!!");
           return false;
@@ -4067,10 +4085,12 @@ export default {
       //   }
       // }
       addZdProject(projectInfo).then((res) => {
+        that.activeName = "second"
         if (res)
           console.log('项目保存完成')
         that.queryProject();
       }).catch((err) => {
+        that.activeName = "second"
         console.log('项目保存失败')
       })
 
@@ -4284,8 +4304,12 @@ export default {
       handlerPolygon.deactivate();
       handlerPolygon.clear();
     }
-    if (handleInput)
-      handleInput.destroy()
+    if (handleInput){
+        handleInput.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+        handleInput.destroy();
+        handleInput=null;
+    }
+
     this.positions = [];
     this.regions = [];
     this.entities = []

src/views/ConstructionApplication3D/MXDBinfo/MXDBinfo.vue

@@ -469,7 +469,8 @@ export default {
               backgroundColor: new Cesium.Color(0.0, 0.0, 0.0, 0.0),
               //打开背景  打开背景 （不会被线段覆盖）
               showBackground: true,
-              heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+              // heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+              disableDepthTestDistance: Number.POSITIVE_INFINITY,
             },
           });
           that.LandPlanningList.push(GHYDlayerData);

src/views/ConstructionApplication3D/RSAnalysis/RSAnalysis.vue

@@ -1,70 +1,141 @@
 <template>
-  <div class="ZTGlobal" style="width: 100%; padding: 1rem 1rem 0rem 1rem; color: white">
-    <el-row :gutter="5" style="border: 1px dashed #02a7f0; padding: 0.5rem; color: #ffffff">
+  <div
+    class="ZTGlobal"
+    style="width: 100%; padding: 1rem 1rem 0rem 1rem; color: white"
+  >
+    <el-row
+      :gutter="5"
+      style="border: 1px dashed #02a7f0; padding: 0.5rem; color: #ffffff"
+    >
       定点分析：
       <el-row :gutter="5">
         观察者高度(米):
-        <el-input-number size="small" label="观察者高度:" min="0" max="50" :step="0.5" precision="1"
-          v-model="personH"></el-input-number>
-        <el-col :span="8"><el-button size="mini" type="default" @click="addGCD">添加观察点</el-button>
+        <el-input-number
+          size="small"
+          label="观察者高度:"
+          min="0"
+          max="50"
+          :step="0.5"
+          precision="1"
+          v-model="personH"
+        ></el-input-number>
+        <el-col :span="8"
+          ><el-button size="mini" type="default" @click="addGCD"
+            >添加观察点</el-button
+          >
         </el-col>
-        <el-col :span="8"><el-button size="mini" type="default" @click="addTagget">添加目标点</el-button>
+        <el-col :span="8"
+          ><el-button size="mini" type="default" @click="addTagget"
+            >添加目标点</el-button
+          >
         </el-col>
         <el-col :span="7">
-          <el-button size="mini" type="default" @click="changeView">切换视角</el-button>
+          <el-button size="mini" type="default" @click="changeView"
+            >切换视角</el-button
+          >
         </el-col>
       </el-row>
       绿线为可见区域，红线为不可见区域
     </el-row>
-    <el-row :gutter="5" style="border: 1px dashed #02a7f0; padding: 0.5rem; color: #ffffff">
+    <el-row
+      :gutter="5"
+      style="border: 1px dashed #02a7f0; padding: 0.5rem; color: #ffffff"
+    >
       环视分析：
       <el-row :gutter="5">
-        <el-col :span="8"><el-button size="mini" type="default" @click="addCirclePoint">添加环视点</el-button>
+        <el-col :span="8"
+          ><el-button size="mini" type="default" @click="addCirclePoint"
+            >添加环视点</el-button
+          >
         </el-col>
       </el-row>
       <el-row :gutter="5">
         <el-col :span="10"> 环视角度(度)： </el-col>
         <el-col :span="10">
-          <el-input-number size="mini" v-model="circlePitch" min="0" max="90"
-            @change="circlePitchChange"></el-input-number></el-col>
+          <el-input-number
+            size="mini"
+            v-model="circlePitch"
+            min="0"
+            max="90"
+            @change="circlePitchChange"
+          ></el-input-number
+        ></el-col>
       </el-row>
       <el-row :gutter="5">
         <el-col :span="10"> 环视高度(米)：</el-col>
         <el-col :span="10">
-          <el-input-number size="mini" v-model="circleH" min="0" max="5000" @change="circlePitchChange"></el-input-number>
+          <el-input-number
+            size="mini"
+            v-model="circleH"
+            min="0"
+            max="5000"
+            @change="circlePitchChange"
+          ></el-input-number>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8"><el-button ref="flyCrile" size="mini" type="default" @click="targetRing()">{{ flyCircleText
-        }}</el-button>
+        <el-col :span="8"
+          ><el-button
+            ref="flyCrile"
+            size="mini"
+            type="default"
+            @click="targetRing()"
+            >{{ flyCircleText }}</el-button
+          >
         </el-col>
       </el-row>
     </el-row>
-    <el-row :gutter="5" style="border: 1px dashed #02a7f0; padding: 0.5rem; color: #ffffff">
+    <el-row
+      :gutter="5"
+      style="border: 1px dashed #02a7f0; padding: 0.5rem; color: #ffffff"
+    >
       沿线飞行：
       <el-row :gutter="2">
-        <el-col :span="8"><el-button size="mini" type="default" @click="addPolyline">绘制线</el-button>
+        <el-col :span="8"
+          ><el-button size="mini" type="default" @click="addPolyline"
+            >绘制线</el-button
+          >
         </el-col>
-        <el-col :span="8"><el-button size="mini" type="default" @click="startPolylineFly">飞行</el-button>
+        <el-col :span="8"
+          ><el-button size="mini" type="default" @click="startPolylineFly"
+            >飞行</el-button
+          >
         </el-col>
-        <el-col :span="8"><el-button size="mini" type="default" @click="stopPolylineFly">停止飞行</el-button>
+        <el-col :span="8"
+          ><el-button size="mini" type="default" @click="stopPolylineFly"
+            >停止飞行</el-button
+          >
         </el-col>
       </el-row>
       <el-row :gutter="2">
         飞行高度(米)：
-        <el-input-number size="small" label="飞行高度:" min="0" max="2000" v-model="flyH"
-          @change="flyChange"></el-input-number>
+        <el-input-number
+          size="small"
+          label="飞行高度:"
+          min="0"
+          max="2000"
+          v-model="flyH"
+          @change="flyChange"
+        ></el-input-number>
       </el-row>
       <el-row :gutter="2">
         飞行速度(km/h):
-        <el-input-number size="small" label="飞行速度:" min="0" max="120" v-model="flySpeed"
-          @change="flyChange"></el-input-number>
+        <el-input-number
+          size="small"
+          label="飞行速度:"
+          min="0"
+          max="120"
+          v-model="flySpeed"
+          @change="flyChange"
+        ></el-input-number>
       </el-row>
     </el-row>
     <el-row> </el-row>
     <el-row :gutter="5">
       <el-col :span="8">
-        <el-button size="mini" type="default" @click="clearScope">清除</el-button>
+        <el-button size="mini" type="default" @click="clearScope"
+          >清除</el-button
+        >
       </el-col>
     </el-row>
   </div>
@@ -81,7 +152,6 @@ let handlerPoint = null; //绘制线
 var sightline;
 var flyManager;
 
-
 var points = [];
 export default {
   data() {
@@ -139,7 +209,6 @@ export default {
     sightline.build();
     handlerPoint = new Cesium.DrawHandler(viewer, Cesium.DrawMode.Point);
     scene.undergroundMode = false;
-
   },
   methods: {
     /**
@@ -195,7 +264,6 @@ export default {
      * 输入点
      */
     setInput() {
-
       var that = this;
       that.changCount = 0;
       handlerPoint = new Cesium.DrawHandler(viewer, Cesium.DrawMode.Point);
@@ -244,13 +312,14 @@ export default {
               show: true,
               text: "观察点",
               font: "15px sans-serif",
-              pixelOffset: new Cesium.Cartesian2(60, -100), //文字偏移
+              pixelOffset: new Cesium.Cartesian2(0, -20), //文字偏移
               fillColor: Cesium.Color.RED,
               // backgroundColor:new Cesium.Color(0, 0, 0, 1),
               distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
                 0,
                 1500
               ), //达到一定高度隐藏
+              disableDepthTestDistance: Number.POSITIVE_INFINITY,
             },
           });
           // that.points.push(entity)
@@ -294,13 +363,14 @@ export default {
               show: true,
               text: "目标点",
               font: "15px sans-serif",
-              pixelOffset: new Cesium.Cartesian2(60, -20), //文字偏移
+              pixelOffset: new Cesium.Cartesian2(0, -20), //文字偏移
               fillColor: Cesium.Color.WHITE,
               // backgroundColor:new Cesium.Color(0, 0, 0, 1),
               distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
                 0,
                 1500
               ), //达到一定高度隐藏
+              disableDepthTestDistance: Number.POSITIVE_INFINITY,
             },
           });
           points.push(labelentity);
@@ -335,13 +405,14 @@ export default {
               show: true,
               text: "环视点",
               font: "15px sans-serif",
-              pixelOffset: new Cesium.Cartesian2(60, -20), //文字偏移
+              pixelOffset: new Cesium.Cartesian2(0, -20), //文字偏移
               fillColor: Cesium.Color.WHITE,
               // backgroundColor:new Cesium.Color(0, 0, 0, 1),
               distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
                 0,
                 1500
               ), //达到一定高度隐藏
+              disableDepthTestDistance: Number.POSITIVE_INFINITY,
             },
           });
           points.push(labelentity);
@@ -382,8 +453,6 @@ export default {
           sightline._currentTargetPoint[1],
           sightline._currentTargetPoint[2],
         ];
-
-
       } else {
         point1 = [
           sightline._currentTargetPoint[0],
@@ -395,7 +464,6 @@ export default {
           sightline.viewPosition[1],
           sightline.viewPosition[2],
         ];
-
       }
       var positionA = Cesium.Cartesian3.fromDegrees(
         point1[0],
@@ -450,7 +518,7 @@ export default {
       scene.camera.stopFlyCircle();
       this.flyCircleText = "环视漫游";
       this.changCount = 0;
-      scene.camera.lookAtTransform(Cesium.Matrix4.IDENTITY)
+      scene.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
     },
     /**
      * 目标点环视
@@ -472,7 +540,10 @@ export default {
         //     roll: 0.0, // default value
         //   },
         // });
-        scene.camera.lookAt(position, new Cesium.HeadingPitchRange(0, that.circlePitch * -1, that.circleH));
+        scene.camera.lookAt(
+          position,
+          new Cesium.HeadingPitchRange(0, that.circlePitch * -1, that.circleH)
+        );
         scene.camera.flyCircle(position);
 
         // scene.camera.setView({
@@ -494,7 +565,7 @@ export default {
       } else {
         that.flyCircleText = "环视漫游";
         scene.camera.stopFlyCircle();
-        scene.camera.lookAtTransform(Cesium.Matrix4.IDENTITY)
+        scene.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
       }
     },
 
@@ -523,7 +594,6 @@ export default {
      * 绘制飞行线
      */
     addPolyline() {
-
       var that = this;
       that.clearScope();
       that.lineFylPoints = [];
@@ -536,7 +606,10 @@ export default {
         var positions = result.object.positions;
         for (var i = 0; i < positions.length; i++) {
           if (i < positions.length - 1)
-            that.lineLength += that.getLineLentByPoints(positions[i], positions[i + 1])
+            that.lineLength += that.getLineLentByPoints(
+              positions[i],
+              positions[i + 1]
+            );
 
           var cartographic = that.Cartesian2toDegrees(positions[i]);
           that.lineFylPoints.push(cartographic);
@@ -644,7 +717,7 @@ export default {
       routes.routes[0].isFlyLoop = true;
       flyManager = new Cesium.FlyManager({
         scene: scene,
-        routes: routes
+        routes: routes,
       });
 
       //初始化飞行管理
@@ -665,8 +738,13 @@ export default {
       });
     },
     getLineLentByPoints(point1, point2) {
-      var d2L = Math.sqrt((point2.y - point1.y) * (point2.y - point1.y) + (point2.x - point1.x) * (point2.x - point1.x))
-      var d3L = Math.sqrt((point2.z - point1.z) * (point2.z - point1.z) + d2L * d2L)
+      var d2L = Math.sqrt(
+        (point2.y - point1.y) * (point2.y - point1.y) +
+          (point2.x - point1.x) * (point2.x - point1.x)
+      );
+      var d3L = Math.sqrt(
+        (point2.z - point1.z) * (point2.z - point1.z) + d2L * d2L
+      );
       return d3L;
     },
     flyChange() {
@@ -678,9 +756,9 @@ export default {
           that.lineFylPoints[index][0],
           that.lineFylPoints[index][1],
           that.lineFylPoints[index][2] + that.flyH - that.flyHOld
-        )
-      })
-      that.flyHOld = that.flyH
+        );
+      });
+      that.flyHOld = that.flyH;
       flyManager && flyManager.play();
     },
     /**
@@ -690,7 +768,6 @@ export default {
       // var allStops = flyManager.getAllRouteStops();
       // flyManager.viewToStop(allStops[allStops.length - 1]);
       flyManager && flyManager.stop();
-    
     },
   },
   beforeDestroy() {

src/views/ConstructionApplication3D/billboard/billboardDesign.vue

@@ -773,11 +773,12 @@ export default {
               //打开背景  打开背景 （不会被线段覆盖）
               showBackground: true,
               // heightReference: Cesium.HeightReference.RELATIVE_TO_GROUND,
-              distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
-                0.0,
-                300.0
-              ),
-              heightReference: Cesium.HeightReference.NONE,
+              // distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
+              //   0.0,
+              //   1800.0
+              // ),
+              // heightReference: Cesium.HeightReference.NONE,
+              disableDepthTestDistance: Number.POSITIVE_INFINITY,
             },
           });
           entityList.push(point);

src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -1721,8 +1721,9 @@ export default {
               backgroundColor: new Cesium.Color(0.0, 0.0, 0.0, 0.0),
               //打开背景  打开背景 （不会被线段覆盖）
               showBackground: true,
-              heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-              clampToS3M: true,
+              // heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+              disableDepthTestDistance: Number.POSITIVE_INFINITY,
+              // clampToS3M: true,
             },
           });
           that.LandPlanningList.push(GHYDlayerData);
@@ -2649,8 +2650,9 @@ export default {
                     backgroundColor: new Cesium.Color(0.0, 0.0, 0.0, 0.8),
                     //打开背景  打开背景 （不会被线段覆盖）
                     showBackground: true,
-                    heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-                    clampToS3M: true,
+                    // heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+                    disableDepthTestDistance: Number.POSITIVE_INFINITY,
+                    // clampToS3M: true,
                   },
                 });
                 that.DLTBlayerDatas.push(DLTBlayerData);

src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -904,7 +904,9 @@ div::-webkit-scrollbar {
 /deep/ .el-table__fixed-right-patch {
   background: rgba(10, 25, 38, 0.9) !important;
 }
-
+/deep/ .el-table__fixed-right {
+  background: rgba(10, 25, 38, 0.9) !important;
+}
 /deep/ .el-table--border::after,
 .el-table--group::after,
 .el-table::before {

src/views/cockpit/stxf.vue

@@ -361,7 +361,7 @@ export default {
     }
 
     .itemCon {
-      width: 21rem;
+      width: 19.5rem;
 
       // height: 1.55rem;
       // background-color: #faa012;

src/views/map3d.vue

@@ -189,26 +189,42 @@ export default {
     this.updateTime();
   },
   methods: {
+    getFly() {
+      viewer.camera.flyTo({
+        //定位到范围中心点
+        destination: {
+          x: -2040463.7901390342,
+          y: 5793227.819015942,
+          z: 1894583.1762108966,
+        },
+        orientation: {
+          heading: 0.000005686606919574899,
+          pitch: -0.41034310444770905,
+          roll: 0.0,
+        },
+      });
+    },
     viewerChange(isbig) {
       // this.$refs.routeViewRef[ isbig ? 'switchPack_down':'switchPack_up']()
       this.$refs.routeViewRef["switch"]();
     },
     handleMenuSelect(item) {
       this.$router.push({ path: item });
-
+      this.getFly();
       // 菜单切换的时候取消左或者右高亮菜单
-      var lis = document.querySelectorAll('.el-menu-demo1 li');
+      var lis = document.querySelectorAll(".el-menu-demo1 li");
       // console.log(lis, "lis");
 
       lis.forEach(function (li) {
-        li.classList.remove('is-active');
+        li.classList.remove("is-active");
       });
     },
     handleMenuSelect1(item) {
       this.$router.push({ path: item });
-      var lis = document.querySelectorAll('.el-menu-demo li');
+      this.getFly();
+      var lis = document.querySelectorAll(".el-menu-demo li");
       lis.forEach(function (li) {
-        li.classList.remove('is-active');
+        li.classList.remove("is-active");
       });
     },
     updateTime() {
@@ -565,7 +581,6 @@ export default {
   border: none !important;
   text-align: center !important;
 }
-
 </style>
 <style>
 .el-menu--popup {